@razdolbai/merls 1.2.2 → 1.3.1

package/test/completion.test.ts

@@ -1,151 +1,151 @@
-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);
-  }
-}
-
-function positionOf(text: string, needle: string): { line: number; character: number } {
-  const index = text.indexOf(needle);
-  assert.notEqual(index, -1, `expected to find ${needle}`);
-  const prefix = text.slice(0, index);
-  const lines = prefix.split("\n");
-  return {
-    line: lines.length - 1,
-    character: lines.at(-1)?.length ?? 0
-  };
-}
-
-export async function runCompletionTest(): Promise<void> {
-  const serverPath = path.resolve(__dirname, "../src/server.js");
-  const mainPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/valid/merlin32-main-6502.asm"
-  );
-  const mainUri = `file://${mainPath.replace(/\\/g, "/")}`;
-  const text = `${fs.readFileSync(mainPath, "utf8")}\n        ld\n        du\n        bpl 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: mainUri,
-        languageId: "asm",
-        version: 1,
-        text
-      }
-    });
-
-    const opcodeResponse = await sendRequest("textDocument/completion", {
-      textDocument: { uri: mainUri },
-      position: positionOf(text, "        ld")
-    });
-    const opcodeItems = opcodeResponse.result as Array<{ label: string }>;
-    assert.equal(opcodeItems.some((item) => item.label === "lda"), true);
-
-    const directiveResponse = await sendRequest("textDocument/completion", {
-      textDocument: { uri: mainUri },
-      position: positionOf(text, "        du")
-    });
-    const directiveItems = directiveResponse.result as Array<{ label: string }>;
-    assert.equal(directiveItems.some((item) => item.label === "dum"), true);
-
-    const symbolResponse = await sendRequest("textDocument/completion", {
-      textDocument: { uri: mainUri },
-      position: positionOf(text, "        bpl G")
-    });
-    const symbolItems = symbolResponse.result as Array<{ label: string }>;
-    assert.equal(symbolItems.some((item) => item.label === "GetKey"), 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);
+  }
+}
+
+function positionOf(text: string, needle: string): { line: number; character: number } {
+  const index = text.indexOf(needle);
+  assert.notEqual(index, -1, `expected to find ${needle}`);
+  const prefix = text.slice(0, index);
+  const lines = prefix.split("\n");
+  return {
+    line: lines.length - 1,
+    character: lines.at(-1)?.length ?? 0
+  };
+}
+
+export async function runCompletionTest(): Promise<void> {
+  const serverPath = path.resolve(__dirname, "../src/server.js");
+  const mainPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/valid/merlin32-main-6502.S"
+  );
+  const mainUri = `file://${mainPath.replace(/\\/g, "/")}`;
+  const text = `${fs.readFileSync(mainPath, "utf8")}\n        ld\n        du\n        bpl 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: mainUri,
+        languageId: "asm",
+        version: 1,
+        text
+      }
+    });
+
+    const opcodeResponse = await sendRequest("textDocument/completion", {
+      textDocument: { uri: mainUri },
+      position: positionOf(text, "        ld")
+    });
+    const opcodeItems = opcodeResponse.result as Array<{ label: string }>;
+    assert.equal(opcodeItems.some((item) => item.label === "lda"), true);
+
+    const directiveResponse = await sendRequest("textDocument/completion", {
+      textDocument: { uri: mainUri },
+      position: positionOf(text, "        du")
+    });
+    const directiveItems = directiveResponse.result as Array<{ label: string }>;
+    assert.equal(directiveItems.some((item) => item.label === "dum"), true);
+
+    const symbolResponse = await sendRequest("textDocument/completion", {
+      textDocument: { uri: mainUri },
+      position: positionOf(text, "        bpl G")
+    });
+    const symbolItems = symbolResponse.result as Array<{ label: string }>;
+    assert.equal(symbolItems.some((item) => item.label === "GetKey"), true);
+  } finally {
+    child.kill();
+  }
+}

package/test/definition-references.test.ts

@@ -1,152 +1,152 @@
-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);
-  }
-}
-
-function positionOf(text: string, needle: string): { line: number; character: number } {
-  const index = text.indexOf(needle);
-  assert.notEqual(index, -1, `expected to find ${needle}`);
-  const prefix = text.slice(0, index);
-  const lines = prefix.split("\n");
-  return {
-    line: lines.length - 1,
-    character: lines.at(-1)?.length ?? 0
-  };
-}
-
-export async function runDefinitionReferencesTest(): Promise<void> {
-  const serverPath = path.resolve(__dirname, "../src/server.js");
-  const mainPath = path.resolve(
-    process.cwd(),
-    "test/fixtures/valid/merlin32-main-6502.asm"
-  );
-  const mainUri = `file://${mainPath.replace(/\\/g, "/")}`;
-  const text = fs.readFileSync(mainPath, "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 {
-    await sendRequest("initialize", {
-      capabilities: {},
-      processId: process.pid,
-      rootUri: `file://${path.resolve(process.cwd()).replace(/\\/g, "/")}`
-    });
-
-    sendNotification("initialized", {});
-    sendNotification("textDocument/didOpen", {
-      textDocument: {
-        uri: mainUri,
-        languageId: "asm",
-        version: 1,
-        text
-      }
-    });
-
-    const definitionResponse = await sendRequest("textDocument/definition", {
-      textDocument: { uri: mainUri },
-      position: positionOf(text, "bpl GetKey")
-    });
-
-    const definition = definitionResponse.result as { uri: string; range: { start: { line: number } } };
-    assert.equal(definition.uri, mainUri);
-    assert.equal(definition.range.start.line, 69);
-
-    const referencesResponse = await sendRequest("textDocument/references", {
-      textDocument: { uri: mainUri },
-      position: positionOf(text, "GetKey  ldx"),
-      context: {
-        includeDeclaration: true
-      }
-    });
-
-    const references = referencesResponse.result as Array<{ uri: string; range: { start: { line: number } } }>;
-    assert.equal(Array.isArray(references), true);
-    assert.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 69), true);
-    assert.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 70), 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);
+  }
+}
+
+function positionOf(text: string, needle: string): { line: number; character: number } {
+  const index = text.indexOf(needle);
+  assert.notEqual(index, -1, `expected to find ${needle}`);
+  const prefix = text.slice(0, index);
+  const lines = prefix.split("\n");
+  return {
+    line: lines.length - 1,
+    character: lines.at(-1)?.length ?? 0
+  };
+}
+
+export async function runDefinitionReferencesTest(): Promise<void> {
+  const serverPath = path.resolve(__dirname, "../src/server.js");
+  const mainPath = path.resolve(
+    process.cwd(),
+    "test/fixtures/valid/merlin32-main-6502.S"
+  );
+  const mainUri = `file://${mainPath.replace(/\\/g, "/")}`;
+  const text = fs.readFileSync(mainPath, "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 {
+    await sendRequest("initialize", {
+      capabilities: {},
+      processId: process.pid,
+      rootUri: `file://${path.resolve(process.cwd()).replace(/\\/g, "/")}`
+    });
+
+    sendNotification("initialized", {});
+    sendNotification("textDocument/didOpen", {
+      textDocument: {
+        uri: mainUri,
+        languageId: "asm",
+        version: 1,
+        text
+      }
+    });
+
+    const definitionResponse = await sendRequest("textDocument/definition", {
+      textDocument: { uri: mainUri },
+      position: positionOf(text, "bpl GetKey")
+    });
+
+    const definition = definitionResponse.result as { uri: string; range: { start: { line: number } } };
+    assert.equal(definition.uri, mainUri);
+    assert.equal(definition.range.start.line, 70);
+
+    const referencesResponse = await sendRequest("textDocument/references", {
+      textDocument: { uri: mainUri },
+      position: positionOf(text, "GetKey  ldx"),
+      context: {
+        includeDeclaration: true
+      }
+    });
+
+    const references = referencesResponse.result as Array<{ uri: string; range: { start: { line: number } } }>;
+    assert.equal(Array.isArray(references), true);
+    assert.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 70), true);
+    assert.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 71), true);
+  } finally {
+    child.kill();
+  }
+}