tm-grammars 1.23.7 → 1.23.9

package/grammars/latex.json

@@ -128,21 +128,44 @@
       "name": "meta.function.environment.songs.latex",
       "patterns": [
         {
-          "begin": "\\\\\\[",
-          "end": "]",
-          "name": "meta.chord.block.latex support.class.chord.block.environment.latex",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          "include": "text.tex.latex#songs-chords"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*((\\\\)beginsong)(?=\\{)",
+      "captures": {
+        "1": {
+          "name": "support.function.be.latex"
         },
+        "2": {
+          "name": "punctuation.definition.function.latex"
+        },
+        "3": {
+          "name": "punctuation.definition.arguments.begin.latex"
+        },
+        "4": {
+          "name": "punctuation.definition.arguments.end.latex"
+        }
+      },
+      "end": "((\\\\)endsong)(?:\\s*\\n)?",
+      "name": "meta.function.environment.song.latex",
+      "patterns": [
         {
-          "match": "\\^",
-          "name": "meta.chord.block.latex support.class.chord.block.environment.latex"
+          "include": "#multiline-arg-no-highlight"
         },
         {
-          "include": "$self"
+          "include": "#multiline-optional-arg-no-highlight"
+        },
+        {
+          "begin": "(?:\\G|(?<=[\\]}]))\\s*",
+          "contentName": "meta.data.environment.song.latex",
+          "end": "\\s*(?=\\\\endsong)",
+          "patterns": [
+            {
+              "include": "text.tex.latex#songs-chords"
+            }
+          ]
         }
       ]
     },
@@ -2188,7 +2211,7 @@
           "include": "#definition-label"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -2222,7 +2245,7 @@
           "include": "#definition-label"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -2339,11 +2362,11 @@
           ]
         }
       },
-      "contentName": "meta.embedded.internal_only_markdown_latex_combined",
+      "contentName": "meta.embedded.markdown_latex_combined",
       "end": "(\\\\end\\{markdown})",
       "patterns": [
         {
-          "include": "text.tex.internal_only_markdown_latex_combined"
+          "include": "text.tex.markdown_latex_combined"
         }
       ]
     },
@@ -2938,7 +2961,7 @@
       "name": "meta.function.verb.latex"
     },
     {
-      "begin": "((\\\\)(?:directlua|luadirect))(\\{)",
+      "begin": "((\\\\)(?:directlua|luadirect|luaexec))(\\{)",
       "beginCaptures": {
         "1": {
           "name": "support.function.verb.latex"
@@ -2983,7 +3006,7 @@
       "name": "meta.math.block.latex support.class.math.block.environment.latex",
       "patterns": [
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -3010,7 +3033,7 @@
           "name": "constant.character.escape.latex"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -3037,7 +3060,7 @@
           "name": "constant.character.escape.latex"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -3060,7 +3083,7 @@
       "name": "meta.math.block.latex support.class.math.block.environment.latex",
       "patterns": [
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -3217,6 +3240,26 @@
         }
       ]
     },
+    "multiline-arg-no-highlight": {
+      "begin": "\\G\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.arguments.begin.latex"
+        }
+      },
+      "end": "}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.arguments.end.latex"
+        }
+      },
+      "name": "meta.parameter.latex",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ]
+    },
     "multiline-optional-arg": {
       "begin": "\\G\\[",
       "beginCaptures": {
@@ -3239,7 +3282,7 @@
       ]
     },
     "multiline-optional-arg-no-highlight": {
-      "begin": "\\G\\[",
+      "begin": "(?:\\G|(?<=}))\\s*\\[",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.optional.begin.latex"
@@ -3343,6 +3386,27 @@
           "name": "meta.parameter.optional.latex"
         }
       ]
+    },
+    "songs-chords": {
+      "patterns": [
+        {
+          "begin": "\\\\\\[",
+          "end": "]",
+          "name": "meta.chord.block.latex support.class.chord.block.environment.latex",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        },
+        {
+          "match": "\\^",
+          "name": "meta.chord.block.latex support.class.chord.block.environment.latex"
+        },
+        {
+          "include": "$self"
+        }
+      ]
     }
   },
   "scopeName": "text.tex.latex"

package/grammars/php.json

@@ -2031,23 +2031,68 @@
       ]
     },
     "instantiation": {
-      "begin": "(?i)(new)\\s+(?!class\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.new.php"
-        }
-      },
-      "end": "(?i)(?=[^a-z0-9_\\x7F-\\x{10FFFF}\\\\])",
       "patterns": [
         {
-          "match": "(?i)(parent|static|self)(?![a-z0-9_\\x7F-\\x{10FFFF}])",
-          "name": "storage.type.php"
-        },
-        {
-          "include": "#class-name"
+          "captures": {
+            "1": {
+              "name": "keyword.other.new.php"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "match": "(?i)(parent|static|self)(?![a-z0-9_\\x7F-\\x{10FFFF}])",
+                  "name": "storage.type.php"
+                },
+                {
+                  "include": "#class-name"
+                },
+                {
+                  "include": "#variable-name"
+                }
+              ]
+            }
+          },
+          "match": "(?i)(new)\\s+(?!class\\b)([$a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)(?![a-z0-9_\\x7F-\\x{10FFFF}\\\\(])"
         },
         {
-          "include": "#variable-name"
+          "begin": "(?i)(new)\\s+(?!class\\b)([$a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)\\s*(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.new.php"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "match": "(?i)(parent|static|self)(?![a-z0-9_\\x7F-\\x{10FFFF}])",
+                  "name": "storage.type.php"
+                },
+                {
+                  "include": "#class-name"
+                },
+                {
+                  "include": "#variable-name"
+                }
+              ]
+            },
+            "3": {
+              "name": "punctuation.definition.arguments.begin.bracket.round.php"
+            }
+          },
+          "contentName": "meta.function-call.php",
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.arguments.end.bracket.round.php"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#named-arguments"
+            },
+            {
+              "include": "$self"
+            }
+          ]
         }
       ]
     },
@@ -2844,6 +2889,10 @@
             },
             {
               "include": "#php_doc_types"
+            },
+            {
+              "match": "[|\\&]",
+              "name": "punctuation.separator.delimiter.php"
             }
           ]
         },
@@ -2880,19 +2929,11 @@
             {
               "match": "[|\\&]",
               "name": "punctuation.separator.delimiter.php"
-            },
-            {
-              "match": "\\(",
-              "name": "punctuation.definition.type.begin.bracket.round.php"
-            },
-            {
-              "match": "\\)",
-              "name": "punctuation.definition.type.end.bracket.round.php"
             }
           ]
         }
       },
-      "match": "(?i)\\??[a-z_\\x7F-\\x{10FFFF}\\\\][a-z0-9_\\x7F-\\x{10FFFF}\\\\]*([|\\&]\\??[a-z_\\x7F-\\x{10FFFF}\\\\][a-z0-9_\\x7F-\\x{10FFFF}\\\\]*)*"
+      "match": "(?i)\\??[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+([|\\&]\\??[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)*"
     },
     "php_doc_types_array_multiple": {
       "begin": "\\(",
@@ -2901,7 +2942,7 @@
           "name": "punctuation.definition.type.begin.bracket.round.phpdoc.php"
         }
       },
-      "end": "(\\))(\\[])|(?=\\*/)",
+      "end": "(\\))(\\[])?|(?=\\*/)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.type.end.bracket.round.phpdoc.php"
@@ -2939,7 +2980,7 @@
           "name": "keyword.other.array.phpdoc.php"
         }
       },
-      "match": "(?i)([a-z_\\x7F-\\x{10FFFF}\\\\][a-z0-9_\\x7F-\\x{10FFFF}\\\\]*)(\\[])"
+      "match": "(?i)([a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)(\\[])"
     },
     "regex-double-quoted": {
       "begin": "\"/(?=(\\\\.|[^\"/])++/[imsxeADSUXu]*\")",

package/grammars/rust.json

@@ -60,7 +60,7 @@
           "name": "variable.other.metavariable.specifier.rust"
         }
       },
-      "match": "(\\$)((crate)|([A-Z][A-Za-z0-9_]*))((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
+      "match": "(\\$)((crate)|([A-Z]\\w*))(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?",
       "name": "meta.macro.metavariable.type.rust",
       "patterns": [
         {
@@ -83,7 +83,7 @@
           "name": "variable.other.metavariable.specifier.rust"
         }
       },
-      "match": "(\\$)([a-z][A-Za-z0-9_]*)((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
+      "match": "(\\$)([a-z]\\w*)(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?",
       "name": "meta.macro.metavariable.rust",
       "patterns": [
         {

package/grammars/tex.json

@@ -3,47 +3,54 @@
   "name": "tex",
   "patterns": [
     {
-      "begin": "(?<=^\\s*)((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
+      "include": "#iffalse-block"
+    },
+    {
+      "include": "#macro-control"
+    },
+    {
+      "include": "#catcode"
+    },
+    {
+      "include": "#comment"
+    },
+    {
+      "match": "[\\[\\]]",
+      "name": "punctuation.definition.brackets.tex"
+    },
+    {
+      "include": "#dollar-math"
+    },
+    {
+      "match": "\\\\\\\\",
+      "name": "keyword.control.newline.tex"
+    },
+    {
+      "include": "#macro-general"
+    }
+  ],
+  "repository": {
+    "braces": {
+      "begin": "(?<!\\\\)\\{",
       "beginCaptures": {
-        "1": {
-          "name": "keyword.control.tex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.tex"
+        "0": {
+          "name": "punctuation.group.begin.tex"
         }
       },
-      "contentName": "comment.line.percentage.tex",
-      "end": "((\\\\)(?:else|fi))",
+      "end": "(?<!\\\\)}",
       "endCaptures": {
-        "1": {
-          "name": "keyword.control.tex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.tex"
+        "0": {
+          "name": "punctuation.group.end.tex"
         }
       },
+      "name": "meta.group.braces.tex",
       "patterns": [
-        {
-          "include": "#comment"
-        },
         {
           "include": "#braces"
-        },
-        {
-          "include": "#conditionals"
         }
       ]
     },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.keyword.tex"
-        }
-      },
-      "match": "(\\\\)(backmatter|csname|else|endcsname|fi|frontmatter|mainmatter|unless|if(case|cat|csname|defined|dim|eof|false|fontchar|hbox|hmode|inner|mmode|num|odd|true|vbox|vmode|void|x)?)(?![a-zA-Z@])",
-      "name": "keyword.control.tex"
-    },
-    {
+    "catcode": {
       "captures": {
         "1": {
           "name": "keyword.control.catcode.tex"
@@ -61,14 +68,50 @@
       "match": "((\\\\)catcode)`\\\\?.(=)(\\d+)",
       "name": "meta.catcode.tex"
     },
-    {
-      "include": "#comment"
+    "comment": {
+      "begin": "(^[ \\t]+)?(?=%)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.tex"
+        }
+      },
+      "end": "(?!\\G)",
+      "patterns": [
+        {
+          "begin": "%:?",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.tex"
+            }
+          },
+          "end": "$\\n?",
+          "name": "comment.line.percentage.tex"
+        },
+        {
+          "begin": "^(%!TEX) (\\S*) =",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.tex"
+            }
+          },
+          "end": "$\\n?",
+          "name": "comment.line.percentage.directive.tex"
+        }
+      ]
     },
-    {
-      "match": "[\\[\\]]",
-      "name": "punctuation.definition.brackets.tex"
+    "conditionals": {
+      "begin": "(?<=^\\s*)\\\\if[a-z]*",
+      "end": "(?<=^\\s*)\\\\fi",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#conditionals"
+        }
+      ]
     },
-    {
+    "dollar-math": {
       "begin": "(\\$(?:\\$|))",
       "beginCaptures": {
         "1": {
@@ -88,119 +131,95 @@
           "name": "constant.character.escape.tex"
         },
         {
-          "include": "#math"
+          "include": "#math-content"
         },
         {
           "include": "$self"
         }
       ]
     },
-    {
-      "match": "\\\\\\\\",
-      "name": "keyword.control.newline.tex"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.function.tex"
-        }
-      },
-      "match": "(\\\\)_*[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
-      "name": "support.class.general.latex3.tex"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.function.tex"
-        }
-      },
-      "match": "(\\.)[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
-      "name": "support.class.general.latex3.tex"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.function.tex"
-        }
-      },
-      "match": "(\\\\)(?:[,;]|[\\p{Alphabetic}@]+)",
-      "name": "support.function.general.tex"
-    },
-    {
-      "captures": {
+    "iffalse-block": {
+      "begin": "(?<=^\\s*)((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
+      "beginCaptures": {
         "1": {
+          "name": "keyword.control.tex"
+        },
+        "2": {
           "name": "punctuation.definition.keyword.tex"
         }
       },
-      "match": "(\\\\)[^a-zA-Z@]",
-      "name": "constant.character.escape.tex"
-    }
-  ],
-  "repository": {
-    "braces": {
-      "begin": "(?<!\\\\)\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.group.begin.tex"
-        }
-      },
-      "end": "(?<!\\\\)}",
+      "contentName": "comment.line.percentage.tex",
+      "end": "((\\\\)(?:else|fi))",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.group.end.tex"
+        "1": {
+          "name": "keyword.control.tex"
+        },
+        "2": {
+          "name": "punctuation.definition.keyword.tex"
         }
       },
-      "name": "meta.group.braces.tex",
       "patterns": [
+        {
+          "include": "#comment"
+        },
         {
           "include": "#braces"
+        },
+        {
+          "include": "#conditionals"
         }
       ]
     },
-    "comment": {
-      "begin": "(^[ \\t]+)?(?=%)",
-      "beginCaptures": {
+    "macro-control": {
+      "captures": {
         "1": {
-          "name": "punctuation.whitespace.comment.leading.tex"
+          "name": "punctuation.definition.keyword.tex"
         }
       },
-      "end": "(?!\\G)",
+      "match": "(\\\\)(backmatter|csname|else|endcsname|fi|frontmatter|mainmatter|unless|if(case|cat|csname|defined|dim|eof|false|fontchar|hbox|hmode|inner|mmode|num|odd|true|vbox|vmode|void|x)?)(?![a-zA-Z@])",
+      "name": "keyword.control.tex"
+    },
+    "macro-general": {
       "patterns": [
         {
-          "begin": "%:?",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.tex"
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.function.tex"
             }
           },
-          "end": "$\\n?",
-          "name": "comment.line.percentage.tex"
+          "match": "(\\\\)_*[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
+          "name": "support.class.general.latex3.tex"
         },
         {
-          "begin": "^(%!TEX) (\\S*) =",
-          "beginCaptures": {
+          "captures": {
             "1": {
-              "name": "punctuation.definition.comment.tex"
+              "name": "punctuation.definition.function.tex"
             }
           },
-          "end": "$\\n?",
-          "name": "comment.line.percentage.directive.tex"
-        }
-      ]
-    },
-    "conditionals": {
-      "begin": "(?<=^\\s*)\\\\if[a-z]*",
-      "end": "(?<=^\\s*)\\\\fi",
-      "patterns": [
+          "match": "(\\.)[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
+          "name": "support.class.general.latex3.tex"
+        },
         {
-          "include": "#comment"
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.function.tex"
+            }
+          },
+          "match": "(\\\\)(?:[,;]|[\\p{Alphabetic}@]+)",
+          "name": "support.function.general.tex"
         },
         {
-          "include": "#conditionals"
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.keyword.tex"
+            }
+          },
+          "match": "(\\\\)[^a-zA-Z@]",
+          "name": "constant.character.escape.tex"
         }
       ]
     },
-    "math": {
+    "math-content": {
       "patterns": [
         {
           "begin": "((\\\\)(?:text|mbox))(\\{)",
@@ -224,7 +243,7 @@
           },
           "patterns": [
             {
-              "include": "#math"
+              "include": "#math-content"
             },
             {
               "include": "$self"
@@ -336,7 +355,7 @@
           "name": "constant.numeric.math.tex"
         },
         {
-          "match": "[+*/_^-]",
+          "match": "[+*/-]|(?<!\\^)\\^(?!\\^)|(?<!_)_(?!_)",
           "name": "punctuation.math.operator.tex"
         }
       ]