Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable conflict marker decorators even if merge editor is enabled. (#157982)

Browse Source
This commit is contained in:
Henning Dieterichs
2022-08-12 15:21:38 +02:00
committed by GitHub
parent f8ad3a16bd
commit 7dd5f05b6e
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/merge-conflict/src/services.ts
View File

@@ -48,19 +48,6 @@ export default class ServiceWrapper implements vscode.Disposable {
}
createExtensionConfiguration(): interfaces.IExtensionConfiguration {
// PRAGMATIC way to avoid conflicting with the new merge editor: when git opts into
// 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>('mergeEditor')) {
return {
enableCodeLens: false,
enableDecorations: false,
enableEditorOverview: false
};
}
const workspaceConfiguration = vscode.workspace.getConfiguration(ConfigurationSectionName);
const codeLensEnabled: boolean = workspaceConfiguration.get('codeLens.enabled', true);
const decoratorsEnabled: boolean = workspaceConfiguration.get('decorators.enabled', true);