github-linguist 7.6.1 → 7.7.0

data/grammars/source.mcfunction.json

@@ -46,6 +46,14 @@
             }
           }
         },
+        {
+          "match": "([a-z0-9_\\.\\-\\/]+)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.mcfunction"
+            }
+          }
+        },
         {
           "begin": "(\\[)",
           "end": "(\\])",
@@ -194,6 +202,21 @@
         }
       }
     },
+    "command.token.block_predicate_without_namespace": {
+      "name": "meta.command.token.block_predicate_without_namespace.mcfunction",
+      "begin": "(?\u003c= )(?=(\\#)?([a-z0-9_\\.\\-\\/]+)(\\[ *([a-z_][a-z0-9_]*) *\\=))",
+      "end": "(?=\\n)|(?:(?\u003c=\\])(?!\\{)|(?\u003c=\\}))([^ \\n]*)",
+      "patterns": [
+        {
+          "include": "#block_predicate"
+        }
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.mcfunction"
+        }
+      }
+    },
     "command.token.boolean": {
       "name": "meta.command.token.boolean.mcfunction",
       "match": "(?\u003c= )(true|false)(?=[ \\n]|$)",
@@ -224,6 +247,18 @@
         }
       }
     },
+    "command.token.greedy_parent": {
+      "name": "meta.command.token.greedy_parent.mcfunction",
+      "match": "((?\u003c=^say | say ))(.*)$",
+      "captures": {
+        "1": {
+          "name": "entity.name.mcfunction"
+        },
+        "2": {
+          "name": "string.quoted.mcfunction"
+        }
+      }
+    },
     "command.token.literal": {
       "name": "meta.command.token.literal.mcfunction",
       "match": "(?\u003c= )([a-z_][a-z0-9_]*)(?=[ \\n]|$)",
@@ -362,7 +397,7 @@
     },
     "command.token.root_redirect": {
       "name": "meta.command.token.root_redirect.mcfunction",
-      "match": "(?\u003c= )(run) ?([a-z_][a-z0-9_]*)?(?=[ \\n]|$)",
+      "match": "(?\u003c= )(run) ([a-z_][a-z0-9_]*)?(?=[ \\n]|$)",
       "captures": {
         "1": {
           "name": "entity.name.mcfunction"
@@ -556,6 +591,9 @@
         {
           "include": "#command.token.block_predicate"
         },
+        {
+          "include": "#command.token.block_predicate_without_namespace"
+        },
         {
           "include": "#command.token.resource_location"
         },
@@ -580,6 +618,9 @@
         {
           "include": "#command.token.root_redirect"
         },
+        {
+          "include": "#command.token.greedy_parent"
+        },
         {
           "include": "#command.token.literal"
         },
@@ -672,25 +713,34 @@
       "patterns": [
         {
           "name": "meta.comment.block.annotation.mcfunction",
-          "match": "((\\@\\w*)\\b.*)$",
+          "match": "((\\@\\w*)\\b(.*))$",
           "captures": {
             "1": {
               "name": "comment.block.mcfunction"
             },
             "2": {
               "name": "markup.heading.mcfunction"
+            },
+            "3": {
+              "name": "comment.block.mcfunction"
             }
           }
         },
         {
           "name": "meta.comment.block.heading.mcfunction",
-          "match": "((\\#.*))$",
+          "match": "((\u003e)((.*)))$",
           "captures": {
             "1": {
               "name": "comment.block.mcfunction"
             },
             "2": {
-              "name": "markup.heading.mcfunction"
+              "name": "markup.list.mcfunction"
+            },
+            "3": {
+              "name": "markup.bold.mcfunction"
+            },
+            "4": {
+              "name": "markup.list.mcfunction"
             }
           }
         },
@@ -930,7 +980,7 @@
     "nbt_path.property": {
       "patterns": [
         {
-          "begin": "(\\.)?(\\w+)(\\[)",
+          "begin": "(\\.)?(\\w+)?(\\[)",
           "end": "(\\])|(?=\\n)",
           "patterns": [
             {

data/grammars/source.mlir.json

@@ -3,28 +3,15 @@
   "scopeName": "source.mlir",
   "patterns": [
     {
-      "name": "keyword.module.mlir",
-      "match": "\\b(module)\\b"
+      "include": "#comment"
+    },
+    {
+      "include": "#string"
     },
     {
       "name": "support.function.mlir",
-      "begin": "\\b(func)\\b\\s*(@[a-zA-Z_][a-zA-Z_0-9\\.]*)",
-      "end": "}",
-      "patterns": [
-        {
-          "include": "#function_params"
-        },
-        {
-          "include": "#function_attributes"
-        },
-        {
-          "include": "#function_results"
-        },
-        {
-          "include": "#region"
-        }
-      ],
-      "beginCaptures": {
+      "match": "\\b(func)\\b\\s*(@[\\w_][\\w\\d_.$]*)",
+      "captures": {
         "1": {
           "name": "keyword.function.mlir"
         },
@@ -34,145 +21,41 @@
       }
     },
     {
-      "name": "comment.line.double-slash.mlir",
-      "include": "#comment"
+      "name": "keyword.module.mlir",
+      "match": "\\b(attributes|br|call|constant|loc|return)\\b"
+    },
+    {
+      "include": "#identifier"
+    },
+    {
+      "include": "#branch_target"
+    },
+    {
+      "include": "#attribute"
+    },
+    {
+      "include": "#types"
+    },
+    {
+      "include": "#integer"
     }
   ],
   "repository": {
-    "attribute_keywords": {
-      "match": "\\b(dense|none|opaque|sparse)\\b",
-      "captures": {
-        "1": {
-          "name": "keyword.attributes.mlir"
-        }
-      }
-    },
-    "attributes": {
-      "name": "meta.attributes.mlir",
-      "begin": "{",
-      "end": "}",
-      "patterns": [
-        {
-          "include": "#attribute_keywords"
-        },
-        {
-          "include": "#constant"
-        }
-      ]
-    },
-    "bool_constant": {
-      "name": "constant.language.mlir",
-      "match": "\\b(true|false)\\b",
-      "captures": {
-        "1": {
-          "name": "constant.language.mlir"
-        }
-      }
+    "attribute": {
+      "name": "meta.attribute.mlir",
+      "match": "\\W[\\w_][\\w\\d_.$]*\\s*="
     },
     "branch_target": {
-      "name": "meta.branch_target.mlir",
-      "begin": "(\\^bb[\\w\\d_$\\.-]+)",
-      "end": "[:,\\n]",
-      "patterns": [
-        {
-          "include": "#branch_target_region"
-        },
-        {
-          "include": "#comment"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.label.mlir"
-        }
-      }
-    },
-    "branch_target_region": {
-      "name": "meta.branch_target.mlir",
-      "begin": "\\(",
-      "end": "\\)",
-      "patterns": [
-        {
-          "include": "#identifier"
-        },
-        {
-          "include": "#types"
-        }
-      ]
+      "name": "entity.name.label.mlir",
+      "match": "\\^bb[\\w\\d_$\\.-]+"
     },
     "comment": {
       "name": "comment.line.double-slash.mlir",
       "match": "//.*$"
     },
-    "constant": {
-      "name": "constants.other.mlir",
-      "patterns": [
-        {
-          "include": "#bool_constant"
-        },
-        {
-          "include": "#integer"
-        },
-        {
-          "include": "#string"
-        }
-      ]
-    },
-    "container": {
-      "name": "meta.types.container.mlir",
-      "begin": "(complex|tuple)\u003c",
-      "end": "\u003e",
-      "patterns": [
-        {
-          "include": "#types"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.container.mlir"
-        }
-      }
-    },
-    "function_attributes": {
-      "name": "meta.attributes.function.mlir",
-      "begin": "(attributes)\\s*{",
-      "end": "}",
-      "patterns": [
-        {
-          "include": "#constant"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.attributes.mlir"
-        }
-      }
-    },
-    "function_params": {
-      "begin": "\\(",
-      "end": "\\)",
-      "patterns": [
-        {
-          "include": "#identifier"
-        },
-        {
-          "include": "#types"
-        }
-      ]
-    },
-    "function_results": {
-      "name": "meta.function.results.mlir",
-      "begin": "-\u003e\\s*\\(",
-      "end": "\\)",
-      "patterns": [
-        {
-          "include": "#types"
-        }
-      ]
-    },
     "identifier": {
       "name": "meta.identifier.mlir",
-      "match": "[\\%#][a-zA-Z0-9][\\w\\d_]*",
+      "match": "[\\%#@][\\w_][\\w\\d_.$]*",
       "captures": {
         "0": {
           "name": "variable.mlir"
@@ -180,143 +63,11 @@
       }
     },
     "integer": {
-      "name": "constant.numeric.mlir",
-      "match": "[1-9][0-9]*"
-    },
-    "loc": {
-      "name": "meta.loc.mlir",
-      "begin": "\\b(loc)\\(",
-      "end": "\\)",
-      "patterns": [
-        {
-          "include": "#loc_fusedloc"
-        },
-        {
-          "include": "#loc_nameloc"
-        },
-        {
-          "include": "#op_generic"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.loc.mlir"
-        }
-      }
-    },
-    "loc_fusedloc": {
-      "name": "meta.location.mlir",
-      "begin": "(fused)(\u003c.*\u003e)?\\[",
-      "end": "\\]",
-      "patterns": [
-        {
-          "include": "#string"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.loc.mlir"
-        },
-        "2": {
-          "patterns": [
-            {
-              "include": "#string"
-            }
-          ]
-        }
-      }
-    },
-    "loc_nameloc": {
-      "name": "meta.location.mlir",
-      "patterns": [
-        {
-          "include": "#string"
-        }
-      ]
-    },
-    "op": {
-      "patterns": [
-        {
-          "include": "#terminator"
-        },
-        {
-          "include": "#op_generic"
-        }
-      ]
-    },
-    "op_generic": {
-      "name": "meta.op.generic.mlir",
-      "begin": "((%[\\w\\d_]*)\\s*)=\\s*(?=\")",
-      "end": "\\n",
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#attributes"
-        },
-        {
-          "include": "#identifier"
-        },
-        {
-          "include": "#loc"
-        },
-        {
-          "include": "#string"
-        },
-        {
-          "include": "#types"
-        }
-      ],
-      "beginCaptures": {
-        "2": {
-          "name": "variable.mlir"
-        }
-      }
-    },
-    "region": {
-      "name": "meta.region.mlir",
-      "begin": "{",
-      "end": "(?=})",
-      "patterns": [
-        {
-          "include": "#branch_target"
-        },
-        {
-          "include": "#op"
-        },
-        {
-          "include": "#attributes"
-        },
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#string"
-        }
-      ]
-    },
-    "shaped_container": {
-      "name": "meta.types.standard.shaped_container.mlir",
-      "begin": "(memref|tensor|vector)\u003c",
-      "end": "\u003e",
-      "patterns": [
-        {
-          "include": "#types"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.shaped_container.mlir"
-        }
-      }
-    },
-    "standard_simple_types": {
-      "name": "meta.types.standard.simple.mlir",
-      "match": "\\b(index|i[1-9]\\d*|f16|bf16|f32|f64)\\b",
+      "name": "meta.identifier.mlir",
+      "match": "[\\Wx]([0-9]+)",
       "captures": {
         "1": {
-          "name": "keyword.types.standard.simple.mlir"
+          "name": "constant.numeric.mlir"
         }
       }
     },
@@ -345,45 +96,14 @@
         }
       }
     },
-    "terminator": {
-      "begin": "(br|cond_br|return)",
-      "end": "\\n",
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#branch_target"
-        },
-        {
-          "include": "#identifier"
-        },
-        {
-          "include": "#types"
-        },
-        {
-          "include": "#loc"
-        }
-      ],
-      "beginCaptures": {
+    "types": {
+      "name": "meta.types.simple.mlir",
+      "match": "[\\Wx](index|i[1-9][0-9]*|f16|bf16|f32|f64|memref|tensor|vector)\\b",
+      "captures": {
         "1": {
-          "name": "keyword.control.mlir"
+          "name": "storage.type.mlir"
         }
       }
-    },
-    "types": {
-      "name": "meta.types.mlir",
-      "patterns": [
-        {
-          "include": "#container"
-        },
-        {
-          "include": "#shaped_container"
-        },
-        {
-          "include": "#standard_simple_types"
-        }
-      ]
     }
   }
 }