diff --git a/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences b/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences
index f6f5089..157eeac 100644
--- a/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences
+++ b/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences
@@ -7,7 +7,7 @@
increaseIndentPattern
- (^\s*\$?\b((local)?[\s\w=]+)?(function|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\b((?!\bend\b).)*$|^.*\b(do|then)\b((?!\bend\b).)*$|^.*\{((?!\}).)*$)
+ (^\s*\$?(?!declare\s+function\b)\b((local)?[\s\w=]+)?\b(function(?!\s*\([^)]*\)\s*:)|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\b((?!\bend\b).)*$|^.*\b(do|then)\b((?!\bend\b).)*$|^.*\{((?!\}).)*$)
decreaseIndentPattern
(^\s*\$?\b(elsei|elseif|else|catch|pluto_catch|end|until)\b.*$|^((?!\{).)*\}\;?.*$)
diff --git a/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage b/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage
index bf3bc7a..9f031ba 100644
--- a/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage
+++ b/Pluto.tmbundle/Syntaxes/Pluto.tmLanguage
@@ -26,32 +26,37 @@
begin
- \b(function)(?:\s+(?:[a-zA-Z_][a-zA-Z0-9_]*([.:]))?([a-zA-Z_][a-zA-Z0-9_]*))?\s*(\()
+ (?:(\$declare)\s+)?\b(function)(?:\s+(?:[a-zA-Z_][a-zA-Z0-9_]*([.:]))?([a-zA-Z_][a-zA-Z0-9_]*))?\s*(\()
beginCaptures
1
name
- storage.type.function.pluto
+ storage.modifier.pluto
2
name
- punctuation.separator.parameter.pluto
+ storage.type.function.pluto
3
name
- entity.name.function.pluto
+ punctuation.separator.parameter.pluto
4
+
+ name
+ entity.name.function.pluto
+
+ 5
name
punctuation.section.group.begin.pluto
end
- (\))(?:(:)\s+(void|\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\??))?(\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
@@ -107,9 +112,17 @@
name
constant.language.pluto
+
+ include
+ #function_type
+
+
+ include
+ #table_type
+
match
- (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\??)
+ (:)\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
@@ -205,6 +218,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_]*)?
@@ -482,10 +538,83 @@
match
- \$(define|alias)\b
+ \$(define|alias|haltcompiler)\b
name
storage.modifier.pluto
+
+ begin
+ (?<!\S)(\$declare)\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*(\{)
+ beginCaptures
+
+ 1
+
+ name
+ storage.modifier.pluto
+
+ 2
+
+ name
+ invalid.name.reserved.not-narrow.not-overridable.not-optional.not-special.pluto
+
+ 3
+
+ name
+ punctuation.separator.colon.pluto
+
+ 4
+
+ 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
+
+
+
+
+ match
+ (?<!\S)(\$declare)\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
+
+ name
+ storage.modifier.pluto
+
+ 2
+
+ name
+ invalid.name.reserved.not-narrow.not-overridable.not-optional.not-special.pluto
+
+ 3
+
+ name
+ punctuation.separator.colon.pluto
+
+ 4
+
+ name
+ storage.type.primitive.pluto
+
+
+
match
\+|-|%|#|\*|\/|\^|==|~=|!=|<=?|>=?|(?<!\.)\.{2}(?!\.)|\$|\||~|&
@@ -559,9 +688,17 @@
end
\w+
+
+ include
+ #function_type
+
+
+ include
+ #table_type
+
match
- (:)\s+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\??)
+ (:)\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
@@ -667,9 +804,59 @@
name
keyword.control.pluto
+
+ begin
+ \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*(\{)
+ beginCaptures
+
+ 1
+
+ name
+ storage.modifier.pluto
+
+ 2
+
+ name
+ invalid.name.reserved.not-narrow.not-overridable.not-optional.not-special.pluto
+
+ 3
+
+ name
+ punctuation.separator.colon.pluto
+
+ 4
+
+ 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
+
+
+
+
+ include
+ #function_type
+
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+(\??(?:(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\|)*(?:string|number|int|float|bool(?:ean)?|function|table|userdata)\??))?(?!\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
@@ -714,7 +901,7 @@
match
- (?<![^.]\.|:)\b(_G|_VERSION|_PVERSION|math\.(pi|huge|mininteger|maxinteger)|os\.(platform|arch)|json\.(null|withnull|withorder))\b
+ (?<![^.]\.|:)\b(_G|_VERSION|_PVERSION|math\.(pi|huge|mininteger|maxinteger)|os\.(platform|arch)|json\.(null|withnull|withorder|msgpack))\b
name
constant.language.pluto support.constant.builtin.pluto
@@ -1184,6 +1371,334 @@
+ table_type
+
+ begin
+ (:)\s*(\{)
+ beginCaptures
+
+ 1
+
+ name
+ punctuation.separator.colon.pluto
+
+ 2
+
+ 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
+
+
+
+ table_type_body
+
+ patterns
+
+
+ match
+ [a-zA-Z_][a-zA-Z0-9_]*
+ name
+ variable.other.field.pluto
+
+
+ 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
+
+ name
+ punctuation.separator.colon.pluto
+
+ 2
+
+ name
+ storage.type.primitive.pluto
+
+
+ name
+ meta.typehint.pluto
+
+
+ match
+ ;
+ name
+ punctuation.terminator.semicolon.pluto
+
+
+ match
+ ,
+ name
+ punctuation.separator.comma.pluto
+
+
+
+ function_type
+
+ begin
+ (:)\s*(function)\s*(?=\()
+ beginCaptures
+
+ 1
+
+ name
+ punctuation.separator.colon.pluto
+
+ 2
+
+ 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
+
+ name
+ punctuation.separator.colon.pluto
+
+ 2
+
+ name
+ storage.type.primitive.pluto
+
+
+ name
+ meta.typehint.pluto
+
+
+
+ function_type_params
+
+ patterns
+
+
+ match
+ [a-zA-Z_][a-zA-Z0-9_]*
+ name
+ variable.parameter.function.pluto
+
+
+ match
+ ,
+ name
+ punctuation.separator.comma.pluto
+
+
+ match
+ \.\.\.
+ name
+ constant.language.pluto
+
+
+ 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
+
+ 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
+
+ name
+ punctuation.separator.colon.pluto
+
+ 2
+
+ name
+ storage.type.primitive.pluto
+
+
+ name
+ meta.typehint.pluto
+
+
+
+ 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/language-config.json b/language-config.json
index 6e7cf57..8f81179 100644
--- a/language-config.json
+++ b/language-config.json
@@ -5,7 +5,7 @@
},
// Keep in sync with Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences
"indentationRules": {
- "increaseIndentPattern": "(^\\s*\\$?\\b((local)?[\\s\\w=]+)?(function|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\\b((?!\\bend\\b).)*$|^.*\\b(do|then)\\b((?!\\bend\\b).)*$|^.*\\{((?!\\}).)*$)",
+ "increaseIndentPattern": "(^\\s*\\$?(?!declare\\s+function\\b)\\b((local)?[\\s\\w=]+)?\\b(function(?!\\s*\\([^)]*\\)\\s*:)|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\\b((?!\\bend\\b).)*$|^.*\\b(do|then)\\b((?!\\bend\\b).)*$|^.*\\{((?!\\}).)*$)",
"decreaseIndentPattern": "(^\\s*\\$?\\b(elsei|elseif|else|catch|pluto_catch|end|until)\\b.*$|^((?!\\{).)*\\}\\;?.*$)"
}
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 8c74ce9..617cd7c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"keywords": [
"Pluto language"
],
- "version": "0.7.1",
+ "version": "0.8.0",
"publisher": "calamity-inc",
"icon": "icon.png",
"repository": "https://github.com/PlutoLang/Syntax-Highlighting",
diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest
index 85c416b..b7233e0 100644
--- a/source.extension.vsixmanifest
+++ b/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
-
+
Pluto Syntax Highlighting
Provides syntax highlighting and snippets for Pluto, a Lua dialect.
icon.png
diff --git a/test.js b/test.js
index 166bdc1..2d15767 100644
--- a/test.js
+++ b/test.js
@@ -59,7 +59,8 @@ async function main()
const actual = createClassificationString(code);
if (actual != expected)
{
- console.log(`Mismatch for ${code}`);
+ console.log(code + " MISMATCH");
+ console.log(actual);
ok = false;
}
};
@@ -82,6 +83,254 @@ async function main()
` - constant.numeric.integer.pluto`
);
+ checkClassification(
+ `local p: { x: number; y: number }`,
+ `----- storage.modifier.pluto`,
+ ` -- meta.typehint.table.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.table.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(
+ `local p: { x: number, y: number }`,
+ `----- storage.modifier.pluto`,
+ ` -- meta.typehint.table.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.table.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(
+ `local function f(cb: { a: string })`,
+ `----- storage.modifier.pluto`,
+ ` -------- storage.type.function.pluto`,
+ ` - meta.function.pluto`,
+ ` - entity.name.function.pluto`,
+ ` - punctuation.section.group.begin.pluto`,
+ ` -- variable.parameter.function.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.table.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`,
+ ` - meta.typehint.table.pluto`,
+ ` - punctuation.section.table.end.pluto`,
+ ` - punctuation.section.group.end.pluto`
+ );
+
+ checkClassification(
+ `local f: function(a: string): int = tonumber`,
+ `----- storage.modifier.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.function.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`,
+ ` - keyword.operator.assignment.pluto`
+ );
+
+ checkClassification(
+ `local function f(cb: function(a: string): int)`,
+ `----- storage.modifier.pluto`,
+ ` -------- storage.type.function.pluto`,
+ ` - meta.function.pluto`,
+ ` - entity.name.function.pluto`,
+ ` - punctuation.section.group.begin.pluto`,
+ ` -- variable.parameter.function.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.function.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`,
+ ` - punctuation.section.group.end.pluto`
+ );
+
+ checkClassification(
+ `local function f(): (bool, int)`,
+ `----- storage.modifier.pluto`,
+ ` -------- storage.type.function.pluto`,
+ ` - meta.function.pluto`,
+ ` - entity.name.function.pluto`,
+ ` - punctuation.section.group.begin.pluto`,
+ ` - punctuation.section.group.end.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.function.pluto`,
+ ` ----------- storage.type.primitive.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`
+ );
+ checkClassification(
+ `$declare _PVERSION: string`,
+ `-------- storage.modifier.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` ------ storage.type.primitive.pluto`
+ );
+ checkClassification(
+ `$declare function tonumber(str: string, base: ?number): number`,
+ `-------- storage.modifier.pluto`,
+ ` - meta.function.pluto`,
+ ` -------- storage.type.function.pluto`,
+ ` - meta.function.pluto`,
+ ` -------- entity.name.function.pluto`,
+ ` - punctuation.section.group.begin.pluto`,
+ ` --- variable.parameter.function.pluto`,
+ ` - punctuation.separator.colon.pluto`,
+ ` - meta.typehint.pluto`,
+ ` ------ storage.type.primitive.pluto`,
+ ` - punctuation.separator.comma.pluto`,
+ ` - meta.function.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.function.pluto`,
+ ` ------ storage.type.primitive.pluto`
+ );
+
+ checkClassification(
+ `$if true then`,
+ `- keyword.operator.logical.pluto`,
+ ` -- keyword.control.pluto`,
+ ` ---- constant.language.pluto`,
+ ` ---- keyword.control.pluto`
+ );
+ checkClassification(
+ `$else`,
+ `- keyword.operator.logical.pluto`,
+ ` ---- keyword.control.pluto`
+ );
+ checkClassification(
+ `$end`,
+ `- keyword.operator.logical.pluto`,
+ ` --- keyword.control.pluto`
+ );
+
const langConfig = JSON.parse(
fs.readFileSync(path.join(__dirname, "language-config.json"), "utf8").replace(/\/\/.*$/gm, "")
);
@@ -111,6 +360,9 @@ async function main()
checkIndentation("until finished", false, true);
checkIndentation("values = {", true, false);
checkIndentation("}", false, true);
+ checkIndentation("$type Func = function(_: string): void", false, false);
+ checkIndentation("$declare function tonumber(str: string, base: ?number): number", false, false);
+ checkIndentation("local entry", false, false);
if (!ok)
{
diff --git a/visual-check.pluto b/visual-check.pluto
index 0cf329a..42efdaf 100644
--- a/visual-check.pluto
+++ b/visual-check.pluto
@@ -30,3 +30,16 @@ goto label;
-- @param p1 first parameter
-- @return something
-- @see other function
+
+
+$type StringOrNumber = string|number
+$type Point = { x: number, y: number }
+$type Point = { x: number; y: number }
+$type Callback = function(a: string): int
+
+local f: function(a: string): int = tonumber
+local function f(cb: function(a: string): int) end
+
+local p: { x: number, y: number } = { x = 1, y = 2 }
+local p: { x: number; y: number } = { x = 1, y = 2 }
+local function f(cb: { a: string }) end