From e27196db325964cb5238cc6e7170cf1eac3b9099 Mon Sep 17 00:00:00 2001 From: Phil Price Date: Tue, 23 May 2017 09:06:26 -0700 Subject: [PATCH] Update setting section name --- extensions/merge-conflict/src/services.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/merge-conflict/src/services.ts b/extensions/merge-conflict/src/services.ts index 3e825e37b11..2c7b5267364 100644 --- a/extensions/merge-conflict/src/services.ts +++ b/extensions/merge-conflict/src/services.ts @@ -10,7 +10,9 @@ import ContentProvider from './contentProvider'; import Decorator from './mergeDecorator'; import * as interfaces from './interfaces'; -const ConfigurationSectionName = 'git'; +const ConfigurationSectionName = 'merge-conflict'; +const FeatureEnabledProperty = 'enableEditorMerge'; +const AlwaysEnableDecorations = true; // If true, merge-conflict.enableEditorMerge is ignored export default class ServiceWrapper implements vscode.Disposable { @@ -49,11 +51,11 @@ export default class ServiceWrapper implements vscode.Disposable { createExtensionConfiguration(): interfaces.IExtensionConfiguration { const workspaceConfiguration = vscode.workspace.getConfiguration(ConfigurationSectionName); - const isEnabled: boolean = workspaceConfiguration.get('enableEditorMerge', true); + const isEnabled: boolean = workspaceConfiguration.get(FeatureEnabledProperty, true); return { enableCodeLens: isEnabled, - enableDecorations: isEnabled, + enableDecorations: AlwaysEnableDecorations || isEnabled, enableEditorOverview: isEnabled }; }