mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
Enable conflict marker decorators even if merge editor is enabled. (#157982)
This commit is contained in:
parent
f8ad3a16bd
commit
7dd5f05b6e
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue