web - improve window indicator

Benjamin Pasero · Benjamin Pasero · commit 513807b0e440 · 2020-08-28T17:50:39.000+02:00
diff --git a/resources/web/code-web.js b/resources/web/code-web.js
@@ -27,7 +27,7 @@ const BUILTIN_MARKETPLACE_EXTENSIONS_ROOT = path.join(APP_ROOT, '.build', 'built
 const WEB_DEV_EXTENSIONS_ROOT = path.join(APP_ROOT, '.build', 'builtInWebDevExtensions');
 const WEB_MAIN = path.join(APP_ROOT, 'src', 'vs', 'code', 'browser', 'workbench', 'workbench-dev.html');
 
-const WEB_PLAYGROUND_VERSION = '0.0.4';
+const WEB_PLAYGROUND_VERSION = '0.0.5';
 
 const args = minimist(process.argv, {
 	boolean: [
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
@@ -3,8 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchConstructionOptions, create, ICredentialsProvider, IURLCallbackProvider, IWorkspaceProvider, IWorkspace, IWindowIndicator, ICommand, IHomeIndicator, IProductQualityChangeHandler } from 'vs/workbench/workbench.web.api';
-import product from 'vs/platform/product/common/product';
+import { IWorkbenchConstructionOptions, create, ICredentialsProvider, IURLCallbackProvider, IWorkspaceProvider, IWorkspace, IWindowIndicator, IHomeIndicator, IProductQualityChangeHandler } from 'vs/workbench/workbench.web.api';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { generateUuid } from 'vs/base/common/uuid';
@@ -302,8 +301,6 @@ class WindowIndicator implements IWindowIndicator {
 	readonly tooltip: string;
 	readonly command: string | undefined;
 
-	readonly commandImpl: ICommand | undefined = undefined;
-
 	constructor(workspace: IWorkspace) {
 		let repositoryOwner: string | undefined = undefined;
 		let repositoryName: string | undefined = undefined;
@@ -321,20 +318,16 @@ class WindowIndicator implements IWindowIndicator {
 			}
 		}
 
+		// Repo
 		if (repositoryName && repositoryOwner) {
-			this.label = localize('openInDesktopLabel', "$(remote) Open in Desktop");
-			this.tooltip = localize('openInDesktopTooltip', "Open in Desktop");
-			this.command = '_web.openInDesktop';
-			this.commandImpl = {
-				id: this.command,
-				handler: () => {
-					const protocol = product.quality === 'stable' ? 'vscode' : 'vscode-insiders';
-					window.open(`${protocol}://vscode.git/clone?url=${encodeURIComponent(`https://github.com/${repositoryOwner}/${repositoryName}.git`)}`);
-				}
-			};
-		} else {
-			this.label = localize('playgroundLabel', "Web Playground");
-			this.tooltip = this.label;
+			this.label = localize('playgroundLabelRepository', "$(remote) VS Code Web Playground: {0}/{1}", repositoryOwner, repositoryName);
+			this.tooltip = localize('playgroundRepositoryTooltip', "VS Code Web Playground: {0}/{1}", repositoryOwner, repositoryName);
+		}
+
+		// No Repo
+		else {
+			this.label = localize('playgroundLabel', "$(remote) VS Code Web Playground");
+			this.tooltip = localize('playgroundTooltip', "VS Code Web Playground");
 		}
 	}
 }
@@ -416,16 +409,10 @@ class WindowIndicator implements IWindowIndicator {
 		title: localize('home', "Home")
 	};
 
-	// Commands
-	const commands: ICommand[] = [];
-
 	// Window indicator (unless connected to a remote)
 	let windowIndicator: WindowIndicator | undefined = undefined;
 	if (!workspaceProvider.hasRemote()) {
 		windowIndicator = new WindowIndicator(workspace);
-		if (windowIndicator.commandImpl) {
-			commands.push(windowIndicator.commandImpl);
-		}
 	}
 
 	// Product Quality Change Handler
@@ -447,7 +434,6 @@ class WindowIndicator implements IWindowIndicator {
 	create(document.body, {
 		...config,
 		homeIndicator,
-		commands,
 		windowIndicator,
 		productQualityChangeHandler,
 		workspaceProvider,
