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

rename setting to git.mergeEditor, no more experimental

Browse source
This commit is contained in:
Johannes 2022-06-27 12:54:55 +02:00
parent 0182e175eb
commit aae22c1605
No known key found for this signature in database
GPG key ID: 6DEF802A22264FCA
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extensions/git/package.json
View file

@ -2500,14 +2500,11 @@
"markdownDescription": "%config.logLevel%",
"scope": "window"
},
"git.experimental.mergeEditor": {
"git.mergeEditor": {
"type": "boolean",
"default": false,
"markdownDescription": "%config.experimental.mergeEditor%",
"scope": "window",
"tags": [
"experimental"
]
"markdownDescription": "%config.mergeEditor%",
"scope": "window"
}
}
},

2
extensions/git/package.nls.json
View file

@ -243,7 +243,7 @@
"config.logLevel.error": "Log only error, and critical information",
"config.logLevel.critical": "Log only critical information",
"config.logLevel.off": "Log nothing",
"config.experimental.mergeEditor": "Open the _experimental_ merge editor for files that are currently under conflict.",
"config.mergeEditor": "Open the merge editor for files that are currently under conflict.",
"submenu.explorer": "Git",
"submenu.commit": "Commit",
"submenu.commit.amend": "Amend",

4
extensions/git/src/repository.ts
View file

@ -616,7 +616,7 @@ class ResourceCommandResolver {
if (!resource.leftUri) {
const bothModified = resource.type === Status.BOTH_MODIFIED;
if (resource.rightUri && bothModified && workspace.getConfiguration('git').get<boolean>('experimental.mergeEditor', false)) {
if (resource.rightUri && bothModified && workspace.getConfiguration('git').get<boolean>('mergeEditor', false)) {
return {
command: '_git.openMergeEditor',
title: localize('open.merge', "Open Merge"),
@ -935,7 +935,7 @@ export class Repository implements Disposable {
updateIndexGroupVisibility();
workspace.onDidChangeConfiguration(e => {
if (e.affectsConfiguration('git.experimental.mergeEditor')) {
if (e.affectsConfiguration('git.mergeEditor')) {
this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
}
}, undefined, this.disposables);

2
extensions/merge-conflict/src/services.ts
View file

@ -53,7 +53,7 @@ export default class ServiceWrapper implements vscode.Disposable {
// using the merge editor we disable this extension - for the merge editor but also
// for "other" editors
const gitConfig = vscode.workspace.getConfiguration('git');
if (gitConfig.get<boolean>('experimental.mergeEditor')) {
if (gitConfig.get<boolean>('mergeEditor')) {
return {
enableCodeLens: false,
enableDecorations: false,