Fix missing stopCurrentWorkspace command

package.json

@@ -155,11 +155,17 @@
 				"icon": "$(primitive-square)"
 			},
 			{
-				"command": "gitpod.workspaces.stopCurrentWorkspace",
+				"command": "gitpod.workspaces.stopCurrentWorkspace_inline",
 				"category": "Gitpod",
 				"title": "Disconnect and Stop",
 				"icon": "$(primitive-square)"
 			},
+			{
+				"command": "gitpod.workspaces.stopCurrentWorkspace",
+				"category": "Gitpod",
+				"title": "Stop Current Workspace",
+				"icon": "$(primitive-square)"
+			},
 			{
 				"command": "gitpod.workspaces.openInBrowser",
 				"category": "Gitpod",
@@ -224,7 +230,7 @@
 					"group": "inline@3"
 				},
 				{
-					"command": "gitpod.workspaces.stopCurrentWorkspace",
+					"command": "gitpod.workspaces.stopCurrentWorkspace_inline",
 					"when": "viewItem =~ /^gitpod-workspaces.workspace.+connected$/",
 					"group": "inline@4"
 				},
@@ -314,9 +320,13 @@
 					"when": "false"
 				},
 				{
-					"command": "gitpod.workspaces.stopCurrentWorkspace",
+					"command": "gitpod.workspaces.stopCurrentWorkspace_inline",
 					"when": "false"
 				},
+				{
+					"command": "gitpod.workspaces.stopCurrentWorkspace",
+					"when": "gitpod.authenticated == true && gitpod.inWorkspace == true"
+				},
 				{
 					"command": "gitpod.workspaces.openInBrowser",
 					"when": "gitpod.authenticated == true && gitpod.inWorkspace == true"

src/commands/workspaces.ts

@@ -490,7 +490,7 @@ export class StopWorkspaceCommandInline extends StopWorkspaceCommand {
 }
 
 export class StopCurrentWorkspaceCommand implements Command {
-	readonly id = 'gitpod.workspaces.stopCurrentWorkspace';
+	readonly id: string = 'gitpod.workspaces.stopCurrentWorkspace';
 
 	constructor(
 		private readonly workspaceId: string | undefined,
@@ -516,6 +516,19 @@ export class StopCurrentWorkspaceCommand implements Command {
 	}
 }
 
+export class StopCurrentWorkspaceCommandInline extends StopCurrentWorkspaceCommand {
+	override readonly id = 'gitpod.workspaces.stopCurrentWorkspace_inline';
+
+	constructor(
+		workspaceId: string | undefined,
+		sessionService: ISessionService,
+		hostService: IHostService,
+		telemetryService: ITelemetryService,
+	) {
+		super(workspaceId, sessionService, hostService, telemetryService);
+	}
+}
+
 export class OpenInBrowserCommand implements Command {
 	readonly id = 'gitpod.workspaces.openInBrowser';
 
@@ -613,7 +626,7 @@ export class OpenWorkspaceContextCommand implements Command {
 			return;
 		}
 
-		const rawWsData = await this.sessionService.getAPI().getWorkspace(treeItem.id)
+		const rawWsData = await this.sessionService.getAPI().getWorkspace(treeItem.id);
 		const wsData = rawWorkspaceToWorkspaceData(await this.sessionService.getAPI().getWorkspace(treeItem.id));
 
 		// Report if we couldn't parse contextUrl

src/workspacesExplorerView.ts

@@ -13,7 +13,7 @@ import { getGitpodRemoteWindowConnectionInfo } from './remote';
 import { Barrier } from './common/async';
 import { ITelemetryService } from './common/telemetry';
 import { ILogService } from './services/logService';
-import { ConnectInCurrentWindowCommand, ConnectInNewWindowCommand, DeleteWorkspaceCommand, OpenWorkspaceContextCommand, OpenInBrowserCommand, StopCurrentWorkspaceCommand, StopWorkspaceCommand, DisconnectWorkspaceCommand, ConnectInCurrentWindowCommandInline, StopWorkspaceCommandInline, DeleteWorkspaceCommandContext, StopWorkspaceCommandContext, ConnectInCurrentWindowCommandContext, ConnectInNewWindowCommandContext, ConnectInCurrentWindowCommandContext_1, ConnectInCurrentWindowCommandInline_1 } from './commands/workspaces';
+import { ConnectInCurrentWindowCommand, ConnectInNewWindowCommand, DeleteWorkspaceCommand, OpenWorkspaceContextCommand, OpenInBrowserCommand, StopCurrentWorkspaceCommand, StopWorkspaceCommand, DisconnectWorkspaceCommand, ConnectInCurrentWindowCommandInline, StopWorkspaceCommandInline, DeleteWorkspaceCommandContext, StopWorkspaceCommandContext, ConnectInCurrentWindowCommandContext, ConnectInNewWindowCommandContext, ConnectInCurrentWindowCommandContext_1, ConnectInCurrentWindowCommandInline_1, StopCurrentWorkspaceCommandInline } from './commands/workspaces';
 import { IRemoteService } from './services/remoteService';
 import { IExperimentsService } from './experiments';
 
@@ -114,6 +114,7 @@ export class WorkspacesExplorerView extends Disposable implements vscode.TreeDat
         commandManager.register(new StopWorkspaceCommandContext(sessionService, hostService, telemetryService));
         commandManager.register(new StopWorkspaceCommandInline(sessionService, hostService, telemetryService));
         commandManager.register(new StopCurrentWorkspaceCommand(this.connectedWorkspaceId, sessionService, hostService, telemetryService));
+        commandManager.register(new StopCurrentWorkspaceCommandInline(this.connectedWorkspaceId, sessionService, hostService, telemetryService));
         commandManager.register(new OpenInBrowserCommand(sessionService, hostService, telemetryService));
         commandManager.register(new DeleteWorkspaceCommand(sessionService, hostService, telemetryService));
         commandManager.register(new DeleteWorkspaceCommandContext(sessionService, hostService, telemetryService));