github-linguist 5.3.3 → 6.0.0

data/grammars/source.lua.json

@@ -1,16 +1,17 @@
 {
-  "comment": "Lua Syntax: version 0.8",
-  "fileTypes": [
-    "lua",
-    "p8",
-    "rockspec"
-  ],
-  "firstLineMatch": "\\A#!.*?\\blua(\\d+(\\.\\d+)?)?\\b|\\A--\\s+-\\*-\\s*lua\\s*-\\*-",
-  "keyEquivalent": "^~L",
   "name": "Lua",
+  "scopeName": "source.lua",
   "patterns": [
     {
+      "name": "meta.function.lua",
       "begin": "\\b((local\\b)\\s+)?(function)\\s*(\\s+[a-zA-Z_][a-zA-Z0-9_]*(\\.[a-zA-Z_][a-zA-Z0-9_]*)*(:[a-zA-Z_][a-zA-Z0-9_]*)?\\s*)?(\\()",
+      "end": "\\)",
+      "patterns": [
+        {
+          "name": "variable.parameter.function.lua",
+          "match": "[a-zA-Z_][a-zA-Z0-9_]*"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.local.lua"
@@ -25,78 +26,77 @@
           "name": "punctuation.definition.parameters.begin.lua"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.parameters.end.lua"
         }
-      },
-      "name": "meta.function.lua",
-      "patterns": [
-        {
-          "match": "[a-zA-Z_][a-zA-Z0-9_]*",
-          "name": "variable.parameter.function.lua"
-        }
-      ]
+      }
     },
     {
-      "match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(?![pPeE.0-9])",
-      "name": "constant.numeric.integer.hexadecimal.lua"
+      "name": "constant.numeric.integer.hexadecimal.lua",
+      "match": "(?\u003c![\\w\\d.])0[xX][0-9A-Fa-f]+(?![pPeE.0-9])"
     },
     {
-      "match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(\\.[0-9A-Fa-f]+)?([eE]-?\\d*)?([pP][-+]\\d+)?",
-      "name": "constant.numeric.float.hexadecimal.lua"
+      "name": "constant.numeric.float.hexadecimal.lua",
+      "match": "(?\u003c![\\w\\d.])0[xX][0-9A-Fa-f]+(\\.[0-9A-Fa-f]+)?([eE]-?\\d*)?([pP][-+]\\d+)?"
     },
     {
-      "match": "(?<![\\w\\d.])\\d+(?![pPeE.0-9])",
-      "name": "constant.numeric.integer.lua"
+      "name": "constant.numeric.integer.lua",
+      "match": "(?\u003c![\\w\\d.])\\d+(?![pPeE.0-9])"
     },
     {
-      "match": "(?<![\\w\\d.])\\d+(\\.\\d+)?([eE]-?\\d*)?",
-      "name": "constant.numeric.float.lua"
+      "name": "constant.numeric.float.lua",
+      "match": "(?\u003c![\\w\\d.])\\d+(\\.\\d+)?([eE]-?\\d*)?"
     },
     {
+      "name": "string.quoted.single.lua",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "include": "#escaped_char"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.lua"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.lua"
         }
-      },
-      "name": "string.quoted.single.lua",
+      }
+    },
+    {
+      "name": "string.quoted.double.lua",
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "\"",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.lua"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.lua"
         }
-      },
-      "name": "string.quoted.double.lua",
+      }
+    },
+    {
+      "contentName": "meta.embedded.lua",
+      "begin": "(?\u003c=\\.cdef)\\s*(\\[(=*)\\[)",
+      "end": "(\\]\\2\\])",
       "patterns": [
         {
-          "include": "#escaped_char"
+          "include": "source.c"
         }
-      ]
-    },
-    {
-      "begin": "(?<=\\.cdef)\\s*(\\[(=*)\\[)",
+      ],
       "beginCaptures": {
         "0": {
           "name": "string.quoted.other.multiline.lua"
@@ -105,8 +105,6 @@
           "name": "punctuation.definition.string.begin.lua"
         }
       },
-      "contentName": "meta.embedded.lua",
-      "end": "(\\]\\2\\])",
       "endCaptures": {
         "0": {
           "name": "string.quoted.other.multiline.lua"
@@ -114,79 +112,75 @@
         "1": {
           "name": "punctuation.definition.string.end.lua"
         }
-      },
-      "patterns": [
-        {
-          "include": "source.c"
-        }
-      ]
+      }
     },
     {
-      "begin": "(?<!--)\\[(=*)\\[",
+      "name": "string.quoted.other.multiline.lua",
+      "begin": "(?\u003c!--)\\[(=*)\\[",
+      "end": "\\]\\1\\]",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.lua"
         }
       },
-      "end": "\\]\\1\\]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.lua"
         }
-      },
-      "name": "string.quoted.other.multiline.lua"
+      }
     },
     {
+      "name": "comment.line.shebang.lua",
+      "match": "\\A(#!).*$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.definition.comment.lua"
         }
-      },
-      "match": "\\A(#!).*$\\n?",
-      "name": "comment.line.shebang.lua"
+      }
     },
     {
       "begin": "(^[ \\t]+)?(?=--)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.lua"
-        }
-      },
       "end": "(?!\\G)((?!^)[ \\t]+\\n)?",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.trailing.lua"
-        }
-      },
       "patterns": [
         {
+          "name": "comment.block.lua",
           "begin": "--\\[(=*)\\[",
+          "end": "\\]\\1\\]",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.lua"
             }
           },
-          "end": "\\]\\1\\]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.lua"
             }
-          },
-          "name": "comment.block.lua"
+          }
         },
         {
+          "name": "comment.line.double-dash.lua",
           "begin": "--",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.lua"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-dash.lua"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.lua"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.trailing.lua"
+        }
+      }
     },
     {
+      "match": "\\b(goto)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
       "captures": {
         "1": {
           "name": "keyword.control.goto.lua"
@@ -194,10 +188,11 @@
         "2": {
           "name": "constant.other.placeholder.lua"
         }
-      },
-      "match": "\\b(goto)\\s+([a-zA-Z_][a-zA-Z0-9_]*)"
+      }
     },
     {
+      "name": "constant.other.placeholder.lua",
+      "match": "(::)[a-zA-Z_][a-zA-Z0-9_]*(::)",
       "captures": {
         "1": {
           "name": "punctuation.definition.label.begin.lua"
@@ -205,73 +200,69 @@
         "2": {
           "name": "punctuation.definition.label.end.lua"
         }
-      },
-      "match": "(::)[a-zA-Z_][a-zA-Z0-9_]*(::)",
-      "name": "constant.other.placeholder.lua"
+      }
     },
     {
-      "match": "\\b(break|do|else|for|if|elseif|goto|return|then|repeat|while|until|end|function|local|in)\\b",
-      "name": "keyword.control.lua"
+      "name": "keyword.control.lua",
+      "match": "\\b(break|do|else|for|if|elseif|goto|return|then|repeat|while|until|end|function|local|in)\\b"
     },
     {
-      "match": "(?<![^.]\\.|:)\\b(false|nil|true|_G|_VERSION|math\\.(pi|huge))\\b|(?<![.])\\.{3}(?!\\.)",
-      "name": "constant.language.lua"
+      "name": "constant.language.lua",
+      "match": "(?\u003c![^.]\\.|:)\\b(false|nil|true|_G|_VERSION|math\\.(pi|huge))\\b|(?\u003c![.])\\.{3}(?!\\.)"
     },
     {
-      "match": "(?<![^.]\\.|:)\\b(self)\\b",
-      "name": "variable.language.self.lua"
+      "name": "variable.language.self.lua",
+      "match": "(?\u003c![^.]\\.|:)\\b(self)\\b"
     },
     {
-      "match": "(?<![^.]\\.|:)\\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|loadfile|loadstring|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\\b(?=\\s*(?:[({\"']|\\[\\[))",
-      "name": "support.function.lua"
+      "name": "support.function.lua",
+      "match": "(?\u003c![^.]\\.|:)\\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|loadfile|loadstring|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\\b(?=\\s*(?:[({\"']|\\[\\[))"
     },
     {
-      "match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)|table\\.(concat|insert|maxn|remove|sort)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(cpath|loaded|loadlib|path|preload|seeall)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|traceback))\\b(?=\\s*(?:[({\"']|\\[\\[))",
-      "name": "support.function.library.lua"
+      "name": "support.function.library.lua",
+      "match": "(?\u003c![^.]\\.|:)\\b(coroutine\\.(create|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)|table\\.(concat|insert|maxn|remove|sort)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(cpath|loaded|loadlib|path|preload|seeall)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|traceback))\\b(?=\\s*(?:[({\"']|\\[\\[))"
     },
     {
-      "match": "\\b(and|or|not)\\b",
-      "name": "keyword.operator.lua"
+      "name": "keyword.operator.lua",
+      "match": "\\b(and|or|not)\\b"
     },
     {
-      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
-      "name": "support.function.any-method.lua"
+      "name": "support.function.any-method.lua",
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))"
     },
     {
-      "match": "(?<=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)",
-      "name": "variable.other.lua"
+      "name": "variable.other.lua",
+      "match": "(?\u003c=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)"
     },
     {
-      "match": "\\+|-|%|#|\\*|\\/|\\^|==?|~=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)",
-      "name": "keyword.operator.lua"
+      "name": "keyword.operator.lua",
+      "match": "\\+|-|%|#|\\*|\\/|\\^|==?|~=|\u003c=?|\u003e=?|(?\u003c!\\.)\\.{2}(?!\\.)"
     }
   ],
   "repository": {
     "escaped_char": {
       "patterns": [
         {
-          "match": "\\\\[abfnrtvz\\\\\"'\\n]",
-          "name": "constant.character.escape.lua"
+          "name": "constant.character.escape.lua",
+          "match": "\\\\[abfnrtvz\\\\\"'\\n]"
         },
         {
-          "match": "\\\\\\d{1,3}",
-          "name": "constant.character.escape.byte.lua"
+          "name": "constant.character.escape.byte.lua",
+          "match": "\\\\\\d{1,3}"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f][0-9A-Fa-f]",
-          "name": "constant.character.escape.byte.lua"
+          "name": "constant.character.escape.byte.lua",
+          "match": "\\\\x[0-9A-Fa-f][0-9A-Fa-f]"
         },
         {
-          "match": "\\\\u\\{[0-9A-Fa-f]+\\}",
-          "name": "constant.character.escape.unicode.lua"
+          "name": "constant.character.escape.unicode.lua",
+          "match": "\\\\u\\{[0-9A-Fa-f]+\\}"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.character.escape.lua"
+          "name": "invalid.illegal.character.escape.lua",
+          "match": "\\\\."
         }
       ]
     }
-  },
-  "scopeName": "source.lua",
-  "uuid": "93E017CC-6F27-11D9-90EB-000D93589AF7"
-}
+  }
+}

data/grammars/source.makefile.json

@@ -1,11 +1,6 @@
 {
-  "fileTypes": [
-    "Makefile",
-    "makefile",
-    "GNUmakefile",
-    "OCamlMakefile"
-  ],
   "name": "Makefile",
+  "scopeName": "source.makefile",
   "patterns": [
     {
       "include": "#comment"
@@ -23,40 +18,35 @@
   "repository": {
     "comment": {
       "begin": "(^[ \\t]+)?(?=#)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.makefile"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.makefile",
           "begin": "#",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.makefile"
-            }
-          },
           "end": "\\n",
-          "name": "comment.line.number-sign.makefile",
           "patterns": [
             {
-              "match": "\\\\\\n",
-              "name": "constant.character.escape.continuation.makefile"
+              "name": "constant.character.escape.continuation.makefile",
+              "match": "\\\\\\n"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.makefile"
+            }
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.makefile"
+        }
+      }
     },
     "directives": {
       "patterns": [
         {
           "begin": "^[ ]*([s\\-]?include)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.include.makefile"
-            }
-          },
           "end": "^",
           "patterns": [
             {
@@ -66,18 +56,18 @@
               "include": "#variables"
             },
             {
-              "match": "%",
-              "name": "constant.other.placeholder.makefile"
+              "name": "constant.other.placeholder.makefile",
+              "match": "%"
             }
-          ]
-        },
-        {
-          "begin": "^[ ]*(vpath)\\b",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.vpath.makefile"
+              "name": "keyword.control.include.makefile"
             }
-          },
+          }
+        },
+        {
+          "begin": "^[ ]*(vpath)\\b",
           "end": "^",
           "patterns": [
             {
@@ -87,29 +77,20 @@
               "include": "#variables"
             },
             {
-              "match": "%",
-              "name": "constant.other.placeholder.makefile"
+              "name": "constant.other.placeholder.makefile",
+              "match": "%"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.vpath.makefile"
+            }
+          }
         },
         {
+          "name": "meta.scope.conditional.makefile",
           "begin": "^(?:(override)\\s*)?(define)\\s*([^\\s]+)\\s*(=|\\?=|:=|\\+=)?(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.override.makefile"
-            },
-            "2": {
-              "name": "keyword.control.define.makefile"
-            },
-            "3": {
-              "name": "variable.other.makefile"
-            },
-            "4": {
-              "name": "punctuation.separator.key-value.makefile"
-            }
-          },
           "end": "^(endef)\\b",
-          "name": "meta.scope.conditional.makefile",
           "patterns": [
             {
               "begin": "\\G(?!\\n)",
@@ -126,15 +107,24 @@
             {
               "include": "#comment"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control.override.makefile"
+            },
+            "2": {
+              "name": "keyword.control.define.makefile"
+            },
+            "3": {
+              "name": "variable.other.makefile"
+            },
+            "4": {
+              "name": "punctuation.separator.key-value.makefile"
+            }
+          }
         },
         {
           "begin": "^[ ]*(export)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.$1.makefile"
-            }
-          },
           "end": "^",
           "patterns": [
             {
@@ -144,18 +134,18 @@
               "include": "#variable-assignment"
             },
             {
-              "match": "[^\\s]+",
-              "name": "variable.other.makefile"
+              "name": "variable.other.makefile",
+              "match": "[^\\s]+"
             }
-          ]
-        },
-        {
-          "begin": "^[ ]*(override|private)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.$1.makefile"
             }
-          },
+          }
+        },
+        {
+          "begin": "^[ ]*(override|private)\\b",
           "end": "^",
           "patterns": [
             {
@@ -164,41 +154,35 @@
             {
               "include": "#variable-assignment"
             }
-          ]
-        },
-        {
-          "begin": "^[ ]*(unexport|undefine)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.$1.makefile"
             }
-          },
+          }
+        },
+        {
+          "begin": "^[ ]*(unexport|undefine)\\b",
           "end": "^",
           "patterns": [
             {
               "include": "#comment"
             },
             {
-              "match": "[^\\s]+",
-              "name": "variable.other.makefile"
+              "name": "variable.other.makefile",
+              "match": "[^\\s]+"
             }
-          ]
-        },
-        {
-          "begin": "^(ifdef|ifndef)\\s*([^\\s]+)(?=\\s)",
-          "captures": {
+          ],
+          "beginCaptures": {
             "1": {
               "name": "keyword.control.$1.makefile"
-            },
-            "2": {
-              "name": "variable.other.makefile"
-            },
-            "3": {
-              "name": "punctuation.separator.key-value.makefile"
             }
-          },
-          "end": "^(endif)\\b",
+          }
+        },
+        {
           "name": "meta.scope.conditional.makefile",
+          "begin": "^(ifdef|ifndef)\\s*([^\\s]+)(?=\\s)",
+          "end": "^(endif)\\b",
           "patterns": [
             {
               "begin": "\\G(?!\\n)",
@@ -212,22 +196,28 @@
             {
               "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "^(ifeq|ifneq)(?=\\s)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.$1.makefile"
+            },
+            "2": {
+              "name": "variable.other.makefile"
+            },
+            "3": {
+              "name": "punctuation.separator.key-value.makefile"
             }
-          },
-          "end": "^(endif)\\b",
+          }
+        },
+        {
           "name": "meta.scope.conditional.makefile",
+          "begin": "^(ifeq|ifneq)(?=\\s)",
+          "end": "^(endif)\\b",
           "patterns": [
             {
+              "name": "meta.scope.condition.makefile",
               "begin": "\\G",
               "end": "^",
-              "name": "meta.scope.condition.makefile",
               "patterns": [
                 {
                   "include": "#variables"
@@ -239,34 +229,45 @@
             },
             {
               "begin": "^else(?=\\s)",
+              "end": "^",
               "beginCaptures": {
                 "0": {
                   "name": "keyword.control.else.makefile"
                 }
-              },
-              "end": "^"
+              }
             },
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control.$1.makefile"
+            }
+          }
         }
       ]
     },
     "interpolation": {
+      "name": "meta.embedded.line.shell",
       "begin": "(?=`)",
       "end": "(?!\\G)",
-      "name": "meta.embedded.line.shell",
       "patterns": [
         {
+          "name": "string.interpolated.backtick.makefile",
+          "contentName": "source.shell",
           "begin": "`",
+          "end": "(`)",
+          "patterns": [
+            {
+              "include": "source.shell"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.makefile"
             }
           },
-          "contentName": "source.shell",
-          "end": "(`)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.makefile"
@@ -274,64 +275,27 @@
             "1": {
               "name": "source.shell"
             }
-          },
-          "name": "string.interpolated.backtick.makefile",
-          "patterns": [
-            {
-              "include": "source.shell"
-            }
-          ]
+          }
         }
       ]
     },
     "recipe": {
+      "name": "meta.scope.target.makefile",
       "begin": "^(?!\\t)([^:]*)(:)(?!\\=)",
-      "beginCaptures": {
-        "1": {
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "support.function.target.$1.makefile"
-                }
-              },
-              "match": "^\\s*(\\.(PHONY|SUFFIXES|DEFAULT|PRECIOUS|INTERMEDIATE|SECONDARY|SECONDEXPANSION|DELETE_ON_ERROR|IGNORE|LOW_RESOLUTION_TIME|SILENT|EXPORT_ALL_VARIABLES|NOTPARALLEL|ONESHELL|POSIX))\\s*$"
-            },
-            {
-              "begin": "(?=\\S)",
-              "end": "(?=\\s|$)",
-              "name": "entity.name.function.target.makefile",
-              "patterns": [
-                {
-                  "include": "#variables"
-                },
-                {
-                  "match": "%",
-                  "name": "constant.other.placeholder.makefile"
-                }
-              ]
-            }
-          ]
-        },
-        "2": {
-          "name": "punctuation.separator.key-value.makefile"
-        }
-      },
       "end": "^(?!\\t)",
-      "name": "meta.scope.target.makefile",
       "patterns": [
         {
+          "name": "meta.scope.prerequisites.makefile",
           "begin": "\\G",
           "end": "^",
-          "name": "meta.scope.prerequisites.makefile",
           "patterns": [
             {
-              "match": "\\\\\\n",
-              "name": "constant.character.escape.continuation.makefile"
+              "name": "constant.character.escape.continuation.makefile",
+              "match": "\\\\\\n"
             },
             {
-              "match": "%|\\*",
-              "name": "constant.other.placeholder.makefile"
+              "name": "constant.other.placeholder.makefile",
+              "match": "%|\\*"
             },
             {
               "include": "#comment"
@@ -342,16 +306,18 @@
           ]
         },
         {
-          "begin": "^\\t",
           "name": "meta.scope.recipe.makefile",
+          "begin": "^\\t",
+          "while": "^\\t",
           "patterns": [
             {
+              "match": ".+\\n?",
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": "\\\\\\n",
-                      "name": "constant.character.escape.continuation.makefile"
+                      "name": "constant.character.escape.continuation.makefile",
+                      "match": "\\\\\\n"
                     },
                     {
                       "include": "#variables"
@@ -361,29 +327,50 @@
                     }
                   ]
                 }
-              },
-              "match": ".+\\n?"
+              }
             }
-          ],
-          "while": "^\\t"
+          ]
         }
-      ]
-    },
-    "variable-assignment": {
-      "begin": "(^[ ]*|\\G\\s*)([^\\s]+)\\s*(=|\\?=|:=|\\+=)",
+      ],
       "beginCaptures": {
-        "2": {
-          "name": "variable.other.makefile"
+        "1": {
+          "patterns": [
+            {
+              "match": "^\\s*(\\.(PHONY|SUFFIXES|DEFAULT|PRECIOUS|INTERMEDIATE|SECONDARY|SECONDEXPANSION|DELETE_ON_ERROR|IGNORE|LOW_RESOLUTION_TIME|SILENT|EXPORT_ALL_VARIABLES|NOTPARALLEL|ONESHELL|POSIX))\\s*$",
+              "captures": {
+                "1": {
+                  "name": "support.function.target.$1.makefile"
+                }
+              }
+            },
+            {
+              "name": "entity.name.function.target.makefile",
+              "begin": "(?=\\S)",
+              "end": "(?=\\s|$)",
+              "patterns": [
+                {
+                  "include": "#variables"
+                },
+                {
+                  "name": "constant.other.placeholder.makefile",
+                  "match": "%"
+                }
+              ]
+            }
+          ]
         },
-        "3": {
+        "2": {
           "name": "punctuation.separator.key-value.makefile"
         }
-      },
+      }
+    },
+    "variable-assignment": {
+      "begin": "(^[ ]*|\\G\\s*)([^\\s]+)\\s*(=|\\?=|:=|\\+=)",
       "end": "\\n",
       "patterns": [
         {
-          "match": "\\\\\\n",
-          "name": "constant.character.escape.continuation.makefile"
+          "name": "constant.character.escape.continuation.makefile",
+          "match": "\\\\\\n"
         },
         {
           "include": "#comment"
@@ -394,60 +381,63 @@
         {
           "include": "#interpolation"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "variable.other.makefile"
+        },
+        "3": {
+          "name": "punctuation.separator.key-value.makefile"
+        }
+      }
     },
     "variables": {
       "patterns": [
         {
+          "name": "variable.language.makefile",
+          "match": "(\\$?\\$)[@%\u003c?^+*]",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.makefile"
             }
-          },
-          "match": "(\\$?\\$)[@%<?^+*]",
-          "name": "variable.language.makefile"
+          }
         },
         {
+          "name": "string.interpolated.makefile",
           "begin": "\\$?\\$\\(",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.variable.makefile"
-            }
-          },
           "end": "\\)",
-          "name": "string.interpolated.makefile",
           "patterns": [
             {
               "include": "#variables"
             },
             {
-              "match": "\\G(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*\\))",
-              "name": "variable.language.makefile"
+              "name": "variable.language.makefile",
+              "match": "\\G(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*\\))"
             },
             {
+              "name": "meta.scope.function-call.makefile",
               "begin": "\\G(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\\s",
-              "beginCaptures": {
-                "1": {
-                  "name": "support.function.$1.makefile"
-                }
-              },
               "end": "(?=\\))",
-              "name": "meta.scope.function-call.makefile",
               "patterns": [
                 {
                   "include": "#variables"
                 },
                 {
-                  "match": "%|\\*",
-                  "name": "constant.other.placeholder.makefile"
+                  "name": "constant.other.placeholder.makefile",
+                  "match": "%|\\*"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "support.function.$1.makefile"
+                }
+              }
             },
             {
-              "begin": "\\G(origin|flavor)\\s(?=[^\\s)]+\\s*\\))",
+              "name": "meta.scope.function-call.makefile",
               "contentName": "variable.other.makefile",
+              "begin": "\\G(origin|flavor)\\s(?=[^\\s)]+\\s*\\))",
               "end": "(?=\\))",
-              "name": "meta.scope.function-call.makefile",
               "patterns": [
                 {
                   "include": "#variables"
@@ -455,20 +445,23 @@
               ]
             },
             {
+              "name": "variable.other.makefile",
               "begin": "\\G(?!\\))",
               "end": "(?=\\))",
-              "name": "variable.other.makefile",
               "patterns": [
                 {
                   "include": "#variables"
                 }
               ]
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.variable.makefile"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.makefile",
-  "uuid": "FF1825E8-6B1C-11D9-B883-000D93589AF6"
-}
+  }
+}