aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest.json2
-rw-r--r--plugins/language_rivet.lua11
2 files changed, 7 insertions, 6 deletions
diff --git a/manifest.json b/manifest.json
index 842533a..c484aca 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1101,7 +1101,7 @@
},
{
"description": "Syntax for the [Rivet](https://github.com/rivet-lang/rivet) programming language",
- "version": "0.4.2",
+ "version": "0.4.3",
"path": "plugins/language_rivet.lua",
"id": "language_rivet",
"mod_version": "3",
diff --git a/plugins/language_rivet.lua b/plugins/language_rivet.lua
index b8d227c..a5837c8 100644
--- a/plugins/language_rivet.lua
+++ b/plugins/language_rivet.lua
@@ -30,9 +30,11 @@ syntax.add {
},
{pattern = "[A-Z][%w_]*", type = "keyword2"}, -- types
{pattern = "%@%s?[%a_][%w_]*", type = "literal"}, -- builtin func/var
+ -- `defer` modes
+ {pattern = "defer%s?%(%s?()[%a_][%w_]*()%s?%)", type = {"keyword", "comment", "normal"} },
{pattern = "[%a_][%w_]*%f[(]", type = "function"},
{pattern = "#%s?[%a_][%w_]*", type = "comment"}, -- if/else_if/else/endif
- {pattern = "#%s?.*", type = "keyword2"}, -- attributes
+ {pattern = "#%s?%[.*%]", type = "keyword2"}, -- attributes
{pattern = "[%a_][%w_]*", type = "symbol"}
},
symbols = {
@@ -47,7 +49,6 @@ syntax.add {
["defer"] = "keyword",
["else"] = "keyword",
["enum"] = "keyword",
- ["errdefer"] = "keyword",
["extend"] = "keyword",
["extern"] = "keyword",
["func"] = "keyword",
@@ -57,13 +58,13 @@ syntax.add {
["import"] = "keyword",
["in"] = "keyword",
["is"] = "keyword",
+ ["match"] = "keyword",
["mut"] = "keyword",
["or"] = "keyword",
["public"] = "keyword",
["return"] = "keyword",
["static"] = "keyword",
["struct"] = "keyword",
- ["switch"] = "keyword",
["test"] = "keyword",
["throw"] = "keyword",
["trait"] = "keyword",
@@ -82,16 +83,16 @@ syntax.add {
["bool"] = "keyword2",
["comptime_int"] = "keyword2",
["comptime_float"] = "keyword2",
+ ["int"] = "keyword2",
["int8"] = "keyword2",
["int16"] = "keyword2",
["int32"] = "keyword2",
["int64"] = "keyword2",
- ["isize"] = "keyword2",
+ ["uint"] = "keyword2",
["uint8"] = "keyword2",
["uint16"] = "keyword2",
["uint32"] = "keyword2",
["uint64"] = "keyword2",
- ["usize"] = "keyword2",
["float32"] = "keyword2",
["float64"] = "keyword2",
["rawptr"] = "keyword2",