Merge pull request #67 from StunxFS/StunxFS/add-rivet-lang

add `language_rivet.lua`

2 files changed, 27 insertions, 28 deletions

diff --git a/README.md b/README.md
index bf4a3c2..aa8eca1 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,6 @@ to something other than a raw file it should be marked with an asterisk.*
 | [`language_fennel`](plugins/language_fennel.lua?raw=1)                                                         | Syntax for the [fennel](https://fennel-lang.org) programming language                                                                                                                                                                                                                           |
 | [`language_fstab`](plugins/language_fstab.lua?raw=1)                                                           | Syntax for the [fstab](https://en.wikipedia.org/wiki/Fstab) config files                                                                                                                                                                                                                        |
 | [`language_gdscript`](plugins/language_gdscript.lua?raw=1)                                                     | Syntax for the [Godot Engine](https://godotengine.org/)'s GDScript scripting language                                                                                                                                                                                                           |
-| [`language_glaz`](plugins/language_glaz.lua?raw=1)                                                             | Syntax for the [Glaz](https://github.com/glaz-lang/glaz) programming language                                                                                                                                                                                                                   |
 | [`language_glsl`](plugins/language_glsl.lua?raw=1)                                                             | Syntax for the [GLSL](https://www.khronos.org/registry/OpenGL/specs/gl/) programming language                                                                                                                                                                                                   |
 | [`language_gmi`](plugins/language_gmi.lua?raw=1)                                                               | Syntax for the [Gemtext](https://gemini.circumlunar.space/docs/gemtext.gmi) markup language                                                                                                                                                                                                     |
 | [`language_go`](plugins/language_go.lua?raw=1)                                                                 | Syntax for the [Go](https://golang.org/) programming language                                                                                                                                                                                                                                   |
@@ -97,6 +96,7 @@ to something other than a raw file it should be marked with an asterisk.*
 | [`language_psql`](plugins/language_psql.lua?raw=1)                                                             | Syntax for the postgresql database access language                                                                                                                                                                                                                                              |
 | [`language_r`](plugins/language_R.lua?raw=1)                                                                   | Syntax for [R](https://www.r-project.org/) scripting language                                                                                                                                                                                                                                   |
 | [`language_rescript`](plugins/language_rescript.lua?raw=1)                                                     | Syntax for the [ReScript](https://rescript-lang.org/) programming language                                                                                                                                                                                                                      |
+| [`language_rivet`](plugins/language_rivet.lua?raw=1)                                                           | Syntax for the [Rivet](https://github.com/rivet-lang/rivet) programming language                                                                                                                                                                                                                |
 | [`language_ruby`](plugins/language_ruby.lua?raw=1)                                                             | Syntax for the [Ruby](https://www.ruby-lang.org/) programming language                                                                                                                                                                                                                          |
 | [`language_rust`](plugins/language_rust.lua?raw=1)                                                             | Syntax for the [Rust](https://rust-lang.org/) programming language                                                                                                                                                                                                                              |
 | [`language_sass`](plugins/language_sass.lua?raw=1)                                                             | Syntax for the [Sass](https://sass-lang.com/) CSS preprocessor                                                                                                                                                                                                                                  |
diff --git a/plugins/language_glaz.lua b/plugins/language_rivet.lua
index fd313e8..b291749 100644
--- a/plugins/language_glaz.lua
+++ b/plugins/language_rivet.lua
@@ -1,20 +1,20 @@
 -- mod-version:2 -- lite-xl 2.0
 
--- Syntax highlighting for the Glaz programming language.
+-- Syntax highlighting for the Rivet programming language.
 -- by StunxFS :)
 
 local syntax = require "core.syntax"
 
 syntax.add {
-    name = "Glaz",
-    files = {"%.glaz$", "^glaz%.proj$"},
+    name = "Rivet",
+    files = {"%.ri$"},
     comment = "//",
     block_comment = {"/*", "*/"},
     patterns = {
         {pattern = "//.-\n", type = "comment"},
         {pattern = {"/%*", "%*/"}, type = "comment"},
         {pattern = {'"', '"', "\\"}, type = "string"},
-        {pattern = "'.'", type = "string"},
+        {pattern = "'\\?.'", type = "string"},
         {pattern = "0b[01_]+", type = "number"},
         {pattern = "0o[0-7_]+", type = "number"},
         {pattern = "0x[%x_]+", type = "number"},
@@ -28,55 +28,57 @@ syntax.add {
         {pattern = "[%a_][%w_]*%f[(]", type = "function"},
         {pattern = "[%a_][%w_]*!%f[%[(]", type = "keyword2"},
         {pattern = "[%a_][%w_]*", type = "symbol"},
-        {pattern = {"@%[", "%]"}, type = "keyword"},
         {pattern = "%$%s?[%a_][%w_]*", type = "keyword"},
         {pattern = "#%s?include%s()<.->", type = {"keyword", "string"}},
         {pattern = "#%s?[%a_][%w_]*", type = "keyword"}
     },
     symbols = {
-        ["mod"] = "keyword",
-        ["src"] = "keyword",
         ["extern"] = "keyword",
-        ["interface"] = "keyword",
+        ["use"] = "keyword",
+
+        ["pub"] = "keyword",
+        ["as"] = "keyword",
+
+        ["pkg"] = "keyword",
+        ["mod"] = "keyword",
+        ["const"] = "keyword",
+        ["trait"] = "keyword",
         ["struct"] = "keyword",
         ["union"] = "keyword",
         ["type"] = "keyword",
         ["enum"] = "keyword",
-        ["impl"] = "keyword",
         ["fn"] = "keyword",
         ["test"] = "keyword",
-        ["pub"] = "keyword",
-        ["use"] = "keyword",
+        ["impl"] = "keyword",
+
+        ["match"] = "keyword",
         ["if"] = "keyword",
         ["elif"] = "keyword",
         ["else"] = "keyword",
-        ["do"] = "keyword",
+        ["loop"] = "keyword",
         ["while"] = "keyword",
         ["for"] = "keyword",
-        ["loop"] = "keyword",
+
         ["break"] = "keyword",
         ["continue"] = "keyword",
         ["return"] = "keyword",
         ["raise"] = "keyword",
-        ["goto"] = "keyword",
-        ["unsafe"] = "keyword",
-        ["const"] = "keyword",
+
         ["let"] = "keyword",
         ["mut"] = "keyword",
-        ["switch"] = "keyword",
-        ["defer"] = "keyword",
+        ["unsafe"] = "keyword",
+        ["goto"] = "keyword",
         ["try"] = "keyword",
         ["orelse"] = "keyword",
         ["catch"] = "keyword",
         ["cast"] = "keyword",
-        ["as"] = "keyword",
         ["is"] = "keyword",
         ["in"] = "keyword",
-        ["and"] = "keyword",
         ["or"] = "keyword",
-        ["Self"] = "keyword",
+        ["and"] = "keyword",
 
         -- types
+        ["bool"] = "keyword2",
         ["i8"] = "keyword2",
         ["i16"] = "keyword2",
         ["i32"] = "keyword2",
@@ -87,22 +89,19 @@ syntax.add {
         ["u64"] = "keyword2",
         ["f32"] = "keyword2",
         ["f64"] = "keyword2",
-        ["bool"] = "keyword2",
-        ["rune"] = "keyword2",
+        ["char"] = "keyword2",
         ["isize"] = "keyword2",
         ["usize"] = "keyword2",
         ["str"] = "keyword2",
-        ["charptr"] = "keyword2",
         ["rawptr"] = "keyword2",
-        ["vec"] = "keyword2",
-        ["map"] = "keyword2",
+        ["Self"] = "keyword2",
 
         -- literals
         ["base"] = "literal",
         ["self"] = "literal",
         ["true"] = "literal",
         ["false"] = "literal",
-        ["null"] = "literal"
+        ["none"] = "literal"
     }
 }