From 645f1669513059444f66abaffb5ed24e8ddb4085 Mon Sep 17 00:00:00 2001
From: may <63159454+m4rch3n1ng@users.noreply.github.com>
Date: Sun, 18 Jan 2026 18:57:14 +0100
Subject: [PATCH] add some missing comment injections, misc query cleanup
 (#15116)

---
 book/src/generated/lang-support.md        |  2 +-
 runtime/queries/ada/injections.scm        |  2 ++
 runtime/queries/forth/injections.scm      |  2 ++
 runtime/queries/ghostty/highlights.scm    |  1 -
 runtime/queries/ghostty/injections.scm    |  2 ++
 runtime/queries/git-config/injections.scm |  2 ++
 runtime/queries/git-ignore/injections.scm |  2 ++
 runtime/queries/glimmer/injections.scm    |  2 ++
 runtime/queries/graphql/injections.scm    |  2 ++
 runtime/queries/ini/injections.scm        |  2 ++
 runtime/queries/json5/injections.scm      |  3 ++
 runtime/queries/jsonc/injections.scm      |  3 ++
 runtime/queries/meson/injections.scm      |  2 ++
 runtime/queries/nim/injections.scm        |  3 ++
 runtime/queries/ripple/brackets.scm       | 16 ----------
 runtime/queries/ripple/outline.scm        | 25 ---------------
 runtime/queries/ripple/rainbows.scm       | 39 +++++++++++++++++++++++
 runtime/queries/ripple/tags.scm           | 21 ++++++++++++
 runtime/queries/scheme/injections.scm     |  5 +--
 runtime/queries/systemd/injections.scm    |  1 +
 runtime/queries/vala/injections.scm       |  2 ++
 21 files changed, 92 insertions(+), 47 deletions(-)
 create mode 100644 runtime/queries/ada/injections.scm
 create mode 100644 runtime/queries/forth/injections.scm
 create mode 100644 runtime/queries/ghostty/injections.scm
 create mode 100644 runtime/queries/git-config/injections.scm
 create mode 100644 runtime/queries/git-ignore/injections.scm
 create mode 100644 runtime/queries/glimmer/injections.scm
 create mode 100644 runtime/queries/graphql/injections.scm
 create mode 100644 runtime/queries/ini/injections.scm
 create mode 100644 runtime/queries/json5/injections.scm
 create mode 100644 runtime/queries/jsonc/injections.scm
 create mode 100644 runtime/queries/meson/injections.scm
 create mode 100644 runtime/queries/nim/injections.scm
 delete mode 100644 runtime/queries/ripple/brackets.scm
 delete mode 100644 runtime/queries/ripple/outline.scm
 create mode 100644 runtime/queries/ripple/rainbows.scm
 create mode 100644 runtime/queries/ripple/tags.scm
 create mode 100644 runtime/queries/systemd/injections.scm
 create mode 100644 runtime/queries/vala/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index d763b2ce..fa9a64bd 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -228,7 +228,7 @@
 | regex | ✓ |  |  |  | ✓ |  |
 | rego | ✓ |  |  |  |  | `regols` |
 | rescript | ✓ | ✓ |  |  |  | `rescript-language-server` |
-| ripple | ✓ |  |  |  |  | `ripple-language-server` |
+| ripple | ✓ |  |  | ✓ | ✓ | `ripple-language-server` |
 | rmarkdown | ✓ |  | ✓ |  |  | `R` |
 | robot | ✓ |  |  |  |  | `robotframework_ls` |
 | robots.txt | ✓ | ✓ |  | ✓ |  |  |
diff --git a/runtime/queries/ada/injections.scm b/runtime/queries/ada/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/ada/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/forth/injections.scm b/runtime/queries/forth/injections.scm
new file mode 100644
index 00000000..e4509a5f
--- /dev/null
+++ b/runtime/queries/forth/injections.scm
@@ -0,0 +1,2 @@
+([(line_comment) (block_comment)] @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ghostty/highlights.scm b/runtime/queries/ghostty/highlights.scm
index 4ae953e5..9f7f2da1 100644
--- a/runtime/queries/ghostty/highlights.scm
+++ b/runtime/queries/ghostty/highlights.scm
@@ -1,4 +1,3 @@
-; extends
 ; Comments
 (comment) @comment
 
diff --git a/runtime/queries/ghostty/injections.scm b/runtime/queries/ghostty/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/ghostty/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/git-config/injections.scm b/runtime/queries/git-config/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/git-config/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/git-ignore/injections.scm b/runtime/queries/git-ignore/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/git-ignore/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/glimmer/injections.scm b/runtime/queries/glimmer/injections.scm
new file mode 100644
index 00000000..0c0037a0
--- /dev/null
+++ b/runtime/queries/glimmer/injections.scm
@@ -0,0 +1,2 @@
+((comment_statement) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/graphql/injections.scm b/runtime/queries/graphql/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/graphql/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ini/injections.scm b/runtime/queries/ini/injections.scm
new file mode 100644
index 00000000..e5424c24
--- /dev/null
+++ b/runtime/queries/ini/injections.scm
@@ -0,0 +1,2 @@
+((comment (text) @injection.content)
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/json5/injections.scm b/runtime/queries/json5/injections.scm
new file mode 100644
index 00000000..f722f6d2
--- /dev/null
+++ b/runtime/queries/json5/injections.scm
@@ -0,0 +1,3 @@
+; inherits: json
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/jsonc/injections.scm b/runtime/queries/jsonc/injections.scm
new file mode 100644
index 00000000..f722f6d2
--- /dev/null
+++ b/runtime/queries/jsonc/injections.scm
@@ -0,0 +1,3 @@
+; inherits: json
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/meson/injections.scm b/runtime/queries/meson/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/meson/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/nim/injections.scm b/runtime/queries/nim/injections.scm
new file mode 100644
index 00000000..48521a2f
--- /dev/null
+++ b/runtime/queries/nim/injections.scm
@@ -0,0 +1,3 @@
+([(comment (comment_content) @injection.content)
+  (block_comment (comment_content) @injection.content)]
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ripple/brackets.scm b/runtime/queries/ripple/brackets.scm
deleted file mode 100644
index 6dead9c9..00000000
--- a/runtime/queries/ripple/brackets.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-; Bracket pairs for cursor navigation
-(jsx_opening_element
-  "<" @open
-  ">" @close)
-
-(jsx_closing_element
-  "</" @open
-  ">" @close)
-
-(jsx_self_closing_element
-  "<" @open
-  "/>" @close)
-
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
diff --git a/runtime/queries/ripple/outline.scm b/runtime/queries/ripple/outline.scm
deleted file mode 100644
index ba10936d..00000000
--- a/runtime/queries/ripple/outline.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-; Code outline/structure for symbol navigation
-
-; Components
-(component_declaration
-  name: (identifier) @name) @item
-
-; Fragments
-(fragment_declaration
-  name: (identifier) @name) @item
-
-; Functions
-(function_declaration
-  name: (identifier) @name) @item
-
-; Classes
-(class_declaration
-  name: (identifier) @name) @item
-
-; Methods
-(method_definition
-  name: (property_name) @name) @item
-
-; Variables (const/let)
-(variable_declarator
-  name: (identifier) @name) @item
diff --git a/runtime/queries/ripple/rainbows.scm b/runtime/queries/ripple/rainbows.scm
new file mode 100644
index 00000000..17742da2
--- /dev/null
+++ b/runtime/queries/ripple/rainbows.scm
@@ -0,0 +1,39 @@
+; Bracket pairs for cursor navigation
+
+[
+  (for_statement)
+  (for_in_statement)
+  (for_of_statement)
+  (catch_clause)
+  (formal_parameters)
+  (parenthesized_expression)
+  (arguments)
+  (parenthesized_type)
+  (array_pattern)
+  (subscript_expression)
+  (computed_property_name)
+  (array)
+  (array_type)
+  (tuple_type)
+  (export_clause)
+  (named_imports)
+  (statement_block)
+  (switch_body)
+  (component_body)
+  (class_body)
+  (object_pattern)
+  (server_block)
+  (object)
+  (jsx_expression)
+  (object_type)
+] @rainbow.scope
+
+(jsx_opening_element ["<" ">"] @rainbow.bracket) @rainbow.scope
+(jsx_closing_element ["</" ">"] @rainbow.bracket) @rainbow.scope
+(jsx_self_closing_element ["<" "/>"] @rainbow.bracket) @rainbow.scope
+
+[
+  "(" ")"
+  "[" "]"
+  "{" "}"
+] @rainbow.bracket
diff --git a/runtime/queries/ripple/tags.scm b/runtime/queries/ripple/tags.scm
new file mode 100644
index 00000000..0289f326
--- /dev/null
+++ b/runtime/queries/ripple/tags.scm
@@ -0,0 +1,21 @@
+; Code outline/structure for symbol navigation
+
+; Components
+(component_declaration
+  name: (identifier) @name) @definition.function
+
+; Fragments
+(fragment_declaration
+  name: (identifier) @name) @definition.function
+
+; Functions
+(function_declaration
+  name: (identifier) @name) @definition.function
+
+; Classes
+(class_declaration
+  name: (identifier) @name) @definition.class
+
+; Methods
+(method_definition
+  name: (property_name) @name) @definition.function
diff --git a/runtime/queries/scheme/injections.scm b/runtime/queries/scheme/injections.scm
index aebb54d9..ba6d1c7c 100644
--- a/runtime/queries/scheme/injections.scm
+++ b/runtime/queries/scheme/injections.scm
@@ -1,5 +1,2 @@
-((comment) @injection.content
- (#set! injection.language "comment"))
-
-((block_comment) @injection.content
+([(comment) (block_comment)] @injection.content
  (#set! injection.language "comment"))
diff --git a/runtime/queries/systemd/injections.scm b/runtime/queries/systemd/injections.scm
new file mode 100644
index 00000000..5fa4bb82
--- /dev/null
+++ b/runtime/queries/systemd/injections.scm
@@ -0,0 +1 @@
+; inherits: ini
diff --git a/runtime/queries/vala/injections.scm b/runtime/queries/vala/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/vala/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
-- 
2.51.2