refactor keybinding parsing to rust

.github/workflows/ci.yml

@@ -5,6 +5,9 @@ on:
             - main
         tags:
             - v[0-9]+.[0-9]+.[0-9]+*
+        paths:
+            - src/**
+
     pull_request:
         types: ['opened', 'edited', 'reopened', 'synchronize', 'ready_for_review']
 
@@ -44,7 +47,9 @@ jobs:
           run: pnpm install --frozen-lockfile && pnpm exec playwright install chromium
         - name: Unit Tests
           env: { COVERAGE: 'true' }
-          run: mise test${{ matrix.environment }}
+          run: |
+            mise test${{ matrix.environment }}
+            mise test-rust
         - name: Integration Tests
           if: matrix.environment == ''
           env: { COVERAGE: 'true' }

.gitignore

@@ -1,3 +1,5 @@
+!.vscode/settings.json
+
 # build output
 out
 *.vsix
@@ -8,8 +10,12 @@ node_modules
 
 # code coverage
 .nyc_output/**
+*.info
+*.profdata
 coverage/**
 coverage.json
+*.profraw
+*.lcov
 
 # unit testing
 test/temp/**

.vscode/extensions.json

@@ -1,10 +1,12 @@
 {
-  // See http://go.microsoft.com/fwlink/?LinkId=827846
-  // for the documentation about the extensions.json format
-  "recommendations": [
-    "dbaeumer.vscode-eslint",
-    "connor4312.esbuild-problem-matchers",
-    "ms-vscode.extension-test-runner",
-    "ms-playwright.playwright",
-  ]
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "dbaeumer.vscode-eslint",
+        "connor4312.esbuild-problem-matchers",
+        "ms-vscode.extension-test-runner",
+        "ms-playwright.playwright",
+        "rust-lang.rust-analyzer",
+        "hverlin.mise-vscode",
+    ]
 }

.vscode/launch.json

@@ -12,7 +12,9 @@
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--profile",
-                "debug",
+                "master-key-debug",
+                "--install-extension",
+                "tamasfe.even-better-toml"
             ],
             "outFiles": [
                 "${workspaceFolder}/out/node/**/*.js"

.vscode/settings.json

@@ -0,0 +1,34 @@
+{
+    "eslint.validate": [
+        "javascript",
+        "javascriptreact",
+        "yaml",
+        "github-actions-workflow" // for GitHub Actions workflow files
+    ],
+    "rust-analyzer.linkedProjects": [
+        "src/rust/parsing/Cargo.toml"
+    ],
+    "window.title": "vscode-master-key",
+    // NOTE: if we update the version of rust used in `mise.toml.` these
+    // paths also need to be updated
+    "rust-analyzer.cargo.sysroot": "${userHome}/.rustup/toolchains/1.90.0-aarch64-apple-darwin",
+    "rust-analyzer.cargo.sysrootSrc": "${userHome}/.rustup/toolchains/1.90.0-aarch64-apple-darwin/lib/rustlib/src/rust",
+    "rust-analyzer.checkOnSave": true,
+    "rust-analyzer.cargo.allTargets": false,
+    "rust-analyzer.cargo.buildScripts.rebuildOnSave": true,
+    "workbench.colorCustomizations": {
+        "iLoveWorkSpaceColors": false,
+        "iLoveWorkSpaceRandom": false,
+        "useWorkspaceLite": false
+    },
+    "debug.javascript.defaultRuntimeExecutable": {
+        "pwa-node": "/Users/davidlittle/.local/share/mise/shims/node"
+    },
+    "files.watcherExclude": {
+        "**/.git/**": true,
+        "**/.jj/**": true,
+        "**/target/**": true,
+        "out/**": true,
+    },
+    "python.defaultInterpreterPath": "${userHome}/.local/share/mise/installs/python/3.10.4/bin/python",
+}

.vscode/tasks.json

@@ -25,6 +25,24 @@
                         }
                     ]
                 },
+                {
+                    "applyTo": "allDocuments",
+                    "source": "tsc",
+                    "fileLocation": "relative",
+                    "pattern": [
+                        {
+                            "regexp": "^\\[lint\\]\\s+([0-9]+):([0-9]+)\\s*([a-z]+)\\s*(.*)$",
+                            "line": 1,
+                            "column": 2,
+                            "severity": 3,
+                            "message": 4
+                        },
+                        {
+                            "regexp": "^\\[lint\\]\\s(.*\\ts)\\s*$",
+                            "file": 1,
+                        }
+                    ]
+                },
                 {
                     "applyTo": "allDocuments",
                     "base": "$esbuild",
@@ -40,24 +58,6 @@
                         }
                     }
                 },
-                {
-                    "applyTo": "closedDocuments",
-                    "source": "eslint",
-                    "fileLocation": "absolute",
-                    "pattern": [
-                        {
-                            "regexp": "^\\[lint\\]\\s(.*)$",
-                            "file": 1,
-                        },
-                        {
-                            "regexp": "^\\[lint\\]\\s+([0-9]+):([0-9]+)\\s+([a-z]+)\\s+(.*)$",
-                            "line": 1,
-                            "code": 2,
-                            "severity": 3,
-                            "message": 4
-                        }
-                    ]
-                },
             ],
             "isBackground": true,
             "label": "npm: watch:esbuild",

docs/.gitignore

@@ -1,7 +1,4 @@
 .vitepress/commands.mjs
-commands/*
 .vitepress/bindings.mjs
-bindings/*
-expressions/*
-guide.md
 .vitepress/dist/**
+**/*.md

eslint.config.mjs

@@ -14,6 +14,7 @@ export default defineConfig([
         'src/rust/parsing/lib/**/*.{js,ts,t.ds}',
         'out/**/*.js',
         'src/oldtest/**',
+        'src/oldparsing/**',
         'docs/.vitepress/theme/**/*.{js,ts,t.ds}',
     ]),
     {

mise.toml

@@ -1,40 +1,81 @@
 [tools]
-"cargo:wasm-pack" = "0.13.1"
 node = "20"
-"npm:pnpm" = "10.12.4"
 "npm:typescript" = "5.8.3"
 "npm:vsce" = "2.15"
-rust = { version = "1.87", targets = "wasm32-unknown-unknown" }
-watchexec = "2.3.2"
-"ubi:haberdashpi/simple-src-docs" = "0.6.0"
 "npm:c8" = "latest"
 "npm:http-server" = "14.1.1"
+"npm:pnpm" = "10.13.1"
+"ubi:haberdashpi/simple-src-docs" = "0.6.0"
+watchexec = "2.3.2"
+rust = { version = "1.90", targets = "wasm32-unknown-unknown", component = "llvm-tools-preview" }
+"cargo:wasm-pack" = "0.13.1"
+"cargo:cargo-binutils" = "0.3.6"
+"cargo:rustfilt" = "latest"
+"cargo:nu" = "latest"
 
 [hooks]
-postinstall = ['pnpm install --frozen-lockfile', 'pnpm exec playwright install chromium']
+postinstall = [
+    'pnpm install --frozen-lockfile',
+    'pnpm exec playwright install chromium',
+    'rustup toolchain install nightly -c llvm-tools-preview', # needed to compute test coverage
+    'rustup add target wasm32-unknown-unknown',               # mise doesn't seem to install this automatically
+]
 
 [tasks.lint]
 run = 'pnpm exec eslint src'
 
 [tasks.check-types]
 run = 'tsc --noEmit --project tsconfig.json'
 
-# [tasks.build-rust]
-# sources = ['src/rust/parsing/src/**/*.rs', 'src/rust/parsing/Cargo.toml']
-# outputs = ['out/**/*.wasm', 'src/rust/parsing/lib/*']
-# dir = 'src/rust/parsing'
-# run = [
-#     'wasm-pack build --target web --out-dir lib',
-#     'cp lib/parsing_bg.wasm ../../../out/parsing_bg.wasm',
-# ]
+# TODO: maybe consider using colons and figure out mise task hierarchies???
+[tasks.build-rust]
+dir = 'src/rust/parsing'
+sources = ['src/**/*.rs', 'Cargo.toml']
+outputs = ['lib/*']
+run = [
+    'wasm-pack build --target web --out-dir lib',
+    'mkdir -p ../../../out',
+    'cp lib/parsing_bg.wasm ../../../out/parsing_bg.wasm',
+]
+
+[vars]
+coverage_options = '''--ignore-filename-regex '/.cargo/registry' --ignore-filename-regex '.rustup/toolchains' --ignore-filename-regex 'rustc/' --compilation-dir src/rust/parsing --instr-profile coverage/parsing.profdata --Xdemangler rustfilt'''
+
+[tasks.test-rust]
+dir = 'src/rust/parsing'
+shell = 'nu -c'
+env.RUST_BACKTRACE = "1"
+run = '''
+def main [...args] {
+    if ($env.COVERAGE? | default false | into bool) {
+        $env.RUSTFLAGS = '-C instrument-coverage'
+        $env.LLVM_PROFILE_FILE = 'coverage/parsing.profraw'
+
+        let object_files = cargo +nightly test --tests --no-run --message-format=json |
+            from json -o | where profile?.test |
+            get filenames.0 |
+            each { |f| $'--object=($in)' }
+
+        cargo +nightly test --tests ...$args -- --nocapture
+        cargo +nightly profdata -- merge -sparse coverage/parsing.profraw -o coverage/parsing.profdata
+        (cargo +nightly cov -- export {{vars.coverage_options}} --format=lcov ...($object_files) o>
+            coverage/parsing.info)
+
+        cargo +nightly cov -- report --use-color {{vars.coverage_options}} ...($object_files)
+    } else {
+        cargo test ...$args -- --nocapture
+    }
+}
+main
+'''
 
 [tasks.build]
-depends = ['check-types', 'lint'] #, 'build-rust']
+depends = ['check-types', 'lint', 'build-rust']
 sources = ['src/**/*.ts']
-run = ['pwd', 'node esbuild.mjs']
+run = 'node esbuild.mjs'
 
 [tasks.package]
-depends = ['check-types', 'lint'] #, 'build-rust']
+depends = ['check-types', 'lint', 'build-rust']
 sources = ['src/**/*.ts']
 run = [
     'node esbuild.mjs --release',
@@ -50,15 +91,16 @@ run = 'tsc -p src/test --outDir out/test'
 
 [tasks.test]
 depends = ['build-tests']
-shell = 'bash -c'
+shell = 'nu -c'
 run = '''
-if $COVERAGE; then
-    pnpm exec vscode-test --config .vscode-test.mjs --extensionDevelopmentPath=. \
-        --version=insiders --coverage --coverage-output=coverage/unit \
-        --coverage-reporter=json
-else
-    pnpm exec vscode-test --config .vscode-test.mjs --extensionDevelopmentPath=. --version=insiders
-fi
+if ($env.COVERAGE? | default false | into bool) {
+    (pnpm exec vscode-test --config .vscode-test.mjs --extensionDevelopmentPath .
+        --version insiders --coverage --coverage-output coverage/unit
+        --coverage-reporter json)
+} else {
+    (pnpm exec vscode-test --config .vscode-test.mjs --extensionDevelopmentPath .
+        --version=insiders)
+}
 '''
 
 [tasks.test-web]
@@ -72,39 +114,48 @@ depends = ['build --web']
 run = 'pnpm exec vscode-test-web --extensionDevelopmentPath=.'
 
 [tasks.assemble-coverage]
-run = [
-    'c8 --temp-directory coverage/integration/tmp/ report -r json -o coverage/integration/',
-    '''
-pnpm exec istanbul-merge --out coverage/merged/coverage-final.json \
-    coverage/integration/coverage-final.json coverage/unit/coverage-final.json
-''',
-    '''
-    pnpm exec nyc report -t coverage/merged --report-dir coverage -r lcov -r text \
-        --exclude node_modules --exclude out --exclude .vscode-test \
-        --exclude src/test
-    ''',
-]
+shell = 'nu -c'
+run = '''
+c8 --temp-directory coverage/integration/tmp/ report -r json -o coverage/integration/',
+(pnpm exec istanbul-merge --out coverage/merged/coverage-final.json
+    coverage/integration/coverage-final.json coverage/unit/coverage-final.json)
+(pnpm exec nyc report -t coverage/merged --report-dir coverage -r lcov
+    --exclude node_modules --exclude out --exclude .vscode-test
+    --exclude src/test)
+mv coverage/lcov.info coverage/ts_coverage.info'
+
+cat coverage/*_coverage.info o> coverage/lcov.info
+lcov-summary coverage/lcov.info
+'''
 
 [tasks.test-integration]
 depends = ['build', 'build-tests']
 run = 'pnpm exec playwright test'
 
 [tasks.extract-docs]
-sources = ['README.md', 'src/extension/**/*.ts', 'docs/templates/**/*.md']
-outputs = { auto = true }
-run = 'simple-src-docs -d docs src README.md docs/templates'
+sources = ['README.md', 'src/extension/**/*.ts', 'src/rust/**/*.rs', 'src/docs/**/*.md']
+outputs = ['docs/**/*.md']
+run = ['simple-src-docs -d docs src README.md', 'cp src/docs/index.md docs/']
+
+[tasks.dev-docs]
+depends = ['extract-docs']
+run = 'pnpm exec vitepress dev docs'
 
 [tasks.build-docs]
-sources = [
-    'docs/index.md',
-    'docs/guide.md',
-    'docs/bindings/**/*.md',
-    'docs/commands/**/*.md',
-]
+sources = ['docs/**/*.md']
 outputs = ['docs/.vitepress/dist/**/*']
 depends = ['extract-docs']
 run = 'pnpm exec vitepress build docs'
 
+[tasks.clean-docs]
+shell = 'nu -c'
+run = '''
+let to_remove = glob docs/**/*.md
+if not ($to_remove | is-empty) {
+    rm ...$to_remove
+}
+'''
+
 [tasks.report-coverage]
 depends = ['test --coverage', 'test-integration']
 run = ['c8 report -r html', 'http-server coverage']