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

Merge pull request #199007 from microsoft/hediet/b/like-wolverine

Browse source 
Adopt config.multiDiffEditor.experimental.enabled
This commit is contained in:
Henning Dieterichs 2023-11-27 12:31:58 +01:00 committed by GitHub
parent badad38003 95d76848a1
commit b5f1966e92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/git/package.json
View file

@ -1425,12 +1425,12 @@
},
{
"command": "git.viewStagedChanges",
"when": "scmProvider == git && scmResourceGroup == index",
"when": "scmProvider == git && scmResourceGroup == index && config.multiDiffEditor.experimental.enabled",
"group": "inline@1"
},
{
"command": "git.viewChanges",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.multiDiffEditor.experimental.enabled",
"group": "inline@1"
}
],
@ -1812,7 +1812,7 @@
{
"command": "git.timeline.openCommit",
"group": "inline",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled"
},
{
"command": "git.timeline.openDiff",
@ -1822,7 +1822,7 @@
{
"command": "git.timeline.openCommit",
"group": "1_actions@2",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled"
},
{
"command": "git.timeline.compareWithSelected",

11
src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts
View file

@ -23,6 +23,7 @@ import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/act
import { URI } from 'vs/base/common/uri';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
class MultiDiffEditorResolverContribution extends Disposable {
@ -128,3 +129,13 @@ export class GoToFileAction extends Action2 {
}
registerAction2(GoToFileAction);
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
properties: {
'multiDiffEditor.experimental.enabled': {
type: 'boolean',
default: false,
description: 'Enable experimental multi diff editor.',
},
}
});