Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-25 15:35:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

scm.diffDecorations config setting

Browse Source 
fixes #21795
This commit is contained in:
Joao Moreno
2017-12-12 10:22:54 +01:00
parent 0af8e38d39
commit 3023911908
2 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
+40 -37
View File
@@ -46,7 +46,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { basename } from 'vs/base/common/paths';
import { MenuId, IMenuService, IMenu, MenuItemAction } from 'vs/platform/actions/common/actions';
import { fillInActions, MenuItemActionItem } from 'vs/platform/actions/browser/menuItemActionItem';
import { IChange, IEditorModel, ScrollType, IEditorContribution, OverviewRulerLane, IModel } from 'vs/editor/common/editorCommon';
import { IChange, IEditorModel, ScrollType, IEditorContribution, OverviewRulerLane, IModel, IModelDecorationOptions } from 'vs/editor/common/editorCommon';
import { sortedDiff, firstIndex } from 'vs/base/common/arrays';
import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
@@ -729,43 +729,46 @@ export const overviewRulerDeletedForeground = registerColor('editorOverviewRuler
class DirtyDiffDecorator {
static MODIFIED_DECORATION_OPTIONS = ModelDecorationOptions.register({
linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-modified',
isWholeLine: true,
overviewRuler: {
color: themeColorFromId(overviewRulerModifiedForeground),
darkColor: themeColorFromId(overviewRulerModifiedForeground),
position: OverviewRulerLane.Left
}
});
static createDecoration(className: string, foregroundColor: string, options: { gutter: boolean, overview: boolean }): ModelDecorationOptions {
const decorationOptions: IModelDecorationOptions = {
isWholeLine: true,
};
static ADDED_DECORATION_OPTIONS = ModelDecorationOptions.register({
linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-added',
isWholeLine: true,
overviewRuler: {
color: themeColorFromId(overviewRulerAddedForeground),
darkColor: themeColorFromId(overviewRulerAddedForeground),
position: OverviewRulerLane.Left
if (options.gutter) {
decorationOptions.linesDecorationsClassName = `dirty-diff-glyph ${className}`;
}
});
static DELETED_DECORATION_OPTIONS = ModelDecorationOptions.register({
linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-deleted',
isWholeLine: true,
overviewRuler: {
color: themeColorFromId(overviewRulerDeletedForeground),
darkColor: themeColorFromId(overviewRulerDeletedForeground),
position: OverviewRulerLane.Left
if (options.overview) {
decorationOptions.overviewRuler = {
color: themeColorFromId(overviewRulerModifiedForeground),
darkColor: themeColorFromId(overviewRulerModifiedForeground),
position: OverviewRulerLane.Left
};
}
});
return ModelDecorationOptions.createDynamic(decorationOptions);
}
private modifiedOptions: ModelDecorationOptions;
private addedOptions: ModelDecorationOptions;
private deletedOptions: ModelDecorationOptions;
private decorations: string[] = [];
private disposables: IDisposable[] = [];
constructor(
private editorModel: IModel,
private model: DirtyDiffModel
private model: DirtyDiffModel,
@IConfigurationService configurationService: IConfigurationService
) {
const decorations = configurationService.getValue<string>('scm.diffDecorations');
const gutter = decorations === 'all' || decorations === 'gutter';
const overview = decorations === 'all' || decorations === 'overview';
const options = { gutter, overview };
this.modifiedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-modified', overviewRulerModifiedForeground, options);
this.addedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-added', overviewRulerAddedForeground, options);
this.deletedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-deleted', overviewRulerDeletedForeground, options);
model.onDidChange(this.onDidChange, this, this.disposables);
}
@@ -782,7 +785,7 @@ class DirtyDiffDecorator {
startLineNumber: startLineNumber, startColumn: 1,
endLineNumber: endLineNumber, endColumn: 1
},
options: DirtyDiffDecorator.ADDED_DECORATION_OPTIONS
options: this.addedOptions
};
case ChangeType.Delete:
return {
@@ -790,7 +793,7 @@ class DirtyDiffDecorator {
startLineNumber: startLineNumber, startColumn: 1,
endLineNumber: startLineNumber, endColumn: 1
},
options: DirtyDiffDecorator.DELETED_DECORATION_OPTIONS
options: this.deletedOptions
};
case ChangeType.Modify:
return {
@@ -798,7 +801,7 @@ class DirtyDiffDecorator {
startLineNumber: startLineNumber, startColumn: 1,
endLineNumber: endLineNumber, endColumn: 1
},
options: DirtyDiffDecorator.MODIFIED_DECORATION_OPTIONS
options: this.modifiedOptions
};
}
});
@@ -1012,13 +1015,13 @@ export class DirtyDiffWorkbenchController implements ext.IWorkbenchContribution,
@IInstantiationService private instantiationService: IInstantiationService,
@IConfigurationService private configurationService: IConfigurationService
) {
const onDidChangeEnablement = filterEvent(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.enableDiffDecorations'));
onDidChangeEnablement(this.onDidChangeEnablement, this, this.disposables);
this.onDidChangeEnablement();
const onDidChangeConfiguration = filterEvent(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
this.onDidChangeConfiguration();
}
private onDidChangeEnablement(): void {
const enabled = this.configurationService.getValue('scm.enableDiffDecorations');
private onDidChangeConfiguration(): void {
const enabled = this.configurationService.getValue<string>('scm.diffDecorations') !== 'none';
if (enabled) {
this.enable();
@@ -1029,7 +1032,7 @@ export class DirtyDiffWorkbenchController implements ext.IWorkbenchContribution,
private enable(): void {
if (this.enabled) {
return;
this.disable();
}
this.transientDisposables.push(this.editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
@@ -1083,7 +1086,7 @@ export class DirtyDiffWorkbenchController implements ext.IWorkbenchContribution,
private onModelVisible(editorModel: IModel): void {
const model = this.instantiationService.createInstance(DirtyDiffModel, editorModel);
const decorator = new DirtyDiffDecorator(editorModel, model);
const decorator = new DirtyDiffDecorator(editorModel, model, this.configurationService);
this.items[editorModel.id] = new DirtyDiffItem(model, decorator);
}
src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
+5 -4
View File
@@ -68,10 +68,11 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
order: 5,
type: 'object',
properties: {
'scm.enableDiffDecorations': {
'type': 'boolean',
'default': true,
'description': localize('enableDiffDecorations', "Enables or disables diff decorations in the editor.")
'scm.diffDecorations': {
type: 'string',
enum: ['all', 'gutter', 'overview', 'none'],
default: 'all',
description: localize('diffDecorations', "Controls diff decorations in the editor.")
},
}
});