development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update setting section name

Browse source
This commit is contained in:
Phil Price 2017-05-23 09:06:26 -07:00
parent b1b9619644
commit e27196db32
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
};
}