Merge branch 'feat/sas-server-2' of github.com-ghp:sassoftware/vscode-sas-extension into feat/sas-server-2

Author: Scott Dover

.github/workflows/package.yml

@@ -1,4 +1,4 @@
-name: Package VSIX
+name: Package and Publish VSIX
 
 on:
   workflow_dispatch:
@@ -21,3 +21,21 @@ jobs:
         with:
           path: ./*.vsix
           retention-days: 5
+
+      - uses: johnnybenson/[email protected]
+        id: package-json
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: echo "vsixPath=sas-lsp-${{ steps.package-json.outputs.version }}.vsix" >> "$GITHUB_OUTPUT"
+        id: vsixPath
+        if: steps.package-json.outputs.has-updated == 'true'
+      - run: npx @vscode/vsce publish -i ${{ steps.vsixPath.outputs.vsixPath }}
+        if: steps.package-json.outputs.has-updated == 'true'
+        env:
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
+      - run: npx ovsx publish ${{ steps.vsixPath.outputs.vsixPath }} -p ${{ secrets.OVSX_PAT }}
+        if: steps.package-json.outputs.has-updated == 'true'
+      - run: |
+          git tag -f v${{ steps.package-json.outputs.version }}
+          git push -f origin v${{ steps.package-json.outputs.version }}
+        if: steps.package-json.outputs.has-updated == 'true'

client/package-lock.json

@@ -9,9 +9,9 @@
     "vscode": "^1.82.0"
   },
   "dependencies": {
-    "ag-grid-community": "^32.1.0",
-    "ag-grid-react": "^32.1.0",
-    "axios": "^1.7.5",
+    "ag-grid-community": "^32.2.0",
+    "ag-grid-react": "^32.2.0",
+    "axios": "^1.7.7",
     "media-typer": "^1.1.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

client/package.json

@@ -12,10 +12,13 @@ import {
 } from "vscode";
 import type { BaseLanguageClient } from "vscode-languageclient";
 
+import { basename, extname } from "path";
+
 import { showResult } from "../components/ResultPanel";
 import {
   appendExecutionLogFn,
   appendSessionLogFn,
+  setFileName,
 } from "../components/logViewer";
 import { sasDiagnostic } from "../components/logViewer/sasDiagnostics";
 import { SASCodeDocument } from "../components/utils/SASCodeDocument";
@@ -112,6 +115,12 @@ async function runCode(selected?: boolean, uri?: Uri) {
   session.onExecutionLogFn = onExecutionLogFn;
   session.onSessionLogFn = appendSessionLogFn;
 
+  const fileName = basename(
+    codeDoc.getFileName(),
+    extname(codeDoc.getFileName()),
+  );
+  setFileName(fileName);
+
   await session.setup();
 
   await window.withProgress(
@@ -222,6 +231,12 @@ async function _runTask(
   );
   session.onSessionLogFn = appendSessionLogFn;
 
+  const fileName = basename(
+    codeDoc.getFileName(),
+    extname(codeDoc.getFileName()),
+  );
+  setFileName(fileName);
+
   messageEmitter.fire(`${l10n.t("Connecting to SAS session...")}\r\n`);
   !cancelled && (await session.setup(true));
 

client/src/commands/run.ts

@@ -12,6 +12,7 @@ import type { OnLogFn } from "../../connection";
 import { useLogStore, useRunStore } from "../../store";
 import { logSelectors, runSelectors } from "../../store/selectors";
 import {
+  clearLogOnExecutionStart,
   showLogOnExecutionFinish,
   showLogOnExecutionStart,
 } from "../utils/settings";
@@ -20,6 +21,7 @@ const { setProducedExecutionLogOutput } = useLogStore.getState();
 
 let outputChannel: OutputChannel;
 let data: string[] = [];
+let fileName = "";
 
 export const legend = {
   tokenTypes: ["error", "warning", "note"],
@@ -66,9 +68,16 @@ export const appendLogToken = (type: string): void => {
   data.push(type);
 };
 
+export const setFileName = (name: string) => {
+  fileName = name;
+};
+
 const appendLogLines: OnLogFn = (logs) => {
   if (!outputChannel) {
-    outputChannel = window.createOutputChannel(l10n.t("SAS Log"), "sas-log");
+    const name = clearLogOnExecutionStart()
+      ? l10n.t("SAS Log: {name}", { name: fileName })
+      : l10n.t("SAS Log");
+    outputChannel = window.createOutputChannel(name, "sas-log");
   }
   for (const line of logs) {
     appendLogToken(line.type);
@@ -100,6 +109,12 @@ useRunStore.subscribe(
       }
     } else if (isExecuting && !prevIsExecuting) {
       setProducedExecutionLogOutput(false);
+
+      if (clearLogOnExecutionStart() && outputChannel) {
+        outputChannel.dispose();
+        outputChannel = undefined;
+        data = [];
+      }
     }
   },
 );

client/src/components/logViewer/index.ts

@@ -9,12 +9,9 @@ import {
   isSourceCodeLineAfterLineWrapping,
 } from "./ProblemProcessor";
 
-export function parseLog(
-  logs: LogLine[],
-  logStartFlag: string,
-): Problem[] | null {
+export function parseLog(logs: LogLine[], logStartFlag: string): Problem[] {
   if (logs.length === 0 || logStartFlag.trim() === "") {
-    return null;
+    return [];
   }
 
   // logs cleaning

client/src/components/logViewer/logParser.ts

@@ -0,0 +1,57 @@
+// Copyright © 2024, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { NotebookCell, window, workspace } from "vscode";
+
+export const exportNotebook = async () => {
+  const notebook = window.activeNotebookEditor?.notebook;
+
+  if (!notebook) {
+    return;
+  }
+
+  const uri = await window.showSaveDialog({
+    filters: { SAS: ["sas"] },
+  });
+
+  if (!uri) {
+    return;
+  }
+
+  const content = notebook
+    .getCells()
+    .map((cell) => exportCell(cell) + "\n")
+    .join("\n");
+
+  workspace.fs.writeFile(uri, Buffer.from(content));
+};
+
+const exportCell = (cell: NotebookCell) => {
+  const text = cell.document.getText();
+  switch (cell.document.languageId) {
+    case "sas":
+      return text;
+    case "python":
+      return wrapPython(text);
+    case "sql":
+      return wrapSQL(text);
+    case "markdown":
+      return `/*\n${text}\n*/`;
+  }
+};
+
+const wrapSQL = (code: string) => {
+  if (!code.trimEnd().endsWith(";")) {
+    code = `${code};`;
+  }
+  return `proc sql;
+${code}
+quit;`;
+};
+
+const wrapPython = (code: string) => {
+  return `proc python;
+submit;
+${code}
+endsubmit;
+run;`;
+};

client/src/components/notebook/Exporter.ts

@@ -47,6 +47,10 @@ export async function runSasFileTask(
 
   const textDocument = await getTextDocumentFromFile(file);
   const parameters = getCodeDocumentConstructionParameters(textDocument, {
+    selections:
+      file === undefined || file.trim() === ""
+        ? window.activeTextEditor?.selections
+        : undefined,
     preamble,
     postamble,
   });

client/src/components/tasks/SasTasks.ts

@@ -38,6 +38,10 @@ export class SASCodeDocument {
     return this.parameters.uri;
   }
 
+  public getFileName(): string {
+    return this.parameters.fileName;
+  }
+
   public wrappedCodeLineAt(lineNumber: number) {
     return this.getWrappedCode().split("\n")[lineNumber];
   }

client/src/components/utils/SASCodeDocument.ts

@@ -26,6 +26,10 @@ export function showLogOnExecutionFinish(): boolean {
   return workspace.getConfiguration("SAS").get("log.showOnExecutionFinish");
 }
 
+export function clearLogOnExecutionStart(): boolean {
+  return workspace.getConfiguration("SAS").get("log.clearOnExecutionStart");
+}
+
 export function isShowProblemsFromSASLogEnabled(): boolean {
   return workspace.getConfiguration("SAS").get("problems.log.enabled");
 }