Implement sample testing

Squash a ton of uncovered bugs

Author: Colonial-Dev

CHANGELOG.md

@@ -71,6 +71,10 @@
   - Vimscript
   - x86 Assembly
   - Zig
+- Removed languages due to a lack of working highlight queries:
+  - Astro
+  - Common Lisp
+  - Iex
 
 
 ### 0.10.5

README.md

@@ -30,7 +30,6 @@ Inkjet comes bundled with support for over seventy languages, and it's easy to a
 | ---- | ------- |
 | Ada  | `ada`   |
 | Assembly (generic) | `asm` |
-| Astro | `astro` |
 | Awk | `awk` |
 | Bash | `bash`, `sh`, `shell` |
 | BibTeX | `bibtex`, `bib` |
@@ -40,7 +39,6 @@ Inkjet comes bundled with support for over seventy languages, and it's easy to a
 | Cap'N Proto | `capnp` |
 | Clojure | `clojure`, `clj`, `cljc` |
 | C# | `c_sharp`, `c#`, `csharp`, `cs` |
-| Common Lisp | `commonlisp`, `common-lisp`, `cl`, `lisp` |
 | C++ | `c++`, `cpp`, `hpp`, `h++`, `cc`, `hh` |
 | CSS | `css` |
 | Cue | `cue` |
@@ -64,7 +62,6 @@ Inkjet comes bundled with support for over seventy languages, and it's easy to a
 | HCL | `hcl`, `terraform` |
 | HEEx | `heex` |
 | HTML | `html`, `htm` |
-| IEx | `iex` |
 | INI | `ini` |
 | JavaScript | `javascript`, `js` |
 | JSON | `json` |

build/dev.rs

@@ -228,8 +228,8 @@ pub fn generate_themes_module() -> Result<()> {
         #![allow(dead_code)]
     };
 
-    let themes = themes
-        .into_iter()
+    let consts = themes
+        .iter()
         .map(|t| {
             let name = quote::format_ident!(
                 "{}",
@@ -243,9 +243,37 @@ pub fn generate_themes_module() -> Result<()> {
             }
         });
 
+    let tests = themes
+        .iter()
+        .map(|t| {
+            let name = quote::format_ident!(
+                "{}",
+                t.replace('-', "_").to_uppercase()
+            );
+
+            let path = include_path(t);
+
+            quote::quote! {
+                #[test]
+                fn #name() {
+                    let data = #path;
+
+                    Theme::from_helix(data).unwrap();
+                }
+            }
+        });
+
     let combined = quote::quote!{
         #module_start
-        #(#themes)*
+        #(#consts)*
+
+        #[cfg(test)]
+        #[allow(non_snake_case)]
+        mod tests {
+            use crate::theme::*;
+
+            #(#tests)*
+        }
     };
 
     let combined = format!("{combined}");

build/inherits.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+IFS=$(echo -en "\n\b")
+
+for res in $(grep -r "; inherits" languages/); do
+    FILE=$(echo "$res" | cut  -d ":" -f 1 | xargs)
+    LANG=$(echo "$res" | cut  -d ":" -f 3 | xargs)
+    TARG=$(echo "$res" | cut  -d ":" -f2- | xargs)
+    
+    NAME=$(basename "$FILE")
+
+    sed -i "/$TARG/{r languages/$LANG/queries/$NAME
+d}" $FILE
+done

build/languages.toml

@@ -13,12 +13,16 @@ repo = "https://github.com/rush-rs/tree-sitter-asm"
 hash = "55b2b91"
 helix_override = true
 aliases = ["assembly", "assembler"]
+command = '''
+set -euxo pipefail &&
+cp languages/temp/asm/queries/asm/* languages/temp/asm/queries
+'''
 
-[[languages]]
-name = "astro"
-repo = "https://github.com/virchau13/tree-sitter-astro"
-hash = "4be1807"
-helix_override = true
+# [[languages]]
+# name = "astro"
+# repo = "https://github.com/virchau13/tree-sitter-astro"
+# hash = "4be1807"
+# helix_override = true
 
 [[languages]]
 name = "awk"
@@ -80,20 +84,21 @@ hash = "fd7f740"
 aliases = ["c#", "csharp", "cs"]
 helix_override = true
 
-[[languages]]
-name = "commonlisp"
-pretty_name = "CommonLisp"
-helix_path = "common-lisp"
-repo = "https://github.com/theHamsta/tree-sitter-commonlisp"
-hash = "bf2a65b"
-aliases = ["cl", "lisp", "common-lisp"]
+# [[languages]]
+# name = "commonlisp"
+# pretty_name = "CommonLisp"
+# helix_path = "common-lisp"
+# repo = "https://github.com/theHamsta/tree-sitter-commonlisp"
+# hash = "bf2a65b"
+# aliases = ["cl", "lisp", "common-lisp"]
 
+# Note - must manually comment out the (nullptr) @constant.builtin line in the highlights.scm for this to work
 [[languages]]
 name = "cpp"
 repo = "https://github.com/tree-sitter/tree-sitter-cpp"
 hash = "30f973c"
 aliases = ["c++", "hpp", "h++", "cc", "hh"]
-helix_override = true
+
 
 [[languages]]
 name = "css"
@@ -230,10 +235,10 @@ repo = "https://github.com/tree-sitter/tree-sitter-html"
 hash = "14bdaf0"
 aliases = ["htm"]
 
-[[languages]]
-name = "iex"
-repo = "https://github.com/elixir-lang/tree-sitter-iex"
-hash = "39f20bb"
+# [[languages]]
+# name = "iex"
+# repo = "https://github.com/elixir-lang/tree-sitter-iex"
+# hash = "39f20bb"
 
 [[languages]]
 name = "ini"
@@ -270,7 +275,7 @@ repo = "https://github.com/tree-sitter/tree-sitter-javascript"
 hash = "b6f0624"
 helix_override = true
 command = '''
-cp languages/temp/jsx/queries/highlights-jsx.scm languages/temp/jsx/queries/highlights.scm &&
+cat languages/temp/jsx/queries/highlights-jsx.scm >> languages/temp/jsx/queries/highlights.scm &&
 sed -i -e 's/tree_sitter_javascript/tree_sitter_jsx/g' languages/temp/jsx/src/parser.c &&
 sed -i -e 's/tree_sitter_javascript/tree_sitter_jsx/g' languages/temp/jsx/src/scanner.c
 '''
@@ -335,7 +340,7 @@ helix_override = true
 
 [[languages]]
 name = "nim"
-repo = "https://github.com/aMOPel/tree-sitter-nim"
+repo = "https://github.com/alaviss/tree-sitter-nim"
 hash = "4900b68"
 helix_override = true
 
@@ -403,9 +408,11 @@ repo = "https://github.com/tree-sitter/tree-sitter-php"
 hash = "74c6b0d"
 command = '''
 set -euxo pipefail &&
-sed -i -e 's/#include "\(.*\)"/#include "scanner.h"/g' languages/temp/php/php/src/scanner.c &&
-cp -r languages/temp/php/php/src languages/temp/php &&
-cp languages/temp/php/common/scanner.h languages/temp/php/src
+sed -i -e 's/#include "\(.*\)"/#include "scanner.h"/g' languages/temp/php/php_only/src/scanner.c &&
+cp -r languages/temp/php/php_only/src languages/temp/php &&
+cp languages/temp/php/common/scanner.h languages/temp/php/src &&
+sed -i -e 's/tree_sitter_php_only/tree_sitter_php/g' languages/temp/php/src/parser.c &&
+sed -i -e 's/tree_sitter_php_only/tree_sitter_php/g' languages/temp/php/src/scanner.c
 '''
 helix_override = true
 
@@ -447,6 +454,7 @@ name = "racket"
 repo = "https://github.com/6cdh/tree-sitter-racket"
 hash = "5b211bf"
 aliases = ["rkt"]
+helix_override = true
 
 [[languages]]
 name = "regex"
@@ -476,6 +484,7 @@ name = "scheme"
 repo = "https://github.com/6cdh/tree-sitter-scheme"
 hash = "63e25a4"
 aliases = ["scm", "ss"]
+helix_override = true
 
 [[languages]]
 name = "scss"

languages/asm/queries/highlights.scm

@@ -0,0 +1,63 @@
+; General
+(label
+  [(ident) (word)] @label)
+
+(reg) @variable.builtin
+
+(meta
+  kind: (_) @function.builtin)
+
+(instruction
+  kind: (_) @function.builtin)
+
+(const
+  name: (word) @constant)
+
+; Comments
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+; Literals
+(int) @number
+
+(float) @number.float
+
+(string) @string
+
+; Keywords
+[
+  "byte"
+  "word"
+  "dword"
+  "qword"
+  "ptr"
+  "rel"
+  "label"
+  "const"
+] @keyword
+
+; Operators & Punctuation
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "|"
+  "^"
+  "&"
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ","
+  ":"
+] @punctuation.delimiter

languages/asm/queries/injections.scm

@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))