fix(ci): Stay on Nim 1.6 for now; Add tree-sitter nim as a submodule

Author: zah

.gitmodules

@@ -81,3 +81,6 @@
 	path = libs/nim-confutils
 	url = https://github.com/metacraft-labs/nim-confutils
 	branch = codetracer
+[submodule "libs/tree-sitter-nim"]
+	path = libs/tree-sitter-nim
+	url = [email protected]:metacraft-labs/tree-sitter-nim.git

ci/lint/nim.sh

@@ -6,7 +6,8 @@ echo '##########################################################################
 echo 'Testing nimsuggest'
 echo '###############################################################################'
 
-just test-nimsuggest
+# Use Nim 1.6 for nimsuggest - vendored libs aren't compatible with Nim 2.x nimsuggest
+./scripts/with-nim-1.6 just test-nimsuggest
 
 
 echo '###############################################################################'

libs/tree-sitter-nim

@@ -145,9 +145,10 @@ in
           # ourPkgs.staticDeps
           ourPkgs.upstream-nim-codetracer
 
-          # Nim versions for runtime (tracing/testing user Nim programs)
-          # nim-2_2 provides 'nim' binary for runtime compilation
-          ourPkgs.nim-2_2
+          # Nim 1.6 for runtime/development - compatible with vendored libs and nimsuggest
+          # Note: Don't add nim-2_x here - it breaks nimsuggest compatibility.
+          # Use scripts/with-nim-* for multi-version testing instead.
+          ourPkgs.nim-1_6
 
           # useful for lsp/editor support
           nimlsp
@@ -295,6 +296,11 @@ in
         export CODETRACER_DEV_TOOLS=0
         export CODETRACER_LOG_LEVEL=INFO
 
+        # Ensure tree-sitter-nim parser is generated (cached - only regenerates if needed)
+        if [ -d "$ROOT_PATH/libs/tree-sitter-nim" ]; then
+          (cd "$ROOT_PATH/libs/tree-sitter-nim" && just generate)
+        fi
+
         figlet "Welcome to CodeTracer"
       '';
     }

nix/shells/main.nix

@@ -58,7 +58,7 @@ tree-sitter-pascal = "0.10.0"
 tree-sitter-d = "0.8.2"
 tree-sitter-ruby = "0.23.1"
 tree-sitter-python = "0.25.0"
-tree-sitter-nim = { path = "../../../tree-sitter-nim/bindings/rust" }
+tree-sitter-nim = { path = "../../libs/tree-sitter-nim/bindings/rust" }
 
 # the binding for our custom tracepoint tresitter grammar:
 tree-sitter-tracepoint = { path = "./tree-sitter-trace/" }