No longer passes stdout as content of document

lfortran · Nov 20, 2024 · 3a86f33 · 3a86f33
1 parent 982ca92
commit 3a86f33
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/server/test/spec/lfortran-accessors.spec.ts b/server/test/spec/lfortran-accessors.spec.ts
@@ -34,23 +34,23 @@ 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);
     });
 
     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);
     });
 
     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,23 +114,23 @@ 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);
     });
 
     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);
     });
 
     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,23 +186,23 @@ 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);
     });
 
     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);
     });
 
     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
@@ -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: "<error: please stub with sinon>",
   }
 };
diff --git 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;