mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 13:46:13 +00:00
Merge pull request #199007 from microsoft/hediet/b/like-wolverine
Adopt config.multiDiffEditor.experimental.enabled
This commit is contained in:
commit
b5f1966e92
|
@ -1425,12 +1425,12 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"command": "git.viewStagedChanges",
|
"command": "git.viewStagedChanges",
|
||||||
"when": "scmProvider == git && scmResourceGroup == index",
|
"when": "scmProvider == git && scmResourceGroup == index && config.multiDiffEditor.experimental.enabled",
|
||||||
"group": "inline@1"
|
"group": "inline@1"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"command": "git.viewChanges",
|
"command": "git.viewChanges",
|
||||||
"when": "scmProvider == git && scmResourceGroup == workingTree",
|
"when": "scmProvider == git && scmResourceGroup == workingTree && config.multiDiffEditor.experimental.enabled",
|
||||||
"group": "inline@1"
|
"group": "inline@1"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
@ -1812,7 +1812,7 @@
|
||||||
{
|
{
|
||||||
"command": "git.timeline.openCommit",
|
"command": "git.timeline.openCommit",
|
||||||
"group": "inline",
|
"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",
|
"command": "git.timeline.openDiff",
|
||||||
|
@ -1822,7 +1822,7 @@
|
||||||
{
|
{
|
||||||
"command": "git.timeline.openCommit",
|
"command": "git.timeline.openCommit",
|
||||||
"group": "1_actions@2",
|
"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",
|
"command": "git.timeline.compareWithSelected",
|
||||||
|
|
|
@ -23,6 +23,7 @@ import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/act
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
|
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
|
||||||
|
import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
|
||||||
|
|
||||||
class MultiDiffEditorResolverContribution extends Disposable {
|
class MultiDiffEditorResolverContribution extends Disposable {
|
||||||
|
|
||||||
|
@ -128,3 +129,13 @@ export class GoToFileAction extends Action2 {
|
||||||
}
|
}
|
||||||
|
|
||||||
registerAction2(GoToFileAction);
|
registerAction2(GoToFileAction);
|
||||||
|
|
||||||
|
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
|
||||||
|
properties: {
|
||||||
|
'multiDiffEditor.experimental.enabled': {
|
||||||
|
type: 'boolean',
|
||||||
|
default: false,
|
||||||
|
description: 'Enable experimental multi diff editor.',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in a new issue