use remoteName in test resolver

aeschli · aeschli · commit 32eb0c0cb9ae · 2019-07-24T18:09:23.000+02:00
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
@@ -53,17 +53,17 @@
 			"statusBar/windowIndicator": [
 				{
 					"command": "vscode-testresolver.newWindow",
-					"when": "!remoteAuthority",
+					"when": "!remoteName",
 					"group": "9_local_testresolver@2"
 				},
 				{
 					"command": "vscode-testresolver.showLog",
-					"when": "remoteAuthority =~ /^test\\+.*$/",
+					"when": "remoteName == test",
 					"group": "1_remote_testresolver_open@3"
 				},
 				{
 					"command": "vscode-testresolver.newWindow",
-					"when": "remoteAuthority =~ /^test\\+.*$/",
+					"when": "remoteName == test",
 					"group": "1_remote_testresolver_open@1"
 				}
 			]
diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts
@@ -123,7 +123,6 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		IsWebContext.bindTo(this.contextKeyService);
 		IsMacNativeContext.bindTo(this.contextKeyService);
 
-		Deprecated_RemoteAuthorityContext.bindTo(this.contextKeyService).set(this.environmentService.configuration.remoteAuthority || ''); // remove once 
 		RemoteNameContext.bindTo(this.contextKeyService).set(getRemoteName(this.environmentService.configuration.remoteAuthority) || '');
 
 		// macOS Native Tabs
diff --git a/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts b/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
@@ -119,7 +119,7 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc
 		if (this.disconnected !== isDisconnected) {
 			this.disconnected = isDisconnected;
 			RemoteConnectionState.bindTo(this.contextKeyService).set(isDisconnected ? 'disconnected' : 'connected');
-			Deprecated_RemoteAuthorityContext.bindTo(this.contextKeyService).set(!isDisconnected && this.remoteAuthority || '');
+			Deprecated_RemoteAuthorityContext.bindTo(this.contextKeyService).set(isDisconnected ? '' : this.remoteAuthority || '');
 			this.updateWindowIndicator();
 		}
 	}
@@ -164,7 +164,7 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc
 
 	private showIndicatorActions(menu: IMenu) {
 
-		const actions = !this.disconnected || !this.remoteAuthority ? menu.getActions() : [];
+		const actions = menu.getActions();
 
 		const items: (IQuickPickItem | IQuickPickSeparator)[] = [];
 		for (let actionGroup of actions) {

Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,17 @@`
`53`	`53`	`"statusBar/windowIndicator": [`
`54`	`54`	`{`
`55`	`55`	`"command": "vscode-testresolver.newWindow",`
`56`		`- "when": "!remoteAuthority",`
	`56`	`+ "when": "!remoteName",`
`57`	`57`	`"group": "9_local_testresolver@2"`
`58`	`58`	`},`
`59`	`59`	`{`
`60`	`60`	`"command": "vscode-testresolver.showLog",`
`61`		`- "when": "remoteAuthority =~ /^test\\+.*$/",`
	`61`	`+ "when": "remoteName == test",`
`62`	`62`	`"group": "1_remote_testresolver_open@3"`
`63`	`63`	`},`
`64`	`64`	`{`
`65`	`65`	`"command": "vscode-testresolver.newWindow",`
`66`		`- "when": "remoteAuthority =~ /^test\\+.*$/",`
	`66`	`+ "when": "remoteName == test",`
`67`	`67`	`"group": "1_remote_testresolver_open@1"`
`68`	`68`	`}`
`69`	`69`	`]`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc`
`119`	`119`	`if (this.disconnected !== isDisconnected) {`
`120`	`120`	`this.disconnected = isDisconnected;`
`121`	`121`	`RemoteConnectionState.bindTo(this.contextKeyService).set(isDisconnected ? 'disconnected' : 'connected');`
`122`		`- Deprecated_RemoteAuthorityContext.bindTo(this.contextKeyService).set(!isDisconnected && this.remoteAuthority \|\| '');`
	`122`	`+ Deprecated_RemoteAuthorityContext.bindTo(this.contextKeyService).set(isDisconnected ? '' : this.remoteAuthority \|\| '');`
`123`	`123`	`this.updateWindowIndicator();`
`124`	`124`	`}`
`125`	`125`	`}`
`@@ -164,7 +164,7 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc`
`164`	`164`
`165`	`165`	`private showIndicatorActions(menu: IMenu) {`
`166`	`166`
`167`		`- const actions = !this.disconnected \|\| !this.remoteAuthority ? menu.getActions() : [];`
	`167`	`+ const actions = menu.getActions();`
`168`	`168`
`169`	`169`	`const items: (IQuickPickItem \| IQuickPickSeparator)[] = [];`
`170`	`170`	`for (let actionGroup of actions) {`