diff options
| author | DanielGavin <danielgavin5@hotmail.com> | 2022-06-07 09:13:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 09:13:01 +0200 |
| commit | 07dca9db607881bdf89cf92646e425149295859a (patch) | |
| tree | 9ea06debd5c30210f259c6f9e727b01237c5e350 | |
| parent | ac23f0ac1840ca445fb8758fc29fee5278199e00 (diff) | |
| parent | d1bba8a5852a6fd1501bcd1127fb620343ce5672 (diff) | |
Merge pull request #111 from yay/master
Adds support for or_else and or_return keywords
| -rw-r--r-- | editors/vscode/package.json | 4 | ||||
| -rw-r--r-- | editors/vscode/syntaxes/odin.tmLanguage.json | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/editors/vscode/package.json b/editors/vscode/package.json index 661dc2a..57767bb 100644 --- a/editors/vscode/package.json +++ b/editors/vscode/package.json @@ -151,6 +151,7 @@ "lint": "eslint src --ext ts", "watch": "tsc -watch -p ./", "pretest": "npm run compile && npm run lint", + "package": "npm run compile && vsce package -o extension.vsix", "test": "node ./out/test/runTest.js" }, "devDependencies": { @@ -165,7 +166,8 @@ "glob": "^7.2.0", "mocha": "^8.4.0", "typescript": "^4.6.2", - "vscode-test": "^1.6.1" + "vscode-test": "^1.6.1", + "vsce": "^2.7.0" }, "dependencies": { "adm-zip": "^0.5.9", diff --git a/editors/vscode/syntaxes/odin.tmLanguage.json b/editors/vscode/syntaxes/odin.tmLanguage.json index 026aa15..d155e2d 100644 --- a/editors/vscode/syntaxes/odin.tmLanguage.json +++ b/editors/vscode/syntaxes/odin.tmLanguage.json @@ -50,7 +50,7 @@ { "name": "comment.block.odin", "begin": "/\\*", - "end": "\\*/", + "end": "\\*/", "patterns": [{ "include": "#block-comment" }] @@ -90,7 +90,7 @@ }, { "name": "keyword.control.odin", - "match": "\\b(if|else|when|for|in|defer|switch|return)\\b" + "match": "\\b(if|else|or_else|when|for|in|defer|switch|return|or_return)\\b" }, { "name": "keyword.control.odin", |