@razdolbai/merls 1.2.2 → 1.3.1

package/test/diagnostics.test.ts

@@ -1,129 +1,129 @@
-import assert from "node:assert/strict";
-import fs from "node:fs";
-import path from "node:path";
-
-import { parseDocument } from "../src/asm/document";
-import {
-  collectWorkspaceDiagnostics,
-  type Diagnostic
-} from "../src/asm/diagnostics";
-
-export function runDiagnosticsTest(): void {
-  const duplicateSource = [
-    "dup     equ 1",
-    "        lda missing",
-    "dup     equ 2",
-    "        adc (",
-    "        dsk ../build/WORLD",
-    "        typ BIN",
-    "        typ BLAH",
-    "        end BLAH"
-  ].join("\n");
-
-  const bankOpsPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/invalid/65816-bank-ops.asm"
-  );
-  const longPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/invalid/65816-long-addressing.asm"
-  );
-
-  const diagnostics = collectWorkspaceDiagnostics([
-    {
-      filePath: "<memory>",
-      document: parseDocument(duplicateSource)
-    },
-    {
-      filePath: bankOpsPath,
-      document: parseDocument(fs.readFileSync(bankOpsPath, "utf8"))
-    },
-    {
-      filePath: longPath,
-      document: parseDocument(fs.readFileSync(longPath, "utf8"))
-    }
-  ]);
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === "<memory>" &&
-        diagnostic.code === "duplicate-symbol" &&
-        diagnostic.line === 2
-    ),
-    true
-  );
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === "<memory>" &&
-        diagnostic.code === "unresolved-reference" &&
-        diagnostic.line === 1 &&
-        diagnostic.message.includes("missing")
-    ),
-    true
-  );
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === "<memory>" &&
-        diagnostic.code === "unresolved-reference" &&
-        (diagnostic.line === 4 || diagnostic.line === 5)
-    ),
-    false
-  );
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === "<memory>" &&
-        diagnostic.code === "unresolved-reference" &&
-        diagnostic.line === 6 &&
-        diagnostic.message.includes("BLAH")
-    ),
-    true
-  );
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === "<memory>" &&
-        diagnostic.code === "malformed-line" &&
-        diagnostic.line === 3
-    ),
-    true
-  );
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === "<memory>" &&
-        diagnostic.code === "malformed-line" &&
-        diagnostic.line === 7 &&
-        diagnostic.message === "unexpected operand for end"
-    ),
-    true
-  );
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === bankOpsPath &&
-        diagnostic.code === "unsupported-65816" &&
-        diagnostic.message.includes("mvn")
-    ),
-    true
-  );
-
-  assert.equal(
-    diagnostics.some(
-      (diagnostic: Diagnostic) =>
-        diagnostic.filePath === longPath &&
-        diagnostic.code === "unsupported-65816" &&
-        diagnostic.message.includes("^")
-    ),
-    true
-  );
-}
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import path from "node:path";
+
+import { parseDocument } from "../src/asm/document";
+import {
+  collectWorkspaceDiagnostics,
+  type Diagnostic
+} from "../src/asm/diagnostics";
+
+export function runDiagnosticsTest(): void {
+  const duplicateSource = [
+    "dup     equ 1",
+    "        lda missing",
+    "dup     equ 2",
+    "        adc (",
+    "        dsk ../build/WORLD",
+    "        typ BIN",
+    "        typ BLAH",
+    "        end BLAH"
+  ].join("\n");
+
+  const bankOpsPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/invalid/65816-bank-ops.S"
+  );
+  const longPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/invalid/65816-long-addressing.S"
+  );
+
+  const diagnostics = collectWorkspaceDiagnostics([
+    {
+      filePath: "<memory>",
+      document: parseDocument(duplicateSource)
+    },
+    {
+      filePath: bankOpsPath,
+      document: parseDocument(fs.readFileSync(bankOpsPath, "utf8"))
+    },
+    {
+      filePath: longPath,
+      document: parseDocument(fs.readFileSync(longPath, "utf8"))
+    }
+  ]);
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === "<memory>" &&
+        diagnostic.code === "duplicate-symbol" &&
+        diagnostic.line === 2
+    ),
+    true
+  );
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === "<memory>" &&
+        diagnostic.code === "unresolved-reference" &&
+        diagnostic.line === 1 &&
+        diagnostic.message.includes("missing")
+    ),
+    true
+  );
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === "<memory>" &&
+        diagnostic.code === "unresolved-reference" &&
+        (diagnostic.line === 4 || diagnostic.line === 5)
+    ),
+    false
+  );
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === "<memory>" &&
+        diagnostic.code === "unresolved-reference" &&
+        diagnostic.line === 6 &&
+        diagnostic.message.includes("BLAH")
+    ),
+    true
+  );
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === "<memory>" &&
+        diagnostic.code === "malformed-line" &&
+        diagnostic.line === 3
+    ),
+    true
+  );
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === "<memory>" &&
+        diagnostic.code === "malformed-line" &&
+        diagnostic.line === 7 &&
+        diagnostic.message === "unexpected operand for end"
+    ),
+    true
+  );
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === bankOpsPath &&
+        diagnostic.code === "unsupported-65816" &&
+        diagnostic.message.includes("mvn")
+    ),
+    true
+  );
+
+  assert.equal(
+    diagnostics.some(
+      (diagnostic: Diagnostic) =>
+        diagnostic.filePath === longPath &&
+        diagnostic.code === "unsupported-65816" &&
+        diagnostic.message.includes("^")
+    ),
+    true
+  );
+}

package/test/document-symbol.test.ts

@@ -1,131 +1,131 @@
-import assert from "node:assert/strict";
-import fs from "node:fs";
-import path from "node:path";
-import { spawn } from "node:child_process";
-
-type JsonRpcMessage = {
-  id?: number;
-  jsonrpc: "2.0";
-  method?: string;
-  result?: unknown;
-};
-
-function encodeMessage(message: object): string {
-  const body = JSON.stringify(message);
-  return `Content-Length: ${Buffer.byteLength(body, "utf8")}\r\n\r\n${body}`;
-}
-
-function decodeMessages(streamBuffer: string): { messages: JsonRpcMessage[]; rest: string } {
-  const messages: JsonRpcMessage[] = [];
-  let buffer = streamBuffer;
-
-  for (;;) {
-    const separator = buffer.indexOf("\r\n\r\n");
-    if (separator === -1) {
-      return { messages, rest: buffer };
-    }
-
-    const header = buffer.slice(0, separator);
-    const match = /Content-Length: (\d+)/i.exec(header);
-    if (!match) {
-      throw new Error(`Missing Content-Length header: ${header}`);
-    }
-
-    const length = Number(match[1]);
-    const body = buffer.slice(separator + 4);
-    if (Buffer.byteLength(body, "utf8") < length) {
-      return { messages, rest: buffer };
-    }
-
-    messages.push(JSON.parse(body.slice(0, length)) as JsonRpcMessage);
-    buffer = body.slice(length);
-  }
-}
-
-export async function runDocumentSymbolTest(): Promise<void> {
-  const serverPath = path.resolve(__dirname, "../src/server.js");
-  const fixturePath = path.resolve(
-    process.cwd(),
-    "test/fixtures/valid/merlin32-main-6502.asm"
-  );
-  const uri = `file://${fixturePath.replace(/\\/g, "/")}`;
-  const text = fs.readFileSync(fixturePath, "utf8");
-  const child = spawn(process.execPath, [serverPath], {
-    stdio: ["pipe", "pipe", "pipe"]
-  });
-
-  let stdout = "";
-  let nextId = 1;
-  const pending = new Map<number, (message: JsonRpcMessage) => void>();
-
-  child.stdout.setEncoding("utf8");
-  child.stdout.on("data", (chunk: string) => {
-    stdout += chunk;
-    const decoded = decodeMessages(stdout);
-    stdout = decoded.rest;
-
-    for (const message of decoded.messages) {
-      if (message.id !== undefined) {
-        pending.get(message.id)?.(message);
-        pending.delete(message.id);
-      }
-    }
-  });
-
-  function sendRequest(method: string, params: object): Promise<JsonRpcMessage> {
-    const id = nextId++;
-    child.stdin.write(
-      encodeMessage({
-        id,
-        jsonrpc: "2.0",
-        method,
-        params
-      })
-    );
-
-    return new Promise((resolve) => {
-      pending.set(id, resolve);
-    });
-  }
-
-  function sendNotification(method: string, params: object): void {
-    child.stdin.write(
-      encodeMessage({
-        jsonrpc: "2.0",
-        method,
-        params
-      })
-    );
-  }
-
-  try {
-    const initialize = await sendRequest("initialize", {
-      capabilities: {},
-      processId: process.pid,
-      rootUri: null
-    });
-    assert.equal(initialize.id, 1);
-
-    sendNotification("initialized", {});
-    sendNotification("textDocument/didOpen", {
-      textDocument: {
-        uri,
-        languageId: "asm",
-        version: 1,
-        text
-      }
-    });
-
-    const response = await sendRequest("textDocument/documentSymbol", {
-      textDocument: { uri }
-    });
-
-    const symbols = response.result as Array<{ name: string; kind: number }>;
-    assert.equal(Array.isArray(symbols), true);
-    assert.equal(symbols.some((symbol) => symbol.name === "TEXT" && symbol.kind === 13), true);
-    assert.equal(symbols.some((symbol) => symbol.name === "TEST_START" && symbol.kind === 6), true);
-    assert.equal(symbols.some((symbol) => symbol.name === "dum0" && symbol.kind === 8), true);
-  } finally {
-    child.kill();
-  }
-}
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import path from "node:path";
+import { spawn } from "node:child_process";
+
+type JsonRpcMessage = {
+  id?: number;
+  jsonrpc: "2.0";
+  method?: string;
+  result?: unknown;
+};
+
+function encodeMessage(message: object): string {
+  const body = JSON.stringify(message);
+  return `Content-Length: ${Buffer.byteLength(body, "utf8")}\r\n\r\n${body}`;
+}
+
+function decodeMessages(streamBuffer: string): { messages: JsonRpcMessage[]; rest: string } {
+  const messages: JsonRpcMessage[] = [];
+  let buffer = streamBuffer;
+
+  for (;;) {
+    const separator = buffer.indexOf("\r\n\r\n");
+    if (separator === -1) {
+      return { messages, rest: buffer };
+    }
+
+    const header = buffer.slice(0, separator);
+    const match = /Content-Length: (\d+)/i.exec(header);
+    if (!match) {
+      throw new Error(`Missing Content-Length header: ${header}`);
+    }
+
+    const length = Number(match[1]);
+    const body = buffer.slice(separator + 4);
+    if (Buffer.byteLength(body, "utf8") < length) {
+      return { messages, rest: buffer };
+    }
+
+    messages.push(JSON.parse(body.slice(0, length)) as JsonRpcMessage);
+    buffer = body.slice(length);
+  }
+}
+
+export async function runDocumentSymbolTest(): Promise<void> {
+  const serverPath = path.resolve(__dirname, "../src/server.js");
+  const fixturePath = path.resolve(
+    process.cwd(),
+    "test/fixtures/valid/merlin32-main-6502.S"
+  );
+  const uri = `file://${fixturePath.replace(/\\/g, "/")}`;
+  const text = fs.readFileSync(fixturePath, "utf8");
+  const child = spawn(process.execPath, [serverPath], {
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+
+  let stdout = "";
+  let nextId = 1;
+  const pending = new Map<number, (message: JsonRpcMessage) => void>();
+
+  child.stdout.setEncoding("utf8");
+  child.stdout.on("data", (chunk: string) => {
+    stdout += chunk;
+    const decoded = decodeMessages(stdout);
+    stdout = decoded.rest;
+
+    for (const message of decoded.messages) {
+      if (message.id !== undefined) {
+        pending.get(message.id)?.(message);
+        pending.delete(message.id);
+      }
+    }
+  });
+
+  function sendRequest(method: string, params: object): Promise<JsonRpcMessage> {
+    const id = nextId++;
+    child.stdin.write(
+      encodeMessage({
+        id,
+        jsonrpc: "2.0",
+        method,
+        params
+      })
+    );
+
+    return new Promise((resolve) => {
+      pending.set(id, resolve);
+    });
+  }
+
+  function sendNotification(method: string, params: object): void {
+    child.stdin.write(
+      encodeMessage({
+        jsonrpc: "2.0",
+        method,
+        params
+      })
+    );
+  }
+
+  try {
+    const initialize = await sendRequest("initialize", {
+      capabilities: {},
+      processId: process.pid,
+      rootUri: null
+    });
+    assert.equal(initialize.id, 1);
+
+    sendNotification("initialized", {});
+    sendNotification("textDocument/didOpen", {
+      textDocument: {
+        uri,
+        languageId: "asm",
+        version: 1,
+        text
+      }
+    });
+
+    const response = await sendRequest("textDocument/documentSymbol", {
+      textDocument: { uri }
+    });
+
+    const symbols = response.result as Array<{ name: string; kind: number }>;
+    assert.equal(Array.isArray(symbols), true);
+    assert.equal(symbols.some((symbol) => symbol.name === "TEXT" && symbol.kind === 13), true);
+    assert.equal(symbols.some((symbol) => symbol.name === "TEST_START" && symbol.kind === 6), true);
+    assert.equal(symbols.some((symbol) => symbol.name === "dum0" && symbol.kind === 8), true);
+  } finally {
+    child.kill();
+  }
+}

package/test/fixture-corpus.test.ts

@@ -1,33 +1,33 @@
-import assert from "node:assert/strict";
-import fs from "node:fs";
-import path from "node:path";
-
-const validFixturePaths = [
-  "test/fixtures/valid/merlin32-linkscript.asm",
-  "test/fixtures/valid/merlin32-main-6502.asm"
-];
-
-const invalidFixturePaths = [
-  "test/fixtures/invalid/65816-bank-ops.asm",
-  "test/fixtures/invalid/65816-long-addressing.asm"
-];
-
-export function runFixtureCorpusTest(): void {
-  for (const fixturePath of validFixturePaths) {
-    const absolutePath = path.resolve(process.cwd(), fixturePath);
-    assert.equal(fs.existsSync(absolutePath), true, `${fixturePath} should exist`);
-
-    const content = fs.readFileSync(absolutePath, "utf8");
-    assert.match(content, /Source: apple2accumulator\/merlin32/);
-    assert.ok(content.trim().length > 0, `${fixturePath} should not be empty`);
-  }
-
-  for (const fixturePath of invalidFixturePaths) {
-    const absolutePath = path.resolve(process.cwd(), fixturePath);
-    assert.equal(fs.existsSync(absolutePath), true, `${fixturePath} should exist`);
-
-    const content = fs.readFileSync(absolutePath, "utf8");
-    assert.match(content, /Source: apple2accumulator\/merlin32/);
-    assert.match(content, /65816-only/);
-  }
-}
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import path from "node:path";
+
+const validFixturePaths = [
+  "test/fixtures/valid/merlin32-linkscript.S",
+  "test/fixtures/valid/merlin32-main-6502.S"
+];
+
+const invalidFixturePaths = [
+  "test/fixtures/invalid/65816-bank-ops.S",
+  "test/fixtures/invalid/65816-long-addressing.S"
+];
+
+export function runFixtureCorpusTest(): void {
+  for (const fixturePath of validFixturePaths) {
+    const absolutePath = path.resolve(process.cwd(), fixturePath);
+    assert.equal(fs.existsSync(absolutePath), true, `${fixturePath} should exist`);
+
+    const content = fs.readFileSync(absolutePath, "utf8");
+    assert.match(content, /Source: apple2accumulator\/merlin32/);
+    assert.ok(content.trim().length > 0, `${fixturePath} should not be empty`);
+  }
+
+  for (const fixturePath of invalidFixturePaths) {
+    const absolutePath = path.resolve(process.cwd(), fixturePath);
+    assert.equal(fs.existsSync(absolutePath), true, `${fixturePath} should exist`);
+
+    const content = fs.readFileSync(absolutePath, "utf8");
+    assert.match(content, /Source: apple2accumulator\/merlin32/);
+    assert.match(content, /65816-only/);
+  }
+}

package/test/fixtures/valid/{merlin32-linkscript.asm → merlin32-linkscript.S}

@@ -1,16 +1,16 @@
-; Source: apple2accumulator/merlin32
-; Upstream file: Test/linkscript.s
-; Transcribed for a 6502-only positive fixture corpus.
-
-*  linkscript.s
-*  Merlin32 Test
-*
-*  Created by Lane Roathe on 8/21/19.
-
-    typ $06
-
-    dsk Merlin32Test
-    org $800
-
-    asm "merlin32-main-6502.asm"
-    sna main
+; Source: apple2accumulator/merlin32
+; Upstream file: Test/linkscript.s
+; Transcribed for a 6502-only positive fixture corpus.
+
+*  linkscript.s
+*  Merlin32 Test
+*
+*  Created by Lane Roathe on 8/21/19.
+
+    typ $06
+
+    dsk Merlin32Test
+    org $800
+
+    asm "merlin32-main-6502.S"
+    sna main

package/test/fixtures/valid/{merlin32-main-6502.asm → merlin32-main-6502.S}

@@ -13,6 +13,7 @@ TEXT    =   $FB39
 CROUT   =   $FD8E
 DOSWARM =   $3D0
 TSTADDR =   $1000
+MY_VAL  EQU $42
 
         DUM 0
 dum0    ds  1