From 5af53cd4e0c084ad2ec9418a37c1d9682eef32d4 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Thu, 2 Nov 2023 20:59:00 +0100
Subject: [PATCH] [LaTeX] Replace some ugly anonymous multi-push contexts

---
 LaTeX/LaTeX.sublime-syntax | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/LaTeX/LaTeX.sublime-syntax b/LaTeX/LaTeX.sublime-syntax
index 3558c88d44..94a81ac124 100644
--- a/LaTeX/LaTeX.sublime-syntax
+++ b/LaTeX/LaTeX.sublime-syntax
@@ -363,16 +363,14 @@ contexts:
         3: punctuation.definition.group.brace.begin.tex
       push:
         - meta_scope: meta.function.box.latex
-        - match: \}
-          scope: punctuation.definition.group.brace.end.tex
-          pop: 1
+        - include: brace-group-end
         - include: main
     - match: ((\\)(?:framebox|makebox))\b
       captures:
         1: support.function.box.latex
         2: punctuation.definition.backslash.latex
       push:
-        - [{meta_scope: meta.function.box.latex}, {match: '', pop: 1}]
+        - box-meta
         - argument
         - optional-arguments
     - match: ((\\)parbox)\b
@@ -380,7 +378,7 @@ contexts:
         1: support.function.box.latex
         2: punctuation.definition.backslash.latex
       push:
-        - [{meta_scope: meta.function.box.latex}, {match: '', pop: 1}]
+        - box-meta
         - argument
         - argument
         - optional-arguments
@@ -389,10 +387,15 @@ contexts:
         1: support.function.box.latex
         2: punctuation.definition.backslash.latex
       push:
-        - [{meta_scope: meta.function.box.latex}, {match: '', pop: 1}]
+        - box-meta
         - argument
         - optional-arguments
 
+  box-meta:
+    - meta_include_prototype: false
+    - meta_scope: meta.function.box.latex
+    - include: immediately-pop
+
   preamble:
     - match: (\\)documentclass\b
       scope: meta.preamble.documentclass.latex keyword.control.preamble.latex
@@ -680,10 +683,15 @@ contexts:
         1: support.function.includegraphics.latex
         2: punctuation.definition.backslash.latex
       push:
-        - [{meta_scope: meta.function.includegraphics.latex}, {match: '', pop: 1}]
+        - includegraphics-meta
         - argument
         - optional-arguments
 
+  includegraphics-meta:
+    - meta_include_prototype: false
+    - meta_scope: meta.function.includegraphics.latex
+    - include: immediately-pop
+
   url:
     - match: ((\\)(?:url|href|path))(\{)([^}]*)(\})
       scope: meta.function.link.url.latex
@@ -1024,9 +1032,7 @@ contexts:
   # utility that waits for the brace, and pops the three contexts
   # we push for each \text... command otherwise
   expect-text-markup-open-brace:
-    - match: \{
-      scope: punctuation.definition.group.brace.begin.tex
-      pop: 1
+    - include: brace-group-begin
     - match: (?=\S)
       pop: 3