fix: remove upstreamed directives

`#inject-lang!` and `#trim!`; fix `set-lang-from-mimetype`

6 files changed, 7 insertions, 37 deletions

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