Add qml lang and fix some regexes

3 files changed, 20 insertions, 8 deletions

diff --git a/dged.nix b/dged.nix
index eff5eca..0458d58 100644
--- a/dged.nix
+++ b/dged.nix
@@ -40,6 +40,16 @@ stdenv.mkDerivation {
       "nix" = tree-sitter-nix;
       "python" = tree-sitter-python;
       "make" = tree-sitter-make;
+      "qmljs" = tree-sitter.buildGrammar {
+        language = "qmljs";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "yuja";
+          repo = "tree-sitter-qmljs";
+          rev = "master";
+          hash = "sha256-q20gLVLs0LpqRpgo/qNRDfExbWXhICWZjM1ux4+AT6M=";
+        };
+      };
       "gitcommit" = tree-sitter.buildGrammar {
         language = "gitcommit";
         version = "0.3.3";
diff --git a/src/dged/lang.c b/src/dged/lang.c
index a287d59..7964674 100644
--- a/src/dged/lang.c
+++ b/src/dged/lang.c
@@ -51,14 +51,14 @@ static struct language g_fundamental = {
 
 void languages_init(bool register_default) {
   if (register_default) {
-    define_lang("Bash", "bash", ".*\\.bash", 4, NULL);
-    define_lang("C", "c", ".*\\.(c|h)", 2, "clangd");
-    define_lang("C++", "cxx", ".*\\.(cpp|cxx|cc|c++|hh|h)", 2, "clangd");
-    define_lang("Rust", "rs", ".*\\.rs", 4, "rust-analyzer");
-    define_lang("Nix", "nix", ".*\\.nix", 2, "rnix-lsp");
-    define_lang("Make", "make", ".*(Makefile|\\.mk)", 4, NULL);
-    define_lang("Python", "python", ".*\\.py", 4, NULL);
-    define_lang("Git Commit Message", "gitcommit", "COMMIT_EDITMSG", 4, NULL);
+    define_lang("Bash", "bash", ".*\\.bash$", 4, NULL);
+    define_lang("C", "c", ".*\\.(c|h)$", 2, "clangd");
+    define_lang("C++", "cxx", ".*\\.(cpp|cxx|cc|c++|hh|h)$", 2, "clangd");
+    define_lang("Rust", "rs", ".*\\.rs$", 4, "rust-analyzer");
+    define_lang("Nix", "nix", ".*\\.nix$", 2, "rnix-lsp");
+    define_lang("Make", "make", ".*(Makefile|\\.mk)$", 4, NULL);
+    define_lang("Python", "python", ".*\\.py$", 4, NULL);
+    define_lang("Git Commit Message", "gitcommit", "^COMMIT_EDITMSG$", 4, NULL);
   }
 }
 
diff --git a/src/dged/syntax.c b/src/dged/syntax.c
index 64178fe..7f13b11 100644
--- a/src/dged/syntax.c
+++ b/src/dged/syntax.c
@@ -355,6 +355,7 @@ static void update_parser(struct buffer *buffer, void *userdata,
                  s8eq(cname, s8("function.macro")) ||
                  s8eq(cname, s8("function.method")) ||
                  s8eq(cname, s8("function.builtin")) ||
+                 s8eq(cname, s8("function.signal")) ||
                  s8eq(cname, s8("function.special"))) {
         highlight = true;
         color = Color_Yellow;
@@ -578,6 +579,7 @@ void syntax_init() {
   lang_setting_set_default(&l, "grammar",
                            (struct setting_value){.type = Setting_String,
                                                   .string_value = "gitcommit"});
+
   buffer_add_create_hook(create_parser, NULL);
   lang_destroy(&l);
 }