Adjust fallback captures

Switch module and sigil modifier captures from prefixed fallbacks to
secondary capture fallbacks

Author: AlternateRT

.tsqueryrc.json

@@ -48,9 +48,11 @@
       "keyword.operator": "Captures operator keywords",
       "keyword.operator.regex": "Captures regex mode modifiers",
       "label": "Captures labels",
-      "label.modifier": "Captures modifiers",
       "link_text": "Captures link text",
       "link_uri": "Captures link URIs",
+      "modifier": "Captures modifiers",
+      "module": "Captures modules",
+      "module.struct": "Captures structs",
       "number": "Captures numeric values",
       "operator": "Captures operators",
       "predictive": "Captures predictive text",
@@ -76,8 +78,6 @@
       "type": "Captures types",
       "type.builtin": "Captures built-in types",
       "type.interface": "Captures interface types",
-      "type.module": "Captures modules",
-      "type.module.struct": "Captures structs",
       "type.spec": "Captures typespecs",
       "type.super": "Captures superclass types",
       "variable": "Captures variables",

languages/elixir/highlights.scm

@@ -60,23 +60,23 @@
 (char) @constant.char
 
 ; Modules
-(alias) @type.module
+(alias) @type @module
 
 ; Erlang modules
 (call
   target: (dot
     left: [
       (atom)
       (quoted_atom)
-    ] @type.module))
+    ] @type @module))
 
 ; Structs
 (struct
   [
     (alias)
     (atom)
     (quoted_atom)
-  ] @type.module.struct)
+  ] @type @module.struct)
 
 ; Regular identifiers
 (identifier) @variable
@@ -111,7 +111,7 @@
   quoted_end: _ @string.special) @string.special
 
 ; Sigil modifiers
-(sigil_modifiers) @label.modifier
+(sigil_modifiers) @label @modifier
 
 ; String/charlist sigils
 (sigil
@@ -197,7 +197,7 @@
   operand: [
     (atom)
     (quoted_atom)
-  ] @type.module)
+  ] @type @module)
 
 ; Capture functions from a map field/variable holding a module
 (unary_operator
@@ -236,7 +236,7 @@
   right: [
     (atom)
     (quoted_atom)
-  ] @type.module)
+  ] @type @module)
 
 ; Piping into a map field/variable holding a module that has no parentheses
 (binary_operator

languages/heex/highlights.scm

@@ -46,7 +46,7 @@
 ; HEEx components are highlighted the same as Elixir modules and functions
 (component_name
   [
-    (module) @type.module
+    (module) @type @module
     (function) @function
     "." @operator
   ])