diff options
| author | Joyce Er <joyceerhl@gmail.com> | 2022-07-27 20:31:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 20:31:55 +0300 |
| commit | 6cb10e9cfa016c5c773f3fb4d7821f2da33f2d61 (patch) | |
| tree | 4ea3202043713328167c699bec44fbaac607e3ec /src/vs | |
| parent | bcba69611f62af31be86c7703caa8f5af003e9ab (diff) | |
| parent | 04dd05c0ed64e5d57075788b69e29a713a359516 (diff) | |
Merge pull request #156475 from microsoft/dev/joyceerhl/statistical-magpie
Fixes for edit sessions actions visibility and naming
Diffstat (limited to 'src/vs')
| -rw-r--r-- | src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts | 5 | ||||
| -rw-r--r-- | src/vs/workbench/contrib/editSessions/browser/editSessionsWorkbenchService.ts | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts index 0602d52a480..06a991fd12d 100644 --- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts +++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts @@ -46,6 +46,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { EditSessionsDataViews } from 'vs/workbench/contrib/editSessions/browser/editSessionsViews'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { EditSessionsContentProvider } from 'vs/workbench/contrib/editSessions/browser/editSessionsContentProvider'; +import { isNative } from 'vs/base/common/platform'; +import { WorkspaceFolderCountContext } from 'vs/workbench/common/contextkeys'; registerSingleton(IEditSessionsLogService, EditSessionsLogService); registerSingleton(IEditSessionsWorkbenchService, EditSessionsWorkbenchService); @@ -54,6 +56,7 @@ const continueEditSessionCommand: IAction2Options = { id: '_workbench.experimental.editSessions.actions.continueEditSession', title: { value: localize('continue edit session', "Continue Edit Session..."), original: 'Continue Edit Session...' }, category: EDIT_SESSION_SYNC_CATEGORY, + precondition: WorkspaceFolderCountContext.notEqualsTo('0'), f1: true }; const openLocalFolderCommand: IAction2Options = { @@ -529,7 +532,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo private createPickItems(): ContinueEditSessionItem[] { const items = [...this.continueEditSessionOptions].filter((option) => option.when === undefined || this.contextKeyService.contextMatchesRules(option.when)); - if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined) { + if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) { items.push(new ContinueEditSessionItem( localize('continueEditSessionItem.openInLocalFolder', 'Open In Local Folder'), openLocalFolderCommand.id, diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsWorkbenchService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsWorkbenchService.ts index d8dbac59900..36f51b145a0 100644 --- a/src/vs/workbench/contrib/editSessions/browser/editSessionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsWorkbenchService.ts @@ -355,7 +355,7 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes constructor() { super({ id: 'workbench.editSessions.actions.resetAuth', - title: localize('reset auth', 'Sign Out'), + title: localize('reset auth.v2', 'Sign Out of Edit Sessions'), category: EDIT_SESSION_SYNC_CATEGORY, precondition: ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, true), menu: [{ |