github-linguist 4.8.13 → 4.8.14

data/grammars/source.haskell.json

@@ -894,7 +894,7 @@
           }
         },
         {
-          "match": "(::|∷)(.*?)(?:(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(<-|=)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])|$)",
+          "match": "(::|∷)(.*?)(?=(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(<-|=)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])|$)",
           "captures": {
             "1": {
               "name": "keyword.other.double-colon.haskell"
@@ -906,16 +906,6 @@
                   "include": "#type_signature"
                 }
               ]
-            },
-            "3": {
-              "patterns": [
-                {
-                  "include": "#assignment_op"
-                },
-                {
-                  "include": "#operator"
-                }
-              ]
             }
           }
         }

data/grammars/source.js.json

@@ -948,7 +948,7 @@
       "name": "constant.language.js"
     },
     {
-      "begin": "(?<=[\\[=(?:+,!]|^|return|=>|&&|\\|\\|)\\s*(/)(?![/*+{}?])(?=.*/)",
+      "begin": "(?<=[\\[=(?:+,!]|^|return|=>|&&|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.js"

data/grammars/source.renpy.json

@@ -399,7 +399,7 @@
           "name": "keyword.control.statement.renpy"
         }
       },
-      "end": "(\\n|\\()|#",
+      "end": "(\\n|\\()|\\:",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.inheritance.end.python"
@@ -1057,7 +1057,7 @@
       "name": "support.type.python"
     },
     "constant_placeholder": {
-      "match": "(?i:(%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?([hL][a-z]|[a-z%]))|(\\{([\\\\\\/#=\\-\\+!\\[\\].:\\w ]+)?\\})|(\\{\\/([!\\[\\].:\\w ]+)?\\})|(\\[([!\\[\\].:\\w ]+)?\\]))",
+      "match": "(?i:(%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?([hL][a-z]|[a-z%]))|(\\{([\\?\\&\\%\\\\\\/#=\\-\\+!\\[\\].:\\w ]+)?\\})|(\\{\\/([!\\[\\].:\\w ]+)?\\})|(\\[([!\\[\\].:\\w ]+)?\\]))",
       "name": "constant.other.placeholder.tags.renpy"
     },
     "docstrings": {

data/grammars/source.viml.json

@@ -8,7 +8,7 @@
     "nvimrc",
     "_vimrc"
   ],
-  "firstLineMatch": "(?x)\n\n# Hashbang\n^\\#!.*(?:\\s|\\/|(?<=!)\\b)\n\t(?:vim|nvim)\n(?:$|\\s)\n\n|\n\n# Modeline\n(?i:\n\t# Vim/Vi modeline, accounting for all possible variations\n\t(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s* set?\\s))\n\t(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:]\n\t(?:filetype|ft|syntax)\\s*=\n\t\tvim\n\t(?=\\s|:|$)\n\t\n\t|\n\t\n\t# Emacs modeline, assuming a major mode for VimScript even exists\n\t-\\*-(?:(?:(?!mode\\s*:)[^:;]+:[^:;]+;)*\\s*mode\\s*:)?\\s*\n\t\t(Vim|VimL|VimScript)\n\t\\s*(?:;[^:;]+:[^:;]+?)*;?\\s*-\\*-\n)",
+  "firstLineMatch": "(?x)\n\n# Hashbang\n^\\#!.*(?:\\s|\\/|(?<=!)\\b)\n\t(?:vim|nvim)\n(?:$|\\s)\n\n|\n\n# Modeline\n(?i:\n\t# Vim/Vi modeline, accounting for all possible variations\n\t(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s* set?\\s))\n\t(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:]\n\t(?:filetype|ft|syntax)\\s*=\n\t\tvim\n\t(?=\\s|:|$)\n\t\n\t|\n\t\n\t# Emacs modeline, assuming a major mode for VimScript even exists\n\t-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n\t\t(?:Vim|VimL|VimScript)\n\t(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n)",
   "foldingStartMarker": "^(?:if|while|for|fu|function|augroup|aug)",
   "foldingStopMarker": "(?:endif|endwhile|endfor|endf|endfunction|augroup\\.END|aug\\.END)$",
   "patterns": [

data/grammars/text.html.mediawiki.json

@@ -179,7 +179,7 @@
           "name": "meta.embedded.tex.math",
           "patterns": [
             {
-              "include": "text.tex.math"
+              "include": "text.tex#math"
             }
           ]
         },
@@ -190,7 +190,7 @@
           "name": "meta.embedded.html.table",
           "patterns": [
             {
-              "include": "text.html"
+              "include": "text.html.basic"
             }
           ]
         },

data/grammars/text.html.php.blade.json

@@ -8,31 +8,158 @@
   "foldingStartMarker": "(/\\*|\\{\\s*$|<<<HTML)",
   "foldingStopMarker": "(\\*/|^\\s*\\}|^HTML;)",
   "injections": {
-    "text.html.php.blade - (meta.embedded | meta.tag | comment.block.meta.embedded.blade), L:text.html.php.blade meta.tag, L:source.js.embedded.html": {
+    "text.html.php.blade - (meta.embedded | meta.tag | comment.block.blade), L:text.html.php.blade meta.tag, L:source.js.embedded.html": {
       "patterns": [
         {
           "begin": "{{--",
-          "captures": {
+          "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.blade"
+              "name": "punctuation.definition.comment.begin.blade"
             }
           },
           "end": "--}}",
-          "name": "comment.block.meta.embedded.blade"
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.end.blade"
+            }
+          },
+          "name": "comment.block.blade",
+          "patterns": [
+            {
+              "name": "invalid.illegal.php-code-in-comment.blade",
+              "begin": "(^\\s*)(?=<\\?(?![^?]*\\?>))",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.whitespace.embedded.leading.php"
+                }
+              },
+              "end": "(?!\\G)(\\s*$\\n)?",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.whitespace.embedded.trailing.php"
+                }
+              },
+              "patterns": [
+                {
+                  "begin": "<\\?(?i:php|=)?",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.begin.php"
+                    }
+                  },
+                  "contentName": "source.php",
+                  "end": "(\\?)>",
+                  "endCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.end.php"
+                    },
+                    "1": {
+                      "name": "source.php"
+                    }
+                  },
+                  "name": "meta.embedded.block.php",
+                  "patterns": [
+                    {
+                      "include": "#language"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "begin": "<\\?(?i:php|=)?(?![^?]*\\?>)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.begin.php"
+                }
+              },
+              "contentName": "source.php",
+              "end": "(\\?)>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.end.php"
+                },
+                "1": {
+                  "name": "source.php"
+                }
+              },
+              "name": "invalid.illegal.php-code-in-comment.blade.meta.embedded.block.php",
+              "patterns": [
+                {
+                  "include": "#language"
+                }
+              ]
+            },
+            {
+              "begin": "<\\?(?i:php|=)?",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.begin.php"
+                }
+              },
+              "end": ">",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.end.php"
+                }
+              },
+              "name": "invalid.illegal.php-code-in-comment.blade.meta.embedded.line.php",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "source.php"
+                    },
+                    "2": {
+                      "name": "punctuation.section.embedded.end.php"
+                    },
+                    "3": {
+                      "name": "source.php"
+                    }
+                  },
+                  "match": "\\G(\\s*)((\\?))(?=>)",
+                  "name": "meta.special.empty-tag.php"
+                },
+                {
+                  "begin": "\\G",
+                  "contentName": "source.php",
+                  "end": "(\\?)(?=>)",
+                  "endCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.end.php"
+                    },
+                    "1": {
+                      "name": "source.php"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "include": "#language"
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
         },
         {
           "begin": "(?<!@){{{",
-          "captures": {
+          "beginCaptures": {
+            "0": {
+              "name": "support.function.construct.begin.blade"
+            }
+          },
+          "contentName": "source.php",
+          "end": "(})}}",
+          "endCaptures": {
             "0": {
-              "name": "support.punctuation.blade"
+              "name": "support.function.construct.end.blade"
             },
             "1": {
               "name": "source.php"
             }
           },
-          "contentName": "source.php",
-          "end": "(})}}",
-          "name": "meta.embedded.echo.blade",
+          "name": "meta.function.echo.blade",
           "patterns": [
             {
               "include": "#language"
@@ -41,17 +168,22 @@
         },
         {
           "begin": "(?<![@{]){{",
-          "captures": {
+          "beginCaptures": {
+            "0": {
+              "name": "support.function.construct.begin.blade"
+            }
+          },
+          "contentName": "source.php",
+          "end": "(})}",
+          "endCaptures": {
             "0": {
-              "name": "support.punctuation.blade"
+              "name": "support.function.construct.end.blade"
             },
             "1": {
               "name": "source.php"
             }
           },
-          "contentName": "source.php",
-          "end": "(})}",
-          "name": "meta.embedded.echo.blade",
+          "name": "meta.function.echo.blade",
           "patterns": [
             {
               "include": "#language"
@@ -60,17 +192,22 @@
         },
         {
           "begin": "(?<!@){!!",
-          "captures": {
+          "beginCaptures": {
+            "0": {
+              "name": "support.function.construct.begin.blade"
+            }
+          },
+          "contentName": "source.php",
+          "end": "(!)!}",
+          "endCaptures": {
             "0": {
-              "name": "support.punctuation.blade"
+              "name": "support.function.construct.end.blade"
             },
             "1": {
               "name": "source.php"
             }
           },
-          "contentName": "source.php",
-          "end": "(!)!}",
-          "name": "meta.embedded.echo.blade",
+          "name": "meta.function.echo.blade",
           "patterns": [
             {
               "include": "#language"
@@ -78,7 +215,7 @@
           ]
         },
         {
-          "begin": "(?<![A-z0-9_@])@(break|c(hoice|ontinue)|each|hasSection|(else)?(if|can(not)?)|in(ject|clude(If)?)|extends|for(e(ach|lse))?|lang|p(hp|ush)|section|stack|un(less|set)|while|yield)\\s*(?=\\()",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to opening parentheses\n  break\n|can\n|cannot\n|choice\n|continue\n|each\n|elsecan\n|elsecannot\n|elseif\n|extends\n|for\n|foreach\n|forelse\n|hasSection\n|if\n|include\n|includeIf\n|inject\n|lang\n|php\n|push\n|section\n|stack\n|unless\n|unset\n|while\n|yield\n)\n\\s* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
           "beginCaptures": {
             "0": {
               "name": "keyword.blade"
@@ -86,7 +223,7 @@
           },
           "contentName": "source.php",
           "end": "(?<=\\))(?!.*\\))",
-          "name": "meta.embedded.blade",
+          "name": "meta.directive.blade",
           "patterns": [
             {
               "include": "#language"
@@ -94,19 +231,35 @@
           ]
         },
         {
-          "match": "(?<![A-z0-9_@])@(append|break|continue|empty|else|end(can(not)?|for(each|else)?|i(f|nject)|p(hp|ush)|section|unless|verbatim|while)|overwrite|s(how|top)|verbatim)\\b|(?<!@)@parent",
-          "name": "meta.embedded.keyword.blade"
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to opening parentheses\n append\n|else\n|empty\n|endcan\n|endcannot\n|endfor\n|endforeach\n|endforelse\n|endif\n|endphp\n|endpush\n|endsection\n|endunless\n|endwhile\n|overwrite\n|show\n|stop\n)\n\\s* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.blade"
+            }
+          },
+          "contentName": "comment.blade",
+          "end": "(?<=\\))(?!.*\\))",
+          "name": "meta.directive.blade"
+        },
+        {
+          "match": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to word boundary\n append\n|break\n|continue\n|else\n|empty\n|endcan\n|endcannot\n|endfor\n|endforeach\n|endforelse\n|endif\n|endinject\n|endphp\n|endpush\n|endsection\n|endunless\n|endverbatim\n|endwhile\n|overwrite\n|show\n|stop\n|verbatim\n)\n\\b\n|\n(?<!@) # @parent can only be escaped using another @\n@parent",
+          "name": "keyword.blade"
         },
         {
-          "begin": "(?<![A-z0-9_@])@\\w+\\s*(?=\\()",
+          "begin": "(?<![A-Za-z0-9_@])@php",
+          "end": "(?<![A-Za-z0-9_@])@endphp",
           "beginCaptures": {
             "0": {
-              "name": "entity.blade"
+              "name": "keyword.begin.blade"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword.end.blade"
             }
           },
           "contentName": "source.php",
-          "end": "(?<=\\))(?!.*\\))",
-          "name": "meta.embedded.blade",
+          "name": "meta.embedded.block.blade",
           "patterns": [
             {
               "include": "#language"
@@ -114,20 +267,15 @@
           ]
         },
         {
-          "begin": "(?<![A-z0-9_@])@php",
-          "end": "(?<![A-z0-9_@])@endphp",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n\\w+(?:::w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n\\s* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
           "beginCaptures": {
             "0": {
-              "name": "meta.embedded.keyword.blade"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "meta.embedded.keyword.blade"
+              "name": "entity.name.function.blade"
             }
           },
           "contentName": "source.php",
-          "name": "meta.embedded.blade",
+          "end": "(?<=\\))(?!.*\\))",
+          "name": "meta.directive.custom.blade",
           "patterns": [
             {
               "include": "#language"
@@ -135,8 +283,8 @@
           ]
         },
         {
-          "match": "(?<![A-z0-9_@])@(?!(choice|each|(else)?(if|can(not)?)|extends|for(e(ach|lse))?|hasSection|in(clude(If)?|ject)|lang|p(hp|ush)|section|stack|un(less|set)|while|yield)\\b)\\w+\\b",
-          "name": "meta.embedded.entity.blade"
+          "match": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n\\w+(?:::w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n\\b # Bounded by word boundary",
+          "name": "entity.name.function.blade"
         },
         {
           "begin": "(^\\s*)(?=<\\?(?![^?]*\\?>))",
@@ -1954,6 +2102,9 @@
       },
       "name": "string.regexp.single-quoted.php",
       "patterns": [
+        {
+          "include": "#single_quote_regex_escape"
+        },
         {
           "captures": {
             "1": {
@@ -1974,28 +2125,18 @@
             }
           },
           "end": "\\]",
-          "name": "string.regexp.character-class.php",
-          "patterns": [
-            {
-              "include": "#single_quote_regex_escape"
-            }
-          ]
+          "name": "string.regexp.character-class.php"
         },
         {
           "match": "[$^+*]",
           "name": "keyword.operator.regexp.php"
-        },
-        {
-          "include": "#single_quote_regex_escape"
-        }
-      ],
-      "repository": {
-        "single_quote_regex_escape": {
-          "comment": "Support both PHP string and regex escaping",
-          "match": "(?x) \\\\ (?: \\\\ (?: \\\\ [\\\\']? | [^'] ) | . )",
-          "name": "constant.character.escape.php"
         }
-      }
+      ]
+    },
+    "single_quote_regex_escape": {
+      "comment": "Support both PHP string and regex escaping",
+      "match": "(?x) \\\\ (?: \\\\ (?: \\\\ [\\\\']? | [^'] ) | . )",
+      "name": "constant.character.escape.php"
     },
     "sql-string-double-quoted": {
       "begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)",

data/grammars/text.html.vue.json

@@ -871,13 +871,13 @@
           "begin": "\\{\\{\\{?",
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.tag.begin.html"
+              "name": "punctuation.definition.generic.begin.html"
             }
           },
           "end": "\\}\\}\\}?",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.tag.end.html"
+              "name": "punctuation.definition.generic.end.html"
             }
           },
           "name": "expression.embbeded.vue",