From 16c43068ec30828c5aed11e87262c56f36782595 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 23 Dec 2024 23:08:26 -0500
Subject: [PATCH] Align queries with 'nvim-treesitter'

Makes it easier to update either way.
---
 queries/folds.scm      |  2 --
 queries/highlights.scm | 48 ++++++++++++++++--------------------------
 queries/indents.scm    | 14 ++++++------
 queries/injections.scm |  2 --
 queries/locals.scm     |  2 --
 5 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/queries/folds.scm b/queries/folds.scm
index 6f39fe9..c40ea3d 100644
--- a/queries/folds.scm
+++ b/queries/folds.scm
@@ -4,5 +4,3 @@
   (module)
   (select_expression)
 ] @fold
-
-; vim: sw=2 foldmethod=marker
diff --git a/queries/highlights.scm b/queries/highlights.scm
index d6e66ea..4fc8854 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -1,41 +1,35 @@
 (comment) @comment
 
-; Operators {{{
 (operator) @operator
 
-(integer_literal ("-") @operator)
-; }}}
+(integer_literal
+  "-" @operator)
 
-; Punctuation {{{
 [
- ","
- ":"
+  ","
+  ":"
 ] @punctuation.delimiter
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
-; }}}
 
-; Literal {{{
 (boolean_literal) @boolean
 
 (integer_literal) @number
 
 [
- (raw_string_literal)
- (interpreted_string_literal)
+  (raw_string_literal)
+  (interpreted_string_literal)
 ] @string
 
 (escape_sequence) @string.escape
-; }}}
 
-; Declarations {{{
 (identifier) @variable
 
 (module
@@ -44,25 +38,19 @@
 (module
   (property
     field: (identifier) @variable.parameter))
-; }}}
 
-; Built-ins {{{
 [
- (unset)
- (default)
- (any)
+  (unset)
+  (default)
+  (any)
 ] @variable.builtin
-(condition
- name: (identifier) @function.builtin)
-; }}}
 
-; Expressions {{{
+(condition
+  name: (identifier) @function.builtin)
+
 (map_expression
   (property
     field: (identifier) @property))
 
 (select_expression
   "select" @keyword.conditional)
-; }}}
-
-; vim: sw=2 foldmethod=marker
diff --git a/queries/indents.scm b/queries/indents.scm
index 9eca576..8cf8adc 100644
--- a/queries/indents.scm
+++ b/queries/indents.scm
@@ -1,36 +1,38 @@
-; Expressions {{{
 (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)
-; }}}
 
-; Declarations {{{
 (module) @indent.begin
+
 (module
   ")" @indent.branch)
+
 (module
   "}" @indent.branch)
-; }}}
-
-; vim: sw=2 foldmethod=marker
diff --git a/queries/injections.scm b/queries/injections.scm
index 9735c59..2f0e58e 100644
--- a/queries/injections.scm
+++ b/queries/injections.scm
@@ -1,4 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-
-; vim: sw=2 foldmethod=marker
diff --git a/queries/locals.scm b/queries/locals.scm
index 089d116..c8a5a17 100644
--- a/queries/locals.scm
+++ b/queries/locals.scm
@@ -13,5 +13,3 @@
   binding: (identifier) @local.definition.var)
 
 (identifier) @local.reference
-
-; vim: sw=2 foldmethod=marker