@razdolbai/merls 1.2.2 → 1.3.1

package/test/workspace-symbol.test.ts

@@ -1,139 +1,139 @@
-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";
-  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 runWorkspaceSymbolTest(): Promise<void> {
-  const serverPath = path.resolve(__dirname, "../src/server.js");
-  const linkPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/valid/merlin32-linkscript.asm"
-  );
-  const mainPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/valid/merlin32-main-6502.asm"
-  );
-  const linkUri = `file://${linkPath.replace(/\\/g, "/")}`;
-  const mainUri = `file://${mainPath.replace(/\\/g, "/")}`;
-  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 {
-    await sendRequest("initialize", {
-      capabilities: {},
-      processId: process.pid,
-      rootUri: `file://${path.resolve(process.cwd()).replace(/\\/g, "/")}`
-    });
-
-    sendNotification("initialized", {});
-    sendNotification("textDocument/didOpen", {
-      textDocument: {
-        uri: linkUri,
-        languageId: "asm",
-        version: 1,
-        text: fs.readFileSync(linkPath, "utf8")
-      }
-    });
-    sendNotification("textDocument/didOpen", {
-      textDocument: {
-        uri: mainUri,
-        languageId: "asm",
-        version: 1,
-        text: fs.readFileSync(mainPath, "utf8")
-      }
-    });
-
-    const response = await sendRequest("workspace/symbol", {
-      query: "Get"
-    });
-
-    const symbols = response.result as Array<{ name: string; location: { uri: string } }>;
-    assert.equal(Array.isArray(symbols), true);
-    assert.equal(symbols.some((symbol) => symbol.name === "GetKey" && symbol.location.uri === mainUri), 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";
+  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 runWorkspaceSymbolTest(): Promise<void> {
+  const serverPath = path.resolve(__dirname, "../src/server.js");
+  const linkPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/valid/merlin32-linkscript.S"
+  );
+  const mainPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/valid/merlin32-main-6502.S"
+  );
+  const linkUri = `file://${linkPath.replace(/\\/g, "/")}`;
+  const mainUri = `file://${mainPath.replace(/\\/g, "/")}`;
+  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 {
+    await sendRequest("initialize", {
+      capabilities: {},
+      processId: process.pid,
+      rootUri: `file://${path.resolve(process.cwd()).replace(/\\/g, "/")}`
+    });
+
+    sendNotification("initialized", {});
+    sendNotification("textDocument/didOpen", {
+      textDocument: {
+        uri: linkUri,
+        languageId: "asm",
+        version: 1,
+        text: fs.readFileSync(linkPath, "utf8")
+      }
+    });
+    sendNotification("textDocument/didOpen", {
+      textDocument: {
+        uri: mainUri,
+        languageId: "asm",
+        version: 1,
+        text: fs.readFileSync(mainPath, "utf8")
+      }
+    });
+
+    const response = await sendRequest("workspace/symbol", {
+      query: "Get"
+    });
+
+    const symbols = response.result as Array<{ name: string; location: { uri: string } }>;
+    assert.equal(Array.isArray(symbols), true);
+    assert.equal(symbols.some((symbol) => symbol.name === "GetKey" && symbol.location.uri === mainUri), true);
+  } finally {
+    child.kill();
+  }
+}

package/test/workspace.test.ts

@@ -1,29 +1,29 @@
-import assert from "node:assert/strict";
-import path from "node:path";
-
-import { indexWorkspace } from "../src/asm/workspace";
-
-export function runWorkspaceGraphTest(): void {
-  const entryPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/valid/merlin32-linkscript.asm"
-  );
-  const mainPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/valid/merlin32-main-6502.asm"
-  );
-
-  const workspace = indexWorkspace(entryPath);
-
-  assert.deepEqual(workspace.loadOrder, [entryPath, mainPath]);
-  assert.deepEqual(workspace.dependencies.get(entryPath), [mainPath]);
-  assert.equal(workspace.documents.has(entryPath), true);
-  assert.equal(workspace.documents.has(mainPath), true);
-
-  assert.deepEqual(workspace.symbols.get("TEXT"), {
-    name: "TEXT",
-    kind: "equate",
-    line: 11,
-    filePath: mainPath
-  });
-}
+import assert from "node:assert/strict";
+import path from "node:path";
+
+import { indexWorkspace } from "../src/asm/workspace";
+
+export function runWorkspaceGraphTest(): void {
+  const entryPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/valid/merlin32-linkscript.S"
+  );
+  const mainPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/valid/merlin32-main-6502.S"
+  );
+
+  const workspace = indexWorkspace(entryPath);
+
+  assert.deepEqual(workspace.loadOrder, [entryPath, mainPath]);
+  assert.deepEqual(workspace.dependencies.get(entryPath), [mainPath]);
+  assert.equal(workspace.documents.has(entryPath), true);
+  assert.equal(workspace.documents.has(mainPath), true);
+
+  assert.deepEqual(workspace.symbols.get("TEXT"), {
+    name: "TEXT",
+    kind: "equate",
+    line: 11,
+    filePath: mainPath
+  });
+}