feat(c-family): inherit injections

queries/arduino/injections.scm

@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "arduino"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: cpp

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"))

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"))
 

queries/cuda/injections.scm

@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "cuda"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: cpp

queries/glsl/injections.scm

@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "glsl"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: c

queries/hlsl/injections.scm

@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "hlsl"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: cpp

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)