fixes

package.json

@@ -16,7 +16,6 @@
 		"Formatters"
 	],
 	"activationEvents": [
-		"onLanguage:hblang",
 		"onCommand:extension.formatDocument"
 	],
 	"contributes": {

syntaxes/hblang.tmLanguage.json

@@ -19,10 +19,13 @@
 					"include": "#string"
 				},
 				{
-					"include": "#number"
+					"include": "#keyword"
 				},
 				{
-					"include": "#keyword"
+					"include": "#function"
+				},
+				{
+					"include": "#number"
 				},
 				{
 					"include": "#struct"
@@ -33,9 +36,6 @@
 				{
 					"include": "#variable"
 				},
-				{
-					"include": "#function"
-				},
 				{
 					"include": "#operator"
 				},
@@ -122,19 +122,23 @@
 			"patterns": [
 				{
 					"name": "storage.type.hblang",
-					"match": "\\buint|int|(u|i)(8|16|32)|void|bool|[A-Z]\\w+\\b"
+					"match": "\\b(uint|int|(u|i)(8|16|32)|void|bool|type|never|([A-Z]\\w+))\\b"
 				}
 			]
 		},
 		"variable": {
 			"patterns": [
 				{
-					"name": "variable.other.declaration.hblang",
+					"name": "variable.parameter.hblang",
 					"match": "\\b\\w+\\s*:=\\b"
 				},
 				{
-					"name": "variable.other.assignment.hblang",
+					"name": "variable.parameter.hblang",
 					"match": "\\b\\w+\\s*=\\b"
+				},
+				{
+					"name": "variable.parameter.hblang",
+					"match": "(?<=\\w+\\.)(\\w+)\\b"
 				}
 			]
 		},
@@ -150,43 +154,68 @@
 			"patterns": [
 				{
 					"name": "entity.name.function.hblang",
-					"begin": "\\b\\w+\\s*\\(",
+					"begin": "(?<!\\w)fn\\s*\\(",
 					"end": "\\)",
+					"captures": {
+						"0": {
+							"name": "keyword.hblang"
+						}
+					},
 					"patterns": [
 						{
 							"include": "#all"
 						},
 						{
-							"include": "#parameter"
+							"name": "variable.parameter.hblang",
+							"match": "\\b\\w+\\b(\\s*,\\s*\\b\\w+\\b)*"
+						}
+					]
+				},
+				{
+					"name": "entity.name.function.hblang",
+					"begin": "(?:@)?\\b\\w+\\s*\\(",
+					"end": "\\)",
+					"captures": {
+						"0": {
+							"name": "entity.name.function.hblang"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#all"
+						},
+						{
+							"name": "variable.parameter.hblang",
+							"match": "\\b\\w+\\b(\\s*,\\s*\\b\\w+\\b)*"
 						}
 					]
 				}
 			]
-		},
-		"struct": {
-			"patterns": [
-				{
-					"name": "entity.name.type.struct.hblang",
-					"match": "\\b[A-Z]\\w+\\b"
-				}
-			]
-		},
-		"array": {
-			"patterns": [
-				{
-					"name": "storage.type.array.hblang",
-					"begin": "\\.\\(",
-					"end": "\\)"
-				}
-			]
-		},
-		"punctuation": {
-			"patterns": [
-				{
-					"name": "punctuation.terminator.statement.hblang",
-					"match": ";|\\.|,|:"
-				}
-			]
 		}
+	},
+	"struct": {
+		"patterns": [
+			{
+				"name": "entity.name.type.struct.hblang",
+				"match": "\\b[A-Z]\\w+\\b"
+			}
+		]
+	},
+	"array": {
+		"patterns": [
+			{
+				"name": "storage.type.array.hblang",
+				"begin": "\\.\\(",
+				"end": "\\)"
+			}
+		]
+	},
+	"punctuation": {
+		"patterns": [
+			{
+				"name": "punctuation.terminator.statement.hblang",
+				"match": ";|\\.|,|:"
+			}
+		]
 	}
 }