github-linguist 7.6.0 → 7.10.0

data/grammars/source.v.json

@@ -1,93 +1,30 @@
 {
-  "name": "v",
+  "name": "V",
   "scopeName": "source.v",
   "patterns": [
     {
-      "name": "meta.definition.module.v",
-      "begin": "^\\s*(module)\\s+",
-      "end": "([0-9a-zA-Z_]*)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.module.v"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "entity.name.module.v"
-        }
-      }
+      "include": "#comments"
     },
     {
-      "name": "meta.definition.import.v",
-      "begin": "^\\s*(import)\\s+",
-      "end": "([0-9a-zA-Z_.]*)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.import.v"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "entity.name.import.v"
-        }
-      }
+      "include": "#as-is"
     },
     {
-      "name": "meta.definition.include.v",
-      "begin": "^\\s*(#include)",
-      "end": "\\s+([\\\u003c\"])\\s*(.*)([\\\u003e\"])",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.include.v"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "string.quoted.double.v"
-        },
-        "2": {
-          "name": "string.quoted.double.v"
-        },
-        "3": {
-          "name": "string.quoted.double.v"
-        }
-      }
+      "include": "#attributes"
     },
     {
-      "name": "meta.definition.flag.v",
-      "begin": "^\\s*(#flag)",
-      "end": "\\s+(.*?)$",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.flag.v"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "string.quoted.single.v"
-        }
-      }
+      "include": "#assignment"
     },
     {
-      "name": "meta.definition.reference.v",
-      "match": "(\u0026)\\s*(?=[0-9a-zA-Z_])",
-      "captures": {
-        "1": {
-          "name": "keyword.operator.address.v"
-        }
-      }
+      "include": "#module-decl"
     },
     {
-      "name": "meta.definition.escaped.keyword.v",
-      "match": "((?:@)(?:mut|pub|fn|module|import|const|map|assert|sizeof|type|struct|interface|enum|in|or|switch|case|match|if|else|for|go|goto|defer|return|int|uint|i?(?:8|16|32|64|128)|u?(?:8|16|32|64|128)|f?(?:32|64)|bool|byte|byteptr|voidptr|string|ustring|rune))",
-      "captures": {
-        "0": {
-          "name": "keyword.other.escaped.v"
-        }
-      }
+      "include": "#import-decl"
     },
     {
-      "include": "#comments"
+      "include": "#include-decl"
+    },
+    {
+      "include": "#flag-decl"
     },
     {
       "include": "#brackets"
@@ -96,46 +33,40 @@
       "include": "#builtin-fix"
     },
     {
-      "include": "#generics"
+      "include": "#escaped-fix"
     },
     {
       "include": "#operators"
     },
     {
-      "include": "#function-new-limited-overload"
+      "include": "#function-limited-overload-decl"
     },
     {
-      "include": "#function-new-extend"
+      "include": "#function-extend-decl"
     },
     {
-      "include": "#function-new"
+      "include": "#function-decl"
     },
     {
       "include": "#function-exist"
     },
     {
-      "include": "#type"
-    },
-    {
-      "include": "#enum"
-    },
-    {
-      "include": "#struct"
+      "include": "#generic"
     },
     {
-      "include": "#interface"
+      "include": "#constants"
     },
     {
-      "include": "#constants"
+      "include": "#type"
     },
     {
-      "include": "#variable-assignment"
+      "include": "#enum"
     },
     {
-      "include": "#variable-increment-decrement"
+      "include": "#interface"
     },
     {
-      "include": "#goto"
+      "include": "#struct"
     },
     {
       "include": "#keywords"
@@ -143,41 +74,72 @@
     {
       "include": "#storage"
     },
-    {
-      "include": "#std-types"
-    },
-    {
-      "include": "#std-cbased-types"
-    },
     {
       "include": "#numbers"
     },
     {
       "include": "#strings"
+    },
+    {
+      "include": "#types"
     }
   ],
   "repository": {
-    "attributes": {
-      "patterns": [
-        {
-          "name": "meta.function.attribute.v",
-          "match": "^\\s*(?=\\[(live|inline)\\])",
-          "captures": {
-            "1": {
-              "name": "entity.function.attribute.v"
+    "as-is": {
+      "begin": "\\s+(as|is)\\s+",
+      "end": "([\\w.]*)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.$1.v"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "entity.name.alias.v"
+        }
+      }
+    },
+    "assignment": {
+      "name": "meta.definition.variable.v",
+      "match": "([\\w.]+)\\s*((?:\\:|\\+|\\-|\\*|\\/|\\%|\\\u0026|\\||\\^)?=)\\s*(?=.+)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
+            },
+            {
+              "name": "variable.assignment.other.v",
+              "match": "\\w+"
             }
-          }
+          ]
         },
-        {
-          "name": "meta.struct.attribute.v",
-          "match": "(?\u003c=[0-9a-zA-Z_\\s])(?=\\[(skip)\\])",
-          "captures": {
-            "1": {
-              "name": "entity.struct.attribute.v"
+        "2": {
+          "patterns": [
+            {
+              "include": "#operators"
             }
-          }
+          ]
         }
-      ]
+      }
+    },
+    "attributes": {
+      "name": "meta.definition.attribute.v",
+      "match": "^\\s*((\\[)(deprecated|unsafe_fn|typedef|live|inline|flag)(\\]))",
+      "captures": {
+        "1": {
+          "name": "meta.function.attribute.v"
+        },
+        "2": {
+          "name": "punctuation.definition.begin.bracket.square.v"
+        },
+        "3": {
+          "name": "storage.modifier.attribute.v"
+        },
+        "4": {
+          "name": "punctuation.definition.end.bracket.square.v"
+        }
+      }
     },
     "brackets": {
       "patterns": [
@@ -220,8 +182,23 @@
           }
         },
         {
-          "name": "punctuation.definition.bracket.square.v",
-          "match": "\\[|\\]"
+          "begin": "\\[",
+          "end": "\\]",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.square.begin.v"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.square.end.v"
+            }
+          }
         }
       ]
     },
@@ -230,40 +207,24 @@
         {
           "patterns": [
             {
-              "match": "^\\s*(const)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "storage.modifier.v"
-                }
-              }
-            },
-            {
-              "match": "(assert)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "keyword.assert.v"
-                }
-              }
+              "name": "storage.modifier.v",
+              "match": "(const)(?=\\s*\\()"
             },
             {
-              "match": "(sizeof)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "keyword.sizeof.v"
-                }
-              }
+              "name": "keyword.$1.v",
+              "match": "\\b(fn|type|enum|struct|interface|map|assert|sizeof)\\b(?=\\s*\\()"
             }
           ]
         },
         {
           "patterns": [
             {
-              "match": "(in|or|switch|case|match|if|else|for|go|goto|defer|return)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "keyword.control.v"
-                }
-              }
+              "name": "keyword.control.v",
+              "match": "(\\$if|\\$else)(?=\\s*\\()"
+            },
+            {
+              "name": "keyword.control.v",
+              "match": "\\b(in|is|or|break|continue|default|unsafe|match|if|else|for|go|goto|defer|return)\\b(?=\\s*\\()"
             }
           ]
         },
@@ -271,7 +232,7 @@
           "patterns": [
             {
               "name": "meta.expr.numeric.cast.v",
-              "match": "(int|uint|i?(?:8|16|32|64|128)|u?(?:8|16|32|64|128)|f?(?:32|64))(?=\\s*\\()",
+              "match": "(i?(?:8|16|nt|64|128)|u?(?:16|32|64|128)|f?(?:32|64))(?=\\s*\\()",
               "captures": {
                 "1": {
                   "name": "storage.type.numeric.v"
@@ -280,64 +241,10 @@
             },
             {
               "name": "meta.expr.bool.cast.v",
-              "match": "(bool)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "storage.type.boolean.v"
-                }
-              }
-            },
-            {
-              "name": "meta.expr.byte.cast.v",
-              "match": "(byte)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "storage.type.byte.v"
-                }
-              }
-            },
-            {
-              "name": "meta.expr.byteptr.cast.v",
-              "match": "(byteptr)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "storage.type.byteptr.v"
-                }
-              }
-            },
-            {
-              "name": "meta.expr.voidptr.cast.v",
-              "match": "(voidptr)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "storage.type.voidptr.v"
-                }
-              }
-            },
-            {
-              "name": "meta.expr.string.cast.v",
-              "match": "(string)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "storage.type.string.v"
-                }
-              }
-            },
-            {
-              "name": "meta.expr.ustring.cast.v",
-              "match": "(ustring)(?=\\s*\\()",
-              "captures": {
-                "1": {
-                  "name": "storage.type.ustring.v"
-                }
-              }
-            },
-            {
-              "name": "meta.expr.rune.cast.v",
-              "match": "(rune)(?=\\s*\\()",
+              "match": "(bool|byte|byteptr|charptr|voidptr|string|ustring|rune|none)(?=\\s*\\()",
               "captures": {
                 "1": {
-                  "name": "storage.type.rune.v"
+                  "name": "storage.type.$1.v"
                 }
               }
             }
@@ -348,12 +255,22 @@
     "comments": {
       "patterns": [
         {
-          "name": "comment.block.v",
+          "name": "comment.block.documentation.v",
           "begin": "/\\*",
           "end": "\\*/",
-          "captures": {
+          "patterns": [
+            {
+              "include": "#comments"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.begin.v"
+            }
+          },
+          "endCaptures": {
             "0": {
-              "name": "comment.block.documentation.v"
+              "name": "punctuation.definition.comment.end.v"
             }
           }
         },
@@ -363,346 +280,255 @@
           "end": "$",
           "beginCaptures": {
             "0": {
-              "name": "comment.block.documentation.v"
+              "name": "punctuation.definition.comment.begin.v"
             }
           }
         }
       ]
     },
     "constants": {
-      "patterns": [
-        {
-          "name": "constant.language.v",
-          "match": "\\b(true|false)\\b"
-        },
-        {
-          "name": "constant.other.v",
-          "match": "([0-9A-Z]+)(?=\\s*\\=)"
-        }
-      ]
+      "name": "constant.language.v",
+      "match": "\\b(true|false)\\b"
     },
     "enum": {
-      "patterns": [
-        {
-          "name": "meta.definition.enum.v",
-          "match": "^\\s*(\\benum\\b)\\s+(?:[0-9a-zA-Z_]+\\.)?([0-9a-zA-Z_]*)",
-          "captures": {
-            "1": {
-              "name": "keyword.enum.v"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.enum.v",
-                  "match": "\\w+"
-                }
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "flags": {
-      "patterns": [
-        {
-          "name": "meta.flag.include.v",
-          "match": "(-L|I)\\s*(?=.+?)",
-          "captures": {
-            "1": {
-              "name": "keyword.flag.include.v"
-            }
-          }
+      "name": "meta.definition.enum.v",
+      "match": "^\\s*(?:(pub)?\\s+)?(enum)\\s+(?:\\w+\\.)?(\\w*)",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.$1.v"
         },
-        {
-          "name": "meta.flag.linking.v",
-          "match": "(-l[0-9a-zA-Z._\\-]+)",
-          "captures": {
-            "1": {
-              "name": "entity.name.library.v"
-            }
-          }
+        "2": {
+          "name": "storage.type.enum.v"
         },
-        {
-          "name": "meta.flag.os-specific.linking.v",
-          "match": "(windows|darwin|linux|bsd)\\s+(?=-(?=l|L))",
-          "captures": {
-            "1": {
-              "name": "keyword.flag.os.v"
-            }
-          }
+        "3": {
+          "name": "entity.name.enum.v"
         }
-      ]
+      }
     },
-    "function-exist": {
-      "patterns": [
-        {
-          "name": "meta.function.v",
-          "match": "([0-9a-zA-Z_]+)(\\\u003c[0-9a-zA-Z_]*\\\u003e)?(?=\\s*\\()",
-          "captures": {
-            "0": {
-              "name": "meta.function.call.v"
-            },
-            "1": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "support.function.v",
-                  "match": "\\w+"
-                }
-              ]
-            },
-            "2": {
-              "patterns": [
-                {
-                  "include": "#function-generic"
-                }
-              ]
-            }
-          }
+    "escaped-fix": {
+      "name": "meta.escaped.keyword.v",
+      "match": "((?:@)(?:mut|var|pub|fn|unsafe|module|import|as|const|map|assert|sizeof|type|struct|interface|enum|in|is|or|match|if|else|for|go|goto|defer|return|i?(?:8|16|nt|64|128)|u?(?:16|32|64|128)|f?(?:32|64)|bool|byte|byteptr|charptr|voidptr|string|ustring|rune|none))",
+      "captures": {
+        "0": {
+          "name": "keyword.other.escaped.v"
         }
-      ]
+      }
     },
-    "function-generic": {
-      "patterns": [
-        {
-          "name": "meta.definition.generic.v",
-          "match": "(\\\u003c)([0-9a-zA-Z_]+)(\\\u003e)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.bracket.angle.begin.v"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.generic.v",
-                  "match": "\\w+"
-                }
-              ]
+    "flag-decl": {
+      "name": "meta.flag.v",
+      "begin": "^\\s*(#flag)",
+      "end": "\\s+(.*?)$",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.flag.v"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "string.quoted.single.v"
+        }
+      }
+    },
+    "function-decl": {
+      "name": "meta.definition.function.v",
+      "begin": "^\\s*(pub)?\\s*(fn)\\s+",
+      "end": "(?:(?:C\\.)?)(\\w+)\\s*((?\u003c=[\\w\\s+])(\\\u003c)(\\w+)(\\\u003e))?",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.v"
+        },
+        "2": {
+          "name": "keyword.function.v"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
             },
-            "3": {
-              "name": "punctuation.definition.bracket.angle.end.v"
+            {
+              "name": "entity.name.function.v",
+              "match": "\\w+"
             }
-          }
+          ]
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#generic"
+            }
+          ]
         }
-      ]
+      }
     },
-    "function-new": {
-      "patterns": [
-        {
-          "name": "meta.function.v",
-          "begin": "^\\s*(pub)?\\s*(fn)\\s+",
-          "end": "(?:(?:C\\.)?)([0-9a-zA-Z_]+)(\\\u003c[0-9a-zA-Z_]*\\\u003e)?",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.v"
+    "function-exist": {
+      "name": "meta.support.function.v",
+      "match": "(\\w+)((?\u003c=[\\w\\s+])(\\\u003c)(\\w+)(\\\u003e))?(?=\\s*\\()",
+      "captures": {
+        "0": {
+          "name": "meta.function.call.v"
+        },
+        "1": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
             },
-            "2": {
-              "name": "keyword.function.v"
+            {
+              "name": "entity.name.function.v",
+              "match": "\\w+"
             }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "meta.definition.function.v"
-            },
-            "1": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.function.v",
-                  "match": "\\w+"
-                }
-              ]
-            },
-            "2": {
-              "patterns": [
-                {
-                  "include": "#function-generic"
-                }
-              ]
+          ]
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#generic"
             }
-          }
+          ]
         }
-      ]
+      }
     },
-    "function-new-extend": {
-      "patterns": [
-        {
-          "name": "meta.function.v",
-          "match": "^\\s*(pub)?\\s*(fn)\\s+(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)([0-9a-zA-Z_]+)(\\\u003c[0-9a-zA-Z_]*\\\u003e)?",
-          "captures": {
-            "0": {
-              "name": "meta.definition.function.v"
-            },
-            "1": {
-              "name": "storage.modifier.v"
-            },
-            "2": {
-              "name": "keyword.function.v"
+    "function-extend-decl": {
+      "name": "meta.definition.function.v",
+      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)\\s*((?\u003c=[\\w\\s+])(\\\u003c)(\\w+)(\\\u003e))?",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.v"
+        },
+        "2": {
+          "name": "keyword.function.v"
+        },
+        "3": {
+          "name": "punctuation.definition.bracket.round.begin.v"
+        },
+        "4": {
+          "patterns": [
+            {
+              "include": "#brackets"
             },
-            "3": {
-              "name": "punctuation.definition.bracket.round.begin.v"
+            {
+              "include": "#storage"
             },
-            "4": {
-              "patterns": [
-                {
-                  "include": "#brackets"
-                },
-                {
-                  "include": "#storage"
-                },
-                {
-                  "include": "#generics"
-                },
-                {
-                  "include": "#std-types"
-                },
-                {
-                  "include": "#std-cbased-types"
-                },
-                {
-                  "include": "#punctuation"
-                }
-              ]
+            {
+              "include": "#generic"
             },
-            "5": {
-              "name": "punctuation.definition.bracket.round.end.v"
+            {
+              "include": "#types"
             },
-            "6": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.function.v",
-                  "match": "\\w+"
-                }
-              ]
+            {
+              "include": "#punctuation"
+            }
+          ]
+        },
+        "5": {
+          "name": "punctuation.definition.bracket.round.end.v"
+        },
+        "6": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
             },
-            "7": {
-              "patterns": [
-                {
-                  "include": "#function-generic"
-                }
-              ]
+            {
+              "name": "entity.name.function.v",
+              "match": "\\w+"
             }
-          }
+          ]
+        },
+        "7": {
+          "patterns": [
+            {
+              "include": "#generic"
+            }
+          ]
         }
-      ]
+      }
     },
-    "function-new-limited-overload": {
-      "patterns": [
-        {
-          "name": "meta.function.v",
-          "match": "^\\s*(pub)?\\s*(fn)\\s+(\\()([^\\)]*)(\\))\\s*([\\+\\-\\*\\/])?\\s*(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)([0-9a-zA-Z_]+)",
-          "captures": {
-            "0": {
-              "name": "meta.definition.function.v"
-            },
-            "1": {
-              "name": "storage.modifier.v"
+    "function-limited-overload-decl": {
+      "name": "meta.definition.function.v",
+      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^\\)]*)(\\))\\s*([\\+\\-\\*\\/])?\\s*(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.v"
+        },
+        "10": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
             },
-            "10": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.function.v",
-                  "match": "\\w+"
-                }
-              ]
+            {
+              "name": "entity.name.function.v",
+              "match": "\\w+"
+            }
+          ]
+        },
+        "2": {
+          "name": "keyword.function.v"
+        },
+        "3": {
+          "name": "punctuation.definition.bracket.round.begin.v"
+        },
+        "4": {
+          "patterns": [
+            {
+              "include": "#brackets"
             },
-            "2": {
-              "name": "keyword.function.v"
+            {
+              "include": "#storage"
             },
-            "3": {
-              "name": "punctuation.definition.bracket.round.begin.v"
+            {
+              "include": "#generic"
             },
-            "4": {
-              "patterns": [
-                {
-                  "include": "#brackets"
-                },
-                {
-                  "include": "#storage"
-                },
-                {
-                  "include": "#generics"
-                },
-                {
-                  "include": "#std-types"
-                },
-                {
-                  "include": "#std-cbased-types"
-                },
-                {
-                  "include": "#punctuation"
-                }
-              ]
+            {
+              "include": "#types"
             },
-            "5": {
-              "name": "punctuation.definition.bracket.round.end.v"
+            {
+              "include": "#punctuation"
+            }
+          ]
+        },
+        "5": {
+          "name": "punctuation.definition.bracket.round.end.v"
+        },
+        "6": {
+          "patterns": [
+            {
+              "include": "#operators"
+            }
+          ]
+        },
+        "7": {
+          "name": "punctuation.definition.bracket.round.begin.v"
+        },
+        "8": {
+          "patterns": [
+            {
+              "include": "#brackets"
             },
-            "6": {
-              "patterns": [
-                {
-                  "include": "#operators"
-                }
-              ]
+            {
+              "include": "#storage"
             },
-            "7": {
-              "name": "punctuation.definition.bracket.round.begin.v"
+            {
+              "include": "#generic"
             },
-            "8": {
-              "patterns": [
-                {
-                  "include": "#brackets"
-                },
-                {
-                  "include": "#storage"
-                },
-                {
-                  "include": "#generics"
-                },
-                {
-                  "include": "#std-types"
-                },
-                {
-                  "include": "#std-cbased-types"
-                },
-                {
-                  "include": "#punctuation"
-                }
-              ]
+            {
+              "include": "#types"
             },
-            "9": {
-              "name": "punctuation.definition.bracket.round.end.v"
+            {
+              "include": "#punctuation"
             }
-          }
+          ]
+        },
+        "9": {
+          "name": "punctuation.definition.bracket.round.end.v"
         }
-      ]
+      }
     },
-    "generics": {
+    "generic": {
       "patterns": [
         {
           "name": "meta.definition.generic.v",
-          "match": "(?\u003c=[\\w\\s])(\\\u003c)([0-9a-zA-Z_]+)(\\\u003e)",
+          "match": "(?\u003c=[\\w\\s+])(\\\u003c)(\\w+)(\\\u003e)",
           "captures": {
             "1": {
               "name": "punctuation.definition.bracket.angle.begin.v"
@@ -710,8 +536,7 @@
             "2": {
               "patterns": [
                 {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
+                  "include": "#illegal-name"
                 },
                 {
                   "name": "entity.name.generic.v",
@@ -726,221 +551,192 @@
         }
       ]
     },
-    "interface": {
-      "patterns": [
-        {
-          "name": "meta.definition.interface.v",
-          "match": "^\\s*(\\binterface\\b)\\s+([0-9a-zA-Z_]*)",
-          "captures": {
-            "1": {
-              "name": "keyword.interface.v"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.interface.v",
-                  "match": "\\w+"
-                }
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "keywords": {
-      "patterns": [
-        {
-          "name": "keyword.control.v",
-          "match": "\\b(in|or|break|continue|switch|case|default|match|if|else|for|go|goto|defer|return)\\b"
-        },
-        {
-          "name": "keyword.control.v",
-          "match": "(\\$if)"
-        },
-        {
-          "name": "keyword.control.v",
-          "match": "(\\$else)"
-        },
-        {
-          "name": "keyword.type.v",
-          "match": "\\btype\\b"
-        },
-        {
-          "name": "keyword.enum.v",
-          "match": "\\benum\\b"
-        },
-        {
-          "name": "keyword.struct.v",
-          "match": "\\bstruct\\b"
-        },
-        {
-          "name": "keyword.interface.v",
-          "match": "\\binterface\\b"
-        },
-        {
-          "name": "keyword.map.v",
-          "match": "\\bmap\\b"
-        },
-        {
-          "name": "keyword.assert.v",
-          "match": "\\bassert\\b"
-        },
-        {
-          "name": "keyword.sizeof.v",
-          "match": "\\bsizeof\\b"
+    "illegal-name": {
+      "name": "invalid.illegal.v",
+      "match": "\\d\\w+"
+    },
+    "import-decl": {
+      "name": "meta.import.v",
+      "begin": "^\\s*(import)\\s+",
+      "end": "([\\w.]+)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.import.v"
         }
-      ]
+      },
+      "endCaptures": {
+        "1": {
+          "name": "entity.name.import.v"
+        }
+      }
     },
-    "numbers": {
+    "include-decl": {
       "patterns": [
         {
-          "match": "([-]?)([0-9e]*)([.]){1}([0-9]+)",
-          "captures": {
+          "name": "meta.include.v",
+          "begin": "^\\s*(#include)",
+          "end": "\\s+([0-9a-zA-Z_]+)",
+          "beginCaptures": {
             "1": {
-              "name": "constant.numeric.float.v"
-            },
-            "2": {
-              "name": "constant.numeric.float.v"
-            },
-            "3": {
-              "name": "constant.numeric.float.v"
-            },
-            "4": {
-              "name": "constant.numeric.float.v"
+              "name": "keyword.include.v"
             }
-          }
-        },
-        {
-          "match": "(0[xX])([0-9a-fA-F]+)",
-          "captures": {
+          },
+          "endCaptures": {
             "1": {
-              "name": "constant.numeric.hex.v"
-            },
-            "2": {
-              "name": "constant.numeric.hex.v"
+              "name": "entity.include.additional.value.v"
             }
           }
         },
         {
-          "match": "\\b([-]?)([0-9]+)",
-          "captures": {
+          "name": "meta.include.v",
+          "begin": "^\\s*(#include)",
+          "end": "\\s+(([\\\u003c\"])\\s*(.*)([\\\u003e\"]))",
+          "beginCaptures": {
             "1": {
-              "name": "constant.numeric.integer.v"
-            },
-            "2": {
-              "name": "constant.numeric.integer.v"
+              "name": "keyword.include.v"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "string.quoted.double.v"
             }
           }
         }
       ]
     },
-    "operators": {
-      "patterns": [
-        {
-          "name": "keyword.operator.arithmethic.v",
-          "match": "(\\+|\\-|\\*|\\/|\\%|\\+\\+|\\-\\-)"
+    "interface": {
+      "name": "meta.definition.interface.v",
+      "match": "^\\s*(?:(pub)?\\s+)?(interface)\\s+(\\w*)",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.$1.v"
         },
-        {
-          "name": "keyword.operator.relation.v",
-          "match": "(\\=\\=|\\!\\=|\\\u003e|\\\u003c|\\\u003e\\=|\\\u003c\\=)"
+        "2": {
+          "name": "keyword.interface.v"
         },
+        "3": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
+            },
+            {
+              "name": "entity.name.interface.v",
+              "match": "\\w+"
+            }
+          ]
+        }
+      }
+    },
+    "keywords": {
+      "patterns": [
         {
-          "name": "keyword.operator.logical.v",
-          "match": "(\\\u0026\\\u0026|\\|\\||\\!)"
+          "name": "keyword.control.v",
+          "match": "(\\$if|\\$else)"
         },
         {
-          "name": "keyword.operator.bitwise.v",
-          "match": "(\\\u0026|\\||\\^|\u003c(?!\u003c)|\u003e(?!\u003e))"
+          "name": "keyword.control.v",
+          "match": "\\b(it|is|in|or|break|continue|default|unsafe|match|if|else|for|go|goto|defer|return)\\b"
         },
         {
-          "name": "keyword.operator.assignment.v",
-          "match": "(\\:\\=|\\=|\\+\\=|\\-\\=|\\*\\=|\\/\\=|\\%\\=|\\\u0026\\=|\\|\\=|\\^\\=|\\\u0026\\\u0026\\=|\\|\\|\\=|\\\u003e\\\u003e\\=|\\\u003c\\\u003c\\=)"
+          "name": "keyword.$1.v",
+          "match": "\\b(fn|type|enum|struct|interface|map|assert|sizeof)\\b"
         }
       ]
     },
-    "punctuation": {
+    "module-decl": {
+      "name": "meta.module.v",
+      "begin": "^\\s*(module)\\s+",
+      "end": "([\\w.]+)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.module.v"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "entity.name.module.v"
+        }
+      }
+    },
+    "numbers": {
       "patterns": [
         {
-          "name": "punctuation.other.dot.v",
-          "match": "\\."
+          "name": "constant.numeric.float.v",
+          "match": "(?:(?:[-]?)(?:[0-9e]*)(?:[.]){1}(?:[0-9]+))"
         },
         {
-          "name": "punctuation.other.comma.v",
-          "match": "\\,"
+          "name": "constant.numeric.exponental.v",
+          "match": "[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)"
         },
         {
-          "name": "punctuation.other.colon.v",
-          "match": "\\:"
+          "name": "constant.numeric.binary.v",
+          "match": "\\b(?:0[b])(?:[0-1]+)"
         },
         {
-          "name": "punctuation.other.semicolon.v",
-          "match": "\\;"
+          "name": "constant.numeric.octal.v",
+          "match": "\\b(?:0[o])(?:[0-7]+)"
         },
         {
-          "name": "punctuation.other.questionmark.v",
-          "match": "\\?"
-        }
-      ]
-    },
-    "std-cbased-types": {
-      "patterns": [
+          "name": "constant.numeric.hex.v",
+          "match": "\\b(?:0[x])(?:[0-9a-fA-F]+)"
+        },
         {
-          "name": "storage.type.numeric.cbased.v",
-          "match": "\\b(size_t|ptrdiff_t)\\b"
+          "name": "constant.numeric.integer.v",
+          "match": "\\b(?:[-]?)(?:[0-9]+)"
         }
       ]
     },
-    "std-types": {
+    "operators": {
       "patterns": [
         {
-          "name": "storage.type.boolean.v",
-          "match": "\\bbool\\b"
+          "name": "keyword.operator.arithmethic.v",
+          "match": "(\\+|\\-|\\*|\\/|\\%|\\+\\+|\\-\\-)"
         },
         {
-          "name": "storage.type.byte.v",
-          "match": "\\bbyte\\b"
+          "name": "keyword.operator.assignment.v",
+          "match": "(\\:\\=|\\=|\\+\\=|\\-\\=|\\*\\=|\\/\\=|\\%\\=|\\\u0026\\=|\\|\\=|\\^\\=|\\\u0026\\\u0026\\=|\\|\\|\\=|\\\u003e\\\u003e\\=|\\\u003c\\\u003c\\=)"
         },
         {
-          "name": "storage.type.byteptr.v",
-          "match": "\\bbyteptr\\b"
+          "name": "keyword.operator.bitwise.v",
+          "match": "(\\\u0026|\\||\\^|\u003c(?!\u003c)|\u003e(?!\u003e))"
         },
         {
-          "name": "storage.type.voidptr.v",
-          "match": "\\bvoidptr\\b"
+          "name": "keyword.operator.logical.v",
+          "match": "(\\\u0026\\\u0026|\\|\\||\\!)"
         },
         {
-          "name": "storage.type.string.v",
-          "match": "\\bstring\\b"
+          "name": "keyword.operator.relation.v",
+          "match": "(\\=\\=|\\!\\=|\\\u003e|\\\u003c|\\\u003e\\=|\\\u003c\\=)"
+        }
+      ]
+    },
+    "punctuation": {
+      "patterns": [
+        {
+          "name": "punctuation.delimiter.period.dot.v",
+          "match": "\\."
         },
         {
-          "name": "storage.type.ustring.v",
-          "match": "\\bustring\\b"
+          "name": "punctuation.delimiter.comma.v",
+          "match": ","
         },
         {
-          "name": "storage.type.rune.v",
-          "match": "\\brune\\b"
+          "name": "punctuation.separator.key-value.colon.v",
+          "match": ":"
         },
         {
-          "name": "storage.type.option.v",
-          "match": "\\boption\\b"
+          "name": "punctuation.definition.other.semicolon.v",
+          "match": ";"
         },
         {
-          "name": "storage.type.numeric.v",
-          "match": "\\b(int|uint|i(8|16|32|64|128)|u(8|16|32|64|u128)|f(32|64))\\b"
+          "name": "punctuation.definition.other.questionmark.v",
+          "match": "\\?"
         }
       ]
     },
     "storage": {
-      "patterns": [
-        {
-          "name": "storage.modifier.v",
-          "match": "\\b(const|mut|pub)\\b"
-        }
-      ]
+      "name": "storage.modifier.v",
+      "match": "\\b(const|mut|var|pub)\\b"
     },
     "string-escaped-char": {
       "patterns": [
@@ -955,47 +751,39 @@
       ]
     },
     "string-interpolation": {
-      "patterns": [
-        {
-          "name": "meta.string.interpolation.v",
-          "match": "(\\$[0-9a-zA-Z_.]+)",
-          "captures": {
-            "1": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\$\\d[\\.\\w]+"
-                },
-                {
-                  "name": "variable.other.interpolated.v",
-                  "match": "\\$[\\.\\w]+"
-                }
-              ]
+      "name": "meta.string.interpolation.v",
+      "match": "(\\$([\\w.]+|\\{.*?\\}))",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "name": "invalid.illegal.v",
+              "match": "\\$\\d[\\.\\w]+"
+            },
+            {
+              "name": "variable.other.interpolated.v",
+              "match": "\\$([\\.\\w]+|\\{.*?\\})"
             }
-          }
+          ]
         }
-      ]
+      }
     },
     "string-placeholder": {
-      "patterns": [
-        {
-          "name": "constant.other.placeholder.v",
-          "match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGsp]"
-        }
-      ]
+      "name": "constant.other.placeholder.v",
+      "match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGsp]"
     },
     "strings": {
       "patterns": [
         {
           "name": "string.quoted.raw.v",
-          "begin": "\\`",
-          "end": "\\`",
+          "begin": "`",
+          "end": "`",
           "patterns": [
             {
-              "include": "#string-interpolation"
+              "include": "#string-escaped-char"
             },
             {
-              "include": "#string-escaped-char"
+              "include": "#string-interpolation"
             },
             {
               "include": "#string-placeholder"
@@ -1014,14 +802,14 @@
         },
         {
           "name": "string.quoted.single.v",
-          "begin": "\\'",
-          "end": "\\'",
+          "begin": "'",
+          "end": "'",
           "patterns": [
             {
-              "include": "#string-interpolation"
+              "include": "#string-escaped-char"
             },
             {
-              "include": "#string-escaped-char"
+              "include": "#string-interpolation"
             },
             {
               "include": "#string-placeholder"
@@ -1044,10 +832,10 @@
           "end": "\"",
           "patterns": [
             {
-              "include": "#string-interpolation"
+              "include": "#string-escaped-char"
             },
             {
-              "include": "#string-escaped-char"
+              "include": "#string-interpolation"
             },
             {
               "include": "#string-placeholder"
@@ -1070,113 +858,151 @@
       "patterns": [
         {
           "name": "meta.definition.struct.v",
-          "match": "^\\s*(\\bstruct\\b)\\s+(?:[0-9a-zA-Z_]+\\.)?([0-9a-zA-Z_]*)",
-          "captures": {
-            "1": {
-              "name": "keyword.struct.v"
+          "begin": "^\\s*(?:(mut|var|pub(?:\\s+mut|var)?|__global)\\s+)?(struct)\\s+([\\w.]+)\\s*({)",
+          "end": "\\s*(})",
+          "patterns": [
+            {
+              "include": "#struct-access-modifier"
             },
-            "2": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
+            {
+              "match": "\\b(\\w+)\\s+([\\w\\[\\]\\*\u0026.]+)(?:\\s*(=)\\s*((?:.(?=$|//|/\\*))*+))?",
+              "captures": {
+                "1": {
+                  "name": "variable.other.property.v"
                 },
-                {
-                  "name": "entity.name.struct.v",
-                  "match": "\\w+"
+                "2": {
+                  "patterns": [
+                    {
+                      "include": "#numbers"
+                    },
+                    {
+                      "include": "#brackets"
+                    },
+                    {
+                      "include": "#types"
+                    },
+                    {
+                      "name": "storage.type.other.v",
+                      "match": "\\w+"
+                    }
+                  ]
+                },
+                "3": {
+                  "name": "keyword.operator.assignment.v"
+                },
+                "4": {
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    }
+                  ]
                 }
-              ]
+              }
+            },
+            {
+              "include": "#types"
+            },
+            {
+              "include": "$self"
             }
-          }
-        }
-      ]
-    },
-    "type": {
-      "patterns": [
-        {
-          "name": "meta.definition.type.v",
-          "match": "^\\s*(\\btype\\b)\\s+([0-9a-zA-Z_]*)\\s+(?:[0-9a-zA-Z]+\\.+)?([0-9a-zA-Z_]*)",
-          "captures": {
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "keyword.type.v"
+              "name": "storage.modifier.$1.v"
             },
             "2": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.type.v",
-                  "match": "\\w+"
-                }
-              ]
+              "name": "storage.type.struct.v"
             },
             "3": {
-              "patterns": [
-                {
-                  "name": "invalid.illegal.v",
-                  "match": "\\d\\w+"
-                },
-                {
-                  "name": "entity.name.type.v",
-                  "match": "\\w+"
-                }
-              ]
+              "name": "entity.name.struct.v"
+            },
+            "4": {
+              "name": "punctuation.definition.bracket.curly.begin.v"
             }
-          }
-        }
-      ]
-    },
-    "variable-assignment": {
-      "patterns": [
-        {
-          "match": "(match|if|else)(?=\\s*\\=\\\u003e)",
-          "captures": {
+          },
+          "endCaptures": {
             "1": {
-              "name": "keyword.control.v"
+              "name": "punctuation.definition.bracket.curly.end.v"
             }
           }
         },
         {
-          "name": "meta.definition.var.v",
-          "match": "([0-9a-zA-Z_.]+)\\s*((?:\\:|\\+|\\-|\\*|\\/|\\%|\\\u0026|\\||\\^)?=)\\s*(?=.+)",
+          "name": "meta.definition.struct.v",
+          "match": "^\\s*(?:(mut|var|pub(?:\\s+mut|var)?|__global))\\s+?(struct)\\s+(?:\\s+([\\w.]+))?",
           "captures": {
             "1": {
-              "name": "variable.other.v"
+              "name": "storage.modifier.$1.v"
             },
             "2": {
-              "name": "keyword.operator.assignment.v"
+              "name": "storage.type.struct.v"
+            },
+            "3": {
+              "name": "entity.name.struct.v"
             }
           }
         }
       ]
     },
-    "variable-increment-decrement": {
-      "patterns": [
-        {
-          "name": "meta.var.increment.expr.v",
-          "match": "([0-9a-zA-Z_.]+)(\\+\\+)",
-          "captures": {
-            "1": {
-              "name": "variable.other.increment.v"
+    "struct-access-modifier": {
+      "match": "(?\u003c=\\s|^)(mut|var|pub(?:\\s+mut|var)?|__global)(:|\\b)",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.$1.v"
+        },
+        "2": {
+          "name": "punctuation.separator.struct.key-value.v"
+        }
+      }
+    },
+    "type": {
+      "name": "meta.definition.type.v",
+      "match": "^\\s*(?:(pub)?\\s+)?(type)\\s+(\\w*)\\s+(?:\\w+\\.+)?(\\w*)",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.$1.v"
+        },
+        "2": {
+          "name": "storage.type.type.v"
+        },
+        "3": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
             },
-            "2": {
-              "name": "keyword.operator.increment.v"
+            {
+              "include": "#types"
+            },
+            {
+              "name": "entity.name.type.v",
+              "match": "\\w+"
             }
-          }
+          ]
         },
-        {
-          "name": "meta.var.decrement.expr.v",
-          "match": "([0-9a-zA-Z_.]+)(\\-\\-)",
-          "captures": {
-            "1": {
-              "name": "variable.other.decrement.v"
+        "4": {
+          "patterns": [
+            {
+              "include": "#illegal-name"
             },
-            "2": {
-              "name": "keyword.operator.decrement.v"
+            {
+              "include": "#types"
+            },
+            {
+              "name": "entity.name.type.v",
+              "match": "\\w+"
             }
-          }
+          ]
+        }
+      }
+    },
+    "types": {
+      "patterns": [
+        {
+          "name": "storage.type.numeric.v",
+          "match": "\\b(i(8|16|nt|64|128)|u(8|16|32|64|128)|f(32|64))\\b"
+        },
+        {
+          "name": "storage.type.$1.v",
+          "match": "\\b(bool|byte|byteptr|charptr|voidptr|string|ustring|rune|none)\\b"
         }
       ]
     }