diffEditorWidget.ts 70.7 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 10 11
import { RunOnceScheduler } from 'vs/base/common/async';
import { EventEmitter, EmitterEvent } from 'vs/base/common/eventEmitter';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
A
Alex Dima 已提交
12 13
import * as objects from 'vs/base/common/objects';
import * as dom from 'vs/base/browser/dom';
A
Alex Dima 已提交
14
import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
J
Johannes Rieken 已提交
15 16 17 18 19
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';
import { DefaultConfig } from 'vs/editor/common/config/defaultConfig';
import { Range } from 'vs/editor/common/core/range';
A
Alex Dima 已提交
20
import * as editorCommon from 'vs/editor/common/editorCommon';
J
Johannes Rieken 已提交
21
import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
22
import { Decoration } from 'vs/editor/common/viewLayout/viewLineParts';
A
Alex Dima 已提交
23
import { renderViewLine, RenderLineInput } from 'vs/editor/common/viewLayout/viewLineRenderer';
A
Alex Dima 已提交
24
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
J
Johannes Rieken 已提交
25
import { CodeEditor } from 'vs/editor/browser/codeEditor';
A
Alex Dima 已提交
26
import { ViewLineToken } from 'vs/editor/common/core/viewLineToken';
J
Johannes Rieken 已提交
27 28 29 30
import { Configuration } from 'vs/editor/browser/config/configuration';
import { Position } from 'vs/editor/common/core/position';
import { Selection } from 'vs/editor/common/core/selection';
import { InlineDecoration } from 'vs/editor/common/viewModel/viewModel';
J
Joao Moreno 已提交
31
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
A
Alex Dima 已提交
32
import { ColorId, MetadataConsts, FontStyle } from 'vs/editor/common/modes';
E
Erich Gamma 已提交
33 34

interface IEditorDiffDecorations {
J
Johannes Rieken 已提交
35 36
	decorations: editorCommon.IModelDeltaDecoration[];
	overviewZones: editorCommon.OverviewRulerZone[];
E
Erich Gamma 已提交
37 38 39
}

interface IEditorDiffDecorationsWithZones extends IEditorDiffDecorations {
J
Johannes Rieken 已提交
40
	zones: editorBrowser.IViewZone[];
E
Erich Gamma 已提交
41 42 43
}

interface IEditorsDiffDecorations {
J
Johannes Rieken 已提交
44 45
	original: IEditorDiffDecorations;
	modified: IEditorDiffDecorations;
E
Erich Gamma 已提交
46 47 48
}

interface IEditorsDiffDecorationsWithZones {
J
Johannes Rieken 已提交
49 50
	original: IEditorDiffDecorationsWithZones;
	modified: IEditorDiffDecorationsWithZones;
E
Erich Gamma 已提交
51 52 53
}

interface IEditorsZones {
J
Johannes Rieken 已提交
54 55
	original: editorBrowser.IViewZone[];
	modified: editorBrowser.IViewZone[];
E
Erich Gamma 已提交
56 57 58
}

interface IDiffEditorWidgetStyle {
59
	getEditorsDiffDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalWhitespaces: editorCommon.IEditorWhitespace[], modifiedWhitespaces: editorCommon.IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorsDiffDecorationsWithZones;
J
Johannes Rieken 已提交
60
	setEnableSplitViewResizing(enableSplitViewResizing: boolean): void;
E
Erich Gamma 已提交
61 62 63 64 65
	layout(): number;
	dispose(): void;
}

class VisualEditorState {
J
Johannes Rieken 已提交
66 67 68
	private _zones: number[];
	private _zonesMap: { [zoneId: string]: boolean; };
	private _decorations: string[];
E
Erich Gamma 已提交
69 70 71 72 73 74 75

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

J
Johannes Rieken 已提交
76
	public getForeignViewZones(allViewZones: editorCommon.IEditorWhitespace[]): editorCommon.IEditorWhitespace[] {
E
Erich Gamma 已提交
77 78 79
		return allViewZones.filter((z) => !this._zonesMap[String(z.id)]);
	}

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

		// (2) Model decorations
		if (this._decorations.length > 0) {
J
Johannes Rieken 已提交
94
			editor.changeDecorations((changeAccessor: editorCommon.IModelDecorationsChangeAccessor) => {
E
Erich Gamma 已提交
95 96 97 98 99 100
				changeAccessor.deltaDecorations(this._decorations, []);
			});
		}
		this._decorations = [];
	}

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

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

		// overview ruler
121 122 123
		if (overviewRuler) {
			overviewRuler.setZones(newDecorations.overviewZones);
		}
E
Erich Gamma 已提交
124 125 126
	}
}

A
Alex Dima 已提交
127
let DIFF_EDITOR_ID = 0;
E
Erich Gamma 已提交
128

A
Alex Dima 已提交
129
export class DiffEditorWidget extends EventEmitter implements editorBrowser.IDiffEditor {
E
Erich Gamma 已提交
130

J
Johannes Rieken 已提交
131
	public onDidChangeModelRawContent(listener: (e: editorCommon.IModelContentChangedEvent) => void): IDisposable {
A
Alex Dima 已提交
132 133
		return this.addListener2(editorCommon.EventType.ModelRawContentChanged, listener);
	}
J
Johannes Rieken 已提交
134
	public onDidChangeModelContent(listener: (e: editorCommon.IModelContentChangedEvent2) => void): IDisposable {
A
Alex Dima 已提交
135
		return this.addListener2(editorCommon.EventType.ModelContentChanged2, listener);
A
Alex Dima 已提交
136
	}
A
Alex Dima 已提交
137 138
	public onDidChangeModelLanguage(listener: (e: editorCommon.IModelLanguageChangedEvent) => void): IDisposable {
		return this.addListener2(editorCommon.EventType.ModelLanguageChanged, listener);
A
Alex Dima 已提交
139
	}
J
Johannes Rieken 已提交
140
	public onDidChangeModelOptions(listener: (e: editorCommon.IModelOptionsChangedEvent) => void): IDisposable {
A
Alex Dima 已提交
141 142
		return this.addListener2(editorCommon.EventType.ModelOptionsChanged, listener);
	}
J
Johannes Rieken 已提交
143
	public onDidChangeConfiguration(listener: (e: editorCommon.IConfigurationChangedEvent) => void): IDisposable {
A
Alex Dima 已提交
144 145
		return this.addListener2(editorCommon.EventType.ConfigurationChanged, listener);
	}
J
Johannes Rieken 已提交
146
	public onDidChangeCursorPosition(listener: (e: editorCommon.ICursorPositionChangedEvent) => void): IDisposable {
A
Alex Dima 已提交
147 148
		return this.addListener2(editorCommon.EventType.CursorPositionChanged, listener);
	}
J
Johannes Rieken 已提交
149
	public onDidChangeCursorSelection(listener: (e: editorCommon.ICursorSelectionChangedEvent) => void): IDisposable {
A
Alex Dima 已提交
150 151
		return this.addListener2(editorCommon.EventType.CursorSelectionChanged, listener);
	}
J
Johannes Rieken 已提交
152
	public onDidDispose(listener: () => void): IDisposable {
A
Alex Dima 已提交
153 154
		return this.addListener2(editorCommon.EventType.Disposed, listener);
	}
J
Johannes Rieken 已提交
155
	public onDidUpdateDiff(listener: () => void): IDisposable {
A
Alex Dima 已提交
156 157 158
		return this.addListener2(editorCommon.EventType.DiffUpdated, listener);
	}

E
Erich Gamma 已提交
159 160 161 162 163 164
	private static ONE_OVERVIEW_WIDTH = 15;
	public static ENTIRE_DIFF_OVERVIEW_WIDTH = 30;
	private static UPDATE_DIFF_DECORATIONS_DELAY = 200; // ms

	private id: number;

J
Johannes Rieken 已提交
165
	private _toDispose: IDisposable[];
E
Erich Gamma 已提交
166

J
Johannes Rieken 已提交
167 168 169 170
	private _theme: string;
	private _domElement: HTMLElement;
	_containerDomElement: HTMLElement;
	private _overviewDomElement: HTMLElement;
A
Alex Dima 已提交
171
	private _overviewViewportDomElement: FastDomNode<HTMLElement>;
E
Erich Gamma 已提交
172

J
Johannes Rieken 已提交
173 174 175
	private _width: number;
	private _height: number;
	private _measureDomElementToken: number;
E
Erich Gamma 已提交
176

J
Johannes Rieken 已提交
177 178 179 180
	private originalEditor: CodeEditor;
	private _originalDomNode: HTMLElement;
	private _originalEditorState: VisualEditorState;
	private _originalOverviewRuler: editorBrowser.IOverviewRuler;
E
Erich Gamma 已提交
181

J
Johannes Rieken 已提交
182 183 184 185
	private modifiedEditor: CodeEditor;
	private _modifiedDomNode: HTMLElement;
	private _modifiedEditorState: VisualEditorState;
	private _modifiedOverviewRuler: editorBrowser.IOverviewRuler;
E
Erich Gamma 已提交
186

J
Johannes Rieken 已提交
187 188 189 190
	private _currentlyChangingViewZones: boolean;
	private _beginUpdateDecorationsTimeout: number;
	private _diffComputationToken: number;
	private _lineChanges: editorCommon.ILineChange[];
E
Erich Gamma 已提交
191

J
Johannes Rieken 已提交
192 193
	private _isVisible: boolean;
	private _isHandlingScrollEvent: boolean;
E
Erich Gamma 已提交
194 195

	private _ignoreTrimWhitespace: boolean;
196
	private _originalIsEditable: boolean;
E
Erich Gamma 已提交
197

J
Johannes Rieken 已提交
198
	private _renderSideBySide: boolean;
199
	private _renderIndicators: boolean;
J
Johannes Rieken 已提交
200 201
	private _enableSplitViewResizing: boolean;
	private _strategy: IDiffEditorWidgetStyle;
E
Erich Gamma 已提交
202

J
Johannes Rieken 已提交
203
	private _updateDecorationsRunner: RunOnceScheduler;
E
Erich Gamma 已提交
204

205
	private _editorWorkerService: IEditorWorkerService;
206
	protected _contextKeyService: IContextKeyService;
207 208

	constructor(
J
Johannes Rieken 已提交
209 210
		domElement: HTMLElement,
		options: editorCommon.IDiffEditorOptions,
211
		@IEditorWorkerService editorWorkerService: IEditorWorkerService,
212
		@IContextKeyService contextKeyService: IContextKeyService,
213 214
		@IInstantiationService instantiationService: IInstantiationService
	) {
E
Erich Gamma 已提交
215
		super();
216
		this._editorWorkerService = editorWorkerService;
J
Joao Moreno 已提交
217 218
		this._contextKeyService = contextKeyService.createScoped(domElement);
		this._contextKeyService.createKey('isInDiffEditor', true);
E
Erich Gamma 已提交
219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237

		this.id = (++DIFF_EDITOR_ID);

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

		this._theme = options.theme || DefaultConfig.editor.theme;
		// 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;
		}

238 239 240 241 242 243
		// renderIndicators
		this._renderIndicators = true;
		if (typeof options.renderIndicators !== 'undefined') {
			this._renderIndicators = options.renderIndicators;
		}

244 245 246 247 248
		this._originalIsEditable = false;
		if (typeof options.originalEditable !== 'undefined') {
			this._originalIsEditable = Boolean(options.originalEditable);
		}

A
Alex Dima 已提交
249
		this._updateDecorationsRunner = new RunOnceScheduler(() => this._updateDecorations(), 0);
E
Erich Gamma 已提交
250 251 252 253 254 255 256 257 258 259

		this._toDispose = [];
		this._toDispose.push(this._updateDecorationsRunner);

		this._containerDomElement = document.createElement('div');
		this._containerDomElement.className = DiffEditorWidget._getClassName(this._theme, this._renderSideBySide);
		this._containerDomElement.style.position = 'relative';
		this._containerDomElement.style.height = '100%';
		this._domElement.appendChild(this._containerDomElement);

A
Alex Dima 已提交
260 261 262
		this._overviewViewportDomElement = createFastDomNode(document.createElement('div'));
		this._overviewViewportDomElement.setClassName('diffViewport');
		this._overviewViewportDomElement.setPosition('absolute');
E
Erich Gamma 已提交
263 264 265 266 267 268

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

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

J
Johannes Rieken 已提交
271
		this._toDispose.push(dom.addDisposableListener(this._overviewDomElement, 'mousedown', (e: MouseEvent) => {
E
Erich Gamma 已提交
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
			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 已提交
294 295 296 297 298 299 300
		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 已提交
301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318

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

319 320 321 322 323 324 325 326
	public get ignoreTrimWhitespace(): boolean {
		return this._ignoreTrimWhitespace;
	}

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

327 328 329 330
	public get renderIndicators(): boolean {
		return this._renderIndicators;
	}

J
Johannes Rieken 已提交
331
	private static _getClassName(theme: string, renderSideBySide: boolean): string {
A
Alex Dima 已提交
332
		let result = 'monaco-diff-editor monaco-editor-background ';
E
Erich Gamma 已提交
333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373
		if (renderSideBySide) {
			result += 'side-by-side ';
		}
		result += theme;
		return result;
	}

	private _recreateOverviewRulers(): void {
		if (this._originalOverviewRuler) {
			this._overviewDomElement.removeChild(this._originalOverviewRuler.getDomNode());
			this._originalOverviewRuler.dispose();
		}
		this._originalOverviewRuler = this.originalEditor.getView().createOverviewRuler('original diffOverviewRuler', 4, Number.MAX_VALUE);
		this._overviewDomElement.appendChild(this._originalOverviewRuler.getDomNode());

		if (this._modifiedOverviewRuler) {
			this._overviewDomElement.removeChild(this._modifiedOverviewRuler.getDomNode());
			this._modifiedOverviewRuler.dispose();
		}
		this._modifiedOverviewRuler = this.modifiedEditor.getView().createOverviewRuler('modified diffOverviewRuler', 4, Number.MAX_VALUE);
		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);
	}

374
	private _createLeftHandSideEditor(options: editorCommon.IDiffEditorOptions, instantiationService: IInstantiationService): void {
A
Alex Dima 已提交
375
		this.originalEditor = this._createInnerEditor(instantiationService, this._originalDomNode, this._adjustOptionsForLeftHandSide(options, this._originalIsEditable));
376
		this._toDispose.push(this.originalEditor.addBulkListener2((events) => this._onOriginalEditorEvents(events)));
A
Alex Dima 已提交
377
		this._toDispose.push(this.addEmitter2(this.originalEditor));
E
Erich Gamma 已提交
378 379
	}

J
Johannes Rieken 已提交
380
	private _createRightHandSideEditor(options: editorCommon.IDiffEditorOptions, instantiationService: IInstantiationService): void {
A
Alex Dima 已提交
381
		this.modifiedEditor = this._createInnerEditor(instantiationService, this._modifiedDomNode, this._adjustOptionsForRightHandSide(options));
382
		this._toDispose.push(this.modifiedEditor.addBulkListener2((events) => this._onModifiedEditorEvents(events)));
A
Alex Dima 已提交
383
		this._toDispose.push(this.addEmitter2(this.modifiedEditor));
E
Erich Gamma 已提交
384 385
	}

A
Alex Dima 已提交
386 387 388 389
	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: editorCommon.IEditorOptions): CodeEditor {
		return instantiationService.createInstance(CodeEditor, container, options);
	}

E
Erich Gamma 已提交
390 391 392 393 394
	public destroy(): void {
		this.dispose();
	}

	public dispose(): void {
J
Joao Moreno 已提交
395
		this._toDispose = dispose(this._toDispose);
E
Erich Gamma 已提交
396 397 398 399 400 401 402 403

		window.clearInterval(this._measureDomElementToken);

		this._cleanViewZonesAndDecorations();

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

A
Alex Dima 已提交
404 405
		this.originalEditor.dispose();
		this.modifiedEditor.dispose();
E
Erich Gamma 已提交
406 407 408

		this._strategy.dispose();

A
Alex Dima 已提交
409 410
		this.emit(editorCommon.EventType.Disposed);

E
Erich Gamma 已提交
411 412 413 414 415 416 417 418 419 420
		super.dispose();
	}

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

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

	public getEditorType(): string {
A
Alex Dima 已提交
421
		return editorCommon.EditorType.IDiffEditor;
E
Erich Gamma 已提交
422 423
	}

A
Alex Dima 已提交
424
	public getLineChanges(): editorCommon.ILineChange[] {
E
Erich Gamma 已提交
425 426 427
		return this._lineChanges;
	}

A
Alex Dima 已提交
428
	public getOriginalEditor(): editorBrowser.ICodeEditor {
E
Erich Gamma 已提交
429 430 431
		return this.originalEditor;
	}

A
Alex Dima 已提交
432
	public getModifiedEditor(): editorBrowser.ICodeEditor {
E
Erich Gamma 已提交
433 434 435
		return this.modifiedEditor;
	}

J
Johannes Rieken 已提交
436
	public updateOptions(newOptions: editorCommon.IDiffEditorOptions): void {
E
Erich Gamma 已提交
437 438 439 440
		// Handle new theme
		this._theme = newOptions && newOptions.theme ? newOptions.theme : this._theme;

		// Handle side by side
A
Alex Dima 已提交
441
		let renderSideBySideChanged = false;
E
Erich Gamma 已提交
442 443 444 445 446 447 448
		if (typeof newOptions.renderSideBySide !== 'undefined') {
			if (this._renderSideBySide !== newOptions.renderSideBySide) {
				this._renderSideBySide = newOptions.renderSideBySide;
				renderSideBySideChanged = true;
			}
		}

449 450
		let beginUpdateDecorations = false;

E
Erich Gamma 已提交
451 452 453 454
		if (typeof newOptions.ignoreTrimWhitespace !== 'undefined') {
			if (this._ignoreTrimWhitespace !== newOptions.ignoreTrimWhitespace) {
				this._ignoreTrimWhitespace = newOptions.ignoreTrimWhitespace;
				// Begin comparing
455 456 457 458 459 460 461 462
				beginUpdateDecorations = true;
			}
		}

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

466 467 468 469
		if (beginUpdateDecorations) {
			this._beginUpdateDecorations();
		}

470 471 472 473
		if (typeof newOptions.originalEditable !== 'undefined') {
			this._originalIsEditable = Boolean(newOptions.originalEditable);
		}

E
Erich Gamma 已提交
474 475 476 477
		// Update class name
		this._containerDomElement.className = DiffEditorWidget._getClassName(this._theme, this._renderSideBySide);

		this.modifiedEditor.updateOptions(this._adjustOptionsForRightHandSide(newOptions));
478
		this.originalEditor.updateOptions(this._adjustOptionsForLeftHandSide(newOptions, this._originalIsEditable));
E
Erich Gamma 已提交
479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495

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

		// renderSideBySide
		if (renderSideBySideChanged) {
			if (this._renderSideBySide) {
				this._setStrategy(new DiffEdtorWidgetSideBySide(this._createDataSource(), this._enableSplitViewResizing));
			} else {
				this._setStrategy(new DiffEdtorWidgetInline(this._createDataSource(), this._enableSplitViewResizing));
			}
		}
	}

J
Johannes Rieken 已提交
496
	public getValue(options: { preserveBOM: boolean; lineEnding: string; } = null): string {
E
Erich Gamma 已提交
497 498 499
		return this.modifiedEditor.getValue(options);
	}

A
Alex Dima 已提交
500
	public getModel(): editorCommon.IDiffEditorModel {
E
Erich Gamma 已提交
501 502 503 504 505 506
		return {
			original: this.originalEditor.getModel(),
			modified: this.modifiedEditor.getModel()
		};
	}

J
Johannes Rieken 已提交
507
	public setModel(model: editorCommon.IDiffEditorModel): void {
E
Erich Gamma 已提交
508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545
		// 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;
	}

J
Johannes Rieken 已提交
546
	public getVisibleColumnFromPosition(position: editorCommon.IPosition): number {
E
Erich Gamma 已提交
547 548 549
		return this.modifiedEditor.getVisibleColumnFromPosition(position);
	}

A
Alex Dima 已提交
550
	public getPosition(): Position {
E
Erich Gamma 已提交
551 552 553
		return this.modifiedEditor.getPosition();
	}

J
Johannes Rieken 已提交
554
	public setPosition(position: editorCommon.IPosition, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void {
E
Erich Gamma 已提交
555 556 557 558 559 560 561 562 563 564 565 566 567 568 569
		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);
	}

J
Johannes Rieken 已提交
570
	public revealPosition(position: editorCommon.IPosition, revealVerticalInCenter: boolean = false, revealHorizontal: boolean = false): void {
E
Erich Gamma 已提交
571 572 573
		this.modifiedEditor.revealPosition(position, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
574
	public revealPositionInCenter(position: editorCommon.IPosition): void {
E
Erich Gamma 已提交
575 576 577
		this.modifiedEditor.revealPositionInCenter(position);
	}

A
Alex Dima 已提交
578
	public revealPositionInCenterIfOutsideViewport(position: editorCommon.IPosition): void {
E
Erich Gamma 已提交
579 580 581
		this.modifiedEditor.revealPositionInCenterIfOutsideViewport(position);
	}

582
	public getSelection(): Selection {
E
Erich Gamma 已提交
583 584 585
		return this.modifiedEditor.getSelection();
	}

586
	public getSelections(): Selection[] {
E
Erich Gamma 已提交
587 588 589
		return this.modifiedEditor.getSelections();
	}

J
Johannes Rieken 已提交
590 591 592 593 594
	public setSelection(range: editorCommon.IRange, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void;
	public setSelection(editorRange: Range, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void;
	public setSelection(selection: editorCommon.ISelection, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void;
	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 已提交
595 596 597
		this.modifiedEditor.setSelection(something, reveal, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
598
	public setSelections(ranges: editorCommon.ISelection[]): void {
E
Erich Gamma 已提交
599 600 601 602 603 604 605 606 607 608 609 610 611 612 613
		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);
	}

J
Johannes Rieken 已提交
614
	public revealRange(range: editorCommon.IRange, revealVerticalInCenter: boolean = false, revealHorizontal: boolean = true): void {
E
Erich Gamma 已提交
615 616 617
		this.modifiedEditor.revealRange(range, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
618
	public revealRangeInCenter(range: editorCommon.IRange): void {
E
Erich Gamma 已提交
619 620 621
		this.modifiedEditor.revealRangeInCenter(range);
	}

A
Alex Dima 已提交
622
	public revealRangeInCenterIfOutsideViewport(range: editorCommon.IRange): void {
E
Erich Gamma 已提交
623 624 625
		this.modifiedEditor.revealRangeInCenterIfOutsideViewport(range);
	}

626 627 628 629
	public revealRangeAtTop(range: editorCommon.IRange): void {
		this.modifiedEditor.revealRangeAtTop(range);
	}

A
Alex Dima 已提交
630
	public getActions(): editorCommon.IEditorAction[] {
E
Erich Gamma 已提交
631 632 633
		return this.modifiedEditor.getActions();
	}

A
Alex Dima 已提交
634
	public getSupportedActions(): editorCommon.IEditorAction[] {
635 636 637
		return this.modifiedEditor.getSupportedActions();
	}

J
Johannes Rieken 已提交
638
	public getAction(id: string): editorCommon.IEditorAction {
E
Erich Gamma 已提交
639 640 641
		return this.modifiedEditor.getAction(id);
	}

A
Alex Dima 已提交
642
	public saveViewState(): editorCommon.IDiffEditorViewState {
A
Alex Dima 已提交
643 644
		let originalViewState = this.originalEditor.saveViewState();
		let modifiedViewState = this.modifiedEditor.saveViewState();
E
Erich Gamma 已提交
645 646 647 648 649 650
		return {
			original: originalViewState,
			modified: modifiedViewState
		};
	}

A
Alex Dima 已提交
651
	public restoreViewState(s: editorCommon.IDiffEditorViewState): void {
E
Erich Gamma 已提交
652
		if (s.original && s.original) {
A
Alex Dima 已提交
653
			let diffEditorState = <editorCommon.IDiffEditorViewState>s;
E
Erich Gamma 已提交
654 655 656 657 658
			this.originalEditor.restoreViewState(diffEditorState.original);
			this.modifiedEditor.restoreViewState(diffEditorState.modified);
		}
	}

J
Johannes Rieken 已提交
659
	public layout(dimension?: editorCommon.IDimension): void {
E
Erich Gamma 已提交
660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686
		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 已提交
687
	public trigger(source: string, handlerId: string, payload: any): void {
E
Erich Gamma 已提交
688 689 690
		this.modifiedEditor.trigger(source, handlerId, payload);
	}

J
Johannes Rieken 已提交
691
	public changeDecorations(callback: (changeAccessor: editorCommon.IModelDecorationsChangeAccessor) => any): any {
E
Erich Gamma 已提交
692 693 694 695 696 697 698 699 700
		return this.modifiedEditor.changeDecorations(callback);
	}

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



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

J
Johannes Rieken 已提交
701
	private _measureDomElement(forceDoLayoutCall: boolean, dimensions?: editorCommon.IDimension): void {
702 703 704 705
		dimensions = dimensions || {
			width: this._containerDomElement.clientWidth,
			height: this._containerDomElement.clientHeight
		};
E
Erich Gamma 已提交
706 707

		if (dimensions.width <= 0) {
708 709
			this._width = 0;
			this._height = 0;
E
Erich Gamma 已提交
710 711 712 713 714 715 716 717 718 719 720 721 722 723 724
			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 已提交
725 726
		let freeSpace = DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH - 2 * DiffEditorWidget.ONE_OVERVIEW_WIDTH;
		let layoutInfo = this.modifiedEditor.getLayoutInfo();
E
Erich Gamma 已提交
727
		if (layoutInfo) {
728
			this._originalOverviewRuler.setLayout(new editorCommon.OverviewRulerPosition({
E
Erich Gamma 已提交
729 730 731
				top: 0,
				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
				right: freeSpace + DiffEditorWidget.ONE_OVERVIEW_WIDTH,
732
				height: this._height
733 734
			}));
			this._modifiedOverviewRuler.setLayout(new editorCommon.OverviewRulerPosition({
E
Erich Gamma 已提交
735 736 737
				top: 0,
				right: 0,
				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
738
				height: this._height
739
			}));
E
Erich Gamma 已提交
740 741 742 743 744
		}
	}

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

J
Johannes Rieken 已提交
745
	private _recomputeIfNecessary(events: EmitterEvent[]): void {
A
Alex Dima 已提交
746 747 748
		let changed = false;
		for (let i = 0; !changed && i < events.length; i++) {
			let type = events[i].getType();
A
Alex Dima 已提交
749
			changed = changed || type === editorCommon.EventType.ModelRawContentChanged;
E
Erich Gamma 已提交
750 751 752 753 754 755 756 757 758 759 760
		}
		if (changed && this._isVisible) {
			// 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);
		}
	}

J
Johannes Rieken 已提交
761
	private _onOriginalEditorEvents(events: EmitterEvent[]): void {
A
Alex Dima 已提交
762
		for (let i = 0; i < events.length; i++) {
763 764 765 766 767
			let type = events[i].getType();
			let data = events[i].getData();

			if (type === 'scroll') {
				this._onOriginalEditorScroll(data);
E
Erich Gamma 已提交
768
			}
769
			if (type === editorCommon.EventType.ViewZonesChanged) {
E
Erich Gamma 已提交
770 771
				this._onViewZonesChanged();
			}
772 773 774 775
			if (type === editorCommon.EventType.ConfigurationChanged) {
				let isViewportWrapping = this.originalEditor.getConfiguration().wrappingInfo.isViewportWrapping;
				if (isViewportWrapping) {
					// oh no, you didn't!
776
					this.originalEditor.updateOptions({ wordWrap: 'off' });
777 778
				}
			}
E
Erich Gamma 已提交
779 780 781 782
		}
		this._recomputeIfNecessary(events);
	}

J
Johannes Rieken 已提交
783
	private _onModifiedEditorEvents(events: EmitterEvent[]): void {
A
Alex Dima 已提交
784
		for (let i = 0; i < events.length; i++) {
785 786 787 788 789
			let type = events[i].getType();
			let data = events[i].getData();

			if (type === 'scroll') {
				this._onModifiedEditorScroll(data);
E
Erich Gamma 已提交
790 791
				this._layoutOverviewViewport();
			}
792
			if (type === 'viewLayoutChanged') {
E
Erich Gamma 已提交
793 794
				this._layoutOverviewViewport();
			}
795
			if (type === editorCommon.EventType.ViewZonesChanged) {
E
Erich Gamma 已提交
796 797
				this._onViewZonesChanged();
			}
798
			if (type === editorCommon.EventType.ConfigurationChanged) {
799
				let e = <editorCommon.IConfigurationChangedEvent>data;
800 801 802
				let isViewportWrapping = this.modifiedEditor.getConfiguration().wrappingInfo.isViewportWrapping;
				if (isViewportWrapping) {
					// oh no, you didn't!
803
					this.modifiedEditor.updateOptions({ wordWrap: 'off' });
804
				}
805
				if (e.fontInfo && this.modifiedEditor.getModel()) {
806 807
					this._onViewZonesChanged();
				}
808
			}
E
Erich Gamma 已提交
809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829
		}
		this._recomputeIfNecessary(events);
	}

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

	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 已提交
830 831 832
		let currentToken = this._diffComputationToken;
		let currentOriginalModel = this.originalEditor.getModel();
		let currentModifiedModel = this.modifiedEditor.getModel();
E
Erich Gamma 已提交
833

834
		this._editorWorkerService.computeDiff(currentOriginalModel.uri, currentModifiedModel.uri, this._ignoreTrimWhitespace).then((result) => {
835 836 837
			if (currentToken === this._diffComputationToken
				&& currentOriginalModel === this.originalEditor.getModel()
				&& currentModifiedModel === this.modifiedEditor.getModel()
J
Johannes Rieken 已提交
838
			) {
839 840
				this._lineChanges = result;
				this._updateDecorationsRunner.schedule();
J
Johannes Rieken 已提交
841
				this.emit(editorCommon.EventType.DiffUpdated, {});
842 843 844 845 846
			}
		}, (error) => {
			if (currentToken === this._diffComputationToken
				&& currentOriginalModel === this.originalEditor.getModel()
				&& currentModifiedModel === this.modifiedEditor.getModel()
J
Johannes Rieken 已提交
847
			) {
E
Erich Gamma 已提交
848 849 850
				this._lineChanges = null;
				this._updateDecorationsRunner.schedule();
			}
851
		});
E
Erich Gamma 已提交
852 853 854 855 856 857 858 859
	}

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

	private _updateDecorations(): void {
860 861 862
		if (!this.originalEditor.getModel() || !this.modifiedEditor.getModel()) {
			return;
		}
A
Alex Dima 已提交
863
		let lineChanges = this._lineChanges || [];
E
Erich Gamma 已提交
864

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

868
		let diffDecorations = this._strategy.getEditorsDiffDecorations(lineChanges, this._ignoreTrimWhitespace, this._renderIndicators, foreignOriginal, foreignModified, this.originalEditor, this.modifiedEditor);
E
Erich Gamma 已提交
869 870 871 872 873 874 875 876 877 878

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

J
Johannes Rieken 已提交
879 880
	private _adjustOptionsForSubEditor(options: editorCommon.IDiffEditorOptions): editorCommon.IDiffEditorOptions {
		let clonedOptions: editorCommon.IDiffEditorOptions = objects.clone(options || {});
881
		clonedOptions.wordWrap = 'off';
E
Erich Gamma 已提交
882 883 884
		clonedOptions.automaticLayout = false;
		clonedOptions.scrollbar = clonedOptions.scrollbar || {};
		clonedOptions.scrollbar.vertical = 'visible';
A
Alex Dima 已提交
885
		clonedOptions.folding = false;
886
		clonedOptions.codeLens = false;
J
Joao Moreno 已提交
887
		clonedOptions.fixedOverflowWidgets = true;
888
		clonedOptions.lineDecorationsWidth = '2ch';
889 890 891
		if (!clonedOptions.minimap) {
			clonedOptions.minimap = {};
		}
892
		clonedOptions.minimap.enabled = false;
E
Erich Gamma 已提交
893 894 895
		return clonedOptions;
	}

A
Alex Dima 已提交
896
	private _adjustOptionsForLeftHandSide(options: editorCommon.IDiffEditorOptions, isEditable: boolean): editorCommon.IEditorOptions {
897 898 899 900 901 902 903
		let result = this._adjustOptionsForSubEditor(options);
		result.readOnly = !isEditable;
		result.overviewRulerLanes = 1;
		result.theme = this._theme + ' original-in-monaco-diff-editor';
		return result;
	}

A
Alex Dima 已提交
904
	private _adjustOptionsForRightHandSide(options: editorCommon.IDiffEditorOptions): editorCommon.IEditorOptions {
905 906 907 908 909
		let result = this._adjustOptionsForSubEditor(options);
		result.revealHorizontalRightPadding = DefaultConfig.editor.revealHorizontalRightPadding + DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
		result.scrollbar.verticalHasArrows = false;
		result.theme = this._theme + ' modified-in-monaco-diff-editor';
		return result;
E
Erich Gamma 已提交
910 911
	}

J
Johannes Rieken 已提交
912
	private _onOriginalEditorScroll(e: editorCommon.IScrollEvent): void {
A
Alex Dima 已提交
913 914 915
		if (!e.scrollTopChanged && !e.scrollLeftChanged) {
			return;
		}
E
Erich Gamma 已提交
916 917 918 919
		if (this._isHandlingScrollEvent) {
			return;
		}
		this._isHandlingScrollEvent = true;
920 921 922 923
		this.modifiedEditor.setScrollPosition({
			scrollLeft: e.scrollLeft,
			scrollTop: e.scrollTop
		});
E
Erich Gamma 已提交
924 925 926
		this._isHandlingScrollEvent = false;
	}

J
Johannes Rieken 已提交
927
	private _onModifiedEditorScroll(e: editorCommon.IScrollEvent): void {
A
Alex Dima 已提交
928 929 930
		if (!e.scrollTopChanged && !e.scrollLeftChanged) {
			return;
		}
J
Johannes Rieken 已提交
931
		if (this._isHandlingScrollEvent) {
E
Erich Gamma 已提交
932 933 934
			return;
		}
		this._isHandlingScrollEvent = true;
935 936 937 938
		this.originalEditor.setScrollPosition({
			scrollLeft: e.scrollLeft,
			scrollTop: e.scrollTop
		});
E
Erich Gamma 已提交
939 940 941 942
		this._isHandlingScrollEvent = false;
	}

	private _doLayout(): void {
A
Alex Dima 已提交
943
		let splitPoint = this._strategy.layout();
E
Erich Gamma 已提交
944 945 946 947 948 949 950 951 952 953

		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 已提交
954 955
		this._overviewViewportDomElement.setWidth(DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH);
		this._overviewViewportDomElement.setHeight(30);
E
Erich Gamma 已提交
956 957 958 959 960 961 962 963 964 965 966 967

		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 已提交
968
		let layout = this._computeOverviewViewport();
E
Erich Gamma 已提交
969
		if (!layout) {
A
Alex Dima 已提交
970 971
			this._overviewViewportDomElement.setTop(0);
			this._overviewViewportDomElement.setHeight(0);
E
Erich Gamma 已提交
972
		} else {
A
Alex Dima 已提交
973 974
			this._overviewViewportDomElement.setTop(layout.top);
			this._overviewViewportDomElement.setHeight(layout.height);
E
Erich Gamma 已提交
975 976 977
		}
	}

J
Johannes Rieken 已提交
978
	private _computeOverviewViewport(): { height: number; top: number; } {
A
Alex Dima 已提交
979
		let layoutInfo = this.modifiedEditor.getLayoutInfo();
E
Erich Gamma 已提交
980 981 982 983
		if (!layoutInfo) {
			return null;
		}

A
Alex Dima 已提交
984 985
		let scrollTop = this.modifiedEditor.getScrollTop();
		let scrollHeight = this.modifiedEditor.getScrollHeight();
E
Erich Gamma 已提交
986

A
Alex Dima 已提交
987 988 989
		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 已提交
990

A
Alex Dima 已提交
991 992
		let computedSliderSize = Math.max(1, Math.floor(layoutInfo.contentHeight * computedRatio));
		let computedSliderPosition = Math.floor(scrollTop * computedRatio);
E
Erich Gamma 已提交
993 994 995 996 997 998 999

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

J
Johannes Rieken 已提交
1000
	private _createDataSource(): IDataSource {
E
Erich Gamma 已提交
1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027
		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 已提交
1028
	private _setStrategy(newStrategy: IDiffEditorWidgetStyle): void {
E
Erich Gamma 已提交
1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042
		if (this._strategy) {
			this._strategy.dispose();
		}

		this._strategy = newStrategy;

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

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

J
Johannes Rieken 已提交
1043
	private _getLineChangeAtOrBeforeLineNumber(lineNumber: number, startLineNumberExtractor: (lineChange: editorCommon.ILineChange) => number): editorCommon.ILineChange {
E
Erich Gamma 已提交
1044 1045 1046 1047 1048
		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 已提交
1049
		let min = 0, max = this._lineChanges.length - 1;
E
Erich Gamma 已提交
1050
		while (min < max) {
A
Alex Dima 已提交
1051 1052 1053
			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 已提交
1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068

			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 已提交
1069
		let lineChange = this._getLineChangeAtOrBeforeLineNumber(lineNumber, (lineChange) => lineChange.originalStartLineNumber);
E
Erich Gamma 已提交
1070 1071 1072 1073 1074

		if (!lineChange) {
			return lineNumber;
		}

A
Alex Dima 已提交
1075 1076 1077 1078
		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 已提交
1079 1080


A
Alex Dima 已提交
1081
		let delta = lineNumber - originalEquivalentLineNumber;
E
Erich Gamma 已提交
1082 1083 1084 1085 1086

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

J
Johannes Rieken 已提交
1087
		return modifiedEquivalentLineNumber + lineChangeModifiedLength - lineChangeOriginalLength + delta;
E
Erich Gamma 已提交
1088 1089 1090
	}

	private _getEquivalentLineForModifiedLineNumber(lineNumber: number): number {
A
Alex Dima 已提交
1091
		let lineChange = this._getLineChangeAtOrBeforeLineNumber(lineNumber, (lineChange) => lineChange.modifiedStartLineNumber);
E
Erich Gamma 已提交
1092 1093 1094 1095 1096

		if (!lineChange) {
			return lineNumber;
		}

A
Alex Dima 已提交
1097 1098 1099 1100
		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 已提交
1101 1102


A
Alex Dima 已提交
1103
		let delta = lineNumber - modifiedEquivalentLineNumber;
E
Erich Gamma 已提交
1104 1105 1106 1107 1108

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

J
Johannes Rieken 已提交
1109
		return originalEquivalentLineNumber + lineChangeOriginalLength - lineChangeModifiedLength + delta;
E
Erich Gamma 已提交
1110 1111
	}

J
Johannes Rieken 已提交
1112
	public getDiffLineInformationForOriginal(lineNumber: number): editorCommon.IDiffLineInformation {
E
Erich Gamma 已提交
1113 1114 1115 1116 1117 1118 1119 1120 1121
		if (!this._lineChanges) {
			// Cannot answer that which I don't know
			return null;
		}
		return {
			equivalentLineNumber: this._getEquivalentLineForOriginalLineNumber(lineNumber)
		};
	}

J
Johannes Rieken 已提交
1122
	public getDiffLineInformationForModified(lineNumber: number): editorCommon.IDiffLineInformation {
E
Erich Gamma 已提交
1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138
		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 已提交
1139 1140
	getOriginalEditor(): editorBrowser.ICodeEditor;
	getModifiedEditor(): editorBrowser.ICodeEditor;
E
Erich Gamma 已提交
1141 1142 1143 1144
}

class DiffEditorWidgetStyle {

J
Johannes Rieken 已提交
1145
	_dataSource: IDataSource;
E
Erich Gamma 已提交
1146

J
Johannes Rieken 已提交
1147
	constructor(dataSource: IDataSource) {
E
Erich Gamma 已提交
1148 1149 1150
		this._dataSource = dataSource;
	}

1151
	public getEditorsDiffDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalWhitespaces: editorCommon.IEditorWhitespace[], modifiedWhitespaces: editorCommon.IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorsDiffDecorationsWithZones {
E
Erich Gamma 已提交
1152 1153 1154 1155 1156 1157 1158
		// Get view zones
		modifiedWhitespaces = modifiedWhitespaces.sort((a, b) => {
			return a.afterLineNumber - b.afterLineNumber;
		});
		originalWhitespaces = originalWhitespaces.sort((a, b) => {
			return a.afterLineNumber - b.afterLineNumber;
		});
1159
		let zones = this._getViewZones(lineChanges, originalWhitespaces, modifiedWhitespaces, originalEditor, modifiedEditor, renderIndicators);
E
Erich Gamma 已提交
1160 1161

		// Get decorations & overview ruler zones
1162 1163
		let originalDecorations = this._getOriginalEditorDecorations(lineChanges, ignoreTrimWhitespace, renderIndicators, originalEditor, modifiedEditor);
		let modifiedDecorations = this._getModifiedEditorDecorations(lineChanges, ignoreTrimWhitespace, renderIndicators, originalEditor, modifiedEditor);
E
Erich Gamma 已提交
1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178

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

R
rebornix 已提交
1179
	_getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean): IEditorsZones {
E
Erich Gamma 已提交
1180 1181 1182
		return null;
	}

1183
	_getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1184 1185 1186
		return null;
	}

1187
	_getModifiedEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1188 1189 1190 1191
		return null;
	}
}

A
Alex Dima 已提交
1192
interface IMyViewZone extends editorBrowser.IViewZone {
E
Erich Gamma 已提交
1193 1194 1195 1196 1197 1198
	shouldNotShrink?: boolean;
}

class ForeignViewZonesIterator {

	private _index: number;
A
Alex Dima 已提交
1199 1200
	private _source: editorCommon.IEditorWhitespace[];
	public current: editorCommon.IEditorWhitespace;
E
Erich Gamma 已提交
1201

A
Alex Dima 已提交
1202
	constructor(source: editorCommon.IEditorWhitespace[]) {
E
Erich Gamma 已提交
1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217
		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;
		}
	}
}

1218
abstract class ViewZonesComputer {
E
Erich Gamma 已提交
1219

J
Johannes Rieken 已提交
1220 1221 1222
	private lineChanges: editorCommon.ILineChange[];
	private originalForeignVZ: editorCommon.IEditorWhitespace[];
	private modifiedForeignVZ: editorCommon.IEditorWhitespace[];
E
Erich Gamma 已提交
1223

J
Johannes Rieken 已提交
1224
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[]) {
E
Erich Gamma 已提交
1225 1226 1227 1228 1229 1230
		this.lineChanges = lineChanges;
		this.originalForeignVZ = originalForeignVZ;
		this.modifiedForeignVZ = modifiedForeignVZ;
	}

	public getViewZones(): IEditorsZones {
A
Alex Dima 已提交
1231
		let result: IEditorsZones = {
E
Erich Gamma 已提交
1232 1233 1234 1235
			original: [],
			modified: []
		};

A
Alex Dima 已提交
1236 1237 1238 1239 1240 1241 1242 1243
		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 已提交
1244 1245 1246
			return a.afterLineNumber - b.afterLineNumber;
		};

A
Alex Dima 已提交
1247
		let addAndCombineIfPossible = (destination: editorBrowser.IViewZone[], item: IMyViewZone) => {
E
Erich Gamma 已提交
1248
			if (item.domNode === null && destination.length > 0) {
A
Alex Dima 已提交
1249
				let lastItem = destination[destination.length - 1];
E
Erich Gamma 已提交
1250 1251 1252 1253 1254 1255 1256 1257
				if (lastItem.afterLineNumber === item.afterLineNumber && lastItem.domNode === null) {
					lastItem.heightInLines += item.heightInLines;
					return;
				}
			}
			destination.push(item);
		};

A
Alex Dima 已提交
1258 1259
		let modifiedForeignVZ = new ForeignViewZonesIterator(this.modifiedForeignVZ);
		let originalForeignVZ = new ForeignViewZonesIterator(this.originalForeignVZ);
E
Erich Gamma 已提交
1260 1261

		// 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 已提交
1262 1263
		for (let i = 0, length = this.lineChanges.length; i <= length; i++) {
			let lineChange = (i < length ? this.lineChanges[i] : null);
E
Erich Gamma 已提交
1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280

			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 已提交
1281 1282
			let stepOriginal: IMyViewZone[] = [];
			let stepModified: IMyViewZone[] = [];
E
Erich Gamma 已提交
1283 1284 1285 1286 1287

			// ---------------------------- 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 已提交
1288
				let viewZoneLineNumber: number;
E
Erich Gamma 已提交
1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303
				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 已提交
1304
				let viewZoneLineNumber: number;
E
Erich Gamma 已提交
1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318
				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 已提交
1319
				let r = this._produceOriginalFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
E
Erich Gamma 已提交
1320 1321 1322 1323 1324 1325
				if (r) {
					stepOriginal.push(r);
				}
			}

			if (lineChange !== null && isChangeOrDelete(lineChange)) {
A
Alex Dima 已提交
1326
				let r = this._produceModifiedFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
E
Erich Gamma 已提交
1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337
				if (r) {
					stepModified.push(r);
				}
			}

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


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

			// [CANCEL & EMIT] Try to cancel view zones out
A
Alex Dima 已提交
1338 1339
			let stepOriginalIndex = 0;
			let stepModifiedIndex = 0;
E
Erich Gamma 已提交
1340 1341 1342 1343 1344

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

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

A
Alex Dima 已提交
1348 1349
				let originalDelta = original.afterLineNumber - originalEquivalentLineNumber;
				let modifiedDelta = modified.afterLineNumber - modifiedEquivalentLineNumber;
E
Erich Gamma 已提交
1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390

				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 已提交
1391
		let ensureDomNode = (z: IMyViewZone) => {
E
Erich Gamma 已提交
1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402
			if (!z.domNode) {
				z.domNode = createFakeLinesDiv();
			}
		};

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

		return result;
	}

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

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

A
Alex Dima 已提交
1408
class DiffEdtorWidgetSideBySide extends DiffEditorWidgetStyle implements IDiffEditorWidgetStyle, IVerticalSashLayoutProvider {
E
Erich Gamma 已提交
1409 1410 1411 1412

	static MINIMUM_EDITOR_WIDTH = 100;

	private _disableSash: boolean;
J
Johannes Rieken 已提交
1413 1414 1415 1416
	private _sash: Sash;
	private _sashRatio: number;
	private _sashPosition: number;
	private _startSashPosition: number;
E
Erich Gamma 已提交
1417

J
Johannes Rieken 已提交
1418
	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean) {
E
Erich Gamma 已提交
1419 1420 1421 1422 1423
		super(dataSource);

		this._disableSash = (enableSplitViewResizing === false);
		this._sashRatio = null;
		this._sashPosition = null;
A
Alex Dima 已提交
1424
		this._sash = new Sash(this._dataSource.getContainerDomNode(), this);
E
Erich Gamma 已提交
1425 1426 1427 1428 1429

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

A
Alex Dima 已提交
1430 1431 1432 1433
		this._sash.addListener2('start', () => this.onSashDragStart());
		this._sash.addListener2('change', (e: ISashEvent) => this.onSashDrag(e));
		this._sash.addListener2('end', () => this.onSashDragEnd());
		this._sash.addListener2('reset', () => this.onSashReset());
E
Erich Gamma 已提交
1434 1435 1436 1437 1438 1439
	}

	public dispose(): void {
		this._sash.dispose();
	}

J
Johannes Rieken 已提交
1440
	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
A
Alex Dima 已提交
1441
		let newDisableSash = (enableSplitViewResizing === false);
E
Erich Gamma 已提交
1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452
		if (this._disableSash !== newDisableSash) {
			this._disableSash = newDisableSash;

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

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

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

A
Alex Dima 已提交
1460
		sashPosition = this._disableSash ? midPoint : sashPosition || midPoint;
E
Erich Gamma 已提交
1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481

		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 已提交
1482
	private onSashDragStart(): void {
E
Erich Gamma 已提交
1483 1484 1485
		this._startSashPosition = this._sashPosition;
	}

J
Johannes Rieken 已提交
1486
	private onSashDrag(e: ISashEvent): void {
A
Alex Dima 已提交
1487 1488 1489
		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 已提交
1490 1491 1492 1493 1494 1495

		this._sashRatio = sashPosition / contentWidth;

		this._dataSource.relayoutEditors();
	}

M
Maxime Quandalle 已提交
1496 1497 1498 1499 1500 1501 1502
	private onSashDragEnd(): void {
		this._sash.layout();
	}

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

A
Alex Dima 已提交
1506
	public getVerticalSashTop(sash: Sash): number {
E
Erich Gamma 已提交
1507 1508 1509
		return 0;
	}

A
Alex Dima 已提交
1510
	public getVerticalSashLeft(sash: Sash): number {
E
Erich Gamma 已提交
1511 1512 1513
		return this._sashPosition;
	}

A
Alex Dima 已提交
1514
	public getVerticalSashHeight(sash: Sash): number {
E
Erich Gamma 已提交
1515 1516 1517
		return this._dataSource.getHeight();
	}

J
Johannes Rieken 已提交
1518
	_getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorsZones {
A
Alex Dima 已提交
1519
		let c = new SideBySideViewZonesComputer(lineChanges, originalForeignVZ, modifiedForeignVZ);
E
Erich Gamma 已提交
1520 1521 1522
		return c.getViewZones();
	}

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

A
Alex Dima 已提交
1525
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1526 1527
			decorations: [],
			overviewZones: []
P
Peng Lyu 已提交
1528
		};
A
Alex Dima 已提交
1529 1530 1531 1532 1533

		let originalModel = originalEditor.getModel();

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

			if (isChangeOrDelete(lineChange)) {
1536 1537 1538 1539
				result.decorations.push({
					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-delete',
1540
						linesDecorationsClassName: renderIndicators ? 'delete-sign' : undefined,
1541 1542 1543 1544
						marginClassName: 'line-delete',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1545 1546 1547 1548
				if (!isChangeOrInsert(lineChange) || !lineChange.charChanges) {
					result.decorations.push(createDecoration(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE, 'char-delete', true));
				}

1549
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1550 1551 1552 1553 1554 1555 1556
					lineChange.originalStartLineNumber,
					lineChange.originalEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(255, 0, 0, 0.4)',
					'rgba(255, 0, 0, 0.4)'
				));
E
Erich Gamma 已提交
1557 1558

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1559 1560
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1561 1562
						if (isChangeOrDelete(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1563 1564 1565
								for (let lineNumber = charChange.originalStartLineNumber; lineNumber <= charChange.originalEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589
									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;
	}

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

A
Alex Dima 已提交
1592
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1593 1594
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1595 1596 1597 1598 1599 1600
		};

		let modifiedModel = modifiedEditor.getModel();

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

			if (isChangeOrInsert(lineChange)) {

1604 1605 1606 1607
				result.decorations.push({
					range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-insert',
1608
						linesDecorationsClassName: renderIndicators ? 'insert-sign' : undefined,
1609 1610 1611 1612
						marginClassName: 'line-insert',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1613 1614 1615
				if (!isChangeOrDelete(lineChange) || !lineChange.charChanges) {
					result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE, 'char-insert', true));
				}
1616
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1617 1618 1619 1620 1621 1622 1623
					lineChange.modifiedStartLineNumber,
					lineChange.modifiedEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(155, 185, 85, 0.4)',
					'rgba(155, 185, 85, 0.4)'
				));
E
Erich Gamma 已提交
1624 1625

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1626 1627
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1628 1629
						if (isChangeOrInsert(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1630 1631 1632
								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659
									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 {

J
Johannes Rieken 已提交
1660
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[]) {
E
Erich Gamma 已提交
1661 1662 1663
		super(lineChanges, originalForeignVZ, modifiedForeignVZ);
	}

J
Johannes Rieken 已提交
1664
	_produceOriginalFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
E
Erich Gamma 已提交
1665 1666 1667 1668 1669 1670 1671 1672 1673 1674
		if (lineChangeModifiedLength > lineChangeOriginalLength) {
			return {
				afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber),
				heightInLines: (lineChangeModifiedLength - lineChangeOriginalLength),
				domNode: null
			};
		}
		return null;
	}

J
Johannes Rieken 已提交
1675
	_produceModifiedFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
E
Erich Gamma 已提交
1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688
		if (lineChangeOriginalLength > lineChangeModifiedLength) {
			return {
				afterLineNumber: Math.max(lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber),
				heightInLines: (lineChangeOriginalLength - lineChangeModifiedLength),
				domNode: null
			};
		}
		return null;
	}
}

class DiffEdtorWidgetInline extends DiffEditorWidgetStyle implements IDiffEditorWidgetStyle {

J
Johannes Rieken 已提交
1689
	private toDispose: IDisposable[];
E
Erich Gamma 已提交
1690 1691
	private decorationsLeft: number;

J
Johannes Rieken 已提交
1692
	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean) {
E
Erich Gamma 已提交
1693 1694
		super(dataSource);

1695
		this.decorationsLeft = dataSource.getOriginalEditor().getLayoutInfo().decorationsLeft;
E
Erich Gamma 已提交
1696 1697

		this.toDispose = [];
J
Johannes Rieken 已提交
1698
		this.toDispose.push(dataSource.getOriginalEditor().onDidLayoutChange((layoutInfo: editorCommon.EditorLayoutInfo) => {
E
Erich Gamma 已提交
1699 1700 1701 1702 1703 1704 1705 1706
			if (this.decorationsLeft !== layoutInfo.decorationsLeft) {
				this.decorationsLeft = layoutInfo.decorationsLeft;
				dataSource.relayoutEditors();
			}
		}));
	}

	public dispose(): void {
J
Joao Moreno 已提交
1707
		this.toDispose = dispose(this.toDispose);
E
Erich Gamma 已提交
1708 1709
	}

J
Johannes Rieken 已提交
1710
	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
E
Erich Gamma 已提交
1711 1712 1713
		// Nothing to do..
	}

R
rebornix 已提交
1714
	_getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean): IEditorsZones {
1715
		let computer = new InlineViewZonesComputer(lineChanges, originalForeignVZ, modifiedForeignVZ, originalEditor, modifiedEditor, renderIndicators);
E
Erich Gamma 已提交
1716 1717 1718
		return computer.getViewZones();
	}

1719
	_getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
A
Alex Dima 已提交
1720
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1721 1722
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1723
		};
E
Erich Gamma 已提交
1724

A
Alex Dima 已提交
1725 1726
		for (let i = 0, length = lineChanges.length; i < length; i++) {
			let lineChange = lineChanges[i];
E
Erich Gamma 已提交
1727 1728 1729

			// Add overview zones in the overview ruler
			if (isChangeOrDelete(lineChange)) {
1730 1731 1732 1733 1734 1735 1736
				result.decorations.push({
					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE),
					options: {
						marginClassName: 'line-delete',
					}
				});

1737
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1738 1739 1740 1741 1742 1743 1744
					lineChange.originalStartLineNumber,
					lineChange.originalEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(255, 0, 0, 0.4)',
					'rgba(255, 0, 0, 0.4)'
				));
E
Erich Gamma 已提交
1745 1746 1747 1748 1749 1750
			}
		}

		return result;
	}

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

A
Alex Dima 已提交
1753
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1754 1755
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1756 1757 1758 1759 1760 1761
		};

		let modifiedModel = modifiedEditor.getModel();

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

			// Add decorations & overview zones
			if (isChangeOrInsert(lineChange)) {
1765 1766 1767 1768
				result.decorations.push({
					range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-insert',
1769
						linesDecorationsClassName: renderIndicators ? 'insert-sign' : undefined,
1770 1771 1772 1773
						marginClassName: 'line-insert',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1774

1775
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1776 1777 1778 1779 1780 1781 1782
					lineChange.modifiedStartLineNumber,
					lineChange.modifiedEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(155, 185, 85, 0.4)',
					'rgba(155, 185, 85, 0.4)'
				));
E
Erich Gamma 已提交
1783 1784

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1785 1786
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1787 1788
						if (isChangeOrInsert(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1789 1790 1791
								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826
									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 已提交
1827 1828 1829
	private originalModel: editorCommon.IModel;
	private modifiedEditorConfiguration: editorCommon.InternalEditorOptions;
	private modifiedEditorTabSize: number;
R
rebornix 已提交
1830
	private renderIndicators: boolean;
E
Erich Gamma 已提交
1831

R
rebornix 已提交
1832
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean) {
E
Erich Gamma 已提交
1833 1834 1835
		super(lineChanges, originalForeignVZ, modifiedForeignVZ);
		this.originalModel = originalEditor.getModel();
		this.modifiedEditorConfiguration = modifiedEditor.getConfiguration();
1836
		this.modifiedEditorTabSize = modifiedEditor.getModel().getOptions().tabSize;
R
rebornix 已提交
1837
		this.renderIndicators = renderIndicators;
E
Erich Gamma 已提交
1838 1839
	}

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

E
Erich Gamma 已提交
1845
		return {
J
Johannes Rieken 已提交
1846
			afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber),
E
Erich Gamma 已提交
1847
			heightInLines: lineChangeModifiedLength,
1848 1849
			domNode: document.createElement('div'),
			marginDomNode: marginDomNode
E
Erich Gamma 已提交
1850 1851 1852
		};
	}

J
Johannes Rieken 已提交
1853
	_produceModifiedFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
A
Alex Dima 已提交
1854
		let decorations: InlineDecoration[] = [];
E
Erich Gamma 已提交
1855
		if (lineChange.charChanges) {
A
Alex Dima 已提交
1856 1857
			for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
				let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1858
				if (isChangeOrDelete(charChange)) {
1859 1860
					decorations.push(new InlineDecoration(
						new Range(charChange.originalStartLineNumber, charChange.originalStartColumn, charChange.originalEndLineNumber, charChange.originalEndColumn),
1861 1862
						'char-delete',
						false
1863
					));
E
Erich Gamma 已提交
1864 1865 1866 1867
				}
			}
		}

A
Alex Dima 已提交
1868
		let html: string[] = [];
1869 1870 1871
		let marginHTML: string[] = [];
		let lineDecorationsWidth = this.modifiedEditorConfiguration.layoutInfo.decorationsWidth;
		let lineHeight = this.modifiedEditorConfiguration.lineHeight;
A
Alex Dima 已提交
1872
		for (let lineNumber = lineChange.originalStartLineNumber; lineNumber <= lineChange.originalEndLineNumber; lineNumber++) {
1873
			html = html.concat(this.renderOriginalLine(lineNumber - lineChange.originalStartLineNumber, this.originalModel, this.modifiedEditorConfiguration, this.modifiedEditorTabSize, lineNumber, decorations));
1874

R
rebornix 已提交
1875
			if (this.renderIndicators) {
1876 1877 1878 1879 1880
				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 已提交
1881 1882
		}

A
Alex Dima 已提交
1883
		let domNode = document.createElement('div');
E
Erich Gamma 已提交
1884 1885
		domNode.className = 'view-lines line-delete';
		domNode.innerHTML = html.join('');
1886
		Configuration.applyFontInfoSlow(domNode, this.modifiedEditorConfiguration.fontInfo);
E
Erich Gamma 已提交
1887

1888 1889 1890 1891 1892
		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 已提交
1893 1894 1895 1896
		return {
			shouldNotShrink: true,
			afterLineNumber: (lineChange.modifiedEndLineNumber === 0 ? lineChange.modifiedStartLineNumber : lineChange.modifiedStartLineNumber - 1),
			heightInLines: lineChangeOriginalLength,
1897 1898
			domNode: domNode,
			marginDomNode: marginDomNode
E
Erich Gamma 已提交
1899 1900 1901
		};
	}

J
Johannes Rieken 已提交
1902
	private renderOriginalLine(count: number, originalModel: editorCommon.IModel, config: editorCommon.InternalEditorOptions, tabSize: number, lineNumber: number, decorations: InlineDecoration[]): string[] {
1903
		let lineContent = originalModel.getLineContent(lineNumber);
E
Erich Gamma 已提交
1904

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

A
Alex Dima 已提交
1907 1908 1909 1910 1911 1912
		const defaultMetadata = (
			(FontStyle.None << MetadataConsts.FONT_STYLE_OFFSET)
			| (ColorId.DefaultForeground << MetadataConsts.FOREGROUND_OFFSET)
			| (ColorId.DefaultBackground << MetadataConsts.BACKGROUND_OFFSET)
		) >>> 0;

A
Alex Dima 已提交
1913
		let r = renderViewLine(new RenderLineInput(
1914
			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
A
Alex Dima 已提交
1915
			lineContent,
1916
			originalModel.mightContainRTL(),
1917
			0,
A
Alex Dima 已提交
1918
			[new ViewLineToken(lineContent.length, defaultMetadata)],
1919
			actualDecorations,
A
Alex Dima 已提交
1920
			tabSize,
1921
			config.fontInfo.spaceWidth,
1922 1923
			config.viewInfo.stopRenderingLineAfter,
			config.viewInfo.renderWhitespace,
1924
			config.viewInfo.renderControlCharacters
A
Alex Dima 已提交
1925
		));
E
Erich Gamma 已提交
1926

J
Johannes Rieken 已提交
1927
		let myResult: string[] = [];
E
Erich Gamma 已提交
1928 1929 1930 1931 1932 1933 1934 1935
		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;">');
1936
		myResult = myResult.concat(r.html);
E
Erich Gamma 已提交
1937 1938 1939 1940 1941 1942
		myResult.push('</div>');

		return myResult;
	}
}

J
Johannes Rieken 已提交
1943
function isChangeOrInsert(lineChange: editorCommon.IChange): boolean {
E
Erich Gamma 已提交
1944 1945 1946
	return lineChange.modifiedEndLineNumber > 0;
}

J
Johannes Rieken 已提交
1947
function isChangeOrDelete(lineChange: editorCommon.IChange): boolean {
E
Erich Gamma 已提交
1948 1949 1950
	return lineChange.originalEndLineNumber > 0;
}

J
Johannes Rieken 已提交
1951
function createDecoration(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, className: string, isWholeLine: boolean) {
E
Erich Gamma 已提交
1952 1953 1954 1955 1956 1957 1958 1959 1960 1961
	return {
		range: new Range(startLineNumber, startColumn, endLineNumber, endColumn),
		options: {
			className: className,
			isWholeLine: isWholeLine
		}
	};
}

function createFakeLinesDiv(): HTMLElement {
A
Alex Dima 已提交
1962
	let r = document.createElement('div');
E
Erich Gamma 已提交
1963 1964 1965
	r.className = 'diagonal-fill';
	return r;
}