From 3a86f33db98493d3b58c50c2ceedf71c9f2c9af4 Mon Sep 17 00:00:00 2001 From: Dylon Edwards Date: Wed, 20 Nov 2024 16:50:33 -0500 Subject: [PATCH] No longer passes stdout as content of document --- server/test/spec/lfortran-accessors.spec.ts | 24 +++++++++---------- server/test/spec/lfortran-common.ts | 8 ------- .../spec/lfortran-language-server.spec.ts | 6 ++--- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/server/test/spec/lfortran-accessors.spec.ts b/server/test/spec/lfortran-accessors.spec.ts index c5c2f8f..a9f1a12 100644 --- a/server/test/spec/lfortran-accessors.spec.ts +++ b/server/test/spec/lfortran-accessors.spec.ts @@ -34,7 +34,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns an empty list", async () => { let stdout = '[]'; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.showDocumentSymbols(uri, stdout, settings); + let response = await lfortran.showDocumentSymbols(uri, "", settings); assert.isArray(response); assert.isEmpty(response); }); @@ -42,7 +42,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns nothing", async () => { let stdout = ""; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.showDocumentSymbols(uri, stdout, settings); + let response = await lfortran.showDocumentSymbols(uri, "", settings); assert.isArray(response); assert.isEmpty(response); }); @@ -50,7 +50,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns an error", async () => { let stdout = "error"; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.showDocumentSymbols(uri, stdout, settings); + let response = await lfortran.showDocumentSymbols(uri, "", settings); assert.isArray(response); assert.isEmpty(response); }); @@ -102,7 +102,7 @@ describe("LFortranCLIAccessor", () => { range.start.character--; range.end.character--; } - let actual = await lfortran.showDocumentSymbols(uri, stdout, settings); + let actual = await lfortran.showDocumentSymbols(uri, "", settings); assert.deepEqual(actual, expected); }); }); @@ -114,7 +114,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns an empty list", async () => { let stdout = "[]"; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.lookupName(uri, stdout, line, column, settings); + let response = await lfortran.lookupName(uri, "", line, column, settings); assert.isArray(response); assert.isEmpty(response); }); @@ -122,7 +122,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns nothing", async () => { let stdout = ""; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.lookupName(uri, stdout, line, column, settings); + let response = await lfortran.lookupName(uri, "", line, column, settings); assert.isArray(response); assert.isEmpty(response); }); @@ -130,7 +130,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns an error", async () => { let stdout = "error"; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.lookupName(uri, stdout, line, column, settings); + let response = await lfortran.lookupName(uri, "", line, column, settings); assert.isArray(response); assert.isEmpty(response); }); @@ -177,7 +177,7 @@ describe("LFortranCLIAccessor", () => { range.start.character--; range.end.character--; - let actual = await lfortran.lookupName(uri, stdout, line, column, settings); + let actual = await lfortran.lookupName(uri, "", line, column, settings); assert.deepEqual(actual, expected); }); }); @@ -186,7 +186,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns an empty list", async () => { let stdout = "[]"; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.showErrors(uri, stdout, settings); + let response = await lfortran.showErrors(uri, "", settings); assert.isArray(response); assert.isEmpty(response); }); @@ -194,7 +194,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns nothing", async () => { let stdout = ""; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.showErrors(uri, stdout, settings); + let response = await lfortran.showErrors(uri, "", settings); assert.isArray(response); assert.isEmpty(response); }); @@ -202,7 +202,7 @@ describe("LFortranCLIAccessor", () => { it("returns an empty list when lfortran returns an error", async () => { let stdout = "error"; sinon.stub(lfortran, "runCompiler").resolves(stdout); - let response = await lfortran.showErrors(uri, stdout, settings); + let response = await lfortran.showErrors(uri, "", settings); assert.isArray(response); assert.isEmpty(response); }); @@ -247,7 +247,7 @@ describe("LFortranCLIAccessor", () => { }); sinon.stub(lfortran, "runCompiler").resolves(stdout); - let actual = await lfortran.showErrors(uri, stdout, settings); + let actual = await lfortran.showErrors(uri, "", settings); assert.deepEqual(actual, expected); }); }); diff --git a/server/test/spec/lfortran-common.ts b/server/test/spec/lfortran-common.ts index 4b363fa..87e4fc5 100644 --- a/server/test/spec/lfortran-common.ts +++ b/server/test/spec/lfortran-common.ts @@ -1,16 +1,8 @@ -import path from "path"; -import * as os from "os"; - import { ExampleSettings } from "../../src/lfortran-types"; -const scriptName: string = ((os.platform() === "win32") - ? "lfortran.ps1" - : "lfortran.sh"); - export const settings: ExampleSettings = { maxNumberOfProblems: 100, compiler: { - // lfortranPath: path.join(__dirname, "..", "bin", scriptName) lfortranPath: "", } }; diff --git a/server/test/spec/lfortran-language-server.spec.ts b/server/test/spec/lfortran-language-server.spec.ts index fb33a4c..ade2e6b 100644 --- a/server/test/spec/lfortran-language-server.spec.ts +++ b/server/test/spec/lfortran-language-server.spec.ts @@ -144,8 +144,8 @@ describe("LFortranLanguageServer", () => { ]; let stdout = JSON.stringify(response); - document.getText.returns(stdout); sinon.stub(lfortran, "runCompiler").resolves(stdout); + document.getText.returns(""); let expected = response; for (let symbol of expected) { @@ -212,8 +212,8 @@ describe("LFortranLanguageServer", () => { } ]); - document.getText.returns(stdout); sinon.stub(lfortran, "runCompiler").resolves(stdout); + document.getText.returns(""); range.start.character--; range.end.character--; @@ -314,8 +314,8 @@ describe("LFortranLanguageServer", () => { let stdout = JSON.stringify({ diagnostics: diagnostics }); - document.getText.returns(stdout); sinon.stub(lfortran, "runCompiler").resolves(stdout); + document.getText.returns(""); await server.validateTextDocument(document); let sendDiagnostics = connection.sendDiagnostics;