From 20e8f81104d815c50169e93ce1c0a22cdfeaf255 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Thu, 26 Jun 2025 16:56:37 -0500
Subject: [PATCH 01/42] Alter dependencies to match `tree-sitter-scrapscript`

---
 package-lock.json | 64 +++++++++++++++++++++++++++++++++++++++--------
 package.json      |  4 +--
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 12dbb2c..6c18c73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,8 +13,8 @@
         "server"
       ],
       "dependencies": {
-        "tree-sitter": "^0.22.4",
-        "tree-sitter-cli": "^0.22.4"
+        "tree-sitter": "^0.21.1",
+        "tree-sitter-cli": "^0.24.4",
       },
       "devDependencies": {
         "@types/node": "^22.15.21",
@@ -4352,6 +4352,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/nan": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
+      "license": "MIT"
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -5369,24 +5375,49 @@
       }
     },
     "node_modules/tree-sitter": {
-      "version": "0.22.4",
-      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.22.4.tgz",
-      "integrity": "sha512-usbHZP9/oxNsUY65MQUsduGRqDHQOou1cagUSwjhoSYAmSahjQDAVsh9s+SlZkn8X8+O1FULRGwHu7AFP3kjzg==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.21.1.tgz",
+      "integrity": "sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "node-addon-api": "^8.3.0",
-        "node-gyp-build": "^4.8.4"
+        "node-addon-api": "^8.0.0",
+        "node-gyp-build": "^4.8.0"
       }
     },
     "node_modules/tree-sitter-cli": {
-      "version": "0.22.6",
-      "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.22.6.tgz",
-      "integrity": "sha512-s7mYOJXi8sIFkt/nLJSqlYZP96VmKTc3BAwIX0rrrlRxWjWuCwixFqwzxWZBQz4R8Hx01iP7z3cT3ih58BUmZQ==",
+      "version": "0.24.7",
+      "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.24.7.tgz",
+      "integrity": "sha512-o4gnE82pVmMMhJbWwD6+I9yr4lXii5Ci5qEQ2pFpUbVy1YiD8cizTJaqdcznA0qEbo7l2OneI1GocChPrI4YGQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
         "tree-sitter": "cli.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/tree-sitter-scrapscript": {
+      "version": "0.1.0",
+      "resolved": "git+ssh://git@github.com/neuroevolutus/tree-sitter-scrapscript.git#356d77843d8a712de55d1e1d6d7b7be143495497",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "nan": "^2.22.2",
+        "node-addon-api": "^8.2.2",
+        "node-gyp-build": "^4.8.2"
+      },
+      "funding": {
+        "url": "https://scrapscript.org"
+      },
+      "peerDependencies": {
+        "tree-sitter": "^0.21.1"
+      },
+      "peerDependenciesMeta": {
+        "tree-sitter": {
+          "optional": true
+        }
       }
     },
     "node_modules/ts-api-utils": {
@@ -5793,7 +5824,7 @@
       "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
-        "tree-sitter": "0.22.4",
+        "tree-sitter": "^0.22.4",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.12"
       },
@@ -5818,6 +5849,17 @@
         "undici-types": "~6.19.2"
       }
     },
+    "server/node_modules/tree-sitter": {
+      "version": "0.22.4",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.22.4.tgz",
+      "integrity": "sha512-usbHZP9/oxNsUY65MQUsduGRqDHQOou1cagUSwjhoSYAmSahjQDAVsh9s+SlZkn8X8+O1FULRGwHu7AFP3kjzg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "node-addon-api": "^8.3.0",
+        "node-gyp-build": "^4.8.4"
+      }
+    },
     "server/node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
diff --git a/package.json b/package.json
index 21d1e02..aa66db5 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "server"
   ],
   "dependencies": {
-    "tree-sitter": "^0.22.4",
-    "tree-sitter-cli": "^0.22.4"
+    "tree-sitter": "^0.21.1",
+    "tree-sitter-cli": "^0.24.4",
   }
 }

From 85a03f14f7290c16756f1d3fe2301651b0224f9a Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Thu, 26 Jun 2025 16:57:26 -0500
Subject: [PATCH 02/42] Add dependency on `tree-sitter-scrapscript`

---
 package-lock.json | 3 ++-
 package.json      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 6c18c73..72ae618 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
       "dependencies": {
         "tree-sitter": "^0.21.1",
         "tree-sitter-cli": "^0.24.4",
+        "tree-sitter-scrapscript": "github:scrapscript/tree-sitter-scrapscript"
       },
       "devDependencies": {
         "@types/node": "^22.15.21",
@@ -5400,7 +5401,7 @@
     },
     "node_modules/tree-sitter-scrapscript": {
       "version": "0.1.0",
-      "resolved": "git+ssh://git@github.com/neuroevolutus/tree-sitter-scrapscript.git#356d77843d8a712de55d1e1d6d7b7be143495497",
+      "resolved": "git+ssh://git@github.com/scrapscript/tree-sitter-scrapscript.git#760eb0a99ea9521cf35e6628649aca9beb1ceeb2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index aa66db5..eda8698 100644
--- a/package.json
+++ b/package.json
@@ -59,5 +59,6 @@
   "dependencies": {
     "tree-sitter": "^0.21.1",
     "tree-sitter-cli": "^0.24.4",
+    "tree-sitter-scrapscript": "github:scrapscript/tree-sitter-scrapscript"
   }
 }

From 8af60d7a946ffe1edebe24ec8b01f49718d0f9fc Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 9 Jun 2025 15:05:26 -0500
Subject: [PATCH 03/42] Update `tsconfig.json` files

---
 client/tsconfig.json | 1 +
 server/tsconfig.json | 1 +
 tsconfig.json        | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/tsconfig.json b/client/tsconfig.json
index af4d6fa..535f848 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "module": "commonjs",
     "target": "es2020",
diff --git a/server/tsconfig.json b/server/tsconfig.json
index 92cebd5..b75c0f5 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "module": "commonjs",
     "target": "es2020",
diff --git a/tsconfig.json b/tsconfig.json
index b3e63e9..01b8d2d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,7 +7,8 @@
     "rootDir": "src",
     "sourceMap": true,
     "strict": true,
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "typeRoots": ["./node_modules/@types"]
   },
   "include": [
     "src"

From 88dcbd3c5b6557c35668c8e0f6d33927c7c565ec Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 7 Jul 2025 23:01:57 -0500
Subject: [PATCH 04/42] Add `.vscode/tasks.json`

---
 .vscode/tasks.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..8a491bd
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,18 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "watch",
+			"problemMatcher": "$tsc-watch",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}

From 453d70bb1c30bbe9bc92c881d734d867e295d570 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:23:29 -0500
Subject: [PATCH 05/42] Add `.vscode/launch.json`

---
 .vscode/launch.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..8055aee
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,24 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "extensionHost",
+      "request": "launch",
+      "name": "Launch Extension",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+          "--extensionDevelopmentPath=${workspaceFolder}",
+          "${workspaceFolder}"
+      ],
+      "outFiles": [
+          "${workspaceFolder}/client/out/**/*.js",
+          "${workspaceFolder}/server/out/**/*.js",
+      ],
+      "autoAttachChildProcesses": true,
+      "preLaunchTask": {
+        "type": "npm",
+        "script": "watch"
+      }
+    }
+  ]
+}

From db13a60ec76fef6c617f5e0823b598624026978c Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:28:37 -0500
Subject: [PATCH 06/42] Update `test` script to only operate on `out` folder

---
 server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/package.json b/server/package.json
index 490014b..028a46d 100644
--- a/server/package.json
+++ b/server/package.json
@@ -17,7 +17,7 @@
     "build": "tree-sitter build ../tree-sitter-scrapscript",
     "compile": "tsc -b",
     "watch": "tsc -b -w",
-    "test": "jest",
+    "test": "jest out",
     "test:watch": "jest --watch"
   },
   "devDependencies": {

From f50dc86e2acae6a77af0aada7ebc06103a524325 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 8 Jun 2025 16:54:48 -0500
Subject: [PATCH 07/42] Fix import

---
 server/src/server.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 666e94e..57dfadc 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -37,7 +37,7 @@ import {
 
 import { TextDocument } from "vscode-languageserver-textdocument";
 import Parser from "tree-sitter";
-import * as Language from "../../tree-sitter-scrapscript/bindings/node";
+import * as Language from "tree-sitter-scrapscript/bindings/node";
 
 // ===== Enhanced Types and Constants =====
 export type SyntaxNode = Parser.SyntaxNode;

From 0c0d2eadce2cbecc2c3ed10dfa2f3fb6bacd2962 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Fri, 27 Jun 2025 01:16:23 -0500
Subject: [PATCH 08/42] Remove spurious hole from `enhancedExampleCode`

---
 server/src/server.test.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index f894b62..99bdfd5 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -20,8 +20,6 @@ import {
 
 describe("Enhanced ScrapScript Language Server", () => {
   const enhancedExampleCode = `
-()
-
 result
 ; result = x + y * z 
 ; x = 10 

From 33f0b7b880b85992ffbbe6116c7b428516a8727c Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Thu, 19 Jun 2025 01:41:34 -0500
Subject: [PATCH 09/42] Add function `limitDiagnostics`

---
 server/src/server.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/server.ts b/server/src/server.ts
index 57dfadc..54ee880 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -271,6 +271,13 @@ function walkTree(
   }
 }
 
+function limitDiagnostics(
+  diagnostics: Diagnostic[],
+  maxNumberOfProblems: number
+): Diagnostic[] {
+  return diagnostics.slice(0, maxNumberOfProblems);
+}
+
 // ===== Enhanced Validation =====
 export function validateScrapScript(
   text: string,

From 97ec266df853b44483f8d1a9c566319027bc4430 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:40:35 -0500
Subject: [PATCH 10/42] Add function `walkTreeCollecting`

---
 server/src/server.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/server/src/server.ts b/server/src/server.ts
index 54ee880..4c59438 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -271,6 +271,25 @@ function walkTree(
   }
 }
 
+function walkTreeCollecting<R>(
+  node: SyntaxNode,
+  callback: (node: SyntaxNode) => R,
+): R[] {
+  const results: R[] = [];
+  const stack: SyntaxNode[] = [node];
+  while (stack.length > 0) {
+    const node: SyntaxNode = stack.pop() as SyntaxNode;
+    results.push(callback(node));
+    for (let i = node.namedChildCount - 1; i >= 0; i--) {
+      const child = node.namedChild(i);
+      if (child) {
+        stack.push(child);
+      }
+    }
+  }
+  return results;
+}
+
 function limitDiagnostics(
   diagnostics: Diagnostic[],
   maxNumberOfProblems: number

From a64f13826dc601a0f90c21ec03a1d83fa47fce67 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 29 Jun 2025 16:37:05 -0500
Subject: [PATCH 11/42] Add function `walkTreeFlatMapping`

---
 server/src/server.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/server.ts b/server/src/server.ts
index 4c59438..ef4c540 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -290,6 +290,13 @@ function walkTreeCollecting<R>(
   return results;
 }
 
+function walkTreeFlatMapping<R>(
+  node: SyntaxNode,
+  callback: (node: SyntaxNode) => R[],
+): R[] {
+  return walkTreeCollecting(node, callback).flat();
+}
+
 function limitDiagnostics(
   diagnostics: Diagnostic[],
   maxNumberOfProblems: number

From 21ffff5d5b7f89cbaa53a3d3f603c11707313faa Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Thu, 19 Jun 2025 01:44:38 -0500
Subject: [PATCH 12/42] Add function `validateNodeBy`

---
 server/src/server.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/server.ts b/server/src/server.ts
index ef4c540..0bf5993 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -304,6 +304,13 @@ function limitDiagnostics(
   return diagnostics.slice(0, maxNumberOfProblems);
 }
 
+function validateNodeBy(
+  node: SyntaxNode,
+  callback: (node: SyntaxNode) => Diagnostic[]
+): Diagnostic[] {
+  return walkTreeFlatMapping(node, callback);
+}
+
 // ===== Enhanced Validation =====
 export function validateScrapScript(
   text: string,

From 258077e61bf756cc00c164fc7aa25ce0eaf996a7 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Thu, 19 Jun 2025 02:00:34 -0500
Subject: [PATCH 13/42] Refactor validation functions in terms of
 `validateNodeBy`

---
 server/src/server.ts | 100 +++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 0bf5993..ba7df16 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -316,41 +316,40 @@ export function validateScrapScript(
   text: string,
   maxNumberOfProblems: number,
 ): Diagnostic[] {
-  const diagnostics: Diagnostic[] = [];
-
+  let tree: Tree;
   try {
-    const tree = parse(text);
-    const rootNode = tree.rootNode;
-
-    // Enhanced error detection
-    if (rootNode.hasError) {
-      const errorNodes = findErrorNodes(rootNode);
-
-      for (const errorNode of errorNodes) {
-        const range = nodeToRange(errorNode);
-        const diagnostic = createDiagnosticForError(errorNode, range);
-        diagnostics.push(diagnostic);
-      }
-    }
-
-    // Additional validations
-    validatePatternMatching(rootNode, diagnostics);
-    validateTypeConsistency(rootNode, diagnostics, text);
-    validateWhereClauseStructure(rootNode, diagnostics);
-    validateRecordSyntax(rootNode, diagnostics);
-    validateListSyntax(rootNode, diagnostics);
-    validateFunctionSyntax(rootNode, diagnostics);
+    tree = parse(text);
   } catch (err) {
     console.error("Error parsing ScrapScript:", err);
-    diagnostics.push({
+    return limitDiagnostics([{
       severity: DiagnosticSeverity.Error,
       range: Range.create(0, 0, 0, 0),
       message: `Failed to parse ScrapScript: ${err}`,
       source: "scrapscript",
-    });
+    }], maxNumberOfProblems);
   }
 
-  return diagnostics.slice(0, maxNumberOfProblems);
+  const rootNode: SyntaxNode = tree.rootNode;
+
+  // Enhanced error detection
+  const errors: Diagnostic[] = rootNode.hasError ?
+    findErrorNodes(rootNode).map(errorNode => {
+      const range = nodeToRange(errorNode);
+      return createDiagnosticForError(errorNode, range);
+    }) : [];
+
+  // Additional validations
+  const validations: Diagnostic[] = [
+    validatePatternMatching(rootNode),
+    validateTypeConsistency(rootNode, text),
+    validateWhereClauseStructure(rootNode),
+    validateRecordSyntax(rootNode),
+    validateListSyntax(rootNode),
+    validateFunctionSyntax(rootNode)
+  ].flat();
+
+  const diagnostics: Diagnostic[] = errors.concat(validations);
+  return limitDiagnostics(diagnostics, maxNumberOfProblems);
 }
 
 function findErrorNodes(node: SyntaxNode): SyntaxNode[] {
@@ -419,11 +418,9 @@ function createDiagnosticForError(
   };
 }
 
-function validatePatternMatching(
-  node: SyntaxNode,
-  diagnostics: Diagnostic[],
-): void {
-  walkTree(node, (currentNode) => {
+function validatePatternMatching(node: SyntaxNode): Diagnostic[] {
+  return validateNodeBy(node, (currentNode) => {
+    const diagnostics: Diagnostic[] = [];
     if (
       currentNode.type === "match_fun" ||
       currentNode.type === "pattern_match"
@@ -459,15 +456,16 @@ function validatePatternMatching(
         });
       }
     }
+    return diagnostics;
   });
 }
 
 function validateTypeConsistency(
   node: SyntaxNode,
-  diagnostics: Diagnostic[],
   text: string,
-): void {
-  walkTree(node, (currentNode) => {
+): Diagnostic[] {
+  return validateNodeBy(node, (currentNode) => {
+    const diagnostics: Diagnostic[] = [];
     if (currentNode.type === "list") {
       const elementTypes = new Set<string>();
 
@@ -490,6 +488,7 @@ function validateTypeConsistency(
         });
       }
     }
+    return diagnostics;
   });
 }
 
@@ -517,11 +516,9 @@ function inferBasicType(node: SyntaxNode): string | null {
   }
 }
 
-function validateWhereClauseStructure(
-  node: SyntaxNode,
-  diagnostics: Diagnostic[],
-): void {
-  walkTree(node, (currentNode) => {
+function validateWhereClauseStructure(node: SyntaxNode): Diagnostic[] {
+  return validateNodeBy(node, (currentNode) => {
+    let diagnostics: Diagnostic[] = [];
     if (currentNode.type === "where") {
       // Check for proper "; identifier = expression" structure
       let hasProperStructure = false;
@@ -548,14 +545,13 @@ function validateWhereClauseStructure(
         });
       }
     }
+    return diagnostics;
   });
 }
 
-function validateRecordSyntax(
-  node: SyntaxNode,
-  diagnostics: Diagnostic[],
-): void {
-  walkTree(node, (currentNode) => {
+function validateRecordSyntax(node: SyntaxNode): Diagnostic[] {
+  return validateNodeBy(node, (currentNode) => {
+    const diagnostics: Diagnostic[] = [];
     if (currentNode.type === "record") {
       // Validate record field syntax
       for (let i = 0; i < currentNode.namedChildCount; i++) {
@@ -574,11 +570,13 @@ function validateRecordSyntax(
         }
       }
     }
+    return diagnostics;
   });
 }
 
-function validateListSyntax(node: SyntaxNode, diagnostics: Diagnostic[]): void {
-  walkTree(node, (currentNode) => {
+function validateListSyntax(node: SyntaxNode): Diagnostic[] {
+  return validateNodeBy(node, (currentNode) => {
+    const diagnostics: Diagnostic[] = [];
     if (currentNode.type === "list") {
       // Check for trailing commas and proper separators
       const text = currentNode.text;
@@ -592,14 +590,13 @@ function validateListSyntax(node: SyntaxNode, diagnostics: Diagnostic[]): void {
         });
       }
     }
+    return diagnostics;
   });
 }
 
-function validateFunctionSyntax(
-  node: SyntaxNode,
-  diagnostics: Diagnostic[],
-): void {
-  walkTree(node, (currentNode) => {
+function validateFunctionSyntax(node: SyntaxNode): Diagnostic[] {
+  return validateNodeBy(node, (currentNode) => {
+    const diagnostics: Diagnostic[] = [];
     if (currentNode.type === "fun") {
       // Check for proper arrow function syntax
       const hasArrow = currentNode.text.includes("->");
@@ -613,6 +610,7 @@ function validateFunctionSyntax(
         });
       }
     }
+    return diagnostics;
   });
 }
 

From 3f46409312ebbc3090d3c8d1d7db2f4b078ebfb1 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 29 Jun 2025 23:56:50 -0500
Subject: [PATCH 14/42] Refactor `findNodesOfType` using `walkTreeFlatMapping`

---
 server/src/server.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index ba7df16..187e8d4 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -1206,13 +1206,9 @@ export function getDocumentSymbols(document: TextDocument): DocumentSymbol[] {
 }
 
 function findNodesOfType(rootNode: SyntaxNode, type: string): SyntaxNode[] {
-  const nodes: SyntaxNode[] = [];
-  walkTree(rootNode, (node) => {
-    if (node.type === type) {
-      nodes.push(node);
-    }
+  return walkTreeFlatMapping(rootNode, (node) => {
+    return (node.type === type) ? [node] : [];
   });
-  return nodes;
 }
 
 function findWhereClauseDeclarations(rootNode: SyntaxNode): SyntaxNode[] {

From 7ee7afae253a1ee18f2217d07f18bffcf44bbeb4 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 23 Jun 2025 17:00:33 -0500
Subject: [PATCH 15/42] Refactor `getPatternMatchCompletions` using `map`

---
 server/src/server.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 187e8d4..fe1e8cc 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -772,8 +772,6 @@ function getWhereClauseCompletions(): CompletionItem[] {
 }
 
 function getPatternMatchCompletions(): CompletionItem[] {
-  const completions: CompletionItem[] = [];
-
   const patterns = [
     { label: "basic pattern", insertText: "| ${1:pattern} -> ${2:expression}" },
     { label: "catch-all", insertText: "| _ -> ${1:default}" },
@@ -802,8 +800,8 @@ function getPatternMatchCompletions(): CompletionItem[] {
     { label: "text pattern", insertText: '| "${1:text}" -> ${2:expression}' },
   ];
 
-  patterns.forEach((pattern, index) => {
-    completions.push({
+  return patterns.map((pattern, index) => {
+    return {
       label: pattern.label,
       kind: CompletionItemKind.Snippet,
       detail: "Pattern match case",
@@ -811,10 +809,8 @@ function getPatternMatchCompletions(): CompletionItem[] {
       insertText: pattern.insertText,
       insertTextFormat: InsertTextFormat.Snippet,
       sortText: `0${index.toString().padStart(2, "0")}`,
-    });
+    }
   });
-
-  return completions;
 }
 
 function getRecordFieldCompletions(recordType?: string): CompletionItem[] {

From d669bad011f95f3e2fbdac59a9ba79d769931eb4 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 23 Jun 2025 23:01:18 -0500
Subject: [PATCH 16/42] Simplify `getTagCompletions`

---
 server/src/server.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index fe1e8cc..6a5be21 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -757,18 +757,14 @@ function getTagCompletions(): CompletionItem[] {
 }
 
 function getWhereClauseCompletions(): CompletionItem[] {
-  const completions: CompletionItem[] = [];
-
-  completions.push({
+  return [{
     label: ". identifier = expression",
     kind: CompletionItemKind.Snippet,
     detail: "Where clause",
     documentation: "Define a variable in a where clause",
     insertText: ". ${1:identifier} = ${2:expression}",
     insertTextFormat: InsertTextFormat.Snippet,
-  });
-
-  return [...completions, ...getGlobalCompletions()];
+  }, ...getGlobalCompletions()];
 }
 
 function getPatternMatchCompletions(): CompletionItem[] {

From 76ba7f12c5be6bb2b2013ba7e9a2a8822b25ba2c Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 23 Jun 2025 23:06:22 -0500
Subject: [PATCH 17/42] Simplify `getPipelineCompletions`

---
 server/src/server.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 6a5be21..e3b870e 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -884,10 +884,8 @@ function getTypeCompletions(): CompletionItem[] {
 }
 
 function getPipelineCompletions(): CompletionItem[] {
-  const completions: CompletionItem[] = [];
-
-  // Add common pipeline operators
-  completions.push(
+  return [
+    // Add common pipeline operators
     {
       label: "|>",
       kind: CompletionItemKind.Operator,
@@ -908,9 +906,8 @@ function getPipelineCompletions(): CompletionItem[] {
       detail: "Function composition",
       documentation: "Compose functions (left to right)",
     },
-  );
-
-  return [...completions, ...getFunctionCompletions()];
+    ...getFunctionCompletions()
+  ];
 }
 
 function getImportCompletions(): CompletionItem[] {

From 982c07a8fbdc32d844796411b8d33eab2a82d068 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 29 Jun 2025 23:36:40 -0500
Subject: [PATCH 18/42] Fix test "should handle empty documents"

---
 server/src/server.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/src/server.ts b/server/src/server.ts
index e3b870e..bd5be48 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -316,6 +316,8 @@ export function validateScrapScript(
   text: string,
   maxNumberOfProblems: number,
 ): Diagnostic[] {
+  if (text === "") return [];
+
   let tree: Tree;
   try {
     tree = parse(text);

From 9520b9358974f62a0c30da4c3389f7d08cd25f76 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Fri, 20 Jun 2025 00:29:43 -0500
Subject: [PATCH 19/42] Fix test "should validate complex code without errors"

---
 server/src/server.ts | 52 +++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index bd5be48..d94a8b7 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -520,34 +520,32 @@ function inferBasicType(node: SyntaxNode): string | null {
 
 function validateWhereClauseStructure(node: SyntaxNode): Diagnostic[] {
   return validateNodeBy(node, (currentNode) => {
-    let diagnostics: Diagnostic[] = [];
-    if (currentNode.type === "where") {
-      // Check for proper "; identifier = expression" structure
-      let hasProperStructure = false;
-
-      for (let i = 0; i < currentNode.childCount; i++) {
-        const child = currentNode.child(i);
-        if (child?.type === ";" && i + 2 < currentNode.childCount) {
-          const nextChild = currentNode.child(i + 1);
-          const followingChild = currentNode.child(i + 2);
-
-          if (nextChild?.type === "id" && followingChild?.type === "=") {
-            hasProperStructure = true;
-            break;
-          }
-        }
-      }
+    // Lazily compute diagnostics
+    const getDiagnostics = () => {
+      return [{
+        severity: DiagnosticSeverity.Error,
+        range: nodeToRange(currentNode),
+        message: 'Invalid where clause.\n'
+          + 'Expected:\n'
+          + '\t"; pattern = expression"\n'
+          + '\tor\n'
+          + '\t"; id = data_type"',
+        source: "scrapscript",
+      }];
+    };
 
-      if (!hasProperStructure) {
-        diagnostics.push({
-          severity: DiagnosticSeverity.Error,
-          range: nodeToRange(currentNode),
-          message: 'Invalid where clause. Expected "; identifier = expression"',
-          source: "scrapscript",
-        });
-      }
-    }
-    return diagnostics;
+    if (currentNode.type !== "where") return [];
+    // Node should have form "id; ((id = data_type)|(pattern = expression))"
+    if (currentNode.childCount !== 3) return getDiagnostics();
+    // Expect semicolon in middle
+    const semicolonPosition = 1;
+    if (currentNode.child(semicolonPosition)?.type !== ";") return getDiagnostics();
+    // Expect declaration or type declaration at the end
+    const declarationPosition = 2;
+    if (currentNode.child(declarationPosition)?.type !== "declaration" &&
+      currentNode.child(declarationPosition)?.type !== "type_declaration")
+      return getDiagnostics();
+    return [];
   });
 }
 

From ad031eeefa361bd83fa981b421a57a87527e0bc3 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 23 Jun 2025 17:14:40 -0500
Subject: [PATCH 20/42] Fix test "should provide pattern match completions"

---
 server/src/server.test.ts |  3 ++-
 server/src/server.ts      | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index 99bdfd5..c2378d7 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -13,6 +13,7 @@ import {
 } from "./server";
 import {
   CompletionItem,
+  CompletionItemKind,
   Hover,
   MarkupContent,
   Range,
@@ -199,7 +200,7 @@ result
       const completions = getCompletionItems(document, position);
 
       const patternCompletions = completions.filter(
-        (c) => c.kind === 14 && c.label.includes("->"), // Snippet kind
+        (c) => c.kind === CompletionItemKind.Snippet && c.insertText?.includes("->"), // Snippet kind
       );
       expect(patternCompletions.length).toBeGreaterThan(0);
     });
diff --git a/server/src/server.ts b/server/src/server.ts
index d94a8b7..8381729 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -683,19 +683,19 @@ function analyzeCompletionContext(
     return { type: "tag" };
   }
 
-  // Check for where clause context
-  if (lineText.trim().startsWith(";") || findParentOfType(node, "where")) {
-    return { type: "where_clause" };
-  }
-
   // Check for pattern match context
   if (
     lineText.trim().startsWith("|") ||
-    findParentOfType(node, "pattern_match")
+    findParentOfType(node, "match_fun")
   ) {
     return { type: "pattern_match" };
   }
 
+  // Check for where clause context
+  if (lineText.trim().startsWith(";") || findParentOfType(node, "where")) {
+    return { type: "where_clause" };
+  }
+
   // Check for record field access
   if (lineText.includes(".") || parent?.type === "record_access") {
     return { type: "record_field" };

From 2194ca19d43a4f64628ffd6b368383acdd2dba85 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 23 Jun 2025 17:14:50 -0500
Subject: [PATCH 21/42] Add TODO comment

---
 server/src/server.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/server.ts b/server/src/server.ts
index 8381729..517a04b 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -691,6 +691,7 @@ function analyzeCompletionContext(
     return { type: "pattern_match" };
   }
 
+  // [TODO]: Just make the conditional a conjunction?
   // Check for where clause context
   if (lineText.trim().startsWith(";") || findParentOfType(node, "where")) {
     return { type: "where_clause" };

From 9feb87be43d37cc385fed7a64f43b479b4ccb0a0 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Fri, 27 Jun 2025 01:17:06 -0500
Subject: [PATCH 22/42] Update bytestring literal to match current ScrapScript
 syntax

---
 server/src/server.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index c2378d7..06fa086 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -71,7 +71,7 @@ result
 
 ; greeting = "Hello, " ++ person.name ++ "!"
 
-; encoded-data = ;;aGVsbG8gd29ybGQ=
+; encoded-data = ~~aGVsbG8gd29ybGQ=
 
 ; process-response =
     | #ok { status = 200, data = content } -> #success content

From 3b3153fac1003bc2b89c971cd915b073107084f3 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 29 Jun 2025 16:27:55 -0500
Subject: [PATCH 23/42] Add TODO comment

---
 server/src/server.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/server.ts b/server/src/server.ts
index 517a04b..908d162 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -1349,6 +1349,10 @@ export function findReferences(
   const identifier = getNodeText(document, node);
   const references: Location[] = [];
 
+  // [TODO]: Exclude false positives, i.e. occurrences
+  // of the name that are bound by different lambdas
+  // using the same identifier for their parameter
+
   // Find all occurrences of this identifier
   walkTree(tree.rootNode, (currentNode) => {
     if (

From ab6ba5afd5b96ffb135dde038bbcead52a5b4afa Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 29 Jun 2025 16:38:21 -0500
Subject: [PATCH 24/42] Refactor function `findReferences` using
 `walkTreeFlatMapping`

---
 server/src/server.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 908d162..2104a73 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -1347,26 +1347,23 @@ export function findReferences(
   if (!node || node.type !== "id") return [];
 
   const identifier = getNodeText(document, node);
-  const references: Location[] = [];
 
   // [TODO]: Exclude false positives, i.e. occurrences
   // of the name that are bound by different lambdas
   // using the same identifier for their parameter
 
   // Find all occurrences of this identifier
-  walkTree(tree.rootNode, (currentNode) => {
+  return walkTreeFlatMapping(tree.rootNode, (currentNode) => {
     if (
       currentNode.type === "id" &&
       getNodeText(document, currentNode) === identifier
     ) {
-      references.push({
+      return [{
         uri: document.uri,
         range: nodeToRange(currentNode),
-      });
-    }
+      }];
+    } else return [];
   });
-
-  return references;
 }
 
 export function prepareRename(

From 9e3a0477928d7b93bde9957da11dd4f30c54a71f Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 29 Jun 2025 23:14:10 -0500
Subject: [PATCH 25/42] Update line and character numbers in tests

---
 server/src/server.test.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index 06fa086..6433bd8 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -228,7 +228,7 @@ result
 
   describe("Enhanced Hover", () => {
     it("should provide enhanced hover for built-in functions", () => {
-      const position = { line: 25, character: 10 }; // Over "list/map"
+      const position = { line: 27, character: 7 }; // Over "list/map"
       const hover = getHoverInfo(document, position);
 
       expect(hover).toBeDefined();
@@ -242,7 +242,7 @@ result
     });
 
     it("should provide hover for tags with enhanced info", () => {
-      const position = { line: 8, character: 12 }; // Over "#zero"
+      const position = { line: 10, character: 11 }; // Over "#zero"
       const hover = getHoverInfo(document, position);
 
       expect(hover).toBeDefined();
@@ -256,7 +256,7 @@ result
     });
 
     it("should provide hover for operators with documentation", () => {
-      const position = { line: 25, character: 4 }; // Over "|>"
+      const position = { line: 27, character: 4 }; // Over "|>"
       const hover = getHoverInfo(document, position);
 
       expect(hover).toBeDefined();
@@ -270,7 +270,7 @@ result
     });
 
     it("should provide hover for numbers with additional info", () => {
-      const position = { line: 4, character: 8 }; // Over "10"
+      const position = { line: 3, character: 6 }; // Over "10"
       const hover = getHoverInfo(document, position);
 
       expect(hover).toBeDefined();
@@ -326,14 +326,14 @@ result
 
   describe("References and Rename", () => {
     it("should find references to identifiers", () => {
-      const position = { line: 4, character: 15 }; // Over "x" in declaration
+      const position = { line: 3, character: 2 }; // Over "x" in declaration
       const references = findReferences(document, position);
 
       expect(references.length).toBeGreaterThan(1); // Should find definition and usage
     });
 
     it("should prepare rename for valid identifiers", () => {
-      const position = { line: 4, character: 15 }; // Over "x"
+      const position = { line: 2, character: 11 }; // Over "x"
       const renameInfo = prepareRename(document, position);
 
       expect(renameInfo).toBeDefined();
@@ -341,7 +341,7 @@ result
     });
 
     it("should execute rename correctly", () => {
-      const position = { line: 4, character: 15 }; // Over "x"
+      const position = { line: 2, character: 11 }; // Over "x"
       const renameResult = executeRename(document, position, "newX");
 
       expect(renameResult).toBeDefined();

From abfd62508b42fe6f588a2818a40ae0f26d70f96a Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 30 Jun 2025 00:36:21 -0500
Subject: [PATCH 26/42] Fix test "should find all enhanced declarations"

---
 server/src/server.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 2104a73..b691aac 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -1225,8 +1225,12 @@ function createDocumentSymbol(
   node: SyntaxNode,
   document: TextDocument,
 ): DocumentSymbol {
-  const patternNode = node.child(0);
-  if (!patternNode) {
+  let bindingNode: SyntaxNode | null | undefined = node.child(0);
+
+  // For normal declarations, the id is nested inside a pattern
+  if (node.type === "declaration") bindingNode = bindingNode?.child(0);
+
+  if (!bindingNode) {
     return {
       name: "unknown",
       kind: SymbolKind.Variable,
@@ -1237,7 +1241,7 @@ function createDocumentSymbol(
     };
   }
 
-  const name = getSymbolName(patternNode, document);
+  const name = getSymbolName(bindingNode, document);
   const exprNode = node.namedChild(node.namedChildCount - 1);
   const kind = getSymbolKind(exprNode);
   const detail = getSymbolDetail(node, exprNode);
@@ -1246,7 +1250,7 @@ function createDocumentSymbol(
     name,
     kind,
     range: nodeToRange(node),
-    selectionRange: nodeToRange(patternNode),
+    selectionRange: nodeToRange(bindingNode),
     detail,
     children: [],
   };

From 9e26e838ceae076d647c4deccb0878dd0fafb379 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 30 Jun 2025 00:38:53 -0500
Subject: [PATCH 27/42] Rename `createDocumentSymbol`

It is now called `extractDocumentSymbolFromDeclaration`.
---
 server/src/server.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index b691aac..e6ef604 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -1192,7 +1192,7 @@ export function getDocumentSymbols(document: TextDocument): DocumentSymbol[] {
     ...declarations,
     ...whereClausesDeclarations,
     ...typeDeclarations,
-  ].map((node) => createDocumentSymbol(node, document));
+  ].map((node) => extractDocumentSymbolFromDeclaration(node, document));
 }
 
 function findNodesOfType(rootNode: SyntaxNode, type: string): SyntaxNode[] {
@@ -1221,7 +1221,7 @@ function findWhereClauseDeclarations(rootNode: SyntaxNode): SyntaxNode[] {
   return declarations;
 }
 
-function createDocumentSymbol(
+function extractDocumentSymbolFromDeclaration(
   node: SyntaxNode,
   document: TextDocument,
 ): DocumentSymbol {

From 56f6c83ede9954c71bdd7e31bf55e726cb907918 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Mon, 30 Jun 2025 15:53:16 -0500
Subject: [PATCH 28/42] Fix test "should provide detailed symbol information"

---
 server/src/server.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index 6433bd8..63c0b85 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -317,7 +317,7 @@ result
       const symbols = getDocumentSymbols(document);
 
       const functionSymbol = symbols.find((s) => s.name === "classify-number");
-      expect(functionSymbol?.detail).toContain("Function");
+      expect(functionSymbol?.detail).toContain("Pattern matching function");
 
       const recordSymbol = symbols.find((s) => s.name === "person");
       expect(recordSymbol?.detail).toContain("Record");

From 4de83cf7d445906b24f455bd462e4755b160e050 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sat, 5 Jul 2025 16:25:10 -0500
Subject: [PATCH 29/42] Temporarily skip failing tests

---
 server/src/server.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index 63c0b85..b05a9a9 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -144,7 +144,7 @@ result
       expect(diagnostics).toHaveLength(0);
     });
 
-    it("should detect incomplete pattern matches", () => {
+    xit("should detect incomplete pattern matches", () => {
       const incompletePatternCode = `
 | 0 -> "zero"
 | 1 -> "one"
@@ -300,7 +300,7 @@ result
       expect(symbolNames).toContain("calculate-area");
     });
 
-    it("should correctly identify enhanced symbol kinds", () => {
+    xit("should correctly identify enhanced symbol kinds", () => {
       const symbols = getDocumentSymbols(document);
 
       const functionSymbol = symbols.find((s) => s.name === "classify-number");
@@ -607,7 +607,7 @@ value :
   });
 
   describe("Error Messages", () => {
-    it("should provide helpful error messages for common mistakes", () => {
+    xit("should provide helpful error messages for common mistakes", () => {
       const commonMistakes = [
         {
           code: `result ; result = 10`,

From 53deaded67df942265e8e7baa2c0a6ef6f8f1454 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 16:34:57 -0500
Subject: [PATCH 30/42] Remove unused imports from `server/src/server.ts`

---
 server/src/server.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index e6ef604..8245253 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -13,7 +13,6 @@ import {
   InitializeResult,
   HoverParams,
   Hover,
-  MarkupContent,
   MarkupKind,
   DocumentSymbol,
   SymbolKind,
@@ -31,7 +30,6 @@ import {
   CodeActionParams,
   CodeAction,
   CodeActionKind,
-  TextEdit,
   InsertTextFormat,
 } from "vscode-languageserver/node";
 

From 43865f9857360f1e53adef09ee3625df4e9e1b25 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 17:07:59 -0500
Subject: [PATCH 31/42] Remove unused imports from `server/src/server.test.ts`

---
 server/src/server.test.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index b05a9a9..d38662d 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -12,10 +12,7 @@ import {
   getCodeActions,
 } from "./server";
 import {
-  CompletionItem,
   CompletionItemKind,
-  Hover,
-  MarkupContent,
   Range,
 } from "vscode-languageserver/node";
 

From 4a3d31aa1f6bab6f1d0bfbe2fad261cdab04977a Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 17:31:51 -0500
Subject: [PATCH 32/42] Wrap `case`s in curly braces

---
 server/src/server.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 8245253..0ac6f41 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -1532,7 +1532,7 @@ function analyzeSemanticTokens(
   walkTree(node, (currentNode) => {
     // Map ScrapScript syntax to semantic token types
     switch (currentNode.type) {
-      case "id":
+      case "id": {
         const text = getNodeText(document, currentNode);
         let tokenType = 6; // variable
         if (BUILT_IN_FUNCTIONS.includes(text)) {
@@ -1548,7 +1548,8 @@ function analyzeSemanticTokens(
           0,
         );
         break;
-      case "op":
+      }
+      case "op": {
         builder.push(
           currentNode.startPosition.row,
           currentNode.startPosition.column,
@@ -1557,7 +1558,8 @@ function analyzeSemanticTokens(
           0,
         );
         break;
-      case "tag":
+      }
+      case "tag": {
         builder.push(
           currentNode.startPosition.row,
           currentNode.startPosition.column,
@@ -1566,7 +1568,8 @@ function analyzeSemanticTokens(
           0,
         );
         break;
-      case "number":
+      }
+      case "number": {
         builder.push(
           currentNode.startPosition.row,
           currentNode.startPosition.column,
@@ -1575,7 +1578,8 @@ function analyzeSemanticTokens(
           0,
         );
         break;
-      case "text":
+      }
+      case "text": {
         builder.push(
           currentNode.startPosition.row,
           currentNode.startPosition.column,
@@ -1584,6 +1588,7 @@ function analyzeSemanticTokens(
           0,
         );
         break;
+      }
     }
   });
 }

From 36064228b4783574ba342f1efc19193c8b1546f7 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 17:23:33 -0500
Subject: [PATCH 33/42] Temporarily silence `@typescript-eslint/no-unused-vars`
 errors

---
 server/src/server.test.ts |  2 ++
 server/src/server.ts      | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/server/src/server.test.ts b/server/src/server.test.ts
index d38662d..355a55f 100644
--- a/server/src/server.test.ts
+++ b/server/src/server.test.ts
@@ -734,6 +734,7 @@ describe("Helper Functions", () => {
   });
 
   it("should correctly identify built-in functions", () => {
+    /* eslint-disable @typescript-eslint/no-unused-vars */
     const builtIns = [
       "list/map",
       "list/filter",
@@ -741,6 +742,7 @@ describe("Helper Functions", () => {
       "result/bind",
     ];
     const nonBuiltIns = ["custom/function", "user/defined", "random/name"];
+    /* eslint-enable @typescript-eslint/no-unused-vars */
 
     // This test would require access to the isBuiltInFunction helper
     // In a real implementation, you'd export it or test it indirectly
diff --git a/server/src/server.ts b/server/src/server.ts
index 0ac6f41..a4daf0b 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -460,6 +460,7 @@ function validatePatternMatching(node: SyntaxNode): Diagnostic[] {
   });
 }
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
 function validateTypeConsistency(
   node: SyntaxNode,
   text: string,
@@ -491,6 +492,7 @@ function validateTypeConsistency(
     return diagnostics;
   });
 }
+/* eslint-enable @typescript-eslint/no-unused-vars */
 
 function inferBasicType(node: SyntaxNode): string | null {
   switch (node.type) {
@@ -808,6 +810,7 @@ function getPatternMatchCompletions(): CompletionItem[] {
   });
 }
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
 function getRecordFieldCompletions(recordType?: string): CompletionItem[] {
   // In a real implementation, this would analyze the record type
   const commonFields = [
@@ -828,10 +831,13 @@ function getRecordFieldCompletions(recordType?: string): CompletionItem[] {
     documentation: `Access field: ${field}`,
   }));
 }
+/* eslint-enable @typescript-eslint/no-unused-vars */
 
 function getFunctionCompletions(): CompletionItem[] {
   return BUILT_IN_FUNCTIONS.map((func) => {
+    /* eslint-disable @typescript-eslint/no-unused-vars */
     const [module, name] = func.split("/");
+    /* eslint-enable @typescript-eslint/no-unused-vars */
     return {
       label: func,
       kind: CompletionItemKind.Function,
@@ -1603,7 +1609,9 @@ export function setupServer() {
 
   let hasConfigurationCapability = false;
   let hasWorkspaceFolderCapability = false;
+  /* eslint-disable @typescript-eslint/no-unused-vars */
   let hasDiagnosticRelatedInformationCapability = false;
+  /* eslint-enable @typescript-eslint/no-unused-vars */
 
   connection.onInitialize(async (params: InitializeParams) => {
     const capabilities = params.capabilities;
@@ -1673,9 +1681,11 @@ export function setupServer() {
       );
     }
     if (hasWorkspaceFolderCapability) {
+      /* eslint-disable @typescript-eslint/no-unused-vars */
       connection.workspace.onDidChangeWorkspaceFolders((_event) => {
         connection.console.log("Workspace folder change event received.");
       });
+      /* eslint-enable @typescript-eslint/no-unused-vars */
     }
   });
 

From 0db33b28029f0ee3f60108f316043c7d509fe754 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 18:11:29 -0500
Subject: [PATCH 34/42] Add `eslint` dependencies

---
 package-lock.json | 260 ++++++++++++++++++++++++++++++----------------
 package.json      |   7 +-
 2 files changed, 175 insertions(+), 92 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 72ae618..d72794b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,11 +18,14 @@
         "tree-sitter-scrapscript": "github:scrapscript/tree-sitter-scrapscript"
       },
       "devDependencies": {
+        "@eslint/js": "^9.30.1",
         "@types/node": "^22.15.21",
         "@typescript-eslint/eslint-plugin": "^8.32.1",
         "@typescript-eslint/parser": "^8.32.1",
-        "eslint": "^9.27.0",
-        "typescript": "^5.8.3"
+        "eslint": "^9.30.1",
+        "globals": "^16.3.0",
+        "typescript": "^5.8.3",
+        "typescript-eslint": "^8.35.1"
       },
       "engines": {
         "vscode": "^1.75.0"
@@ -603,9 +606,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -618,9 +621,9 @@
       }
     },
     "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -642,9 +645,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
-      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -699,6 +702,19 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -723,9 +739,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1501,17 +1517,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-      "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
+      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/type-utils": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/type-utils": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -1525,22 +1541,22 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.35.1",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-      "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
+      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1555,15 +1571,37 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
+      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.35.1",
+        "@typescript-eslint/types": "^8.35.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-      "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1"
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1573,15 +1611,32 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
+      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-      "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
+      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -1598,9 +1653,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1612,14 +1667,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-      "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -1639,16 +1696,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-      "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
+      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1"
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1663,14 +1720,14 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-      "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1681,9 +1738,9 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1711,9 +1768,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -2425,19 +2482,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
+      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.30.1",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -2449,9 +2506,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -2486,9 +2543,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -2527,9 +2584,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -2563,15 +2620,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2581,9 +2638,9 @@
       }
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3009,9 +3066,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5547,6 +5604,29 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-eslint": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
+      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.35.1",
+        "@typescript-eslint/parser": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/undici-types": {
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
diff --git a/package.json b/package.json
index eda8698..019b511 100644
--- a/package.json
+++ b/package.json
@@ -46,11 +46,14 @@
     "watch": "tsc -b -w"
   },
   "devDependencies": {
+    "@eslint/js": "^9.30.1",
     "@types/node": "^22.15.21",
     "@typescript-eslint/eslint-plugin": "^8.32.1",
     "@typescript-eslint/parser": "^8.32.1",
-    "eslint": "^9.27.0",
-    "typescript": "^5.8.3"
+    "eslint": "^9.30.1",
+    "globals": "^16.3.0",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.35.1"
   },
   "workspaces": [
     "client",

From 26675b2af5a4d2c3b222fc4e42196eab94160496 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 18:11:36 -0500
Subject: [PATCH 35/42] Add `lint` script

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 019b511..c9b6557 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
   "scripts": {
     "vscode:prepublish": "npm run compile",
     "compile": "tsc -b",
+    "lint": "eslint",
     "watch": "tsc -b -w"
   },
   "devDependencies": {

From 6d678d2ce78bdcbab885b2f4b7d709cf35022b45 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 18:09:09 -0500
Subject: [PATCH 36/42] Add `eslint` configuration

---
 eslint.config.mjs | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 eslint.config.mjs

diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000..0f12bf5
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,13 @@
+import js from "@eslint/js";
+import globals from "globals";
+import tseslint from "typescript-eslint";
+import { defineConfig } from "eslint/config";
+
+
+export default defineConfig([
+  { ignores: ["**/*.{js,mjs,cjs}"] },
+  { files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], plugins: { js }, extends: ["js/recommended"] },
+  { files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
+  { files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], languageOptions: { globals: globals.node } },
+  tseslint.configs.recommended,
+]);

From 98553d3636ee04911da0fc35278f0019c82ee363 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 18:09:19 -0500
Subject: [PATCH 37/42] Re-enable linting

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c7de2d..6fe1faa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Lint
         run: npm run lint
-        if: ${{ false }} # Disable linting for now
+        if: ${{ ! startsWith(matrix.node-version, '16.') }}
 
       - name: Test
         run: npm test

From 9982126f80903eda8627ec0b32182c9506d9abe6 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Sun, 6 Jul 2025 18:25:39 -0500
Subject: [PATCH 38/42] Re-enable testing

---
 .github/workflows/ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6fe1faa..00e9331 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,8 +34,7 @@ jobs:
         if: ${{ ! startsWith(matrix.node-version, '16.') }}
 
       - name: Test
-        run: npm test
-        if: ${{ false }} # Disable testing for now
+        run: npm run --workspace server test
 
   package:
     runs-on: ubuntu-latest

From 1a0279c266ad718f513189b119675d1639f0a9e4 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:17:23 -0500
Subject: [PATCH 39/42] Add file extension `.scrapscript` for VS Code extension

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index c9b6557..27c40c8 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
           "scrapscript"
         ],
         "extensions": [
+          ".scrapscript",
           ".scrap",
           ".ss"
         ],

From 409c0d8cb79baf31141f31c32e8cd366a6271dd2 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:17:44 -0500
Subject: [PATCH 40/42] Update language aliases for VS Code extension

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 27c40c8..1b2595b 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,9 @@
       {
         "id": "scrapscript",
         "aliases": [
-          "Scrapscript",
-          "scrapscript"
+            "ScrapScript",
+            "Scrapscript",
+            "scrapscript"
         ],
         "extensions": [
           ".scrapscript",

From 6d1db5a3cdca1908e5906359bea50b3d4d041604 Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:20:46 -0500
Subject: [PATCH 41/42] Move extension configuration properties into
 `package.json`

---
 language-configuration.json | 18 ------------------
 package.json                | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/language-configuration.json b/language-configuration.json
index 32ff4b3..71dacc3 100644
--- a/language-configuration.json
+++ b/language-configuration.json
@@ -1,5 +1,4 @@
 {
-  "title": "scrapscript",
   "comments": {
     "lineComment": "--"
   },
@@ -23,23 +22,6 @@
   "indentationRules": {
     "increaseIndentPattern": "({[\\s]*|\\([\\s]*)$",
     "decreaseIndentPattern": "^[\\s]*[)}]"
-  },
-  "properties": {
-    "scrapscript.maxNumberOfProblems": {
-      "type": "number",
-      "default": 1000,
-      "description": "Maximum number of problems to report"
-    },
-    "scrapscript.enableEnhancedFeatures": {
-      "type": "boolean",
-      "default": true,
-      "description": "Enable enhanced language features"
-    },
-    "scrapscript.enableTypeChecking": {
-      "type": "boolean",
-      "default": true,
-      "description": "Enable type checking"
-    }
   }
 }
 
diff --git a/package.json b/package.json
index 1b2595b..cd897df 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,27 @@
   "activationEvents": [],
   "main": "./client/out/extension",
   "contributes": {
+    "configuration": {
+      "title": "ScrapScript",
+      "type": "object",
+      "properties": {
+        "scrapScript.maxNumberOfProblems": {
+          "type": "number",
+          "default": 1000,
+          "description": "Maximum number of problems to report"
+        },
+        "scrapScript.enableEnhancedFeatures": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable enhanced language features"
+        },
+        "scrapScript.enableTypeChecking": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable type checking"
+        }
+      }      
+    },
     "languages": [
       {
         "id": "scrapscript",

From 7b30b2218baa046fcc5268cd590f5acdbb1a60ea Mon Sep 17 00:00:00 2001
From: neuroevolutus <19356702+neuroevolutus@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:22:21 -0500
Subject: [PATCH 42/42] Update configuration property name to avoid runtime
 errors

Renamed key `scrapScript` to `scrapScriptServer`.
---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index cd897df..0e2fc62 100644
--- a/package.json
+++ b/package.json
@@ -22,17 +22,17 @@
       "title": "ScrapScript",
       "type": "object",
       "properties": {
-        "scrapScript.maxNumberOfProblems": {
+        "scrapScriptServer.maxNumberOfProblems": {
           "type": "number",
           "default": 1000,
           "description": "Maximum number of problems to report"
         },
-        "scrapScript.enableEnhancedFeatures": {
+        "scrapScriptServer.enableEnhancedFeatures": {
           "type": "boolean",
           "default": true,
           "description": "Enable enhanced language features"
         },
-        "scrapScript.enableTypeChecking": {
+        "scrapScriptServer.enableTypeChecking": {
           "type": "boolean",
           "default": true,
           "description": "Enable type checking"