diff --git a/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage b/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage
index aa38e29..372f956 100644
--- a/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage
+++ b/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage
@@ -51,7 +51,7 @@
end
- (\))(?:(:)\s+(void|\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|\{[^}]*\})\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|\{[^}]*\})\??))?(\s*<nodiscard>)?
+ (\))(?:(:)\s+(void|\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*|\{[^}]*\})\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*|\{[^}]*\})\??))?(\s*<nodiscard>)?
endCaptures
1
@@ -117,7 +117,7 @@
match
- (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\??)
+ (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??)
captures
1
@@ -213,6 +213,49 @@
+
+ begin
+ (\$type)\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*(=)
+ beginCaptures
+
+ 1
+
+ name
+ storage.type.named.pluto
+
+ 2
+
+ name
+ entity.name.type.pluto
+
+ 3
+
+ name
+ keyword.operator.assignment.pluto
+
+
+ end
+ (?=$)
+ name
+ meta.type.named.pluto
+ patterns
+
+
+ include
+ #function_type_no_colon
+
+
+ include
+ #table_type_no_colon
+
+
+ match
+ \??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??
+ name
+ storage.type.primitive.pluto
+
+
+
match
\b(function)($|\s+)(?:[a-zA-Z_][a-zA-Z0-9_]*([.:]))?([a-zA-Z_][a-zA-Z0-9_]*)?
@@ -577,7 +620,7 @@
match
- (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\??)
+ (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??)
captures
1
@@ -735,7 +778,7 @@
match
- \b(?<!\.)(local|global)\s+(?!class)(?!pluto_class)(?!function)(?:(and|break|do|else|elseif|end|false|for|function|goto|if|in|local|nil|not|or|repeat|pluto_use|pluto_switch|pluto_continue|pluto_enum|pluto_new|pluto_class|pluto_export|pluto_try|pluto_catch|switch|continue|enum|new|class|export|try|catch|return|then|true|until|while)\b|\w+)(?:\s*(:)\s+(?!function\s*\()(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\??))?(?!\s*=\s*\|[a-zA-Z0-9_,\s]*\|\s*->)
+ \b(?<!\.)(local|global)\s+(?!class)(?!pluto_class)(?!function)(?:(and|break|do|else|elseif|end|false|for|function|goto|if|in|local|nil|not|or|repeat|pluto_use|pluto_switch|pluto_continue|pluto_enum|pluto_new|pluto_class|pluto_export|pluto_try|pluto_catch|switch|continue|enum|new|class|export|try|catch|return|then|true|until|while)\b|\w+)(?:\s*(:)\s+(?!function\s*\()(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??))?(?!\s*=\s*\|[a-zA-Z0-9_,\s]*\|\s*->)
captures
1
@@ -1307,7 +1350,7 @@
match
- (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\??)
+ (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??)
captures
1
@@ -1356,7 +1399,7 @@
end
- (?=[,)=\}\]\|$])
+ (?=[,)=\}\]\|\s]|$)
name
meta.typehint.function.pluto
patterns
@@ -1400,7 +1443,7 @@
match
- (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\??)
+ (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??)
captures
1
@@ -1451,7 +1494,83 @@
match
- (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil)\??)
+ (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??)
+ captures
+
+ 1
+
+ name
+ punctuation.separator.colon.pluto
+
+ 2
+
+ name
+ storage.type.primitive.pluto
+
+
+ name
+ meta.typehint.pluto
+
+
+
+ function_type_no_colon
+
+ begin
+ (function)\s*(?=\()
+ beginCaptures
+
+ 1
+
+ name
+ storage.type.function.pluto
+
+
+ end
+ (?=[,)=\}\]\|\s]|$)
+ name
+ meta.typehint.function.pluto
+ patterns
+
+
+ begin
+ \(
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.section.group.begin.pluto
+
+
+ end
+ \)
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.group.end.pluto
+
+
+ patterns
+
+
+ include
+ #function_type_params
+
+
+
+
+ include
+ #function_type
+
+
+ include
+ #table_type
+
+
+ match
+ (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata|any|nil|[a-zA-Z_][a-zA-Z0-9_]*)\??)
captures
1
@@ -1470,6 +1589,38 @@
+ table_type_no_colon
+
+ begin
+ (\{)
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.section.table.begin.pluto
+
+
+ end
+ \}
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.table.end.pluto
+
+
+ name
+ meta.typehint.table.pluto
+ patterns
+
+
+ include
+ #table_type_body
+
+
+
string_inner
patterns
diff --git a/test.js b/test.js
index 13db4d2..e5f8f7d 100644
--- a/test.js
+++ b/test.js
@@ -163,7 +163,6 @@ async function main()
` - punctuation.separator.colon.pluto`,
` - meta.typehint.pluto`,
` --- storage.type.primitive.pluto`,
- ` - meta.typehint.function.pluto`,
` - keyword.operator.assignment.pluto`
);
@@ -190,6 +189,88 @@ async function main()
` - punctuation.section.group.end.pluto`
);
+ checkClassification(
+ `$type StringOrNumber = string|number`,
+ `----- storage.type.named.pluto`,
+ ` - meta.type.named.pluto`,
+ ` -------------- entity.name.type.pluto`,
+ ` - meta.type.named.pluto`,
+ ` - keyword.operator.assignment.pluto`,
+ ` - meta.type.named.pluto`,
+ ` ------------- storage.type.primitive.pluto`
+ );
+ checkClassification(
+ `$type Point = { x: number, y: number }`,
+ `----- storage.type.named.pluto`,
+ ` - meta.type.named.pluto`,
+ ` ----- entity.name.type.pluto`,
+ ` - meta.type.named.pluto`,
+ ` - keyword.operator.assignment.pluto`,
+ ` - meta.type.named.pluto`,
+ ` - punctuation.section.table.begin.pluto`,
+ ` - meta.typehint.table.pluto`,
+ ` - variable.other.field.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.pluto`,
+ ` ------ storage.type.primitive.pluto`,
+ ` - punctuation.separator.comma.pluto`,
+ ` - meta.typehint.table.pluto`,
+ ` - variable.other.field.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.pluto`,
+ ` ------ storage.type.primitive.pluto`,
+ ` - meta.typehint.table.pluto`,
+ ` - punctuation.section.table.end.pluto`
+ );
+ checkClassification(
+ `$type Point = { x: number; y: number }`,
+ `----- storage.type.named.pluto`,
+ ` - meta.type.named.pluto`,
+ ` ----- entity.name.type.pluto`,
+ ` - meta.type.named.pluto`,
+ ` - keyword.operator.assignment.pluto`,
+ ` - meta.type.named.pluto`,
+ ` - punctuation.section.table.begin.pluto`,
+ ` - meta.typehint.table.pluto`,
+ ` - variable.other.field.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.pluto`,
+ ` ------ storage.type.primitive.pluto`,
+ ` - punctuation.terminator.semicolon.pluto`,
+ ` - meta.typehint.table.pluto`,
+ ` - variable.other.field.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.pluto`,
+ ` ------ storage.type.primitive.pluto`,
+ ` - meta.typehint.table.pluto`,
+ ` - punctuation.section.table.end.pluto`
+ );
+ checkClassification(
+ `$type Callback = function(a: string): int`,
+ `----- storage.type.named.pluto`,
+ ` - meta.type.named.pluto`,
+ ` -------- entity.name.type.pluto`,
+ ` - meta.type.named.pluto`,
+ ` - keyword.operator.assignment.pluto`,
+ ` - meta.type.named.pluto`,
+ ` -------- storage.type.function.pluto`,
+ ` - punctuation.section.group.begin.pluto`,
+ ` - variable.parameter.function.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.pluto`,
+ ` ------ storage.type.primitive.pluto`,
+ ` - punctuation.section.group.end.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.pluto`,
+ ` --- storage.type.primitive.pluto`
+ );
+ checkClassification(
+ `local f: Callback`,
+ `----- storage.modifier.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` -------- storage.type.primitive.pluto`
+ );
+
const langConfig = JSON.parse(
fs.readFileSync(path.join(__dirname, "language-config.json"), "utf8").replace(/\/\/.*$/gm, "")
);