diff options
| author | DanielGavin <danielgavin5@hotmail.com> | 2024-01-25 11:06:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-25 11:06:18 +0100 |
| commit | d93559abe647e733b0338cf0707aba09c350481a (patch) | |
| tree | aab1d8d07d98b90ef9e6a26b2aaf4314beef22b2 | |
| parent | eb9e39de321c32db7b12bc50e21c094d9a8a5cf0 (diff) | |
| parent | 594b43a7e0b642473733aabd103ec9830fb1e926 (diff) | |
Merge pull request #300 from thetarnav/syntax-remove-where-clause
Remove where-clause from syntax
| -rw-r--r-- | editors/vscode/syntaxes/odin.tmLanguage.json | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/editors/vscode/syntaxes/odin.tmLanguage.json b/editors/vscode/syntaxes/odin.tmLanguage.json index a78f23e..b0090c7 100644 --- a/editors/vscode/syntaxes/odin.tmLanguage.json +++ b/editors/vscode/syntaxes/odin.tmLanguage.json @@ -15,10 +15,9 @@ { "include": "#constant-assignment" }, { "include": "#variable-assignment" }, { "include": "#case-clause" }, - { "include": "#where-clause" }, { "include": "#block-label" }, { "include": "#type-annotation" }, - { "include": "#block-declaration" }, + { "include": "#block-definition" }, { "include": "#expressions" } ] }, @@ -114,7 +113,15 @@ "end": "(?=^|,|;|\\)|=|:|for|switch|if|{)", "patterns": [ { "include": "#type-declaration" } ] }, - "block-declaration": { + "object-definition": { + "name": "meta.object.type.odin", + "begin": "\\{", + "beginCaptures": { "0": { "name": "punctuation.definition.block.odin" } }, + "end": "\\}", + "endCaptures": { "0": { "name": "punctuation.definition.block.odin" } }, + "patterns": [ { "include": "#statements" } ] + }, + "block-definition": { "name": "meta.block.odin", "begin": "\\{", "beginCaptures": { "0": { "name": "punctuation.definition.block.odin" } }, @@ -141,13 +148,13 @@ "patterns": [ { "include": "#parameters" }, { "include": "#return-type-declaration" }, - { "include": "#where-clause" }, - { "include": "#type-declaration" } + { "include": "#object-definition" }, + { "include": "#expressions" } ] }, { "include": "#comments" }, { "include": "#strings" }, - { "include": "#block-declaration" }, + { "include": "#block-definition" }, { "include": "#keywords" }, { "include": "#basic-types" }, { "include": "#slice" }, @@ -223,13 +230,6 @@ { "include": "#type-declaration" } ] }, - "where-clause": { - "name": "meta.where.clause.odin", - "begin": "\\bwhere\\b", - "beginCaptures": { "0": { "name": "keyword.other.where.odin" } }, - "end": "(?={)", - "patterns": [ { "include": "#expressions" } ] - }, "case-clause": { "name": "meta.case-clause.expr.odin", "begin": "case", |