Skip to content

Commit 42c4aea

Browse files
committed
Hide server-side source control menus for client-side workspaces
1 parent 73c926d commit 42c4aea

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@
192192
},
193193
{
194194
"command": "vscode-objectscript.serverCommands.sourceControl",
195-
"when": "(vscode-objectscript.connectActive && resourceScheme == isfs) || (vscode-objectscript.connectActive && !editorIsOpen)"
195+
"when": "(vscode-objectscript.connectActive && resourceScheme == isfs) || (vscode-objectscript.connectActive && !editorIsOpen && virtualWorkspace)"
196196
},
197197
{
198198
"command": "vscode-objectscript.serverCommands.contextSourceControl",
199199
"when": "false"
200200
},
201201
{
202202
"command": "vscode-objectscript.serverCommands.other",
203-
"when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ || (vscode-objectscript.connectActive && !editorIsOpen)"
203+
"when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ || (vscode-objectscript.connectActive && !editorIsOpen && virtualWorkspace)"
204204
},
205205
{
206206
"command": "vscode-objectscript.serverCommands.contextOther",

src/commands/serverActions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export async function serverActions(): Promise<void> {
3232
const { links } = config("conn");
3333
const nsEncoded = encodeURIComponent(ns);
3434
const actions: ServerAction[] = [];
35+
const wsUri = uriOfWorkspaceFolder();
3536
if (!api.externalServer) {
3637
actions.push({
3738
detail: (active ? "Disable" : "Enable") + " current connection",
@@ -47,7 +48,6 @@ export async function serverActions(): Promise<void> {
4748
});
4849

4950
// Switching namespace makes only sense for non-ISFS folders
50-
const wsUri = uriOfWorkspaceFolder();
5151
if (wsUri && notIsfs(wsUri)) {
5252
actions.push({
5353
id: "switchNamespace",
@@ -137,7 +137,7 @@ export async function serverActions(): Promise<void> {
137137
const classRef = `/csp/documatic/%25CSP.Documatic.cls?LIBRARY=${nsEncoded}${
138138
classname ? "&CLASSNAME=" + classnameEncoded : ""
139139
}`;
140-
const project = new URLSearchParams(uriOfWorkspaceFolder()?.query).get("project") || "";
140+
const project = new URLSearchParams(wsUri?.query).get("project") || "";
141141
let extraLinks = 0;
142142
for (const title in links) {
143143
const rawLink = String(links[title]);
@@ -193,7 +193,7 @@ export async function serverActions(): Promise<void> {
193193
detail: "Select a Studio Add-in to open",
194194
});
195195
if (
196-
!vscode.window.activeTextEditor ||
196+
(!vscode.window.activeTextEditor && wsUri && notIsfs(wsUri)) ||
197197
vscode.window.activeTextEditor.document.uri.scheme === FILESYSTEM_SCHEMA ||
198198
vscode.window.activeTextEditor.document.uri.scheme === FILESYSTEM_READONLY_SCHEMA
199199
) {

0 commit comments

Comments
 (0)