maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #127462

Browse source
This commit is contained in:
Rob Lourens 2021-06-30 10:31:28 -07:00
parent 25dc462ee4
commit c0ddd25430
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
View file

@ -280,7 +280,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
icon: preferencesOpenSettingsIcon,
menu: [{
id: MenuId.EditorTitle,
when: ResourceContextKey.Resource.isEqualTo(that.environmentService.settingsResource.toString()),
when: ContextKeyExpr.and(ResourceContextKey.Resource.isEqualTo(that.environmentService.settingsResource.toString()), ContextKeyExpr.not('isInDiffEditor')),
group: 'navigation',
order: 1
}]
@ -1158,7 +1158,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
title: OPEN_SETTINGS2_ACTION_TITLE,
icon: preferencesOpenSettingsIcon
},
when: ContextKeyExpr.and(ResourceContextKey.Resource.isEqualTo(this.preferencesService.workspaceSettingsResource!.toString()), WorkbenchStateContext.isEqualTo('workspace')),
when: ContextKeyExpr.and(ResourceContextKey.Resource.isEqualTo(this.preferencesService.workspaceSettingsResource!.toString()), WorkbenchStateContext.isEqualTo('workspace'), ContextKeyExpr.not('isInDiffEditor')),
group: 'navigation',
order: 1
});
@ -1183,7 +1183,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
title: OPEN_SETTINGS2_ACTION_TITLE,
icon: preferencesOpenSettingsIcon
},
when: ContextKeyExpr.and(ResourceContextKey.Resource.isEqualTo(this.preferencesService.getFolderSettingsResource(folder.uri)!.toString())),
when: ContextKeyExpr.and(ResourceContextKey.Resource.isEqualTo(this.preferencesService.getFolderSettingsResource(folder.uri)!.toString()), ContextKeyExpr.not('isInDiffEditor')),
group: 'navigation',
order: 1
});