Workspace viewer command visibility (#1323)

* Enablement changes, load anytime - Save, Clear, and Refresh are disabled when there is no attached terminal - Load can be used at any time to attach a terminal + load data easily - View and Remove are no longer shown in the command palette * Update session.ts * Update package.json * Fix lint
REditorSupport · Mar 6, 2023 · 28f00c7 · 28f00c7
1 parent bb929c4
commit 28f00c7
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -326,7 +326,8 @@
         "command": "r.workspaceViewer.refreshEntry",
         "title": "Manual Refresh",
         "icon": "$(refresh)",
-        "category": "R Workspace Viewer"
+        "category": "R Workspace Viewer",
+        "enablement": "rSessionActive"
       },
       {
         "command": "r.workspaceViewer.view",
@@ -338,7 +339,8 @@
         "command": "r.workspaceViewer.clear",
         "title": "Clear environment",
         "icon": "$(clear-all)",
-        "category": "R Workspace Viewer"
+        "category": "R Workspace Viewer",
+        "enablement": "rSessionActive"
       },
       {
         "command": "r.workspaceViewer.remove",
@@ -350,7 +352,8 @@
         "command": "r.workspaceViewer.save",
         "title": "Save workspace",
         "icon": "$(save)",
-        "category": "R Workspace Viewer"
+        "category": "R Workspace Viewer",
+        "enablement": "rSessionActive"
       },
       {
         "command": "r.workspaceViewer.load",
@@ -987,6 +990,20 @@
       }
     ],
     "menus": {
+      "commandPalette": [
+        {
+          "command": "r.workspaceViewer.view",
+          "when": "false"
+        },
+        {
+          "command": "r.workspaceViewer.remove",
+          "when": "false"
+        },
+        {
+          "command": "r.workspaceViewer.package.showQuickPick",
+          "when": "false"
+        }
+      ],
       "editor/title/run": [
         {
           "when": "editorLangId == r",
@@ -2049,4 +2066,4 @@
     "vsls": "^1.0.4753",
     "winreg": "^1.2.4"
   }
-}
+}
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
@@ -164,7 +164,7 @@ export function deleteTerminal(term: vscode.Terminal): void {
         if (config().get<boolean>('sessionWatcher')) {
             void term.processId.then((v) => {
                 if (v) {
-                    cleanupSession(v.toString());
+                    void cleanupSession(v.toString());
                 }
             });
         }

diff --git a/src/session.ts b/src/session.ts
@@ -7,7 +7,7 @@ import { commands, StatusBarItem, Uri, ViewColumn, Webview, window, workspace, e
 
 import { runTextInTerm } from './rTerminal';
 import { FSWatcher } from 'fs-extra';
-import { config, readContent, UriIcon } from './util';
+import { config, readContent, setContext, UriIcon } from './util';
 import { purgeAddinPickerItems, dispatchRStudioAPICall } from './rstudioapi';
 
 import { IRequest } from './liveShare/shareSession';
@@ -774,17 +774,18 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
                         sessionStatusBarItem.show();
                         updateSessionWatcher();
                         purgeAddinPickerItems();
+                        await setContext('rSessionActive', true);
                         if (request.plot_url) {
                             await globalHttpgdManager?.showViewer(request.plot_url);
                         }
                         void watchProcess(pid).then((v: string) => {
-                            cleanupSession(v);
+                            void cleanupSession(v);
                         });
                         break;
                     }
                     case 'detach': {
                         if (request.pid) {
-                            cleanupSession(request.pid);
+                            await cleanupSession(request.pid);
                         }
                         break;
                     }
@@ -826,7 +827,7 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
     }
 }
 
-export function cleanupSession(pidArg: string): void {
+export async function cleanupSession(pidArg: string): Promise<void> {
     if (pid === pidArg) {
         if (sessionStatusBarItem) {
             sessionStatusBarItem.text = 'R: (not attached)';
@@ -837,6 +838,7 @@ export function cleanupSession(pidArg: string): void {
         workspaceData.search = [];
         rWorkspace?.refresh();
         removeSessionFiles();
+        await setContext('rSessionActive', false);
     }
 }
 

diff --git a/src/workspaceViewer.ts b/src/workspaceViewer.ts
@@ -352,22 +352,21 @@ export function saveWorkspace(): void {
 }
 
 export function loadWorkspace(): void {
-    if (workspaceData) {
-        void window.showOpenDialog({
-            defaultUri: Uri.file(workingDir),
-            filters: {
-                'Data': ['RData'],
-            },
-            title: 'Load workspace'
-        }).then(async (uri: Uri[] | undefined) => {
-            if (uri) {
-                const savePath = uri[0].fsPath.split(path.sep).join(path.posix.sep);
-                return runTextInTerm(
-                    `load("${(savePath)}")`
-                );
-            }
-        });
-    }
+    const defaultUri = workingDir ? Uri.file(workingDir) : vscode.window.activeTextEditor?.document.uri;
+    void window.showOpenDialog({
+        defaultUri: defaultUri,
+        filters: {
+            'Data': ['RData'],
+        },
+        title: 'Load workspace'
+    }).then(async (uri: Uri[] | undefined) => {
+        if (uri) {
+            const savePath = uri[0].fsPath.split(path.sep).join(path.posix.sep);
+            return runTextInTerm(
+                `load("${(savePath)}")`
+            );
+        }
+    });
 }
 
 export function viewItem(node: string): void {