diffEditorWidget.ts 70.3 KB
Newer Older
E
Erich Gamma 已提交
1 2 3 4 5 6 7 8
/*---------------------------------------------------------------------------------------------
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

'use strict';

import 'vs/css!./media/diffEditor';
J
Johannes Rieken 已提交
9
import { RunOnceScheduler } from 'vs/base/common/async';
A
Alex Dima 已提交
10
import { Disposable } from 'vs/base/common/lifecycle';
A
Alex Dima 已提交
11 12
import * as objects from 'vs/base/common/objects';
import * as dom from 'vs/base/browser/dom';
A
Alex Dima 已提交
13
import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
J
Johannes Rieken 已提交
14 15 16
import { ISashEvent, IVerticalSashLayoutProvider, Sash } from 'vs/base/browser/ui/sash/sash';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
17
import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
A
Alex Dima 已提交
18
import { Range, IRange } from 'vs/editor/common/core/range';
A
Alex Dima 已提交
19
import * as editorCommon from 'vs/editor/common/editorCommon';
J
Johannes Rieken 已提交
20
import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
A
Alex Dima 已提交
21
import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
A
Alex Dima 已提交
22
import { renderViewLine, RenderLineInput } from 'vs/editor/common/viewLayout/viewLineRenderer';
A
Alex Dima 已提交
23
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
J
Johannes Rieken 已提交
24
import { CodeEditor } from 'vs/editor/browser/codeEditor';
A
Alex Dima 已提交
25
import { ViewLineToken } from 'vs/editor/common/core/viewLineToken';
J
Johannes Rieken 已提交
26
import { Configuration } from 'vs/editor/browser/config/configuration';
A
Alex Dima 已提交
27
import { Position, IPosition } from 'vs/editor/common/core/position';
A
Alex Dima 已提交
28
import { Selection, ISelection } from 'vs/editor/common/core/selection';
J
Johannes Rieken 已提交
29
import { InlineDecoration } from 'vs/editor/common/viewModel/viewModel';
J
Joao Moreno 已提交
30
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
A
Alex Dima 已提交
31
import { ColorId, MetadataConsts, FontStyle } from 'vs/editor/common/modes';
A
Alex Dima 已提交
32
import Event, { Emitter } from 'vs/base/common/event';
33
import * as editorOptions from 'vs/editor/common/config/editorOptions';
34
import { registerThemingParticipant, IThemeService, ITheme, getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
B
Benjamin Pasero 已提交
35 36
import { scrollbarShadow, diffInserted, diffRemoved, defaultInsertColor, defaultRemoveColor, diffInsertedOutline, diffRemovedOutline } from 'vs/platform/theme/common/colorRegistry';
import { Color } from 'vs/base/common/color';
37 38
import { OverviewRulerZone } from 'vs/editor/common/view/overviewZoneManager';
import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer';
E
Erich Gamma 已提交
39 40

interface IEditorDiffDecorations {
J
Johannes Rieken 已提交
41
	decorations: editorCommon.IModelDeltaDecoration[];
A
Alex Dima 已提交
42
	overviewZones: OverviewRulerZone[];
E
Erich Gamma 已提交
43 44 45
}

interface IEditorDiffDecorationsWithZones extends IEditorDiffDecorations {
J
Johannes Rieken 已提交
46
	zones: editorBrowser.IViewZone[];
E
Erich Gamma 已提交
47 48 49
}

interface IEditorsDiffDecorations {
J
Johannes Rieken 已提交
50 51
	original: IEditorDiffDecorations;
	modified: IEditorDiffDecorations;
E
Erich Gamma 已提交
52 53 54
}

interface IEditorsDiffDecorationsWithZones {
J
Johannes Rieken 已提交
55 56
	original: IEditorDiffDecorationsWithZones;
	modified: IEditorDiffDecorationsWithZones;
E
Erich Gamma 已提交
57 58 59
}

interface IEditorsZones {
J
Johannes Rieken 已提交
60 61
	original: editorBrowser.IViewZone[];
	modified: editorBrowser.IViewZone[];
E
Erich Gamma 已提交
62 63 64
}

interface IDiffEditorWidgetStyle {
A
Alex Dima 已提交
65
	getEditorsDiffDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalWhitespaces: IEditorWhitespace[], modifiedWhitespaces: IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorsDiffDecorationsWithZones;
J
Johannes Rieken 已提交
66
	setEnableSplitViewResizing(enableSplitViewResizing: boolean): void;
67
	applyColors(theme: ITheme): boolean;
E
Erich Gamma 已提交
68 69 70 71 72
	layout(): number;
	dispose(): void;
}

class VisualEditorState {
J
Johannes Rieken 已提交
73 74 75
	private _zones: number[];
	private _zonesMap: { [zoneId: string]: boolean; };
	private _decorations: string[];
E
Erich Gamma 已提交
76 77 78 79 80 81 82

	constructor() {
		this._zones = [];
		this._zonesMap = {};
		this._decorations = [];
	}

A
Alex Dima 已提交
83
	public getForeignViewZones(allViewZones: IEditorWhitespace[]): IEditorWhitespace[] {
E
Erich Gamma 已提交
84 85 86
		return allViewZones.filter((z) => !this._zonesMap[String(z.id)]);
	}

J
Johannes Rieken 已提交
87
	public clean(editor: CodeEditor): void {
E
Erich Gamma 已提交
88 89
		// (1) View zones
		if (this._zones.length > 0) {
J
Johannes Rieken 已提交
90
			editor.changeViewZones((viewChangeAccessor: editorBrowser.IViewZoneChangeAccessor) => {
A
Alex Dima 已提交
91
				for (let i = 0, length = this._zones.length; i < length; i++) {
E
Erich Gamma 已提交
92 93 94 95 96 97 98 99 100
					viewChangeAccessor.removeZone(this._zones[i]);
				}
			});
		}
		this._zones = [];
		this._zonesMap = {};

		// (2) Model decorations
		if (this._decorations.length > 0) {
J
Johannes Rieken 已提交
101
			editor.changeDecorations((changeAccessor: editorCommon.IModelDecorationsChangeAccessor) => {
E
Erich Gamma 已提交
102 103 104 105 106 107
				changeAccessor.deltaDecorations(this._decorations, []);
			});
		}
		this._decorations = [];
	}

J
Johannes Rieken 已提交
108
	public apply(editor: CodeEditor, overviewRuler: editorBrowser.IOverviewRuler, newDecorations: IEditorDiffDecorationsWithZones): void {
E
Erich Gamma 已提交
109
		// view zones
J
Johannes Rieken 已提交
110
		editor.changeViewZones((viewChangeAccessor: editorBrowser.IViewZoneChangeAccessor) => {
A
Alex Dima 已提交
111
			for (let i = 0, length = this._zones.length; i < length; i++) {
E
Erich Gamma 已提交
112 113 114 115
				viewChangeAccessor.removeZone(this._zones[i]);
			}
			this._zones = [];
			this._zonesMap = {};
A
Alex Dima 已提交
116
			for (let i = 0, length = newDecorations.zones.length; i < length; i++) {
E
Erich Gamma 已提交
117
				newDecorations.zones[i].suppressMouseDown = true;
A
Alex Dima 已提交
118
				let zoneId = viewChangeAccessor.addZone(newDecorations.zones[i]);
E
Erich Gamma 已提交
119 120 121 122 123 124 125 126 127
				this._zones.push(zoneId);
				this._zonesMap[String(zoneId)] = true;
			}
		});

		// decorations
		this._decorations = editor.deltaDecorations(this._decorations, newDecorations.decorations);

		// overview ruler
128 129 130
		if (overviewRuler) {
			overviewRuler.setZones(newDecorations.overviewZones);
		}
E
Erich Gamma 已提交
131 132 133
	}
}

A
Alex Dima 已提交
134
let DIFF_EDITOR_ID = 0;
E
Erich Gamma 已提交
135

A
Alex Dima 已提交
136
export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffEditor {
A
Alex Dima 已提交
137

E
Erich Gamma 已提交
138 139 140 141
	private static ONE_OVERVIEW_WIDTH = 15;
	public static ENTIRE_DIFF_OVERVIEW_WIDTH = 30;
	private static UPDATE_DIFF_DECORATIONS_DELAY = 200; // ms

A
Alex Dima 已提交
142 143
	private readonly _onDidDispose: Emitter<void> = this._register(new Emitter<void>());
	public readonly onDidDispose: Event<void> = this._onDidDispose.event;
E
Erich Gamma 已提交
144

A
Alex Dima 已提交
145 146 147 148
	private readonly _onDidUpdateDiff: Emitter<void> = this._register(new Emitter<void>());
	public readonly onDidUpdateDiff: Event<void> = this._onDidUpdateDiff.event;

	private readonly id: number;
E
Erich Gamma 已提交
149

J
Johannes Rieken 已提交
150
	private _domElement: HTMLElement;
A
Alex Dima 已提交
151 152 153
	protected readonly _containerDomElement: HTMLElement;
	private readonly _overviewDomElement: HTMLElement;
	private readonly _overviewViewportDomElement: FastDomNode<HTMLElement>;
E
Erich Gamma 已提交
154

J
Johannes Rieken 已提交
155 156
	private _width: number;
	private _height: number;
A
Alex Dima 已提交
157
	private readonly _measureDomElementToken: number;
E
Erich Gamma 已提交
158

J
Johannes Rieken 已提交
159 160 161 162
	private originalEditor: CodeEditor;
	private _originalDomNode: HTMLElement;
	private _originalEditorState: VisualEditorState;
	private _originalOverviewRuler: editorBrowser.IOverviewRuler;
E
Erich Gamma 已提交
163

J
Johannes Rieken 已提交
164 165 166 167
	private modifiedEditor: CodeEditor;
	private _modifiedDomNode: HTMLElement;
	private _modifiedEditorState: VisualEditorState;
	private _modifiedOverviewRuler: editorBrowser.IOverviewRuler;
E
Erich Gamma 已提交
168

J
Johannes Rieken 已提交
169 170 171 172
	private _currentlyChangingViewZones: boolean;
	private _beginUpdateDecorationsTimeout: number;
	private _diffComputationToken: number;
	private _lineChanges: editorCommon.ILineChange[];
E
Erich Gamma 已提交
173

J
Johannes Rieken 已提交
174 175
	private _isVisible: boolean;
	private _isHandlingScrollEvent: boolean;
E
Erich Gamma 已提交
176 177

	private _ignoreTrimWhitespace: boolean;
178
	private _originalIsEditable: boolean;
E
Erich Gamma 已提交
179

J
Johannes Rieken 已提交
180
	private _renderSideBySide: boolean;
181
	private _renderIndicators: boolean;
J
Johannes Rieken 已提交
182 183
	private _enableSplitViewResizing: boolean;
	private _strategy: IDiffEditorWidgetStyle;
E
Erich Gamma 已提交
184

J
Johannes Rieken 已提交
185
	private _updateDecorationsRunner: RunOnceScheduler;
E
Erich Gamma 已提交
186

187
	private _editorWorkerService: IEditorWorkerService;
188
	protected _contextKeyService: IContextKeyService;
189
	private _codeEditorService: ICodeEditorService;
190
	private _themeService: IThemeService;
191 192

	constructor(
J
Johannes Rieken 已提交
193
		domElement: HTMLElement,
194
		options: editorOptions.IDiffEditorOptions,
195
		@IEditorWorkerService editorWorkerService: IEditorWorkerService,
196
		@IContextKeyService contextKeyService: IContextKeyService,
197
		@IInstantiationService instantiationService: IInstantiationService,
198 199
		@ICodeEditorService codeEditorService: ICodeEditorService,
		@IThemeService themeService: IThemeService
200
	) {
E
Erich Gamma 已提交
201
		super();
A
Alex Dima 已提交
202

203
		this._editorWorkerService = editorWorkerService;
204
		this._codeEditorService = codeEditorService;
J
Joao Moreno 已提交
205 206
		this._contextKeyService = contextKeyService.createScoped(domElement);
		this._contextKeyService.createKey('isInDiffEditor', true);
207
		this._themeService = themeService;
E
Erich Gamma 已提交
208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225

		this.id = (++DIFF_EDITOR_ID);

		this._domElement = domElement;
		options = options || {};

		// renderSideBySide
		this._renderSideBySide = true;
		if (typeof options.renderSideBySide !== 'undefined') {
			this._renderSideBySide = options.renderSideBySide;
		}

		// ignoreTrimWhitespace
		this._ignoreTrimWhitespace = true;
		if (typeof options.ignoreTrimWhitespace !== 'undefined') {
			this._ignoreTrimWhitespace = options.ignoreTrimWhitespace;
		}

226 227 228 229 230 231
		// renderIndicators
		this._renderIndicators = true;
		if (typeof options.renderIndicators !== 'undefined') {
			this._renderIndicators = options.renderIndicators;
		}

232 233 234 235 236
		this._originalIsEditable = false;
		if (typeof options.originalEditable !== 'undefined') {
			this._originalIsEditable = Boolean(options.originalEditable);
		}

A
Alex Dima 已提交
237
		this._updateDecorationsRunner = this._register(new RunOnceScheduler(() => this._updateDecorations(), 0));
E
Erich Gamma 已提交
238 239

		this._containerDomElement = document.createElement('div');
240
		this._containerDomElement.className = DiffEditorWidget._getClassName(this._themeService.getTheme(), this._renderSideBySide);
E
Erich Gamma 已提交
241 242 243 244
		this._containerDomElement.style.position = 'relative';
		this._containerDomElement.style.height = '100%';
		this._domElement.appendChild(this._containerDomElement);

A
Alex Dima 已提交
245 246 247
		this._overviewViewportDomElement = createFastDomNode(document.createElement('div'));
		this._overviewViewportDomElement.setClassName('diffViewport');
		this._overviewViewportDomElement.setPosition('absolute');
E
Erich Gamma 已提交
248 249 250 251 252 253

		this._overviewDomElement = document.createElement('div');
		this._overviewDomElement.className = 'diffOverview';
		this._overviewDomElement.style.position = 'absolute';
		this._overviewDomElement.style.height = '100%';

A
Alex Dima 已提交
254
		this._overviewDomElement.appendChild(this._overviewViewportDomElement.domNode);
E
Erich Gamma 已提交
255

A
Alex Dima 已提交
256
		this._register(dom.addDisposableListener(this._overviewDomElement, 'mousedown', (e: MouseEvent) => {
E
Erich Gamma 已提交
257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278
			this.modifiedEditor.delegateVerticalScrollbarMouseDown(e);
		}));
		this._containerDomElement.appendChild(this._overviewDomElement);

		this._createLeftHandSide();
		this._createRightHandSide();

		this._beginUpdateDecorationsTimeout = -1;
		this._currentlyChangingViewZones = false;
		this._diffComputationToken = 0;

		this._originalEditorState = new VisualEditorState();
		this._modifiedEditorState = new VisualEditorState();

		this._isVisible = true;
		this._isHandlingScrollEvent = false;

		this._width = 0;
		this._height = 0;

		this._lineChanges = null;

J
Joao Moreno 已提交
279 280 281 282 283 284 285
		const services = new ServiceCollection();
		services.set(IContextKeyService, this._contextKeyService);

		const scopedInstantiationService = instantiationService.createChild(services);

		this._createLeftHandSideEditor(options, scopedInstantiationService);
		this._createRightHandSideEditor(options, scopedInstantiationService);
E
Erich Gamma 已提交
286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301

		if (options.automaticLayout) {
			this._measureDomElementToken = window.setInterval(() => this._measureDomElement(false), 100);
		}

		// enableSplitViewResizing
		this._enableSplitViewResizing = true;
		if (typeof options.enableSplitViewResizing !== 'undefined') {
			this._enableSplitViewResizing = options.enableSplitViewResizing;
		}

		if (this._renderSideBySide) {
			this._setStrategy(new DiffEdtorWidgetSideBySide(this._createDataSource(), this._enableSplitViewResizing));
		} else {
			this._setStrategy(new DiffEdtorWidgetInline(this._createDataSource(), this._enableSplitViewResizing));
		}
302 303

		this._codeEditorService.addDiffEditor(this);
304

305
		this._register(themeService.onThemeChange(t => {
306 307 308
			if (this._strategy && this._strategy.applyColors(t)) {
				this._updateDecorationsRunner.schedule();
			}
309 310
			this._containerDomElement.className = DiffEditorWidget._getClassName(this._themeService.getTheme(), this._renderSideBySide);
		}));
E
Erich Gamma 已提交
311 312
	}

313 314 315 316 317 318 319 320
	public get ignoreTrimWhitespace(): boolean {
		return this._ignoreTrimWhitespace;
	}

	public get renderSideBySide(): boolean {
		return this._renderSideBySide;
	}

321 322 323 324
	public get renderIndicators(): boolean {
		return this._renderIndicators;
	}

325
	private static _getClassName(theme: ITheme, renderSideBySide: boolean): string {
A
Alex Dima 已提交
326
		let result = 'monaco-diff-editor monaco-editor-background ';
E
Erich Gamma 已提交
327 328 329
		if (renderSideBySide) {
			result += 'side-by-side ';
		}
330
		result += getThemeTypeSelector(theme.type);
E
Erich Gamma 已提交
331 332 333 334 335 336 337 338
		return result;
	}

	private _recreateOverviewRulers(): void {
		if (this._originalOverviewRuler) {
			this._overviewDomElement.removeChild(this._originalOverviewRuler.getDomNode());
			this._originalOverviewRuler.dispose();
		}
A
Alex Dima 已提交
339
		this._originalOverviewRuler = this.originalEditor.createOverviewRuler('original diffOverviewRuler', 4, Number.MAX_VALUE);
E
Erich Gamma 已提交
340 341 342 343 344 345
		this._overviewDomElement.appendChild(this._originalOverviewRuler.getDomNode());

		if (this._modifiedOverviewRuler) {
			this._overviewDomElement.removeChild(this._modifiedOverviewRuler.getDomNode());
			this._modifiedOverviewRuler.dispose();
		}
A
Alex Dima 已提交
346
		this._modifiedOverviewRuler = this.modifiedEditor.createOverviewRuler('modified diffOverviewRuler', 4, Number.MAX_VALUE);
E
Erich Gamma 已提交
347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367
		this._overviewDomElement.appendChild(this._modifiedOverviewRuler.getDomNode());

		this._layoutOverviewRulers();
	}

	private _createLeftHandSide(): void {
		this._originalDomNode = document.createElement('div');
		this._originalDomNode.className = 'editor original';
		this._originalDomNode.style.position = 'absolute';
		this._originalDomNode.style.height = '100%';
		this._containerDomElement.appendChild(this._originalDomNode);
	}

	private _createRightHandSide(): void {
		this._modifiedDomNode = document.createElement('div');
		this._modifiedDomNode.className = 'editor modified';
		this._modifiedDomNode.style.position = 'absolute';
		this._modifiedDomNode.style.height = '100%';
		this._containerDomElement.appendChild(this._modifiedDomNode);
	}

368
	private _createLeftHandSideEditor(options: editorOptions.IDiffEditorOptions, instantiationService: IInstantiationService): void {
A
Alex Dima 已提交
369
		this.originalEditor = this._createInnerEditor(instantiationService, this._originalDomNode, this._adjustOptionsForLeftHandSide(options, this._originalIsEditable));
A
Alex Dima 已提交
370

A
Alex Dima 已提交
371
		this._register(this.originalEditor.onDidScrollChange((e) => {
A
Alex Dima 已提交
372 373 374 375 376 377 378 379 380 381 382 383
			if (this._isHandlingScrollEvent) {
				return;
			}
			if (!e.scrollTopChanged && !e.scrollLeftChanged) {
				return;
			}
			this._isHandlingScrollEvent = true;
			this.modifiedEditor.setScrollPosition({
				scrollLeft: e.scrollLeft,
				scrollTop: e.scrollTop
			});
			this._isHandlingScrollEvent = false;
384 385

			this._layoutOverviewViewport();
A
Alex Dima 已提交
386 387
		}));

A
Alex Dima 已提交
388
		this._register(this.originalEditor.onDidChangeViewZones(() => {
A
Alex Dima 已提交
389 390 391
			this._onViewZonesChanged();
		}));

A
Alex Dima 已提交
392
		this._register(this.originalEditor.onDidChangeModelContent(() => {
A
Alex Dima 已提交
393 394 395 396
			if (this._isVisible) {
				this._beginUpdateDecorationsSoon();
			}
		}));
E
Erich Gamma 已提交
397 398
	}

399
	private _createRightHandSideEditor(options: editorOptions.IDiffEditorOptions, instantiationService: IInstantiationService): void {
A
Alex Dima 已提交
400
		this.modifiedEditor = this._createInnerEditor(instantiationService, this._modifiedDomNode, this._adjustOptionsForRightHandSide(options));
A
Alex Dima 已提交
401

A
Alex Dima 已提交
402
		this._register(this.modifiedEditor.onDidScrollChange((e) => {
A
Alex Dima 已提交
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418
			if (this._isHandlingScrollEvent) {
				return;
			}
			if (!e.scrollTopChanged && !e.scrollLeftChanged) {
				return;
			}
			this._isHandlingScrollEvent = true;
			this.originalEditor.setScrollPosition({
				scrollLeft: e.scrollLeft,
				scrollTop: e.scrollTop
			});
			this._isHandlingScrollEvent = false;

			this._layoutOverviewViewport();
		}));

A
Alex Dima 已提交
419
		this._register(this.modifiedEditor.onDidChangeViewZones(() => {
A
Alex Dima 已提交
420 421 422
			this._onViewZonesChanged();
		}));

A
Alex Dima 已提交
423
		this._register(this.modifiedEditor.onDidChangeConfiguration((e) => {
A
Alex Dima 已提交
424 425 426 427 428
			if (e.fontInfo && this.modifiedEditor.getModel()) {
				this._onViewZonesChanged();
			}
		}));

A
Alex Dima 已提交
429
		this._register(this.modifiedEditor.onDidChangeModelContent(() => {
A
Alex Dima 已提交
430 431 432 433
			if (this._isVisible) {
				this._beginUpdateDecorationsSoon();
			}
		}));
E
Erich Gamma 已提交
434 435
	}

436
	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: editorOptions.IEditorOptions): CodeEditor {
A
Alex Dima 已提交
437 438 439
		return instantiationService.createInstance(CodeEditor, container, options);
	}

E
Erich Gamma 已提交
440 441 442 443 444
	public destroy(): void {
		this.dispose();
	}

	public dispose(): void {
445 446
		this._codeEditorService.removeDiffEditor(this);

E
Erich Gamma 已提交
447 448 449 450 451 452 453
		window.clearInterval(this._measureDomElementToken);

		this._cleanViewZonesAndDecorations();

		this._originalOverviewRuler.dispose();
		this._modifiedOverviewRuler.dispose();

A
Alex Dima 已提交
454 455
		this.originalEditor.dispose();
		this.modifiedEditor.dispose();
E
Erich Gamma 已提交
456 457 458

		this._strategy.dispose();

A
Alex Dima 已提交
459
		this._onDidDispose.fire();
A
Alex Dima 已提交
460

E
Erich Gamma 已提交
461 462 463 464 465 466 467 468 469 470
		super.dispose();
	}

	//------------ begin IDiffEditor methods

	public getId(): string {
		return this.getEditorType() + ':' + this.id;
	}

	public getEditorType(): string {
A
Alex Dima 已提交
471
		return editorCommon.EditorType.IDiffEditor;
E
Erich Gamma 已提交
472 473
	}

A
Alex Dima 已提交
474
	public getLineChanges(): editorCommon.ILineChange[] {
E
Erich Gamma 已提交
475 476 477
		return this._lineChanges;
	}

A
Alex Dima 已提交
478
	public getOriginalEditor(): editorBrowser.ICodeEditor {
E
Erich Gamma 已提交
479 480 481
		return this.originalEditor;
	}

A
Alex Dima 已提交
482
	public getModifiedEditor(): editorBrowser.ICodeEditor {
E
Erich Gamma 已提交
483 484 485
		return this.modifiedEditor;
	}

486
	public updateOptions(newOptions: editorOptions.IDiffEditorOptions): void {
E
Erich Gamma 已提交
487 488

		// Handle side by side
A
Alex Dima 已提交
489
		let renderSideBySideChanged = false;
E
Erich Gamma 已提交
490 491 492 493 494 495 496
		if (typeof newOptions.renderSideBySide !== 'undefined') {
			if (this._renderSideBySide !== newOptions.renderSideBySide) {
				this._renderSideBySide = newOptions.renderSideBySide;
				renderSideBySideChanged = true;
			}
		}

497 498
		let beginUpdateDecorations = false;

E
Erich Gamma 已提交
499 500 501 502
		if (typeof newOptions.ignoreTrimWhitespace !== 'undefined') {
			if (this._ignoreTrimWhitespace !== newOptions.ignoreTrimWhitespace) {
				this._ignoreTrimWhitespace = newOptions.ignoreTrimWhitespace;
				// Begin comparing
503 504 505 506 507 508 509 510
				beginUpdateDecorations = true;
			}
		}

		if (typeof newOptions.renderIndicators !== 'undefined') {
			if (this._renderIndicators !== newOptions.renderIndicators) {
				this._renderIndicators = newOptions.renderIndicators;
				beginUpdateDecorations = true;
E
Erich Gamma 已提交
511 512 513
			}
		}

514 515 516 517
		if (beginUpdateDecorations) {
			this._beginUpdateDecorations();
		}

518 519 520 521
		if (typeof newOptions.originalEditable !== 'undefined') {
			this._originalIsEditable = Boolean(newOptions.originalEditable);
		}

E
Erich Gamma 已提交
522
		this.modifiedEditor.updateOptions(this._adjustOptionsForRightHandSide(newOptions));
523
		this.originalEditor.updateOptions(this._adjustOptionsForLeftHandSide(newOptions, this._originalIsEditable));
E
Erich Gamma 已提交
524 525 526 527 528 529 530 531 532 533

		// enableSplitViewResizing
		if (typeof newOptions.enableSplitViewResizing !== 'undefined') {
			this._enableSplitViewResizing = newOptions.enableSplitViewResizing;
		}
		this._strategy.setEnableSplitViewResizing(this._enableSplitViewResizing);

		// renderSideBySide
		if (renderSideBySideChanged) {
			if (this._renderSideBySide) {
534
				this._setStrategy(new DiffEdtorWidgetSideBySide(this._createDataSource(), this._enableSplitViewResizing, ));
E
Erich Gamma 已提交
535 536 537
			} else {
				this._setStrategy(new DiffEdtorWidgetInline(this._createDataSource(), this._enableSplitViewResizing));
			}
538 539
			// Update class name
			this._containerDomElement.className = DiffEditorWidget._getClassName(this._themeService.getTheme(), this._renderSideBySide);
E
Erich Gamma 已提交
540 541 542
		}
	}

J
Johannes Rieken 已提交
543
	public getValue(options: { preserveBOM: boolean; lineEnding: string; } = null): string {
E
Erich Gamma 已提交
544 545 546
		return this.modifiedEditor.getValue(options);
	}

A
Alex Dima 已提交
547
	public getModel(): editorCommon.IDiffEditorModel {
E
Erich Gamma 已提交
548 549 550 551 552 553
		return {
			original: this.originalEditor.getModel(),
			modified: this.modifiedEditor.getModel()
		};
	}

J
Johannes Rieken 已提交
554
	public setModel(model: editorCommon.IDiffEditorModel): void {
E
Erich Gamma 已提交
555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592
		// Guard us against partial null model
		if (model && (!model.original || !model.modified)) {
			throw new Error(!model.original ? 'DiffEditorWidget.setModel: Original model is null' : 'DiffEditorWidget.setModel: Modified model is null');
		}

		// Remove all view zones & decorations
		this._cleanViewZonesAndDecorations();

		// Update code editor models
		this.originalEditor.setModel(model ? model.original : null);
		this.modifiedEditor.setModel(model ? model.modified : null);
		this._updateDecorationsRunner.cancel();

		if (model) {
			this.originalEditor.setScrollTop(0);
			this.modifiedEditor.setScrollTop(0);
		}

		// Disable any diff computations that will come in
		this._lineChanges = null;
		this._diffComputationToken++;

		if (model) {
			this._recreateOverviewRulers();

			// Begin comparing
			this._beginUpdateDecorations();
		} else {
			this._lineChanges = null;
		}

		this._layoutOverviewViewport();
	}

	public getDomNode(): HTMLElement {
		return this._domElement;
	}

A
Alex Dima 已提交
593
	public getVisibleColumnFromPosition(position: IPosition): number {
E
Erich Gamma 已提交
594 595 596
		return this.modifiedEditor.getVisibleColumnFromPosition(position);
	}

A
Alex Dima 已提交
597
	public getPosition(): Position {
E
Erich Gamma 已提交
598 599 600
		return this.modifiedEditor.getPosition();
	}

A
Alex Dima 已提交
601
	public setPosition(position: IPosition, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void {
E
Erich Gamma 已提交
602 603 604 605 606 607 608 609 610 611 612 613 614 615 616
		this.modifiedEditor.setPosition(position, reveal, revealVerticalInCenter, revealHorizontal);
	}

	public revealLine(lineNumber: number): void {
		this.modifiedEditor.revealLine(lineNumber);
	}

	public revealLineInCenter(lineNumber: number): void {
		this.modifiedEditor.revealLineInCenter(lineNumber);
	}

	public revealLineInCenterIfOutsideViewport(lineNumber: number): void {
		this.modifiedEditor.revealLineInCenterIfOutsideViewport(lineNumber);
	}

A
Alex Dima 已提交
617
	public revealPosition(position: IPosition, revealVerticalInCenter: boolean = false, revealHorizontal: boolean = false): void {
E
Erich Gamma 已提交
618 619 620
		this.modifiedEditor.revealPosition(position, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
621
	public revealPositionInCenter(position: IPosition): void {
E
Erich Gamma 已提交
622 623 624
		this.modifiedEditor.revealPositionInCenter(position);
	}

A
Alex Dima 已提交
625
	public revealPositionInCenterIfOutsideViewport(position: IPosition): void {
E
Erich Gamma 已提交
626 627 628
		this.modifiedEditor.revealPositionInCenterIfOutsideViewport(position);
	}

629
	public getSelection(): Selection {
E
Erich Gamma 已提交
630 631 632
		return this.modifiedEditor.getSelection();
	}

633
	public getSelections(): Selection[] {
E
Erich Gamma 已提交
634 635 636
		return this.modifiedEditor.getSelections();
	}

A
Alex Dima 已提交
637
	public setSelection(range: IRange, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void;
J
Johannes Rieken 已提交
638
	public setSelection(editorRange: Range, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void;
A
Alex Dima 已提交
639
	public setSelection(selection: ISelection, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void;
J
Johannes Rieken 已提交
640 641
	public setSelection(editorSelection: Selection, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void;
	public setSelection(something: any, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void {
E
Erich Gamma 已提交
642 643 644
		this.modifiedEditor.setSelection(something, reveal, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
645
	public setSelections(ranges: ISelection[]): void {
E
Erich Gamma 已提交
646 647 648 649 650 651 652 653 654 655 656 657 658 659 660
		this.modifiedEditor.setSelections(ranges);
	}

	public revealLines(startLineNumber: number, endLineNumber: number): void {
		this.modifiedEditor.revealLines(startLineNumber, endLineNumber);
	}

	public revealLinesInCenter(startLineNumber: number, endLineNumber: number): void {
		this.modifiedEditor.revealLinesInCenter(startLineNumber, endLineNumber);
	}

	public revealLinesInCenterIfOutsideViewport(startLineNumber: number, endLineNumber: number): void {
		this.modifiedEditor.revealLinesInCenterIfOutsideViewport(startLineNumber, endLineNumber);
	}

A
Alex Dima 已提交
661
	public revealRange(range: IRange, revealVerticalInCenter: boolean = false, revealHorizontal: boolean = true): void {
E
Erich Gamma 已提交
662 663 664
		this.modifiedEditor.revealRange(range, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
665
	public revealRangeInCenter(range: IRange): void {
E
Erich Gamma 已提交
666 667 668
		this.modifiedEditor.revealRangeInCenter(range);
	}

A
Alex Dima 已提交
669
	public revealRangeInCenterIfOutsideViewport(range: IRange): void {
E
Erich Gamma 已提交
670 671 672
		this.modifiedEditor.revealRangeInCenterIfOutsideViewport(range);
	}

A
Alex Dima 已提交
673
	public revealRangeAtTop(range: IRange): void {
674 675 676
		this.modifiedEditor.revealRangeAtTop(range);
	}

A
Alex Dima 已提交
677
	public getActions(): editorCommon.IEditorAction[] {
E
Erich Gamma 已提交
678 679 680
		return this.modifiedEditor.getActions();
	}

A
Alex Dima 已提交
681
	public getSupportedActions(): editorCommon.IEditorAction[] {
682 683 684
		return this.modifiedEditor.getSupportedActions();
	}

J
Johannes Rieken 已提交
685
	public getAction(id: string): editorCommon.IEditorAction {
E
Erich Gamma 已提交
686 687 688
		return this.modifiedEditor.getAction(id);
	}

A
Alex Dima 已提交
689
	public saveViewState(): editorCommon.IDiffEditorViewState {
A
Alex Dima 已提交
690 691
		let originalViewState = this.originalEditor.saveViewState();
		let modifiedViewState = this.modifiedEditor.saveViewState();
E
Erich Gamma 已提交
692 693 694 695 696 697
		return {
			original: originalViewState,
			modified: modifiedViewState
		};
	}

A
Alex Dima 已提交
698
	public restoreViewState(s: editorCommon.IDiffEditorViewState): void {
E
Erich Gamma 已提交
699
		if (s.original && s.original) {
A
Alex Dima 已提交
700
			let diffEditorState = <editorCommon.IDiffEditorViewState>s;
E
Erich Gamma 已提交
701 702 703 704 705
			this.originalEditor.restoreViewState(diffEditorState.original);
			this.modifiedEditor.restoreViewState(diffEditorState.modified);
		}
	}

J
Johannes Rieken 已提交
706
	public layout(dimension?: editorCommon.IDimension): void {
E
Erich Gamma 已提交
707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733
		this._measureDomElement(false, dimension);
	}

	public focus(): void {
		this.modifiedEditor.focus();
	}

	public isFocused(): boolean {
		return this.originalEditor.isFocused() || this.modifiedEditor.isFocused();
	}

	public onVisible(): void {
		this._isVisible = true;
		this.originalEditor.onVisible();
		this.modifiedEditor.onVisible();
		// Begin comparing
		this._beginUpdateDecorations();
	}

	public onHide(): void {
		this._isVisible = false;
		this.originalEditor.onHide();
		this.modifiedEditor.onHide();
		// Remove all view zones & decorations
		this._cleanViewZonesAndDecorations();
	}

J
Johannes Rieken 已提交
734
	public trigger(source: string, handlerId: string, payload: any): void {
E
Erich Gamma 已提交
735 736 737
		this.modifiedEditor.trigger(source, handlerId, payload);
	}

J
Johannes Rieken 已提交
738
	public changeDecorations(callback: (changeAccessor: editorCommon.IModelDecorationsChangeAccessor) => any): any {
E
Erich Gamma 已提交
739 740 741 742 743 744 745 746 747
		return this.modifiedEditor.changeDecorations(callback);
	}

	//------------ end IDiffEditor methods



	//------------ begin layouting methods

J
Johannes Rieken 已提交
748
	private _measureDomElement(forceDoLayoutCall: boolean, dimensions?: editorCommon.IDimension): void {
749 750 751 752
		dimensions = dimensions || {
			width: this._containerDomElement.clientWidth,
			height: this._containerDomElement.clientHeight
		};
E
Erich Gamma 已提交
753 754

		if (dimensions.width <= 0) {
755 756
			this._width = 0;
			this._height = 0;
E
Erich Gamma 已提交
757 758 759 760 761 762 763 764 765 766 767 768 769 770 771
			return;
		}

		if (!forceDoLayoutCall && dimensions.width === this._width && dimensions.height === this._height) {
			// Nothing has changed
			return;
		}

		this._width = dimensions.width;
		this._height = dimensions.height;

		this._doLayout();
	}

	private _layoutOverviewRulers(): void {
A
Alex Dima 已提交
772 773
		let freeSpace = DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH - 2 * DiffEditorWidget.ONE_OVERVIEW_WIDTH;
		let layoutInfo = this.modifiedEditor.getLayoutInfo();
E
Erich Gamma 已提交
774
		if (layoutInfo) {
A
Alex Dima 已提交
775
			this._originalOverviewRuler.setLayout({
E
Erich Gamma 已提交
776 777 778
				top: 0,
				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
				right: freeSpace + DiffEditorWidget.ONE_OVERVIEW_WIDTH,
779
				height: this._height
A
Alex Dima 已提交
780 781
			});
			this._modifiedOverviewRuler.setLayout({
E
Erich Gamma 已提交
782 783 784
				top: 0,
				right: 0,
				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
785
				height: this._height
A
Alex Dima 已提交
786
			});
E
Erich Gamma 已提交
787 788 789 790 791 792 793 794 795 796 797 798
		}
	}

	//------------ end layouting methods

	private _onViewZonesChanged(): void {
		if (this._currentlyChangingViewZones) {
			return;
		}
		this._updateDecorationsRunner.schedule();
	}

A
Alex Dima 已提交
799 800 801 802 803 804 805 806 807
	private _beginUpdateDecorationsSoon(): void {
		// Clear previous timeout if necessary
		if (this._beginUpdateDecorationsTimeout !== -1) {
			window.clearTimeout(this._beginUpdateDecorationsTimeout);
			this._beginUpdateDecorationsTimeout = -1;
		}
		this._beginUpdateDecorationsTimeout = window.setTimeout(() => this._beginUpdateDecorations(), DiffEditorWidget.UPDATE_DIFF_DECORATIONS_DELAY);
	}

E
Erich Gamma 已提交
808 809 810 811 812 813 814 815 816 817
	private _beginUpdateDecorations(): void {
		this._beginUpdateDecorationsTimeout = -1;
		if (!this.modifiedEditor.getModel()) {
			return;
		}

		// Prevent old diff requests to come if a new request has been initiated
		// The best method would be to call cancel on the Promise, but this is not
		// yet supported, so using tokens for now.
		this._diffComputationToken++;
A
Alex Dima 已提交
818 819 820
		let currentToken = this._diffComputationToken;
		let currentOriginalModel = this.originalEditor.getModel();
		let currentModifiedModel = this.modifiedEditor.getModel();
E
Erich Gamma 已提交
821

822
		this._editorWorkerService.computeDiff(currentOriginalModel.uri, currentModifiedModel.uri, this._ignoreTrimWhitespace).then((result) => {
823 824 825
			if (currentToken === this._diffComputationToken
				&& currentOriginalModel === this.originalEditor.getModel()
				&& currentModifiedModel === this.modifiedEditor.getModel()
J
Johannes Rieken 已提交
826
			) {
827 828
				this._lineChanges = result;
				this._updateDecorationsRunner.schedule();
A
Alex Dima 已提交
829
				this._onDidUpdateDiff.fire();
830 831 832 833 834
			}
		}, (error) => {
			if (currentToken === this._diffComputationToken
				&& currentOriginalModel === this.originalEditor.getModel()
				&& currentModifiedModel === this.modifiedEditor.getModel()
J
Johannes Rieken 已提交
835
			) {
E
Erich Gamma 已提交
836 837 838
				this._lineChanges = null;
				this._updateDecorationsRunner.schedule();
			}
839
		});
E
Erich Gamma 已提交
840 841 842 843 844 845 846 847
	}

	private _cleanViewZonesAndDecorations(): void {
		this._originalEditorState.clean(this.originalEditor);
		this._modifiedEditorState.clean(this.modifiedEditor);
	}

	private _updateDecorations(): void {
848 849 850
		if (!this.originalEditor.getModel() || !this.modifiedEditor.getModel()) {
			return;
		}
A
Alex Dima 已提交
851
		let lineChanges = this._lineChanges || [];
E
Erich Gamma 已提交
852

A
Alex Dima 已提交
853 854
		let foreignOriginal = this._originalEditorState.getForeignViewZones(this.originalEditor.getWhitespaces());
		let foreignModified = this._modifiedEditorState.getForeignViewZones(this.modifiedEditor.getWhitespaces());
E
Erich Gamma 已提交
855

856
		let diffDecorations = this._strategy.getEditorsDiffDecorations(lineChanges, this._ignoreTrimWhitespace, this._renderIndicators, foreignOriginal, foreignModified, this.originalEditor, this.modifiedEditor);
E
Erich Gamma 已提交
857 858 859 860 861 862 863 864 865 866

		try {
			this._currentlyChangingViewZones = true;
			this._originalEditorState.apply(this.originalEditor, this._originalOverviewRuler, diffDecorations.original);
			this._modifiedEditorState.apply(this.modifiedEditor, this._modifiedOverviewRuler, diffDecorations.modified);
		} finally {
			this._currentlyChangingViewZones = false;
		}
	}

867 868
	private _adjustOptionsForSubEditor(options: editorOptions.IDiffEditorOptions): editorOptions.IDiffEditorOptions {
		let clonedOptions: editorOptions.IDiffEditorOptions = objects.clone(options || {});
A
Alex Dima 已提交
869
		clonedOptions.inDiffEditor = true;
870
		clonedOptions.wordWrap = 'off';
871
		clonedOptions.wordWrapMinified = false;
E
Erich Gamma 已提交
872 873 874
		clonedOptions.automaticLayout = false;
		clonedOptions.scrollbar = clonedOptions.scrollbar || {};
		clonedOptions.scrollbar.vertical = 'visible';
A
Alex Dima 已提交
875
		clonedOptions.folding = false;
876
		clonedOptions.codeLens = false;
J
Joao Moreno 已提交
877
		clonedOptions.fixedOverflowWidgets = true;
878
		clonedOptions.lineDecorationsWidth = '2ch';
879 880 881
		if (!clonedOptions.minimap) {
			clonedOptions.minimap = {};
		}
882
		clonedOptions.minimap.enabled = false;
E
Erich Gamma 已提交
883 884 885
		return clonedOptions;
	}

886
	private _adjustOptionsForLeftHandSide(options: editorOptions.IDiffEditorOptions, isEditable: boolean): editorOptions.IEditorOptions {
887 888 889
		let result = this._adjustOptionsForSubEditor(options);
		result.readOnly = !isEditable;
		result.overviewRulerLanes = 1;
890
		result.extraEditorClassName = 'original-in-monaco-diff-editor';
891 892 893
		return result;
	}

894
	private _adjustOptionsForRightHandSide(options: editorOptions.IDiffEditorOptions): editorOptions.IEditorOptions {
895
		let result = this._adjustOptionsForSubEditor(options);
A
Alex Dima 已提交
896
		result.revealHorizontalRightPadding = editorOptions.EDITOR_DEFAULTS.viewInfo.revealHorizontalRightPadding + DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
897
		result.scrollbar.verticalHasArrows = false;
898
		result.extraEditorClassName = 'modified-in-monaco-diff-editor';
899
		return result;
E
Erich Gamma 已提交
900 901 902
	}

	private _doLayout(): void {
A
Alex Dima 已提交
903
		let splitPoint = this._strategy.layout();
E
Erich Gamma 已提交
904 905 906 907 908 909 910 911 912 913

		this._originalDomNode.style.width = splitPoint + 'px';
		this._originalDomNode.style.left = '0px';

		this._modifiedDomNode.style.width = (this._width - splitPoint) + 'px';
		this._modifiedDomNode.style.left = splitPoint + 'px';

		this._overviewDomElement.style.top = '0px';
		this._overviewDomElement.style.width = DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH + 'px';
		this._overviewDomElement.style.left = (this._width - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH) + 'px';
A
Alex Dima 已提交
914 915
		this._overviewViewportDomElement.setWidth(DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH);
		this._overviewViewportDomElement.setHeight(30);
E
Erich Gamma 已提交
916 917 918 919 920 921 922 923 924 925 926 927

		this.originalEditor.layout({ width: splitPoint, height: this._height });
		this.modifiedEditor.layout({ width: this._width - splitPoint - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH, height: this._height });

		if (this._originalOverviewRuler || this._modifiedOverviewRuler) {
			this._layoutOverviewRulers();
		}

		this._layoutOverviewViewport();
	}

	private _layoutOverviewViewport(): void {
A
Alex Dima 已提交
928
		let layout = this._computeOverviewViewport();
E
Erich Gamma 已提交
929
		if (!layout) {
A
Alex Dima 已提交
930 931
			this._overviewViewportDomElement.setTop(0);
			this._overviewViewportDomElement.setHeight(0);
E
Erich Gamma 已提交
932
		} else {
A
Alex Dima 已提交
933 934
			this._overviewViewportDomElement.setTop(layout.top);
			this._overviewViewportDomElement.setHeight(layout.height);
E
Erich Gamma 已提交
935 936 937
		}
	}

J
Johannes Rieken 已提交
938
	private _computeOverviewViewport(): { height: number; top: number; } {
A
Alex Dima 已提交
939
		let layoutInfo = this.modifiedEditor.getLayoutInfo();
E
Erich Gamma 已提交
940 941 942 943
		if (!layoutInfo) {
			return null;
		}

A
Alex Dima 已提交
944 945
		let scrollTop = this.modifiedEditor.getScrollTop();
		let scrollHeight = this.modifiedEditor.getScrollHeight();
E
Erich Gamma 已提交
946

A
Alex Dima 已提交
947 948 949
		let computedAvailableSize = Math.max(0, layoutInfo.contentHeight);
		let computedRepresentableSize = Math.max(0, computedAvailableSize - 2 * 0);
		let computedRatio = scrollHeight > 0 ? (computedRepresentableSize / scrollHeight) : 0;
E
Erich Gamma 已提交
950

A
Alex Dima 已提交
951 952
		let computedSliderSize = Math.max(1, Math.floor(layoutInfo.contentHeight * computedRatio));
		let computedSliderPosition = Math.floor(scrollTop * computedRatio);
E
Erich Gamma 已提交
953 954 955 956 957 958 959

		return {
			height: computedSliderSize,
			top: computedSliderPosition
		};
	}

J
Johannes Rieken 已提交
960
	private _createDataSource(): IDataSource {
E
Erich Gamma 已提交
961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987
		return {
			getWidth: () => {
				return this._width;
			},

			getHeight: () => {
				return this._height;
			},

			getContainerDomNode: () => {
				return this._containerDomElement;
			},

			relayoutEditors: () => {
				this._doLayout();
			},

			getOriginalEditor: () => {
				return this.originalEditor;
			},

			getModifiedEditor: () => {
				return this.modifiedEditor;
			}
		};
	}

J
Johannes Rieken 已提交
988
	private _setStrategy(newStrategy: IDiffEditorWidgetStyle): void {
E
Erich Gamma 已提交
989 990 991 992 993
		if (this._strategy) {
			this._strategy.dispose();
		}

		this._strategy = newStrategy;
994
		newStrategy.applyColors(this._themeService.getTheme());
E
Erich Gamma 已提交
995 996 997 998 999 1000 1001 1002 1003

		if (this._lineChanges) {
			this._updateDecorations();
		}

		// Just do a layout, the strategy might need it
		this._measureDomElement(true);
	}

J
Johannes Rieken 已提交
1004
	private _getLineChangeAtOrBeforeLineNumber(lineNumber: number, startLineNumberExtractor: (lineChange: editorCommon.ILineChange) => number): editorCommon.ILineChange {
E
Erich Gamma 已提交
1005 1006 1007 1008 1009
		if (this._lineChanges.length === 0 || lineNumber < startLineNumberExtractor(this._lineChanges[0])) {
			// There are no changes or `lineNumber` is before the first change
			return null;
		}

A
Alex Dima 已提交
1010
		let min = 0, max = this._lineChanges.length - 1;
E
Erich Gamma 已提交
1011
		while (min < max) {
A
Alex Dima 已提交
1012 1013 1014
			let mid = Math.floor((min + max) / 2);
			let midStart = startLineNumberExtractor(this._lineChanges[mid]);
			let midEnd = (mid + 1 <= max ? startLineNumberExtractor(this._lineChanges[mid + 1]) : Number.MAX_VALUE);
E
Erich Gamma 已提交
1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029

			if (lineNumber < midStart) {
				max = mid - 1;
			} else if (lineNumber >= midEnd) {
				min = mid + 1;
			} else {
				// HIT!
				min = mid;
				max = mid;
			}
		}
		return this._lineChanges[min];
	}

	private _getEquivalentLineForOriginalLineNumber(lineNumber: number): number {
A
Alex Dima 已提交
1030
		let lineChange = this._getLineChangeAtOrBeforeLineNumber(lineNumber, (lineChange) => lineChange.originalStartLineNumber);
E
Erich Gamma 已提交
1031 1032 1033 1034 1035

		if (!lineChange) {
			return lineNumber;
		}

A
Alex Dima 已提交
1036 1037 1038 1039
		let originalEquivalentLineNumber = lineChange.originalStartLineNumber + (lineChange.originalEndLineNumber > 0 ? -1 : 0);
		let modifiedEquivalentLineNumber = lineChange.modifiedStartLineNumber + (lineChange.modifiedEndLineNumber > 0 ? -1 : 0);
		let lineChangeOriginalLength = (lineChange.originalEndLineNumber > 0 ? (lineChange.originalEndLineNumber - lineChange.originalStartLineNumber + 1) : 0);
		let lineChangeModifiedLength = (lineChange.modifiedEndLineNumber > 0 ? (lineChange.modifiedEndLineNumber - lineChange.modifiedStartLineNumber + 1) : 0);
E
Erich Gamma 已提交
1040 1041


A
Alex Dima 已提交
1042
		let delta = lineNumber - originalEquivalentLineNumber;
E
Erich Gamma 已提交
1043 1044 1045 1046 1047

		if (delta <= lineChangeOriginalLength) {
			return modifiedEquivalentLineNumber + Math.min(delta, lineChangeModifiedLength);
		}

J
Johannes Rieken 已提交
1048
		return modifiedEquivalentLineNumber + lineChangeModifiedLength - lineChangeOriginalLength + delta;
E
Erich Gamma 已提交
1049 1050 1051
	}

	private _getEquivalentLineForModifiedLineNumber(lineNumber: number): number {
A
Alex Dima 已提交
1052
		let lineChange = this._getLineChangeAtOrBeforeLineNumber(lineNumber, (lineChange) => lineChange.modifiedStartLineNumber);
E
Erich Gamma 已提交
1053 1054 1055 1056 1057

		if (!lineChange) {
			return lineNumber;
		}

A
Alex Dima 已提交
1058 1059 1060 1061
		let originalEquivalentLineNumber = lineChange.originalStartLineNumber + (lineChange.originalEndLineNumber > 0 ? -1 : 0);
		let modifiedEquivalentLineNumber = lineChange.modifiedStartLineNumber + (lineChange.modifiedEndLineNumber > 0 ? -1 : 0);
		let lineChangeOriginalLength = (lineChange.originalEndLineNumber > 0 ? (lineChange.originalEndLineNumber - lineChange.originalStartLineNumber + 1) : 0);
		let lineChangeModifiedLength = (lineChange.modifiedEndLineNumber > 0 ? (lineChange.modifiedEndLineNumber - lineChange.modifiedStartLineNumber + 1) : 0);
E
Erich Gamma 已提交
1062 1063


A
Alex Dima 已提交
1064
		let delta = lineNumber - modifiedEquivalentLineNumber;
E
Erich Gamma 已提交
1065 1066 1067 1068 1069

		if (delta <= lineChangeModifiedLength) {
			return originalEquivalentLineNumber + Math.min(delta, lineChangeOriginalLength);
		}

J
Johannes Rieken 已提交
1070
		return originalEquivalentLineNumber + lineChangeOriginalLength - lineChangeModifiedLength + delta;
E
Erich Gamma 已提交
1071 1072
	}

J
Johannes Rieken 已提交
1073
	public getDiffLineInformationForOriginal(lineNumber: number): editorCommon.IDiffLineInformation {
E
Erich Gamma 已提交
1074 1075 1076 1077 1078 1079 1080 1081 1082
		if (!this._lineChanges) {
			// Cannot answer that which I don't know
			return null;
		}
		return {
			equivalentLineNumber: this._getEquivalentLineForOriginalLineNumber(lineNumber)
		};
	}

J
Johannes Rieken 已提交
1083
	public getDiffLineInformationForModified(lineNumber: number): editorCommon.IDiffLineInformation {
E
Erich Gamma 已提交
1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099
		if (!this._lineChanges) {
			// Cannot answer that which I don't know
			return null;
		}
		return {
			equivalentLineNumber: this._getEquivalentLineForModifiedLineNumber(lineNumber)
		};
	}
}

interface IDataSource {
	getWidth(): number;
	getHeight(): number;
	getContainerDomNode(): HTMLElement;
	relayoutEditors(): void;

A
Alex Dima 已提交
1100 1101
	getOriginalEditor(): editorBrowser.ICodeEditor;
	getModifiedEditor(): editorBrowser.ICodeEditor;
E
Erich Gamma 已提交
1102 1103
}

A
Alex Dima 已提交
1104
class DiffEditorWidgetStyle extends Disposable {
E
Erich Gamma 已提交
1105

J
Johannes Rieken 已提交
1106
	_dataSource: IDataSource;
1107 1108
	_insertColor: Color;
	_removeColor: Color;
E
Erich Gamma 已提交
1109

J
Johannes Rieken 已提交
1110
	constructor(dataSource: IDataSource) {
A
Alex Dima 已提交
1111
		super();
E
Erich Gamma 已提交
1112 1113 1114
		this._dataSource = dataSource;
	}

1115 1116 1117 1118 1119 1120 1121 1122 1123
	public applyColors(theme: ITheme): boolean {
		let newInsertColor = (theme.getColor(diffInserted) || defaultInsertColor).transparent(2);
		let newRemoveColor = (theme.getColor(diffRemoved) || defaultRemoveColor).transparent(2);
		let hasChanges = !newInsertColor.equals(this._insertColor) || !newRemoveColor.equals(this._removeColor);
		this._insertColor = newInsertColor;
		this._removeColor = newRemoveColor;
		return hasChanges;
	}

A
Alex Dima 已提交
1124
	public getEditorsDiffDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalWhitespaces: IEditorWhitespace[], modifiedWhitespaces: IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorsDiffDecorationsWithZones {
E
Erich Gamma 已提交
1125 1126 1127 1128 1129 1130 1131
		// Get view zones
		modifiedWhitespaces = modifiedWhitespaces.sort((a, b) => {
			return a.afterLineNumber - b.afterLineNumber;
		});
		originalWhitespaces = originalWhitespaces.sort((a, b) => {
			return a.afterLineNumber - b.afterLineNumber;
		});
1132
		let zones = this._getViewZones(lineChanges, originalWhitespaces, modifiedWhitespaces, originalEditor, modifiedEditor, renderIndicators);
E
Erich Gamma 已提交
1133 1134

		// Get decorations & overview ruler zones
1135 1136
		let originalDecorations = this._getOriginalEditorDecorations(lineChanges, ignoreTrimWhitespace, renderIndicators, originalEditor, modifiedEditor);
		let modifiedDecorations = this._getModifiedEditorDecorations(lineChanges, ignoreTrimWhitespace, renderIndicators, originalEditor, modifiedEditor);
E
Erich Gamma 已提交
1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151

		return {
			original: {
				decorations: originalDecorations.decorations,
				overviewZones: originalDecorations.overviewZones,
				zones: zones.original
			},
			modified: {
				decorations: modifiedDecorations.decorations,
				overviewZones: modifiedDecorations.overviewZones,
				zones: zones.modified
			}
		};
	}

A
Alex Dima 已提交
1152
	_getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean): IEditorsZones {
E
Erich Gamma 已提交
1153 1154 1155
		return null;
	}

1156
	_getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1157 1158 1159
		return null;
	}

1160
	_getModifiedEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1161 1162 1163 1164
		return null;
	}
}

A
Alex Dima 已提交
1165
interface IMyViewZone extends editorBrowser.IViewZone {
E
Erich Gamma 已提交
1166 1167 1168 1169 1170 1171
	shouldNotShrink?: boolean;
}

class ForeignViewZonesIterator {

	private _index: number;
A
Alex Dima 已提交
1172 1173
	private _source: IEditorWhitespace[];
	public current: IEditorWhitespace;
E
Erich Gamma 已提交
1174

A
Alex Dima 已提交
1175
	constructor(source: IEditorWhitespace[]) {
E
Erich Gamma 已提交
1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190
		this._source = source;
		this._index = -1;
		this.advance();
	}

	public advance(): void {
		this._index++;
		if (this._index < this._source.length) {
			this.current = this._source[this._index];
		} else {
			this.current = null;
		}
	}
}

1191
abstract class ViewZonesComputer {
E
Erich Gamma 已提交
1192

J
Johannes Rieken 已提交
1193
	private lineChanges: editorCommon.ILineChange[];
A
Alex Dima 已提交
1194 1195
	private originalForeignVZ: IEditorWhitespace[];
	private modifiedForeignVZ: IEditorWhitespace[];
E
Erich Gamma 已提交
1196

A
Alex Dima 已提交
1197
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[]) {
E
Erich Gamma 已提交
1198 1199 1200 1201 1202 1203
		this.lineChanges = lineChanges;
		this.originalForeignVZ = originalForeignVZ;
		this.modifiedForeignVZ = modifiedForeignVZ;
	}

	public getViewZones(): IEditorsZones {
A
Alex Dima 已提交
1204
		let result: IEditorsZones = {
E
Erich Gamma 已提交
1205 1206 1207 1208
			original: [],
			modified: []
		};

A
Alex Dima 已提交
1209 1210 1211 1212 1213 1214 1215 1216
		let lineChangeModifiedLength: number = 0;
		let lineChangeOriginalLength: number = 0;
		let originalEquivalentLineNumber: number = 0;
		let modifiedEquivalentLineNumber: number = 0;
		let originalEndEquivalentLineNumber: number = 0;
		let modifiedEndEquivalentLineNumber: number = 0;

		let sortMyViewZones = (a: IMyViewZone, b: IMyViewZone) => {
E
Erich Gamma 已提交
1217 1218 1219
			return a.afterLineNumber - b.afterLineNumber;
		};

A
Alex Dima 已提交
1220
		let addAndCombineIfPossible = (destination: editorBrowser.IViewZone[], item: IMyViewZone) => {
E
Erich Gamma 已提交
1221
			if (item.domNode === null && destination.length > 0) {
A
Alex Dima 已提交
1222
				let lastItem = destination[destination.length - 1];
E
Erich Gamma 已提交
1223 1224 1225 1226 1227 1228 1229 1230
				if (lastItem.afterLineNumber === item.afterLineNumber && lastItem.domNode === null) {
					lastItem.heightInLines += item.heightInLines;
					return;
				}
			}
			destination.push(item);
		};

A
Alex Dima 已提交
1231 1232
		let modifiedForeignVZ = new ForeignViewZonesIterator(this.modifiedForeignVZ);
		let originalForeignVZ = new ForeignViewZonesIterator(this.originalForeignVZ);
E
Erich Gamma 已提交
1233 1234

		// In order to include foreign view zones after the last line change, the for loop will iterate once more after the end of the `lineChanges` array
A
Alex Dima 已提交
1235 1236
		for (let i = 0, length = this.lineChanges.length; i <= length; i++) {
			let lineChange = (i < length ? this.lineChanges[i] : null);
E
Erich Gamma 已提交
1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253

			if (lineChange !== null) {
				originalEquivalentLineNumber = lineChange.originalStartLineNumber + (lineChange.originalEndLineNumber > 0 ? -1 : 0);
				modifiedEquivalentLineNumber = lineChange.modifiedStartLineNumber + (lineChange.modifiedEndLineNumber > 0 ? -1 : 0);
				lineChangeOriginalLength = (lineChange.originalEndLineNumber > 0 ? (lineChange.originalEndLineNumber - lineChange.originalStartLineNumber + 1) : 0);
				lineChangeModifiedLength = (lineChange.modifiedEndLineNumber > 0 ? (lineChange.modifiedEndLineNumber - lineChange.modifiedStartLineNumber + 1) : 0);
				originalEndEquivalentLineNumber = Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
				modifiedEndEquivalentLineNumber = Math.max(lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
			} else {
				// Increase to very large value to get the producing tests of foreign view zones running
				originalEquivalentLineNumber += 10000000 + lineChangeOriginalLength;
				modifiedEquivalentLineNumber += 10000000 + lineChangeModifiedLength;
				originalEndEquivalentLineNumber = originalEquivalentLineNumber;
				modifiedEndEquivalentLineNumber = modifiedEquivalentLineNumber;
			}

			// Each step produces view zones, and after producing them, we try to cancel them out, to avoid empty-empty view zone cases
A
Alex Dima 已提交
1254 1255
			let stepOriginal: IMyViewZone[] = [];
			let stepModified: IMyViewZone[] = [];
E
Erich Gamma 已提交
1256 1257 1258 1259 1260

			// ---------------------------- PRODUCE VIEW ZONES

			// [PRODUCE] View zone(s) in original-side due to foreign view zone(s) in modified-side
			while (modifiedForeignVZ.current && modifiedForeignVZ.current.afterLineNumber <= modifiedEndEquivalentLineNumber) {
A
Alex Dima 已提交
1261
				let viewZoneLineNumber: number;
E
Erich Gamma 已提交
1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276
				if (modifiedForeignVZ.current.afterLineNumber <= modifiedEquivalentLineNumber) {
					viewZoneLineNumber = originalEquivalentLineNumber - modifiedEquivalentLineNumber + modifiedForeignVZ.current.afterLineNumber;
				} else {
					viewZoneLineNumber = originalEndEquivalentLineNumber;
				}
				stepOriginal.push({
					afterLineNumber: viewZoneLineNumber,
					heightInLines: modifiedForeignVZ.current.heightInLines,
					domNode: null
				});
				modifiedForeignVZ.advance();
			}

			// [PRODUCE] View zone(s) in modified-side due to foreign view zone(s) in original-side
			while (originalForeignVZ.current && originalForeignVZ.current.afterLineNumber <= originalEndEquivalentLineNumber) {
A
Alex Dima 已提交
1277
				let viewZoneLineNumber: number;
E
Erich Gamma 已提交
1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291
				if (originalForeignVZ.current.afterLineNumber <= originalEquivalentLineNumber) {
					viewZoneLineNumber = modifiedEquivalentLineNumber - originalEquivalentLineNumber + originalForeignVZ.current.afterLineNumber;
				} else {
					viewZoneLineNumber = modifiedEndEquivalentLineNumber;
				}
				stepModified.push({
					afterLineNumber: viewZoneLineNumber,
					heightInLines: originalForeignVZ.current.heightInLines,
					domNode: null
				});
				originalForeignVZ.advance();
			}

			if (lineChange !== null && isChangeOrInsert(lineChange)) {
A
Alex Dima 已提交
1292
				let r = this._produceOriginalFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
E
Erich Gamma 已提交
1293 1294 1295 1296 1297 1298
				if (r) {
					stepOriginal.push(r);
				}
			}

			if (lineChange !== null && isChangeOrDelete(lineChange)) {
A
Alex Dima 已提交
1299
				let r = this._produceModifiedFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
E
Erich Gamma 已提交
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310
				if (r) {
					stepModified.push(r);
				}
			}

			// ---------------------------- END PRODUCE VIEW ZONES


			// ---------------------------- EMIT MINIMAL VIEW ZONES

			// [CANCEL & EMIT] Try to cancel view zones out
A
Alex Dima 已提交
1311 1312
			let stepOriginalIndex = 0;
			let stepModifiedIndex = 0;
E
Erich Gamma 已提交
1313 1314 1315 1316 1317

			stepOriginal = stepOriginal.sort(sortMyViewZones);
			stepModified = stepModified.sort(sortMyViewZones);

			while (stepOriginalIndex < stepOriginal.length && stepModifiedIndex < stepModified.length) {
A
Alex Dima 已提交
1318 1319
				let original = stepOriginal[stepOriginalIndex];
				let modified = stepModified[stepModifiedIndex];
E
Erich Gamma 已提交
1320

A
Alex Dima 已提交
1321 1322
				let originalDelta = original.afterLineNumber - originalEquivalentLineNumber;
				let modifiedDelta = modified.afterLineNumber - modifiedEquivalentLineNumber;
E
Erich Gamma 已提交
1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363

				if (originalDelta < modifiedDelta) {
					addAndCombineIfPossible(result.original, original);
					stepOriginalIndex++;
				} else if (modifiedDelta < originalDelta) {
					addAndCombineIfPossible(result.modified, modified);
					stepModifiedIndex++;
				} else if (original.shouldNotShrink) {
					addAndCombineIfPossible(result.original, original);
					stepOriginalIndex++;
				} else if (modified.shouldNotShrink) {
					addAndCombineIfPossible(result.modified, modified);
					stepModifiedIndex++;
				} else {
					if (original.heightInLines >= modified.heightInLines) {
						// modified view zone gets removed
						original.heightInLines -= modified.heightInLines;
						stepModifiedIndex++;
					} else {
						// original view zone gets removed
						modified.heightInLines -= original.heightInLines;
						stepOriginalIndex++;
					}
				}
			}

			// [EMIT] Remaining original view zones
			while (stepOriginalIndex < stepOriginal.length) {
				addAndCombineIfPossible(result.original, stepOriginal[stepOriginalIndex]);
				stepOriginalIndex++;
			}

			// [EMIT] Remaining modified view zones
			while (stepModifiedIndex < stepModified.length) {
				addAndCombineIfPossible(result.modified, stepModified[stepModifiedIndex]);
				stepModifiedIndex++;
			}

			// ---------------------------- END EMIT MINIMAL VIEW ZONES
		}

A
Alex Dima 已提交
1364
		let ensureDomNode = (z: IMyViewZone) => {
E
Erich Gamma 已提交
1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375
			if (!z.domNode) {
				z.domNode = createFakeLinesDiv();
			}
		};

		result.original.forEach(ensureDomNode);
		result.modified.forEach(ensureDomNode);

		return result;
	}

J
Johannes Rieken 已提交
1376
	protected abstract _produceOriginalFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone;
E
Erich Gamma 已提交
1377

J
Johannes Rieken 已提交
1378
	protected abstract _produceModifiedFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone;
E
Erich Gamma 已提交
1379 1380
}

A
Alex Dima 已提交
1381
class DiffEdtorWidgetSideBySide extends DiffEditorWidgetStyle implements IDiffEditorWidgetStyle, IVerticalSashLayoutProvider {
E
Erich Gamma 已提交
1382 1383 1384 1385

	static MINIMUM_EDITOR_WIDTH = 100;

	private _disableSash: boolean;
J
Johannes Rieken 已提交
1386 1387 1388 1389
	private _sash: Sash;
	private _sashRatio: number;
	private _sashPosition: number;
	private _startSashPosition: number;
E
Erich Gamma 已提交
1390

J
Johannes Rieken 已提交
1391
	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean) {
E
Erich Gamma 已提交
1392 1393 1394 1395 1396
		super(dataSource);

		this._disableSash = (enableSplitViewResizing === false);
		this._sashRatio = null;
		this._sashPosition = null;
A
Alex Dima 已提交
1397
		this._sash = this._register(new Sash(this._dataSource.getContainerDomNode(), this));
E
Erich Gamma 已提交
1398 1399 1400 1401 1402

		if (this._disableSash) {
			this._sash.disable();
		}

A
Alex Dima 已提交
1403 1404 1405 1406
		this._sash.addListener('start', () => this.onSashDragStart());
		this._sash.addListener('change', (e: ISashEvent) => this.onSashDrag(e));
		this._sash.addListener('end', () => this.onSashDragEnd());
		this._sash.addListener('reset', () => this.onSashReset());
E
Erich Gamma 已提交
1407 1408 1409
	}

	public dispose(): void {
A
Alex Dima 已提交
1410
		super.dispose();
E
Erich Gamma 已提交
1411 1412
	}

J
Johannes Rieken 已提交
1413
	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
A
Alex Dima 已提交
1414
		let newDisableSash = (enableSplitViewResizing === false);
E
Erich Gamma 已提交
1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425
		if (this._disableSash !== newDisableSash) {
			this._disableSash = newDisableSash;

			if (this._disableSash) {
				this._sash.disable();
			} else {
				this._sash.enable();
			}
		}
	}

J
Johannes Rieken 已提交
1426
	public layout(sashRatio: number = this._sashRatio): number {
A
Alex Dima 已提交
1427 1428
		let w = this._dataSource.getWidth();
		let contentWidth = w - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
E
Erich Gamma 已提交
1429

A
Alex Dima 已提交
1430 1431
		let sashPosition = Math.floor((sashRatio || 0.5) * contentWidth);
		let midPoint = Math.floor(0.5 * contentWidth);
E
Erich Gamma 已提交
1432

A
Alex Dima 已提交
1433
		sashPosition = this._disableSash ? midPoint : sashPosition || midPoint;
E
Erich Gamma 已提交
1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454

		if (contentWidth > DiffEdtorWidgetSideBySide.MINIMUM_EDITOR_WIDTH * 2) {
			if (sashPosition < DiffEdtorWidgetSideBySide.MINIMUM_EDITOR_WIDTH) {
				sashPosition = DiffEdtorWidgetSideBySide.MINIMUM_EDITOR_WIDTH;
			}

			if (sashPosition > contentWidth - DiffEdtorWidgetSideBySide.MINIMUM_EDITOR_WIDTH) {
				sashPosition = contentWidth - DiffEdtorWidgetSideBySide.MINIMUM_EDITOR_WIDTH;
			}
		} else {
			sashPosition = midPoint;
		}

		if (this._sashPosition !== sashPosition) {
			this._sashPosition = sashPosition;
			this._sash.layout();
		}

		return this._sashPosition;
	}

M
Maxime Quandalle 已提交
1455
	private onSashDragStart(): void {
E
Erich Gamma 已提交
1456 1457 1458
		this._startSashPosition = this._sashPosition;
	}

J
Johannes Rieken 已提交
1459
	private onSashDrag(e: ISashEvent): void {
A
Alex Dima 已提交
1460 1461 1462
		let w = this._dataSource.getWidth();
		let contentWidth = w - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
		let sashPosition = this.layout((this._startSashPosition + (e.currentX - e.startX)) / contentWidth);
E
Erich Gamma 已提交
1463 1464 1465 1466 1467 1468

		this._sashRatio = sashPosition / contentWidth;

		this._dataSource.relayoutEditors();
	}

M
Maxime Quandalle 已提交
1469 1470 1471 1472 1473 1474 1475
	private onSashDragEnd(): void {
		this._sash.layout();
	}

	private onSashReset(): void {
		this._sashRatio = 0.5;
		this._dataSource.relayoutEditors();
E
Erich Gamma 已提交
1476 1477 1478
		this._sash.layout();
	}

A
Alex Dima 已提交
1479
	public getVerticalSashTop(sash: Sash): number {
E
Erich Gamma 已提交
1480 1481 1482
		return 0;
	}

A
Alex Dima 已提交
1483
	public getVerticalSashLeft(sash: Sash): number {
E
Erich Gamma 已提交
1484 1485 1486
		return this._sashPosition;
	}

A
Alex Dima 已提交
1487
	public getVerticalSashHeight(sash: Sash): number {
E
Erich Gamma 已提交
1488 1489 1490
		return this._dataSource.getHeight();
	}

A
Alex Dima 已提交
1491
	_getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorsZones {
A
Alex Dima 已提交
1492
		let c = new SideBySideViewZonesComputer(lineChanges, originalForeignVZ, modifiedForeignVZ);
E
Erich Gamma 已提交
1493 1494 1495
		return c.getViewZones();
	}

1496
	_getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1497

A
Alex Dima 已提交
1498
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1499 1500
			decorations: [],
			overviewZones: []
P
Peng Lyu 已提交
1501
		};
A
Alex Dima 已提交
1502 1503 1504 1505 1506

		let originalModel = originalEditor.getModel();

		for (let i = 0, length = lineChanges.length; i < length; i++) {
			let lineChange = lineChanges[i];
E
Erich Gamma 已提交
1507 1508

			if (isChangeOrDelete(lineChange)) {
1509 1510 1511 1512
				result.decorations.push({
					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-delete',
1513
						linesDecorationsClassName: renderIndicators ? 'delete-sign' : undefined,
1514 1515 1516 1517
						marginClassName: 'line-delete',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1518 1519 1520 1521
				if (!isChangeOrInsert(lineChange) || !lineChange.charChanges) {
					result.decorations.push(createDecoration(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE, 'char-delete', true));
				}

1522 1523
				let color = this._removeColor.toString();

A
Alex Dima 已提交
1524
				result.overviewZones.push(new OverviewRulerZone(
A
Alex Dima 已提交
1525 1526 1527 1528
					lineChange.originalStartLineNumber,
					lineChange.originalEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
1529 1530 1531
					color,
					color,
					color
A
Alex Dima 已提交
1532
				));
E
Erich Gamma 已提交
1533 1534

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1535 1536
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1537 1538
						if (isChangeOrDelete(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1539 1540 1541
								for (let lineNumber = charChange.originalStartLineNumber; lineNumber <= charChange.originalEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565
									if (lineNumber === charChange.originalStartLineNumber) {
										startColumn = charChange.originalStartColumn;
									} else {
										startColumn = originalModel.getLineFirstNonWhitespaceColumn(lineNumber);
									}
									if (lineNumber === charChange.originalEndLineNumber) {
										endColumn = charChange.originalEndColumn;
									} else {
										endColumn = originalModel.getLineLastNonWhitespaceColumn(lineNumber);
									}
									result.decorations.push(createDecoration(lineNumber, startColumn, lineNumber, endColumn, 'char-delete', false));
								}
							} else {
								result.decorations.push(createDecoration(charChange.originalStartLineNumber, charChange.originalStartColumn, charChange.originalEndLineNumber, charChange.originalEndColumn, 'char-delete', false));
							}
						}
					}
				}
			}
		}

		return result;
	}

1566
	_getModifiedEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1567

A
Alex Dima 已提交
1568
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1569 1570
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1571 1572 1573 1574 1575 1576
		};

		let modifiedModel = modifiedEditor.getModel();

		for (let i = 0, length = lineChanges.length; i < length; i++) {
			let lineChange = lineChanges[i];
E
Erich Gamma 已提交
1577 1578 1579

			if (isChangeOrInsert(lineChange)) {

1580 1581 1582 1583
				result.decorations.push({
					range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-insert',
1584
						linesDecorationsClassName: renderIndicators ? 'insert-sign' : undefined,
1585 1586 1587 1588
						marginClassName: 'line-insert',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1589 1590 1591
				if (!isChangeOrDelete(lineChange) || !lineChange.charChanges) {
					result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE, 'char-insert', true));
				}
1592
				let color = this._insertColor.toString();
A
Alex Dima 已提交
1593
				result.overviewZones.push(new OverviewRulerZone(
A
Alex Dima 已提交
1594 1595 1596 1597
					lineChange.modifiedStartLineNumber,
					lineChange.modifiedEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
1598 1599 1600
					color,
					color,
					color
A
Alex Dima 已提交
1601
				));
E
Erich Gamma 已提交
1602 1603

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1604 1605
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1606 1607
						if (isChangeOrInsert(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1608 1609 1610
								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637
									if (lineNumber === charChange.modifiedStartLineNumber) {
										startColumn = charChange.modifiedStartColumn;
									} else {
										startColumn = modifiedModel.getLineFirstNonWhitespaceColumn(lineNumber);
									}
									if (lineNumber === charChange.modifiedEndLineNumber) {
										endColumn = charChange.modifiedEndColumn;
									} else {
										endColumn = modifiedModel.getLineLastNonWhitespaceColumn(lineNumber);
									}
									result.decorations.push(createDecoration(lineNumber, startColumn, lineNumber, endColumn, 'char-insert', false));
								}
							} else {
								result.decorations.push(createDecoration(charChange.modifiedStartLineNumber, charChange.modifiedStartColumn, charChange.modifiedEndLineNumber, charChange.modifiedEndColumn, 'char-insert', false));
							}
						}
					}
				}

			}
		}
		return result;
	}
}

class SideBySideViewZonesComputer extends ViewZonesComputer {

A
Alex Dima 已提交
1638
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[]) {
E
Erich Gamma 已提交
1639 1640 1641
		super(lineChanges, originalForeignVZ, modifiedForeignVZ);
	}

J
Johannes Rieken 已提交
1642
	_produceOriginalFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
E
Erich Gamma 已提交
1643 1644 1645 1646 1647 1648 1649 1650 1651 1652
		if (lineChangeModifiedLength > lineChangeOriginalLength) {
			return {
				afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber),
				heightInLines: (lineChangeModifiedLength - lineChangeOriginalLength),
				domNode: null
			};
		}
		return null;
	}

J
Johannes Rieken 已提交
1653
	_produceModifiedFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
E
Erich Gamma 已提交
1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668
		if (lineChangeOriginalLength > lineChangeModifiedLength) {
			return {
				afterLineNumber: Math.max(lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber),
				heightInLines: (lineChangeOriginalLength - lineChangeModifiedLength),
				domNode: null
			};
		}
		return null;
	}
}

class DiffEdtorWidgetInline extends DiffEditorWidgetStyle implements IDiffEditorWidgetStyle {

	private decorationsLeft: number;

J
Johannes Rieken 已提交
1669
	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean) {
E
Erich Gamma 已提交
1670 1671
		super(dataSource);

1672
		this.decorationsLeft = dataSource.getOriginalEditor().getLayoutInfo().decorationsLeft;
E
Erich Gamma 已提交
1673

1674
		this._register(dataSource.getOriginalEditor().onDidLayoutChange((layoutInfo: editorOptions.EditorLayoutInfo) => {
E
Erich Gamma 已提交
1675 1676 1677 1678 1679 1680 1681 1682
			if (this.decorationsLeft !== layoutInfo.decorationsLeft) {
				this.decorationsLeft = layoutInfo.decorationsLeft;
				dataSource.relayoutEditors();
			}
		}));
	}

	public dispose(): void {
A
Alex Dima 已提交
1683
		super.dispose();
E
Erich Gamma 已提交
1684 1685
	}

J
Johannes Rieken 已提交
1686
	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
E
Erich Gamma 已提交
1687 1688 1689
		// Nothing to do..
	}

A
Alex Dima 已提交
1690
	_getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean): IEditorsZones {
1691
		let computer = new InlineViewZonesComputer(lineChanges, originalForeignVZ, modifiedForeignVZ, originalEditor, modifiedEditor, renderIndicators);
E
Erich Gamma 已提交
1692 1693 1694
		return computer.getViewZones();
	}

1695
	_getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
A
Alex Dima 已提交
1696
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1697 1698
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1699
		};
E
Erich Gamma 已提交
1700

A
Alex Dima 已提交
1701 1702
		for (let i = 0, length = lineChanges.length; i < length; i++) {
			let lineChange = lineChanges[i];
E
Erich Gamma 已提交
1703 1704 1705

			// Add overview zones in the overview ruler
			if (isChangeOrDelete(lineChange)) {
1706 1707 1708 1709 1710 1711 1712
				result.decorations.push({
					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE),
					options: {
						marginClassName: 'line-delete',
					}
				});

1713
				let color = this._removeColor.toString();
A
Alex Dima 已提交
1714
				result.overviewZones.push(new OverviewRulerZone(
A
Alex Dima 已提交
1715 1716 1717 1718
					lineChange.originalStartLineNumber,
					lineChange.originalEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
1719 1720 1721
					color,
					color,
					color
A
Alex Dima 已提交
1722
				));
E
Erich Gamma 已提交
1723 1724 1725 1726 1727 1728
			}
		}

		return result;
	}

1729
	_getModifiedEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1730

A
Alex Dima 已提交
1731
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1732 1733
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1734 1735 1736 1737 1738 1739
		};

		let modifiedModel = modifiedEditor.getModel();

		for (let i = 0, length = lineChanges.length; i < length; i++) {
			let lineChange = lineChanges[i];
E
Erich Gamma 已提交
1740 1741 1742

			// Add decorations & overview zones
			if (isChangeOrInsert(lineChange)) {
1743 1744 1745 1746
				result.decorations.push({
					range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-insert',
1747
						linesDecorationsClassName: renderIndicators ? 'insert-sign' : undefined,
1748 1749 1750 1751
						marginClassName: 'line-insert',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1752

1753
				let color = this._insertColor.toString();
A
Alex Dima 已提交
1754
				result.overviewZones.push(new OverviewRulerZone(
A
Alex Dima 已提交
1755 1756 1757 1758
					lineChange.modifiedStartLineNumber,
					lineChange.modifiedEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
1759 1760 1761
					color,
					color,
					color
A
Alex Dima 已提交
1762
				));
E
Erich Gamma 已提交
1763 1764

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1765 1766
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1767 1768
						if (isChangeOrInsert(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1769 1770 1771
								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806
									if (lineNumber === charChange.modifiedStartLineNumber) {
										startColumn = charChange.modifiedStartColumn;
									} else {
										startColumn = modifiedModel.getLineFirstNonWhitespaceColumn(lineNumber);
									}
									if (lineNumber === charChange.modifiedEndLineNumber) {
										endColumn = charChange.modifiedEndColumn;
									} else {
										endColumn = modifiedModel.getLineLastNonWhitespaceColumn(lineNumber);
									}
									result.decorations.push(createDecoration(lineNumber, startColumn, lineNumber, endColumn, 'char-insert', false));
								}
							} else {
								result.decorations.push(createDecoration(charChange.modifiedStartLineNumber, charChange.modifiedStartColumn, charChange.modifiedEndLineNumber, charChange.modifiedEndColumn, 'char-insert', false));
							}
						}
					}
				} else {
					result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE, 'char-insert', true));
				}
			}
		}

		return result;
	}

	public layout(): number {
		// An editor should not be smaller than 5px
		return Math.max(5, this.decorationsLeft);
	}

}

class InlineViewZonesComputer extends ViewZonesComputer {

J
Johannes Rieken 已提交
1807
	private originalModel: editorCommon.IModel;
1808
	private modifiedEditorConfiguration: editorOptions.InternalEditorOptions;
J
Johannes Rieken 已提交
1809
	private modifiedEditorTabSize: number;
R
rebornix 已提交
1810
	private renderIndicators: boolean;
E
Erich Gamma 已提交
1811

A
Alex Dima 已提交
1812
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean) {
E
Erich Gamma 已提交
1813 1814 1815
		super(lineChanges, originalForeignVZ, modifiedForeignVZ);
		this.originalModel = originalEditor.getModel();
		this.modifiedEditorConfiguration = modifiedEditor.getConfiguration();
1816
		this.modifiedEditorTabSize = modifiedEditor.getModel().getOptions().tabSize;
R
rebornix 已提交
1817
		this.renderIndicators = renderIndicators;
E
Erich Gamma 已提交
1818 1819
	}

J
Johannes Rieken 已提交
1820
	_produceOriginalFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
1821 1822 1823 1824
		let marginDomNode = document.createElement('div');
		marginDomNode.className = 'inline-added-margin-view-zone';
		Configuration.applyFontInfoSlow(marginDomNode, this.modifiedEditorConfiguration.fontInfo);

E
Erich Gamma 已提交
1825
		return {
J
Johannes Rieken 已提交
1826
			afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber),
E
Erich Gamma 已提交
1827
			heightInLines: lineChangeModifiedLength,
1828 1829
			domNode: document.createElement('div'),
			marginDomNode: marginDomNode
E
Erich Gamma 已提交
1830 1831 1832
		};
	}

J
Johannes Rieken 已提交
1833
	_produceModifiedFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
A
Alex Dima 已提交
1834
		let decorations: InlineDecoration[] = [];
E
Erich Gamma 已提交
1835
		if (lineChange.charChanges) {
A
Alex Dima 已提交
1836 1837
			for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
				let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1838
				if (isChangeOrDelete(charChange)) {
1839 1840
					decorations.push(new InlineDecoration(
						new Range(charChange.originalStartLineNumber, charChange.originalStartColumn, charChange.originalEndLineNumber, charChange.originalEndColumn),
1841 1842
						'char-delete',
						false
1843
					));
E
Erich Gamma 已提交
1844 1845 1846 1847
				}
			}
		}

A
Alex Dima 已提交
1848
		let html: string[] = [];
1849 1850 1851
		let marginHTML: string[] = [];
		let lineDecorationsWidth = this.modifiedEditorConfiguration.layoutInfo.decorationsWidth;
		let lineHeight = this.modifiedEditorConfiguration.lineHeight;
A
Alex Dima 已提交
1852
		for (let lineNumber = lineChange.originalStartLineNumber; lineNumber <= lineChange.originalEndLineNumber; lineNumber++) {
1853
			html = html.concat(this.renderOriginalLine(lineNumber - lineChange.originalStartLineNumber, this.originalModel, this.modifiedEditorConfiguration, this.modifiedEditorTabSize, lineNumber, decorations));
1854

R
rebornix 已提交
1855
			if (this.renderIndicators) {
1856 1857 1858 1859 1860
				let index = lineNumber - lineChange.originalStartLineNumber;
				marginHTML = marginHTML.concat([
					`<div class="delete-sign" style="position:absolute;top:${index * lineHeight}px;width:${lineDecorationsWidth}px;height:${lineHeight}px;right:0;"></div>`
				]);
			}
E
Erich Gamma 已提交
1861 1862
		}

A
Alex Dima 已提交
1863
		let domNode = document.createElement('div');
E
Erich Gamma 已提交
1864 1865
		domNode.className = 'view-lines line-delete';
		domNode.innerHTML = html.join('');
1866
		Configuration.applyFontInfoSlow(domNode, this.modifiedEditorConfiguration.fontInfo);
E
Erich Gamma 已提交
1867

1868 1869 1870 1871 1872
		let marginDomNode = document.createElement('div');
		marginDomNode.className = 'inline-deleted-margin-view-zone';
		marginDomNode.innerHTML = marginHTML.join('');
		Configuration.applyFontInfoSlow(marginDomNode, this.modifiedEditorConfiguration.fontInfo);

E
Erich Gamma 已提交
1873 1874 1875 1876
		return {
			shouldNotShrink: true,
			afterLineNumber: (lineChange.modifiedEndLineNumber === 0 ? lineChange.modifiedStartLineNumber : lineChange.modifiedStartLineNumber - 1),
			heightInLines: lineChangeOriginalLength,
1877 1878
			domNode: domNode,
			marginDomNode: marginDomNode
E
Erich Gamma 已提交
1879 1880 1881
		};
	}

1882
	private renderOriginalLine(count: number, originalModel: editorCommon.IModel, config: editorOptions.InternalEditorOptions, tabSize: number, lineNumber: number, decorations: InlineDecoration[]): string[] {
1883
		let lineContent = originalModel.getLineContent(lineNumber);
E
Erich Gamma 已提交
1884

A
Alex Dima 已提交
1885
		let actualDecorations = LineDecoration.filter(decorations, lineNumber, 1, lineContent.length + 1);
E
Erich Gamma 已提交
1886

A
Alex Dima 已提交
1887 1888 1889 1890 1891 1892
		const defaultMetadata = (
			(FontStyle.None << MetadataConsts.FONT_STYLE_OFFSET)
			| (ColorId.DefaultForeground << MetadataConsts.FOREGROUND_OFFSET)
			| (ColorId.DefaultBackground << MetadataConsts.BACKGROUND_OFFSET)
		) >>> 0;

A
Alex Dima 已提交
1893
		let r = renderViewLine(new RenderLineInput(
1894
			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
A
Alex Dima 已提交
1895
			lineContent,
1896
			originalModel.mightContainRTL(),
1897
			0,
A
Alex Dima 已提交
1898
			[new ViewLineToken(lineContent.length, defaultMetadata)],
1899
			actualDecorations,
A
Alex Dima 已提交
1900
			tabSize,
1901
			config.fontInfo.spaceWidth,
1902 1903
			config.viewInfo.stopRenderingLineAfter,
			config.viewInfo.renderWhitespace,
1904 1905
			config.viewInfo.renderControlCharacters,
			config.viewInfo.fontLigatures
A
Alex Dima 已提交
1906
		));
E
Erich Gamma 已提交
1907

J
Johannes Rieken 已提交
1908
		let myResult: string[] = [];
E
Erich Gamma 已提交
1909 1910 1911 1912 1913 1914 1915 1916
		myResult.push('<div class="view-line');
		if (decorations.length === 0) {
			// No char changes
			myResult.push(' char-delete');
		}
		myResult.push('" style="top:');
		myResult.push(String(count * config.lineHeight));
		myResult.push('px;width:1000000px;">');
1917
		myResult = myResult.concat(r.html);
E
Erich Gamma 已提交
1918 1919 1920 1921 1922 1923
		myResult.push('</div>');

		return myResult;
	}
}

J
Johannes Rieken 已提交
1924
function isChangeOrInsert(lineChange: editorCommon.IChange): boolean {
E
Erich Gamma 已提交
1925 1926 1927
	return lineChange.modifiedEndLineNumber > 0;
}

J
Johannes Rieken 已提交
1928
function isChangeOrDelete(lineChange: editorCommon.IChange): boolean {
E
Erich Gamma 已提交
1929 1930 1931
	return lineChange.originalEndLineNumber > 0;
}

J
Johannes Rieken 已提交
1932
function createDecoration(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, className: string, isWholeLine: boolean) {
E
Erich Gamma 已提交
1933 1934 1935 1936 1937 1938 1939 1940 1941 1942
	return {
		range: new Range(startLineNumber, startColumn, endLineNumber, endColumn),
		options: {
			className: className,
			isWholeLine: isWholeLine
		}
	};
}

function createFakeLinesDiv(): HTMLElement {
A
Alex Dima 已提交
1943
	let r = document.createElement('div');
E
Erich Gamma 已提交
1944 1945 1946
	r.className = 'diagonal-fill';
	return r;
}
1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966

registerThemingParticipant((theme, collector) => {
	let added = theme.getColor(diffInserted);
	if (added) {
		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { background-color: ${added}; }`);
		collector.addRule(`.monaco-editor .inline-added-margin-view-zone { background-color: ${added}; }`);
	}
	let removed = theme.getColor(diffRemoved);
	if (removed) {
		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { background-color: ${removed}; }`);
		collector.addRule(`.monaco-editor .inline-deleted-margin-view-zone { background-color: ${removed}; }`);
	}
	let addedOutline = theme.getColor(diffInsertedOutline);
	if (addedOutline) {
		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { border: 1px dashed ${addedOutline}; }`);
	}
	let removedOutline = theme.getColor(diffRemovedOutline);
	if (removedOutline) {
		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px dashed ${removedOutline}; }`);
	}
1967 1968 1969 1970
	let shadow = theme.getColor(scrollbarShadow);
	if (shadow) {
		collector.addRule(`.monaco-diff-editor.side-by-side .editor.modified { box-shadow: -6px 0 5px -5px ${shadow}; }`);
	}
1971
});