feat: reintroduce raw-strings

.github/neovim/init.lua

@@ -0,0 +1,37 @@
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+	if vim.v.shell_error ~= 0 then
+		vim.api.nvim_echo({
+			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+			{ out, "WarningMsg" },
+			{ "\nPress any key to exit..." },
+		}, true, {})
+		vim.fn.getchar()
+		os.exit(1)
+	end
+end
+vim.opt.rtp:prepend(lazypath)
+
+vim.g.mapleader = " "
+vim.g.maplocalleader = "\\"
+
+-- Setup lazy.nvim
+require("lazy").setup({
+	spec = {
+		{
+			"nvim-treesitter/nvim-treesitter",
+			config = function()
+				require("nvim-treesitter.configs").setup({
+					highlight = { enable = true },
+				})
+			end,
+			dependencies = {
+				{ dir = "TS_NU_PATH", build = ":TSUpdate nu" },
+			},
+			build = ":TSUpdate",
+		},
+	},
+})

.github/workflows/main.yml

@@ -5,7 +5,7 @@ on:
       - main
 jobs:
   main:
-    name: install
+    name: setup, lint, test
 
     runs-on: ${{ matrix.os }}
     strategy:
@@ -30,3 +30,9 @@ jobs:
 
       - name: test
         run: npx tree-sitter test
+
+  tests:
+    uses: ./.github/workflows/nvim-tests.yml
+    with:
+      neovim_versions: |
+        [ "nightly", "v0.10.2", "v0.10.1", "v0.9.5" ]

.github/workflows/nvim-tests.yml

@@ -0,0 +1,39 @@
+name: Run tests
+
+on:
+  workflow_call:
+    inputs:
+      neovim_versions:
+        required: true
+        type: string
+
+jobs:
+  tests:
+    name: unit tests
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        rev: ${{ fromJson(inputs.neovim_versions) }}
+    steps:
+      - uses: actions/checkout@v3
+      - run: date +%F > todays-date
+      - name: Restore cache for Neovim
+        uses: actions/cache@v3
+        with:
+          path: .ci/neovim
+          key: ${{ matrix.rev }}-${{ hashFiles('todays-date') }}
+      - name: Prepare
+        run: |
+          test -d .ci/neovim || {
+            mkdir -p .ci/neovim
+            curl -sL "https://github.com/neovim/neovim/releases/download/${{ matrix.rev }}/nvim-linux64.tar.gz" | tar xzf - --strip-components=1 -C "${PWD}/.ci/neovim"
+          }
+
+      - name: Run tests
+        run: |
+          export PATH="${PWD}/.ci/neovim/bin:${PATH}"
+          export VIM="${PWD}/.ci/neovim/share/nvim/runtime"
+          sed "s#TS_NU_PATH#${PWD}#" .github/neovim/init.lua > .ci/init.lua
+          sed -i "s#https://github.com/nushell/tree-sitter-nu#${PWD}#" ${PWD}/plugin/init.lua
+          nvim --headless -c "sleep | q" -u .ci/init.lua ts.nu

Cargo.toml

@@ -24,10 +24,10 @@ path = "bindings/rust/lib.rs"
 # path = "src/main.rs"
 
 [dev-dependencies]
-tree-sitter-language = "0.1.0"
 cc = "1.0"
 
 [dependencies]
+tree-sitter-language = "0.1.0"
 tree-sitter = "~0.20.3"
 
 [build-dependencies]

Package.swift

@@ -35,7 +35,7 @@ let package = Package(
                 ],
                 sources: [
                     "src/parser.c",
-                    // NOTE: if your language has an external scanner, add it here.
+                    "src/scanner.c",
                 ],
                 resources: [
                     .copy("queries")

binding.gyp

@@ -11,7 +11,7 @@
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # NOTE: if your language has an external scanner, add it here.
+        "src/scanner.c",
       ],
       "conditions": [
         ["OS!='win'", {

bindings/go/binding.go

@@ -2,7 +2,7 @@ package tree_sitter_nu
 
 // #cgo CFLAGS: -std=c11 -fPIC
 // #include "../../src/parser.c"
-// // NOTE: if your language has an external scanner, add it here.
+// #include "../../src/scanner.c"
 import "C"
 
 import "unsafe"

bindings/rust/build.rs

@@ -16,11 +16,9 @@ fn main() {
     // If your language uses an external scanner written in C,
     // then include this block of code:
 
-    /*
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
 
     c_config.compile("parser");
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());

grammar.js

@@ -7,9 +7,11 @@ module.exports = grammar({
 
   extras: ($) => [/\s/, $.comment],
 
-  // externals: $ => [
-  //   $.long_flag_equals_value
-  // ],
+  externals: ($) => [
+    $.raw_string_begin,
+    $.raw_string_content,
+    $.raw_string_end,
+  ],
 
   conflicts: ($) => [
     [$._declaration, $._declaration_last],
@@ -428,6 +430,7 @@ module.exports = grammar({
 
     match_pattern: ($) =>
       choice(
+        seq(PUNC().underscore, $.match_guard),
         seq($._match_pattern, optional($.match_guard)),
         seq($._match_pattern, repeat(seq(PUNC().pipe, $._match_pattern))),
       ),
@@ -1009,7 +1012,15 @@ module.exports = grammar({
       ),
 
     val_string: ($) =>
-      choice($._str_double_quotes, $._str_single_quotes, $._str_back_ticks),
+      choice(
+        $._str_double_quotes,
+        $._str_single_quotes,
+        $._str_back_ticks,
+        $._raw_str,
+      ),
+
+    _raw_str: ($) =>
+      seq($.raw_string_begin, $.raw_string_content, $.raw_string_end),
 
     _str_double_quotes: ($) =>
       seq(

installation/neovim.md

@@ -29,7 +29,7 @@ local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
 parser_config.nu = {
   install_info = {
     url = "https://github.com/nushell/tree-sitter-nu",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
     branch = "main",
   },
   filetype = "nu",
@@ -63,6 +63,8 @@ mkdir $local
 http get ([$remote $file] | str join "/") | save --force ($local | path join $file)
 ```
 
+You need to run this snippet whenever the highlights change and `:TSUpdate nu` whenever there is a new version of the parser.
+
 [tree-sitter]: https://tree-sitter.github.io/tree-sitter/
 [nvim-treesitter]: https://github.com/nvim-treesitter/nvim-treesitter
 [nvim-treesitter/playground]: https://github.com/nvim-treesitter/playground

package.json

@@ -13,8 +13,8 @@
   "author": "The Nushell Contributors",
   "license": "MIT",
   "dependencies": {
-    "node-addon-api": "^8.0.0",
-    "node-gyp-build": "^4.8.0"
+    "node-addon-api": "^8.1.0",
+    "node-gyp-build": "^4.8.2"
   },
   "peerDependencies": {
     "tree-sitter": "^0.21.0"
@@ -25,20 +25,10 @@
     }
   },
   "devDependencies": {
-    "prettier": "3.2.5",
-    "tree-sitter-cli": "^0.22.5",
+    "prettier": "3.3.3",
+    "tree-sitter-cli": "^0.23.0",
     "prebuildify": "^6.0.0"
   },
-  "tree-sitter": [
-    {
-      "scope": "source.nu",
-      "file-types": [
-        "nu"
-      ],
-      "highlights": "queries/nu/highlights.scm",
-      "injections": "queries/nu/injections.scm"
-    }
-  ],
   "files": [
     "grammar.js",
     "binding.gyp",
@@ -47,4 +37,4 @@
     "queries/*",
     "src/**"
   ]
-}
+}

plugin/init.lua

@@ -1,15 +1,17 @@
 vim.filetype.add({ extension = { nu = "nu" }, filename = { ["nurfile"] = "nu" } })
 
 vim.api.nvim_create_autocmd("FileType", {
-  pattern = "nu",
-  callback = function(event) vim.bo[event.buf].commentstring = "# %s" end,
+	pattern = "nu",
+	callback = function(event)
+		vim.bo[event.buf].commentstring = "# %s"
+	end,
 })
 
 require("nvim-treesitter.parsers").get_parser_configs().nu = {
-  install_info = {
-    url = "https://github.com/nushell/tree-sitter-nu",
-    files = { "src/parser.c" },
-    branch = "main",
-  },
-  filetype = "nu",
+	install_info = {
+		url = "https://github.com/mrdgo/tree-sitter-nu",
+		files = { "src/parser.c", "src/scanner.c" },
+		branch = "raw-strings-pt2",
+	},
+	filetype = "nu",
 }

queries/nu/highlights.scm

@@ -90,6 +90,10 @@ file_path: (val_string) @variable.parameter
 (escaped_interpolated_content) @string
 (expr_interpolated ["(" ")"] @variable.parameter)
 
+(raw_string_begin) @string
+(raw_string_content) @string
+(raw_string_end) @string
+
 ;;; ---
 ;;; operators
 (expr_binary [