Merge branch 'main' into saspy-spawn

sassoftware · Dec 23, 2024 · a6de442 · a6de442
2 parents 60f2a36 + bc59cd2
commit a6de442
Show file tree

Hide file tree

Showing 40 changed files with 2,721 additions and 486 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,27 @@ 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.
 
+## [v1.13.0] - 2024-12-23
+
+### Changed
+
+- Required VS Code version 1.89 at minimum
+
+### Added
+
+- Python language features inside proc python ([#991](https://github.com/sassoftware/vscode-sas-extension/pull/991))
+- Inherit VS Code file icons in SAS Content and Server ([#1310](https://github.com/sassoftware/vscode-sas-extension/pull/1310))
+- Display macro name in outline pane ([#1326](https://github.com/sassoftware/vscode-sas-extension/pull/1326))
+
+### Fixed
+
+- Display global option help in data step ([#1282](https://github.com/sassoftware/vscode-sas-extension/issues/1282))
+- Unnecessary empty line added by formatter ([#1288](https://github.com/sassoftware/vscode-sas-extension/issues/1288))
+- Display context in hover help for data step statement option ([#1306](https://github.com/sassoftware/vscode-sas-extension/issues/1306))
+- SAS log code action should not impact others ([#1302](https://github.com/sassoftware/vscode-sas-extension/issues/1302))
+- The notebook file is opened incorrectly after renaming ([#1289](https://github.com/sassoftware/vscode-sas-extension/issues/1289))
+- Resolve breaking changes by AG Grid 33 ([#1334](https://github.com/sassoftware/vscode-sas-extension/issues/1334))
+
 ## [v1.12.0] - 2024-11-25
 
 ### Added

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -6,19 +6,19 @@
   "version": "0.0.1",
   "publisher": "SAS",
   "engines": {
-    "vscode": "^1.82.0"
+    "vscode": "^1.89.0"
   },
   "dependencies": {
-    "ag-grid-community": "^32.3.2",
-    "ag-grid-react": "^32.3.2",
-    "axios": "^1.7.7",
+    "ag-grid-community": "^33.0.2",
+    "ag-grid-react": "^33.0.2",
+    "axios": "^1.7.9",
     "media-typer": "^1.1.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "ssh2": "^1.15.0",
-    "uuid": "^11.0.2",
-    "vscode-languageclient": "^9.0.1",
-    "zustand": "^5.0.0"
+    "uuid": "^11.0.3",
+    "vscode-languageclient": "^10.0.0-next.2",
+    "zustand": "^5.0.2"
   },
   "devDependencies": {
     "@types/react": "^18.3.3",

diff --git a/client/src/browser/extension.ts b/client/src/browser/extension.ts
@@ -36,8 +36,8 @@ function createWorkerLanguageClient(
   return new LanguageClient(
     "sas-lsp",
     "SAS Language Server",
-    clientOptions,
     worker,
+    clientOptions,
   );
 }
 

diff --git a/client/src/commands/run.ts b/client/src/commands/run.ts
@@ -47,8 +47,7 @@ async function getSelectedRegions(
       "sas/getFoldingBlock",
       {
         textDocument: { uri: window.activeTextEditor.document.uri.toString() },
-        line,
-        col,
+        position: { line, col },
       },
     );
     if (block) {

diff --git a/client/src/components/ContentNavigator/ContentDataProvider.ts b/client/src/components/ContentNavigator/ContentDataProvider.ts
@@ -18,7 +18,6 @@ import {
   TabInputText,
   TextDocument,
   TextDocumentContentProvider,
-  ThemeIcon,
   TreeDataProvider,
   TreeDragAndDropController,
   TreeItem,
@@ -230,6 +229,7 @@ class ContentDataProvider
       iconPath: this.iconPathForItem(item),
       id: item.uid,
       label: item.name,
+      resourceUri: uri,
     };
   }
 
@@ -301,18 +301,14 @@ class ContentDataProvider
     const oldUriToNewUriMap = [[item.vscUri, newUri]];
     const newItemIsContainer = getIsContainer(newItem);
     if (closing !== true && !newItemIsContainer) {
-      await commands.executeCommand("vscode.openWith", newUri, "default", {
-        preview: false,
-      });
+      await commands.executeCommand("vscode.open", newUri);
     }
     if (closing !== true && newItemIsContainer) {
       const urisToOpen = getPreviouslyOpenedChildItems(
         await this.getChildren(newItem),
       );
       for (const [, newUri] of urisToOpen) {
-        await commands.executeCommand("vscode.openWith", newUri, "default", {
-          preview: false,
-        });
+        await commands.executeCommand("vscode.open", newUri);
       }
       oldUriToNewUriMap.push(...urisToOpen);
     }
@@ -698,7 +694,7 @@ class ContentDataProvider
 
   private iconPathForItem(
     item: ContentItem,
-  ): ThemeIcon | { light: Uri; dark: Uri } {
+  ): undefined | { light: Uri; dark: Uri } {
     const isContainer = getIsContainer(item);
     let icon = "";
     if (isContainer) {
@@ -723,11 +719,6 @@ class ContentDataProvider
           icon = "folder";
           break;
       }
-    } else {
-      const extension = item.name.split(".").pop().toLowerCase();
-      if (extension === "sas") {
-        icon = "sasProgramFile";
-      }
     }
 
     return icon !== ""
@@ -738,7 +729,7 @@ class ContentDataProvider
             `icons/light/${icon}Light.svg`,
           ),
         }
-      : ThemeIcon.File;
+      : undefined;
   }
 }