development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

use remoteName in test resolver

Browse source
This commit is contained in:
Martin Aeschlimann 2019-07-24 18:09:23 +02:00
parent 3e98ad5177
commit 32eb0c0cb9
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/vscode-test-resolver/package.json
View file

@ -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"
}
]

1
src/vs/workbench/browser/contextkeys.ts
View file

@ -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

4
src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
View file

@ -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) {