Merge branch 'main' into fix/screenshot

Author: scottdover

CHANGELOG.md

@@ -4,11 +4,25 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). If you introduce breaking changes, please group them together in the "Changed" section using the **BREAKING:** prefix.
 
-## [Unreleased]
+## [v1.16.0] - 2025-07-31
 
 ### Added
 
 - Add support for `fileNavigationCustomRootPath`/`fileNavigationRoot` for rest & iom/com connections ([#1557](https://github.com/sassoftware/vscode-sas-extension/pull/1557))
+- Toggle SAS code comment by line ([#1521](https://github.com/sassoftware/vscode-sas-extension/pull/1521))
+- Be able to ignore region from format ([#1534](https://github.com/sassoftware/vscode-sas-extension/pull/1534))
+- Set default CSV save location to workspace root for remote workspace ([#1550](https://github.com/sassoftware/vscode-sas-extension/pull/1550))
+
+### Fixed
+
+- Folding does not work in certain case ([#1462](https://github.com/sassoftware/vscode-sas-extension/issues/1462))
+- Library viewer optimization for ITC ([#1520](https://github.com/sassoftware/vscode-sas-extension/pull/1520))
+- Remove redundant line break at end when format ([#1522](https://github.com/sassoftware/vscode-sas-extension/issues/1522))
+- Failed to open a file having character '#' in its name ([#1272](https://github.com/sassoftware/vscode-sas-extension/issues/1272))
+- Failed to create and open a file having character "?" in its name ([#1532](https://github.com/sassoftware/vscode-sas-extension/issues/1532))
+- Cannot delete a file or folder by keyboard on SAS Explorer pane ([#789](https://github.com/sassoftware/vscode-sas-extension/issues/789))
+- Auto-complete for sub-options ([#1555](https://github.com/sassoftware/vscode-sas-extension/issues/1555))
+- Toggle line comment in Proc Python ([#1554](https://github.com/sassoftware/vscode-sas-extension/issues/1554))
 
 ## [v1.15.0] - 2025-06-10
 

client/src/components/notebook/exporters/index.ts

@@ -1,6 +1,6 @@
 // Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Uri, window, workspace } from "vscode";
+import { Uri, l10n, window, workspace } from "vscode";
 import type { LanguageClient } from "vscode-languageclient/node";
 
 import path from "path";
@@ -30,3 +30,108 @@ export const exportNotebook = async (client: LanguageClient) => {
 
   workspace.fs.writeFile(uri, Buffer.from(content));
 };
+
+export const saveOutput = async () => {
+  const notebook = window.activeNotebookEditor?.notebook;
+  const activeCell = window.activeNotebookEditor?.selection?.start;
+
+  if (!notebook || activeCell === undefined) {
+    return;
+  }
+
+  const cell = notebook.cellAt(activeCell);
+  if (!cell) {
+    return;
+  }
+
+  let odsItem = null;
+  let logItem = null;
+
+  for (const output of cell.outputs) {
+    if (!odsItem) {
+      odsItem = output.items.find(
+        (item) => item.mime === "application/vnd.sas.ods.html5",
+      );
+    }
+    if (!logItem) {
+      logItem = output.items.find(
+        (item) => item.mime === "application/vnd.sas.compute.log.lines",
+      );
+    }
+
+    if (odsItem && logItem) {
+      break;
+    }
+  }
+
+  const choices: Array<{
+    label: string;
+    outputType: "html" | "log";
+  }> = [];
+
+  if (odsItem) {
+    choices.push({
+      label: l10n.t("Save ODS HTML"),
+      outputType: "html",
+    });
+  }
+
+  if (logItem) {
+    choices.push({
+      label: l10n.t("Save Log"),
+      outputType: "log",
+    });
+  }
+
+  const exportChoice = await window.showQuickPick(choices, {
+    placeHolder: l10n.t("Choose output type to save"),
+    ignoreFocusOut: true,
+  });
+
+  if (!exportChoice) {
+    return;
+  }
+
+  let content = "";
+  let fileExtension = "";
+  let fileName = "";
+  try {
+    if (exportChoice.outputType === "html" && odsItem) {
+      content = odsItem.data.toString();
+      fileExtension = "html";
+      fileName = `${path.basename(notebook.uri.path, ".sasnb")}_${l10n.t("output")}_${
+        activeCell + 1
+      }.html`;
+    } else if (exportChoice.outputType === "log" && logItem) {
+      const logs: Array<{ line: string; type: string }> = JSON.parse(
+        logItem.data.toString(),
+      );
+      content = logs.map((log) => log.line).join("\n");
+      fileExtension = "log";
+      fileName = `${path.basename(notebook.uri.path, ".sasnb")}_${l10n.t("output")}_${
+        activeCell + 1
+      }.log`;
+    }
+  } catch (error) {
+    window.showErrorMessage(
+      l10n.t("Failed to extract output content." + error),
+    );
+    return;
+  }
+
+  const filters: { [name: string]: string[] } = {};
+  filters[fileExtension.toUpperCase()] = [fileExtension];
+
+  const uri = await window.showSaveDialog({
+    filters,
+    defaultUri: Uri.parse(fileName),
+  });
+
+  if (!uri) {
+    return;
+  }
+
+  await workspace.fs.writeFile(uri, Buffer.from(content));
+
+  window.showInformationMessage(l10n.t("Saved to {0}", uri.fsPath));
+};

client/src/node/extension.ts

@@ -54,7 +54,7 @@ import { LogTokensProvider, legend } from "../components/logViewer";
 import { sasDiagnostic } from "../components/logViewer/sasDiagnostics";
 import { NotebookController } from "../components/notebook/Controller";
 import { NotebookSerializer } from "../components/notebook/Serializer";
-import { exportNotebook } from "../components/notebook/exporters";
+import { exportNotebook, saveOutput } from "../components/notebook/exporters";
 import { ConnectionType } from "../components/profile";
 import { SasTaskProvider } from "../components/tasks/SasTaskProvider";
 import { SAS_TASK_TYPE } from "../components/tasks/SasTasks";
@@ -202,6 +202,7 @@ export function activate(context: ExtensionContext) {
     commands.registerCommand("SAS.notebook.export", () =>
       exportNotebook(client),
     ),
+    commands.registerCommand("SAS.notebook.saveOutput", saveOutput),
     tasks.registerTaskProvider(SAS_TASK_TYPE, new SasTaskProvider()),
     ...sasDiagnostic.getSubscriptions(),
     commands.registerTextEditorCommand("SAS.toggleLineComment", (editor) => {

package-lock.json

@@ -2,7 +2,7 @@
   "name": "sas-lsp",
   "displayName": "SAS",
   "description": "Official SAS Language Extension for VS Code",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "categories": [
     "Programming Languages",
     "Data Science",
@@ -825,6 +825,11 @@
         "title": "%commands.SAS.notebook.export%",
         "category": "SAS Notebook"
       },
+      {
+        "command": "SAS.notebook.saveOutput",
+        "title": "%commands.SAS.notebook.saveOutput%",
+        "category": "SAS Notebook"
+      },
       {
         "command": "SAS.file.new",
         "shortTitle": "%commands.SAS.file.new.short%",
@@ -1097,6 +1102,12 @@
           "command": "SAS.notebook.export"
         }
       ],
+      "notebook/cell/title": [
+        {
+          "command": "SAS.notebook.saveOutput",
+          "when": "notebookType == 'sas-notebook' && notebookCellHasOutputs"
+        }
+      ],
       "commandPalette": [
         {
           "when": "editorLangId == sas && !SAS.hideRunMenuItem",

package.json

@@ -16,6 +16,7 @@
   "commands.SAS.file.new": "New SAS File",
   "commands.SAS.file.new.short": "SAS File",
   "commands.SAS.notebook.export": "Export",
+  "commands.SAS.notebook.saveOutput": "Save Output",
   "commands.SAS.notebook.new": "New SAS Notebook",
   "commands.SAS.notebook.new.short": "SAS Notebook",
   "commands.SAS.refresh": "Refresh",

package.nls.json

@@ -246,7 +246,7 @@ export class LanguageServiceProvider {
 
   toggleLineComment(range: Range) {
     const token = this.syntaxProvider.getSyntax(range.start.line)[0];
-    if (token.style === "embedded-code") {
+    if (token?.style === "embedded-code") {
       return null;
     }
     const lines = this.model