[LaTeX] Scope macro variables in more contexts (#4405)

This PR includes `macro-variables` context everywhere, `main` (or later `expressions`)
are not included in, to ensure `#1` macro variables are highlighted in any context.

Author: deathaxe

LaTeX/LaTeX.sublime-syntax

@@ -170,6 +170,7 @@ contexts:
     - clear_scopes: 1
     - meta_scope: meta.function.identifier.latex
     - include: brace-group-end
+    - include: macro-variables
     - match: (\\){{cmdname}}
       scope: entity.name.newcommand.latex
       captures:
@@ -236,6 +237,7 @@ contexts:
     - include: brace-group-end
     - include: braces
     - include: xparse-newcommand-single-argspec
+    - include: macro-variables
     # not actually allowed, but included here to future-proof highlighting
     - include: general-constants
     - include: general-commands
@@ -308,6 +310,7 @@ contexts:
   xparse-newcommand-args-wrapped-token:
     - meta_scope: meta.group.brace.tex
     - include: brace-group-end
+    - include: macro-variables
     # either a command
     - match: (\\){{cmdname}}{{endcs}}
       scope: constant.other.token.latex
@@ -421,6 +424,7 @@ contexts:
           set:
             - meta_scope: meta.preamble.documentclass.latex meta.group.brace.tex
             - include: brace-group-end
+            - include: macro-variables
             - match: '[A-Za-z[:digit:]-]'
               scope: support.class.latex
         - include: immediately-pop
@@ -437,6 +441,7 @@ contexts:
           set:
             - meta_scope: meta.preamble.usepackage.latex meta.group.brace.tex
             - include: brace-group-end
+            - include: macro-variables
             - match: '[A-Za-z[:digit:]-]*'
               scope: support.class.latex
         - include: immediately-pop
@@ -451,6 +456,7 @@ contexts:
       push:
         - meta_scope: meta.include.latex
         - include: brace-group-end
+        - include: macro-variables
 
   sections:
     - match: |-
@@ -1180,6 +1186,7 @@ contexts:
             - match: '[a-zA-Z0-9\.:/*!^_-]+'
               scope: constant.other.citation.latex
             - include: brace-group-end
+            - include: macro-variables
         - match: ''
           pop: 1
     - match: |-
@@ -1202,6 +1209,7 @@ contexts:
             - match: '[a-zA-Z0-9\.:/*!^_-]+'
               scope: constant.other.reference.latex
             - include: brace-group-end
+            - include: macro-variables
         - match: ''
           pop: 1
     - match: ((\\)label)(\{)
@@ -1214,6 +1222,7 @@ contexts:
         - match: '[a-zA-Z0-9\.:/*!^_-]+'
           scope: entity.name.label.latex
         - include: brace-group-end
+        - include: macro-variables
 
   begin-end-commands:
     - match: ((\\)begin)(\{)\s*(\w*)\*?\s*(\})
@@ -2032,6 +2041,7 @@ contexts:
         - meta_scope: meta.function.newcolumntype.latex
         - include: brace-group-end
         - include: array-preamble
+        - include: macro-variables
 
 
     - match: |-

LaTeX/TeX.sublime-syntax

@@ -597,6 +597,7 @@ contexts:
     - include: math-operators
     - include: math-variables
     - include: math-numbers
+    - include: macro-variables
     - include: boxes
     - include: general-constants
     - include: stray-brace-pop

LaTeX/tests/syntax_test_latex.tex

@@ -279,6 +279,45 @@
 \newcommandprefix
 %^^^^^^^^^^^^^^^^ support.function.general.latex
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% MACRO VARIABLES
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{#1} \end{#1}
+%      ^^ variable.other.readwrite.tex
+%      ^ punctuation.definition.variable.tex
+%               ^^ variable.other.readwrite.tex
+%               ^ punctuation.definition.variable.tex
+
+\cite{#1##2###3}
+%     ^^^^^^^^^ variable.other.readwrite.tex
+%     ^ punctuation.definition.variable.tex
+%       ^^ punctuation.definition.variable.tex
+%          ^^^ punctuation.definition.variable.tex
+
+\cref{#1##2###3}
+%     ^^^^^^^^^ variable.other.readwrite.tex
+%     ^ punctuation.definition.variable.tex
+%       ^^ punctuation.definition.variable.tex
+%          ^^^ punctuation.definition.variable.tex
+
+\label{#1##2###3}
+%      ^^^^^^^^^ variable.other.readwrite.tex
+%      ^ punctuation.definition.variable.tex
+%        ^^ punctuation.definition.variable.tex
+%           ^^^ punctuation.definition.variable.tex
+
+$$
+\crot{#1} \{ { { #2 (#3) } } \}
+%^^^^^^^^^^^^^^^^^^^^^^^^^ meta.environment.math.block.dollar.tex markup.math.block
+%     ^^ variable.other.readwrite.tex
+%     ^ punctuation.definition.variable.tex
+%                ^^ variable.other.readwrite.tex
+%                ^ punctuation.definition.variable.tex
+%                    ^^ variable.other.readwrite.tex
+%                    ^ punctuation.definition.variable.tex
+$$
+
 \newcolumntype{x}{>{$}c<{$}}
 % ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.newcolumntype.latex
 % ^ support.function.newcolumntype.latex