diffEditorWidget.ts 69.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';
J
Johannes Rieken 已提交
14 15 16 17 18 19
import { StyleMutator } from 'vs/base/browser/styleMutator';
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 23
import { Decoration } from 'vs/editor/common/viewLayout/viewLineParts';
import { render2, RenderLineInput2 } from 'vs/editor/common/viewLayout/viewLineRenderer';
A
Alex Dima 已提交
24
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
J
Johannes Rieken 已提交
25 26 27 28 29 30
import { CodeEditor } from 'vs/editor/browser/codeEditor';
import { ViewLineToken, ViewLineTokens } from 'vs/editor/common/core/viewLineToken';
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';
E
Erich Gamma 已提交
31 32

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

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

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

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

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

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

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

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

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

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

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

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

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

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

A
Alex Dima 已提交
125
let DIFF_EDITOR_ID = 0;
E
Erich Gamma 已提交
126

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

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

E
Erich Gamma 已提交
157 158 159 160 161 162
	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 已提交
163
	private _toDispose: IDisposable[];
E
Erich Gamma 已提交
164

J
Johannes Rieken 已提交
165 166 167 168
	private _theme: string;
	private _domElement: HTMLElement;
	_containerDomElement: HTMLElement;
	private _overviewDomElement: HTMLElement;
E
Erich Gamma 已提交
169 170
	private _overviewViewportDomElement: HTMLElement;

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

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

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

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

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

	private _ignoreTrimWhitespace: boolean;
194
	private _originalIsEditable: boolean;
E
Erich Gamma 已提交
195

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

J
Johannes Rieken 已提交
201
	private _updateDecorationsRunner: RunOnceScheduler;
E
Erich Gamma 已提交
202

203
	private _editorWorkerService: IEditorWorkerService;
204
	protected _contextKeyService: IContextKeyService;
205 206

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

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

235 236 237 238 239 240
		// renderIndicators
		this._renderIndicators = true;
		if (typeof options.renderIndicators !== 'undefined') {
			this._renderIndicators = options.renderIndicators;
		}

241 242 243 244 245
		this._originalIsEditable = false;
		if (typeof options.originalEditable !== 'undefined') {
			this._originalIsEditable = Boolean(options.originalEditable);
		}

A
Alex Dima 已提交
246
		this._updateDecorationsRunner = new RunOnceScheduler(() => this._updateDecorations(), 0);
E
Erich Gamma 已提交
247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267

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

		this._overviewViewportDomElement = document.createElement('div');
		this._overviewViewportDomElement.className = 'diffViewport';
		this._overviewViewportDomElement.style.position = 'absolute';

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

		this._overviewDomElement.appendChild(this._overviewViewportDomElement);

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

		this._createLeftHandSideEditor(options, instantiationService);
		this._createRightHandSideEditor(options, instantiationService);

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

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

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

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

J
Johannes Rieken 已提交
323
	private static _getClassName(theme: string, renderSideBySide: boolean): string {
A
Alex Dima 已提交
324
		let result = 'monaco-diff-editor monaco-editor-background ';
E
Erich Gamma 已提交
325 326 327 328 329 330 331 332 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
		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);
	}

366
	private _createLeftHandSideEditor(options: editorCommon.IDiffEditorOptions, instantiationService: IInstantiationService): void {
A
Alex Dima 已提交
367
		this.originalEditor = instantiationService.createInstance(CodeEditor, this._originalDomNode, this._adjustOptionsForLeftHandSide(options, this._originalIsEditable));
368
		this._toDispose.push(this.originalEditor.addBulkListener2((events) => this._onOriginalEditorEvents(events)));
A
Alex Dima 已提交
369
		this._toDispose.push(this.addEmitter2(this.originalEditor));
E
Erich Gamma 已提交
370 371
	}

J
Johannes Rieken 已提交
372
	private _createRightHandSideEditor(options: editorCommon.IDiffEditorOptions, instantiationService: IInstantiationService): void {
A
Alex Dima 已提交
373
		this.modifiedEditor = instantiationService.createInstance(CodeEditor, this._modifiedDomNode, this._adjustOptionsForRightHandSide(options));
374
		this._toDispose.push(this.modifiedEditor.addBulkListener2((events) => this._onModifiedEditorEvents(events)));
A
Alex Dima 已提交
375
		this._toDispose.push(this.addEmitter2(this.modifiedEditor));
E
Erich Gamma 已提交
376 377 378 379 380 381 382
	}

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

	public dispose(): void {
J
Joao Moreno 已提交
383
		this._toDispose = dispose(this._toDispose);
E
Erich Gamma 已提交
384 385 386 387 388 389 390 391

		window.clearInterval(this._measureDomElementToken);

		this._cleanViewZonesAndDecorations();

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

A
Alex Dima 已提交
392 393
		this.originalEditor.dispose();
		this.modifiedEditor.dispose();
E
Erich Gamma 已提交
394 395 396

		this._strategy.dispose();

A
Alex Dima 已提交
397 398
		this.emit(editorCommon.EventType.Disposed);

E
Erich Gamma 已提交
399 400 401 402 403 404 405 406 407 408
		super.dispose();
	}

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

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

	public getEditorType(): string {
A
Alex Dima 已提交
409
		return editorCommon.EditorType.IDiffEditor;
E
Erich Gamma 已提交
410 411
	}

A
Alex Dima 已提交
412
	public getLineChanges(): editorCommon.ILineChange[] {
E
Erich Gamma 已提交
413 414 415
		return this._lineChanges;
	}

A
Alex Dima 已提交
416
	public getOriginalEditor(): editorBrowser.ICodeEditor {
E
Erich Gamma 已提交
417 418 419
		return this.originalEditor;
	}

A
Alex Dima 已提交
420
	public getModifiedEditor(): editorBrowser.ICodeEditor {
E
Erich Gamma 已提交
421 422 423
		return this.modifiedEditor;
	}

J
Johannes Rieken 已提交
424
	public updateOptions(newOptions: editorCommon.IDiffEditorOptions): void {
E
Erich Gamma 已提交
425 426 427 428
		// Handle new theme
		this._theme = newOptions && newOptions.theme ? newOptions.theme : this._theme;

		// Handle side by side
A
Alex Dima 已提交
429
		let renderSideBySideChanged = false;
E
Erich Gamma 已提交
430 431 432 433 434 435 436
		if (typeof newOptions.renderSideBySide !== 'undefined') {
			if (this._renderSideBySide !== newOptions.renderSideBySide) {
				this._renderSideBySide = newOptions.renderSideBySide;
				renderSideBySideChanged = true;
			}
		}

437 438
		let beginUpdateDecorations = false;

E
Erich Gamma 已提交
439 440 441 442
		if (typeof newOptions.ignoreTrimWhitespace !== 'undefined') {
			if (this._ignoreTrimWhitespace !== newOptions.ignoreTrimWhitespace) {
				this._ignoreTrimWhitespace = newOptions.ignoreTrimWhitespace;
				// Begin comparing
443 444 445 446 447 448 449 450
				beginUpdateDecorations = true;
			}
		}

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

454 455 456 457
		if (beginUpdateDecorations) {
			this._beginUpdateDecorations();
		}

458 459 460 461
		if (typeof newOptions.originalEditable !== 'undefined') {
			this._originalIsEditable = Boolean(newOptions.originalEditable);
		}

E
Erich Gamma 已提交
462 463 464 465
		// Update class name
		this._containerDomElement.className = DiffEditorWidget._getClassName(this._theme, this._renderSideBySide);

		this.modifiedEditor.updateOptions(this._adjustOptionsForRightHandSide(newOptions));
466
		this.originalEditor.updateOptions(this._adjustOptionsForLeftHandSide(newOptions, this._originalIsEditable));
E
Erich Gamma 已提交
467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483

		// 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 已提交
484
	public getValue(options: { preserveBOM: boolean; lineEnding: string; } = null): string {
E
Erich Gamma 已提交
485 486 487
		return this.modifiedEditor.getValue(options);
	}

A
Alex Dima 已提交
488
	public getModel(): editorCommon.IDiffEditorModel {
E
Erich Gamma 已提交
489 490 491 492 493 494
		return {
			original: this.originalEditor.getModel(),
			modified: this.modifiedEditor.getModel()
		};
	}

J
Johannes Rieken 已提交
495
	public setModel(model: editorCommon.IDiffEditorModel): void {
E
Erich Gamma 已提交
496 497 498 499 500 501 502 503 504 505 506 507 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
		// 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 已提交
534
	public getVisibleColumnFromPosition(position: editorCommon.IPosition): number {
E
Erich Gamma 已提交
535 536 537
		return this.modifiedEditor.getVisibleColumnFromPosition(position);
	}

A
Alex Dima 已提交
538
	public getPosition(): Position {
E
Erich Gamma 已提交
539 540 541
		return this.modifiedEditor.getPosition();
	}

J
Johannes Rieken 已提交
542
	public setPosition(position: editorCommon.IPosition, reveal?: boolean, revealVerticalInCenter?: boolean, revealHorizontal?: boolean): void {
E
Erich Gamma 已提交
543 544 545 546 547 548 549 550 551 552 553 554 555 556 557
		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 已提交
558
	public revealPosition(position: editorCommon.IPosition, revealVerticalInCenter: boolean = false, revealHorizontal: boolean = false): void {
E
Erich Gamma 已提交
559 560 561
		this.modifiedEditor.revealPosition(position, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
562
	public revealPositionInCenter(position: editorCommon.IPosition): void {
E
Erich Gamma 已提交
563 564 565
		this.modifiedEditor.revealPositionInCenter(position);
	}

A
Alex Dima 已提交
566
	public revealPositionInCenterIfOutsideViewport(position: editorCommon.IPosition): void {
E
Erich Gamma 已提交
567 568 569
		this.modifiedEditor.revealPositionInCenterIfOutsideViewport(position);
	}

570
	public getSelection(): Selection {
E
Erich Gamma 已提交
571 572 573
		return this.modifiedEditor.getSelection();
	}

574
	public getSelections(): Selection[] {
E
Erich Gamma 已提交
575 576 577
		return this.modifiedEditor.getSelections();
	}

J
Johannes Rieken 已提交
578 579 580 581 582
	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 已提交
583 584 585
		this.modifiedEditor.setSelection(something, reveal, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
586
	public setSelections(ranges: editorCommon.ISelection[]): void {
E
Erich Gamma 已提交
587 588 589 590 591 592 593 594 595 596 597 598 599 600 601
		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 已提交
602
	public revealRange(range: editorCommon.IRange, revealVerticalInCenter: boolean = false, revealHorizontal: boolean = true): void {
E
Erich Gamma 已提交
603 604 605
		this.modifiedEditor.revealRange(range, revealVerticalInCenter, revealHorizontal);
	}

A
Alex Dima 已提交
606
	public revealRangeInCenter(range: editorCommon.IRange): void {
E
Erich Gamma 已提交
607 608 609
		this.modifiedEditor.revealRangeInCenter(range);
	}

A
Alex Dima 已提交
610
	public revealRangeInCenterIfOutsideViewport(range: editorCommon.IRange): void {
E
Erich Gamma 已提交
611 612 613
		this.modifiedEditor.revealRangeInCenterIfOutsideViewport(range);
	}

J
Johannes Rieken 已提交
614
	public addAction(descriptor: editorCommon.IActionDescriptor): void {
E
Erich Gamma 已提交
615 616 617
		this.modifiedEditor.addAction(descriptor);
	}

A
Alex Dima 已提交
618
	public getActions(): editorCommon.IEditorAction[] {
E
Erich Gamma 已提交
619 620 621
		return this.modifiedEditor.getActions();
	}

A
Alex Dima 已提交
622
	public getSupportedActions(): editorCommon.IEditorAction[] {
623 624 625
		return this.modifiedEditor.getSupportedActions();
	}

J
Johannes Rieken 已提交
626
	public getAction(id: string): editorCommon.IEditorAction {
E
Erich Gamma 已提交
627 628 629
		return this.modifiedEditor.getAction(id);
	}

A
Alex Dima 已提交
630
	public saveViewState(): editorCommon.IDiffEditorViewState {
A
Alex Dima 已提交
631 632
		let originalViewState = this.originalEditor.saveViewState();
		let modifiedViewState = this.modifiedEditor.saveViewState();
E
Erich Gamma 已提交
633 634 635 636 637 638
		return {
			original: originalViewState,
			modified: modifiedViewState
		};
	}

A
Alex Dima 已提交
639
	public restoreViewState(s: editorCommon.IDiffEditorViewState): void {
E
Erich Gamma 已提交
640
		if (s.original && s.original) {
A
Alex Dima 已提交
641
			let diffEditorState = <editorCommon.IDiffEditorViewState>s;
E
Erich Gamma 已提交
642 643 644 645 646
			this.originalEditor.restoreViewState(diffEditorState.original);
			this.modifiedEditor.restoreViewState(diffEditorState.modified);
		}
	}

J
Johannes Rieken 已提交
647
	public layout(dimension?: editorCommon.IDimension): void {
E
Erich Gamma 已提交
648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674
		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 已提交
675
	public trigger(source: string, handlerId: string, payload: any): void {
E
Erich Gamma 已提交
676 677 678
		this.modifiedEditor.trigger(source, handlerId, payload);
	}

J
Johannes Rieken 已提交
679
	public changeDecorations(callback: (changeAccessor: editorCommon.IModelDecorationsChangeAccessor) => any): any {
E
Erich Gamma 已提交
680 681 682 683 684 685 686 687 688
		return this.modifiedEditor.changeDecorations(callback);
	}

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



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

J
Johannes Rieken 已提交
689
	private _measureDomElement(forceDoLayoutCall: boolean, dimensions?: editorCommon.IDimension): void {
690 691 692 693
		dimensions = dimensions || {
			width: this._containerDomElement.clientWidth,
			height: this._containerDomElement.clientHeight
		};
E
Erich Gamma 已提交
694 695

		if (dimensions.width <= 0) {
696 697
			this._width = 0;
			this._height = 0;
E
Erich Gamma 已提交
698 699 700 701 702 703 704 705 706 707 708 709 710 711 712
			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 已提交
713 714
		let freeSpace = DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH - 2 * DiffEditorWidget.ONE_OVERVIEW_WIDTH;
		let layoutInfo = this.modifiedEditor.getLayoutInfo();
E
Erich Gamma 已提交
715
		if (layoutInfo) {
716
			this._originalOverviewRuler.setLayout(new editorCommon.OverviewRulerPosition({
E
Erich Gamma 已提交
717 718 719
				top: 0,
				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
				right: freeSpace + DiffEditorWidget.ONE_OVERVIEW_WIDTH,
720
				height: this._height
721 722
			}));
			this._modifiedOverviewRuler.setLayout(new editorCommon.OverviewRulerPosition({
E
Erich Gamma 已提交
723 724 725
				top: 0,
				right: 0,
				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
726
				height: this._height
727
			}));
E
Erich Gamma 已提交
728 729 730 731 732
		}
	}

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

J
Johannes Rieken 已提交
733
	private _recomputeIfNecessary(events: EmitterEvent[]): void {
A
Alex Dima 已提交
734 735 736
		let changed = false;
		for (let i = 0; !changed && i < events.length; i++) {
			let type = events[i].getType();
A
Alex Dima 已提交
737
			changed = changed || type === editorCommon.EventType.ModelRawContentChanged;
E
Erich Gamma 已提交
738 739 740 741 742 743 744 745 746 747 748
		}
		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 已提交
749
	private _onOriginalEditorEvents(events: EmitterEvent[]): void {
A
Alex Dima 已提交
750
		for (let i = 0; i < events.length; i++) {
751 752 753 754 755
			let type = events[i].getType();
			let data = events[i].getData();

			if (type === 'scroll') {
				this._onOriginalEditorScroll(data);
E
Erich Gamma 已提交
756
			}
757
			if (type === editorCommon.EventType.ViewZonesChanged) {
E
Erich Gamma 已提交
758 759
				this._onViewZonesChanged();
			}
760 761 762 763 764 765 766
			if (type === editorCommon.EventType.ConfigurationChanged) {
				let isViewportWrapping = this.originalEditor.getConfiguration().wrappingInfo.isViewportWrapping;
				if (isViewportWrapping) {
					// oh no, you didn't!
					this.originalEditor.updateOptions({ wrappingColumn: -1 });
				}
			}
E
Erich Gamma 已提交
767 768 769 770
		}
		this._recomputeIfNecessary(events);
	}

J
Johannes Rieken 已提交
771
	private _onModifiedEditorEvents(events: EmitterEvent[]): void {
A
Alex Dima 已提交
772
		for (let i = 0; i < events.length; i++) {
773 774 775 776 777
			let type = events[i].getType();
			let data = events[i].getData();

			if (type === 'scroll') {
				this._onModifiedEditorScroll(data);
E
Erich Gamma 已提交
778 779
				this._layoutOverviewViewport();
			}
780
			if (type === 'viewLayoutChanged') {
E
Erich Gamma 已提交
781 782
				this._layoutOverviewViewport();
			}
783
			if (type === editorCommon.EventType.ViewZonesChanged) {
E
Erich Gamma 已提交
784 785
				this._onViewZonesChanged();
			}
786
			if (type === editorCommon.EventType.ConfigurationChanged) {
787
				let e = <editorCommon.IConfigurationChangedEvent>data;
788 789 790 791 792
				let isViewportWrapping = this.modifiedEditor.getConfiguration().wrappingInfo.isViewportWrapping;
				if (isViewportWrapping) {
					// oh no, you didn't!
					this.modifiedEditor.updateOptions({ wrappingColumn: -1 });
				}
793
				if (e.fontInfo && this.modifiedEditor.getModel()) {
794 795
					this._onViewZonesChanged();
				}
796
			}
E
Erich Gamma 已提交
797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817
		}
		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 已提交
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();
J
Johannes Rieken 已提交
829
				this.emit(editorCommon.EventType.DiffUpdated, {});
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;
		}
	}

J
Johannes Rieken 已提交
867 868
	private _adjustOptionsForSubEditor(options: editorCommon.IDiffEditorOptions): editorCommon.IDiffEditorOptions {
		let clonedOptions: editorCommon.IDiffEditorOptions = objects.clone(options || {});
E
Erich Gamma 已提交
869 870 871 872
		clonedOptions.wrappingColumn = -1;
		clonedOptions.automaticLayout = false;
		clonedOptions.scrollbar = clonedOptions.scrollbar || {};
		clonedOptions.scrollbar.vertical = 'visible';
A
Alex Dima 已提交
873
		clonedOptions.folding = false;
874
		clonedOptions.codeLens = false;
J
Joao Moreno 已提交
875
		clonedOptions.fixedOverflowWidgets = true;
876
		clonedOptions.lineDecorationsWidth = '2ch';
E
Erich Gamma 已提交
877 878 879
		return clonedOptions;
	}

J
Johannes Rieken 已提交
880
	private _adjustOptionsForLeftHandSide(options: editorCommon.IDiffEditorOptions, isEditable: boolean): editorCommon.IDiffEditorOptions {
881 882 883 884 885 886 887
		let result = this._adjustOptionsForSubEditor(options);
		result.readOnly = !isEditable;
		result.overviewRulerLanes = 1;
		result.theme = this._theme + ' original-in-monaco-diff-editor';
		return result;
	}

J
Johannes Rieken 已提交
888
	private _adjustOptionsForRightHandSide(options: editorCommon.IDiffEditorOptions): editorCommon.IDiffEditorOptions {
889 890 891 892 893
		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 已提交
894 895
	}

J
Johannes Rieken 已提交
896
	private _onOriginalEditorScroll(e: editorCommon.IScrollEvent): void {
A
Alex Dima 已提交
897 898 899
		if (!e.scrollTopChanged && !e.scrollLeftChanged) {
			return;
		}
E
Erich Gamma 已提交
900 901 902 903
		if (this._isHandlingScrollEvent) {
			return;
		}
		this._isHandlingScrollEvent = true;
904 905 906 907
		this.modifiedEditor.setScrollPosition({
			scrollLeft: e.scrollLeft,
			scrollTop: e.scrollTop
		});
E
Erich Gamma 已提交
908 909 910
		this._isHandlingScrollEvent = false;
	}

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

	private _doLayout(): void {
A
Alex Dima 已提交
927
		let splitPoint = this._strategy.layout();
E
Erich Gamma 已提交
928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951

		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';
		this._overviewViewportDomElement.style.width = DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH + 'px';
		this._overviewViewportDomElement.style.height = '30px';

		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 已提交
952
		let layout = this._computeOverviewViewport();
E
Erich Gamma 已提交
953
		if (!layout) {
A
Alex Dima 已提交
954 955
			StyleMutator.setTop(this._overviewViewportDomElement, 0);
			StyleMutator.setHeight(this._overviewViewportDomElement, 0);
E
Erich Gamma 已提交
956
		} else {
A
Alex Dima 已提交
957 958
			StyleMutator.setTop(this._overviewViewportDomElement, layout.top);
			StyleMutator.setHeight(this._overviewViewportDomElement, layout.height);
E
Erich Gamma 已提交
959 960 961
		}
	}

J
Johannes Rieken 已提交
962
	private _computeOverviewViewport(): { height: number; top: number; } {
A
Alex Dima 已提交
963
		let layoutInfo = this.modifiedEditor.getLayoutInfo();
E
Erich Gamma 已提交
964 965 966 967
		if (!layoutInfo) {
			return null;
		}

A
Alex Dima 已提交
968 969
		let scrollTop = this.modifiedEditor.getScrollTop();
		let scrollHeight = this.modifiedEditor.getScrollHeight();
E
Erich Gamma 已提交
970

A
Alex Dima 已提交
971 972 973
		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 已提交
974

A
Alex Dima 已提交
975 976
		let computedSliderSize = Math.max(1, Math.floor(layoutInfo.contentHeight * computedRatio));
		let computedSliderPosition = Math.floor(scrollTop * computedRatio);
E
Erich Gamma 已提交
977 978 979 980 981 982 983

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

J
Johannes Rieken 已提交
984
	private _createDataSource(): IDataSource {
E
Erich Gamma 已提交
985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011
		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 已提交
1012
	private _setStrategy(newStrategy: IDiffEditorWidgetStyle): void {
E
Erich Gamma 已提交
1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026
		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 已提交
1027
	private _getLineChangeAtOrBeforeLineNumber(lineNumber: number, startLineNumberExtractor: (lineChange: editorCommon.ILineChange) => number): editorCommon.ILineChange {
E
Erich Gamma 已提交
1028 1029 1030 1031 1032
		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 已提交
1033
		let min = 0, max = this._lineChanges.length - 1;
E
Erich Gamma 已提交
1034
		while (min < max) {
A
Alex Dima 已提交
1035 1036 1037
			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 已提交
1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052

			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 已提交
1053
		let lineChange = this._getLineChangeAtOrBeforeLineNumber(lineNumber, (lineChange) => lineChange.originalStartLineNumber);
E
Erich Gamma 已提交
1054 1055 1056 1057 1058

		if (!lineChange) {
			return lineNumber;
		}

A
Alex Dima 已提交
1059 1060 1061 1062
		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 已提交
1063 1064


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

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

J
Johannes Rieken 已提交
1071
		return modifiedEquivalentLineNumber + lineChangeModifiedLength - lineChangeOriginalLength + delta;
E
Erich Gamma 已提交
1072 1073 1074
	}

	private _getEquivalentLineForModifiedLineNumber(lineNumber: number): number {
A
Alex Dima 已提交
1075
		let lineChange = this._getLineChangeAtOrBeforeLineNumber(lineNumber, (lineChange) => lineChange.modifiedStartLineNumber);
E
Erich Gamma 已提交
1076 1077 1078 1079 1080

		if (!lineChange) {
			return lineNumber;
		}

A
Alex Dima 已提交
1081 1082 1083 1084
		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 已提交
1085 1086


A
Alex Dima 已提交
1087
		let delta = lineNumber - modifiedEquivalentLineNumber;
E
Erich Gamma 已提交
1088 1089 1090 1091 1092

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

J
Johannes Rieken 已提交
1093
		return originalEquivalentLineNumber + lineChangeOriginalLength - lineChangeModifiedLength + delta;
E
Erich Gamma 已提交
1094 1095
	}

J
Johannes Rieken 已提交
1096
	public getDiffLineInformationForOriginal(lineNumber: number): editorCommon.IDiffLineInformation {
E
Erich Gamma 已提交
1097 1098 1099 1100 1101 1102 1103 1104 1105
		if (!this._lineChanges) {
			// Cannot answer that which I don't know
			return null;
		}
		return {
			equivalentLineNumber: this._getEquivalentLineForOriginalLineNumber(lineNumber)
		};
	}

J
Johannes Rieken 已提交
1106
	public getDiffLineInformationForModified(lineNumber: number): editorCommon.IDiffLineInformation {
E
Erich Gamma 已提交
1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122
		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 已提交
1123 1124
	getOriginalEditor(): editorBrowser.ICodeEditor;
	getModifiedEditor(): editorBrowser.ICodeEditor;
E
Erich Gamma 已提交
1125 1126 1127 1128
}

class DiffEditorWidgetStyle {

J
Johannes Rieken 已提交
1129
	_dataSource: IDataSource;
E
Erich Gamma 已提交
1130

J
Johannes Rieken 已提交
1131
	constructor(dataSource: IDataSource) {
E
Erich Gamma 已提交
1132 1133 1134
		this._dataSource = dataSource;
	}

1135
	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 已提交
1136 1137 1138 1139 1140 1141 1142
		// Get view zones
		modifiedWhitespaces = modifiedWhitespaces.sort((a, b) => {
			return a.afterLineNumber - b.afterLineNumber;
		});
		originalWhitespaces = originalWhitespaces.sort((a, b) => {
			return a.afterLineNumber - b.afterLineNumber;
		});
1143
		let zones = this._getViewZones(lineChanges, originalWhitespaces, modifiedWhitespaces, originalEditor, modifiedEditor, renderIndicators);
E
Erich Gamma 已提交
1144 1145

		// Get decorations & overview ruler zones
1146 1147
		let originalDecorations = this._getOriginalEditorDecorations(lineChanges, ignoreTrimWhitespace, renderIndicators, originalEditor, modifiedEditor);
		let modifiedDecorations = this._getModifiedEditorDecorations(lineChanges, ignoreTrimWhitespace, renderIndicators, originalEditor, modifiedEditor);
E
Erich Gamma 已提交
1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162

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

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

1167
	_getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1168 1169 1170
		return null;
	}

1171
	_getModifiedEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
E
Erich Gamma 已提交
1172 1173 1174 1175
		return null;
	}
}

A
Alex Dima 已提交
1176
interface IMyViewZone extends editorBrowser.IViewZone {
E
Erich Gamma 已提交
1177 1178 1179 1180 1181 1182
	shouldNotShrink?: boolean;
}

class ForeignViewZonesIterator {

	private _index: number;
A
Alex Dima 已提交
1183 1184
	private _source: editorCommon.IEditorWhitespace[];
	public current: editorCommon.IEditorWhitespace;
E
Erich Gamma 已提交
1185

A
Alex Dima 已提交
1186
	constructor(source: editorCommon.IEditorWhitespace[]) {
E
Erich Gamma 已提交
1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201
		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;
		}
	}
}

1202
abstract class ViewZonesComputer {
E
Erich Gamma 已提交
1203

J
Johannes Rieken 已提交
1204 1205 1206
	private lineChanges: editorCommon.ILineChange[];
	private originalForeignVZ: editorCommon.IEditorWhitespace[];
	private modifiedForeignVZ: editorCommon.IEditorWhitespace[];
E
Erich Gamma 已提交
1207

J
Johannes Rieken 已提交
1208
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[]) {
E
Erich Gamma 已提交
1209 1210 1211 1212 1213 1214
		this.lineChanges = lineChanges;
		this.originalForeignVZ = originalForeignVZ;
		this.modifiedForeignVZ = modifiedForeignVZ;
	}

	public getViewZones(): IEditorsZones {
A
Alex Dima 已提交
1215
		let result: IEditorsZones = {
E
Erich Gamma 已提交
1216 1217 1218 1219
			original: [],
			modified: []
		};

A
Alex Dima 已提交
1220 1221 1222 1223 1224 1225 1226 1227
		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 已提交
1228 1229 1230
			return a.afterLineNumber - b.afterLineNumber;
		};

A
Alex Dima 已提交
1231
		let addAndCombineIfPossible = (destination: editorBrowser.IViewZone[], item: IMyViewZone) => {
E
Erich Gamma 已提交
1232
			if (item.domNode === null && destination.length > 0) {
A
Alex Dima 已提交
1233
				let lastItem = destination[destination.length - 1];
E
Erich Gamma 已提交
1234 1235 1236 1237 1238 1239 1240 1241
				if (lastItem.afterLineNumber === item.afterLineNumber && lastItem.domNode === null) {
					lastItem.heightInLines += item.heightInLines;
					return;
				}
			}
			destination.push(item);
		};

A
Alex Dima 已提交
1242 1243
		let modifiedForeignVZ = new ForeignViewZonesIterator(this.modifiedForeignVZ);
		let originalForeignVZ = new ForeignViewZonesIterator(this.originalForeignVZ);
E
Erich Gamma 已提交
1244 1245

		// 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 已提交
1246 1247
		for (let i = 0, length = this.lineChanges.length; i <= length; i++) {
			let lineChange = (i < length ? this.lineChanges[i] : null);
E
Erich Gamma 已提交
1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264

			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 已提交
1265 1266
			let stepOriginal: IMyViewZone[] = [];
			let stepModified: IMyViewZone[] = [];
E
Erich Gamma 已提交
1267 1268 1269 1270 1271

			// ---------------------------- 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 已提交
1272
				let viewZoneLineNumber: number;
E
Erich Gamma 已提交
1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287
				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 已提交
1288
				let viewZoneLineNumber: number;
E
Erich Gamma 已提交
1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302
				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 已提交
1303
				let r = this._produceOriginalFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
E
Erich Gamma 已提交
1304 1305 1306 1307 1308 1309
				if (r) {
					stepOriginal.push(r);
				}
			}

			if (lineChange !== null && isChangeOrDelete(lineChange)) {
A
Alex Dima 已提交
1310
				let r = this._produceModifiedFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
E
Erich Gamma 已提交
1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321
				if (r) {
					stepModified.push(r);
				}
			}

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


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

			// [CANCEL & EMIT] Try to cancel view zones out
A
Alex Dima 已提交
1322 1323
			let stepOriginalIndex = 0;
			let stepModifiedIndex = 0;
E
Erich Gamma 已提交
1324 1325 1326 1327 1328

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

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

A
Alex Dima 已提交
1332 1333
				let originalDelta = original.afterLineNumber - originalEquivalentLineNumber;
				let modifiedDelta = modified.afterLineNumber - modifiedEquivalentLineNumber;
E
Erich Gamma 已提交
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 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374

				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 已提交
1375
		let ensureDomNode = (z: IMyViewZone) => {
E
Erich Gamma 已提交
1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386
			if (!z.domNode) {
				z.domNode = createFakeLinesDiv();
			}
		};

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

		return result;
	}

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

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

A
Alex Dima 已提交
1392
class DiffEdtorWidgetSideBySide extends DiffEditorWidgetStyle implements IDiffEditorWidgetStyle, IVerticalSashLayoutProvider {
E
Erich Gamma 已提交
1393 1394 1395 1396

	static MINIMUM_EDITOR_WIDTH = 100;

	private _disableSash: boolean;
J
Johannes Rieken 已提交
1397 1398 1399 1400
	private _sash: Sash;
	private _sashRatio: number;
	private _sashPosition: number;
	private _startSashPosition: number;
E
Erich Gamma 已提交
1401

J
Johannes Rieken 已提交
1402
	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean) {
E
Erich Gamma 已提交
1403 1404 1405 1406 1407
		super(dataSource);

		this._disableSash = (enableSplitViewResizing === false);
		this._sashRatio = null;
		this._sashPosition = null;
A
Alex Dima 已提交
1408
		this._sash = new Sash(this._dataSource.getContainerDomNode(), this);
E
Erich Gamma 已提交
1409 1410 1411 1412 1413

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

A
Alex Dima 已提交
1414 1415 1416 1417
		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 已提交
1418 1419 1420 1421 1422 1423
	}

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

J
Johannes Rieken 已提交
1424
	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
A
Alex Dima 已提交
1425
		let newDisableSash = (enableSplitViewResizing === false);
E
Erich Gamma 已提交
1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436
		if (this._disableSash !== newDisableSash) {
			this._disableSash = newDisableSash;

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

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

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

A
Alex Dima 已提交
1444
		sashPosition = this._disableSash ? midPoint : sashPosition || midPoint;
E
Erich Gamma 已提交
1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465

		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 已提交
1466
	private onSashDragStart(): void {
E
Erich Gamma 已提交
1467 1468 1469
		this._startSashPosition = this._sashPosition;
	}

J
Johannes Rieken 已提交
1470
	private onSashDrag(e: ISashEvent): void {
A
Alex Dima 已提交
1471 1472 1473
		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 已提交
1474 1475 1476 1477 1478 1479

		this._sashRatio = sashPosition / contentWidth;

		this._dataSource.relayoutEditors();
	}

M
Maxime Quandalle 已提交
1480 1481 1482 1483 1484 1485 1486
	private onSashDragEnd(): void {
		this._sash.layout();
	}

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

A
Alex Dima 已提交
1490
	public getVerticalSashTop(sash: Sash): number {
E
Erich Gamma 已提交
1491 1492 1493
		return 0;
	}

A
Alex Dima 已提交
1494
	public getVerticalSashLeft(sash: Sash): number {
E
Erich Gamma 已提交
1495 1496 1497
		return this._sashPosition;
	}

A
Alex Dima 已提交
1498
	public getVerticalSashHeight(sash: Sash): number {
E
Erich Gamma 已提交
1499 1500 1501
		return this._dataSource.getHeight();
	}

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

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

A
Alex Dima 已提交
1509
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1510 1511
			decorations: [],
			overviewZones: []
P
Peng Lyu 已提交
1512
		};
A
Alex Dima 已提交
1513 1514 1515 1516 1517

		let originalModel = originalEditor.getModel();

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

			if (isChangeOrDelete(lineChange)) {
1520 1521 1522 1523
				result.decorations.push({
					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-delete',
1524
						linesDecorationsClassName: renderIndicators ? 'delete-sign' : undefined,
1525 1526 1527 1528
						marginClassName: 'line-delete',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1529 1530 1531 1532
				if (!isChangeOrInsert(lineChange) || !lineChange.charChanges) {
					result.decorations.push(createDecoration(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE, 'char-delete', true));
				}

1533
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1534 1535 1536 1537 1538 1539 1540
					lineChange.originalStartLineNumber,
					lineChange.originalEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(255, 0, 0, 0.4)',
					'rgba(255, 0, 0, 0.4)'
				));
E
Erich Gamma 已提交
1541 1542

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1543 1544
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1545 1546
						if (isChangeOrDelete(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1547 1548 1549
								for (let lineNumber = charChange.originalStartLineNumber; lineNumber <= charChange.originalEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573
									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;
	}

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

A
Alex Dima 已提交
1576
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1577 1578
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1579 1580 1581 1582 1583 1584
		};

		let modifiedModel = modifiedEditor.getModel();

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

			if (isChangeOrInsert(lineChange)) {

1588 1589 1590 1591
				result.decorations.push({
					range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE),
					options: {
						className: 'line-insert',
1592
						linesDecorationsClassName: renderIndicators ? 'insert-sign' : undefined,
1593 1594 1595 1596
						marginClassName: 'line-insert',
						isWholeLine: true
					}
				});
E
Erich Gamma 已提交
1597 1598 1599
				if (!isChangeOrDelete(lineChange) || !lineChange.charChanges) {
					result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE, 'char-insert', true));
				}
1600
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1601 1602 1603 1604 1605 1606 1607
					lineChange.modifiedStartLineNumber,
					lineChange.modifiedEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(155, 185, 85, 0.4)',
					'rgba(155, 185, 85, 0.4)'
				));
E
Erich Gamma 已提交
1608 1609

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1610 1611
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1612 1613
						if (isChangeOrInsert(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1614 1615 1616
								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643
									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 已提交
1644
	constructor(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[]) {
E
Erich Gamma 已提交
1645 1646 1647
		super(lineChanges, originalForeignVZ, modifiedForeignVZ);
	}

J
Johannes Rieken 已提交
1648
	_produceOriginalFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
E
Erich Gamma 已提交
1649 1650 1651 1652 1653 1654 1655 1656 1657 1658
		if (lineChangeModifiedLength > lineChangeOriginalLength) {
			return {
				afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber),
				heightInLines: (lineChangeModifiedLength - lineChangeOriginalLength),
				domNode: null
			};
		}
		return null;
	}

J
Johannes Rieken 已提交
1659
	_produceModifiedFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone {
E
Erich Gamma 已提交
1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672
		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 已提交
1673
	private toDispose: IDisposable[];
E
Erich Gamma 已提交
1674 1675
	private decorationsLeft: number;

J
Johannes Rieken 已提交
1676
	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean) {
E
Erich Gamma 已提交
1677 1678
		super(dataSource);

1679
		this.decorationsLeft = dataSource.getOriginalEditor().getLayoutInfo().decorationsLeft;
E
Erich Gamma 已提交
1680 1681

		this.toDispose = [];
J
Johannes Rieken 已提交
1682
		this.toDispose.push(dataSource.getOriginalEditor().onDidLayoutChange((layoutInfo: editorCommon.EditorLayoutInfo) => {
E
Erich Gamma 已提交
1683 1684 1685 1686 1687 1688 1689 1690
			if (this.decorationsLeft !== layoutInfo.decorationsLeft) {
				this.decorationsLeft = layoutInfo.decorationsLeft;
				dataSource.relayoutEditors();
			}
		}));
	}

	public dispose(): void {
J
Joao Moreno 已提交
1691
		this.toDispose = dispose(this.toDispose);
E
Erich Gamma 已提交
1692 1693
	}

J
Johannes Rieken 已提交
1694
	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
E
Erich Gamma 已提交
1695 1696 1697
		// Nothing to do..
	}

R
rebornix 已提交
1698
	_getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: editorCommon.IEditorWhitespace[], modifiedForeignVZ: editorCommon.IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean): IEditorsZones {
1699
		let computer = new InlineViewZonesComputer(lineChanges, originalForeignVZ, modifiedForeignVZ, originalEditor, modifiedEditor, renderIndicators);
E
Erich Gamma 已提交
1700 1701 1702
		return computer.getViewZones();
	}

1703
	_getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations {
A
Alex Dima 已提交
1704
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1705 1706
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1707
		};
E
Erich Gamma 已提交
1708

A
Alex Dima 已提交
1709 1710
		for (let i = 0, length = lineChanges.length; i < length; i++) {
			let lineChange = lineChanges[i];
E
Erich Gamma 已提交
1711 1712 1713

			// Add overview zones in the overview ruler
			if (isChangeOrDelete(lineChange)) {
1714 1715 1716 1717 1718 1719 1720
				result.decorations.push({
					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE),
					options: {
						marginClassName: 'line-delete',
					}
				});

1721
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1722 1723 1724 1725 1726 1727 1728
					lineChange.originalStartLineNumber,
					lineChange.originalEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(255, 0, 0, 0.4)',
					'rgba(255, 0, 0, 0.4)'
				));
E
Erich Gamma 已提交
1729 1730 1731 1732 1733 1734
			}
		}

		return result;
	}

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

A
Alex Dima 已提交
1737
		let result: IEditorDiffDecorations = {
J
Johannes Rieken 已提交
1738 1739
			decorations: [],
			overviewZones: []
A
Alex Dima 已提交
1740 1741 1742 1743 1744 1745
		};

		let modifiedModel = modifiedEditor.getModel();

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

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

1759
				result.overviewZones.push(new editorCommon.OverviewRulerZone(
A
Alex Dima 已提交
1760 1761 1762 1763 1764 1765 1766
					lineChange.modifiedStartLineNumber,
					lineChange.modifiedEndLineNumber,
					editorCommon.OverviewRulerLane.Full,
					0,
					'rgba(155, 185, 85, 0.4)',
					'rgba(155, 185, 85, 0.4)'
				));
E
Erich Gamma 已提交
1767 1768

				if (lineChange.charChanges) {
A
Alex Dima 已提交
1769 1770
					for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) {
						let charChange = lineChange.charChanges[j];
E
Erich Gamma 已提交
1771 1772
						if (isChangeOrInsert(charChange)) {
							if (ignoreTrimWhitespace) {
A
Alex Dima 已提交
1773 1774 1775
								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
									let startColumn: number;
									let endColumn: number;
E
Erich Gamma 已提交
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 1807 1808 1809 1810
									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 已提交
1811 1812 1813
	private originalModel: editorCommon.IModel;
	private modifiedEditorConfiguration: editorCommon.InternalEditorOptions;
	private modifiedEditorTabSize: number;
R
rebornix 已提交
1814
	private renderIndicators: boolean;
E
Erich Gamma 已提交
1815

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

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

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

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

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

R
rebornix 已提交
1858
			if (this.renderIndicators) {
1859 1860 1861 1862 1863
				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 已提交
1864 1865
		}

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

1871 1872 1873 1874 1875
		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 已提交
1876 1877 1878 1879
		return {
			shouldNotShrink: true,
			afterLineNumber: (lineChange.modifiedEndLineNumber === 0 ? lineChange.modifiedStartLineNumber : lineChange.modifiedStartLineNumber - 1),
			heightInLines: lineChangeOriginalLength,
1880 1881
			domNode: domNode,
			marginDomNode: marginDomNode
E
Erich Gamma 已提交
1882 1883 1884
		};
	}

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

1888
		let lineTokens = new ViewLineTokens([new ViewLineToken(0, '')], 0, lineContent.length);
A
Alex Dima 已提交
1889
		let actualDecorations = Decoration.filter(decorations, lineNumber, 1, lineContent.length + 1);
E
Erich Gamma 已提交
1890

1891
		let r = render2(new RenderLineInput2(
A
Alex Dima 已提交
1892
			lineContent,
1893 1894
			lineTokens,
			actualDecorations,
A
Alex Dima 已提交
1895
			tabSize,
1896
			config.fontInfo.spaceWidth,
1897 1898
			config.viewInfo.stopRenderingLineAfter,
			config.viewInfo.renderWhitespace,
1899
			config.viewInfo.renderControlCharacters
A
Alex Dima 已提交
1900
		));
E
Erich Gamma 已提交
1901

J
Johannes Rieken 已提交
1902
		let myResult: string[] = [];
E
Erich Gamma 已提交
1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917
		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;">');
		myResult = myResult.concat(r.output);
		myResult.push('</div>');

		return myResult;
	}
}

J
Johannes Rieken 已提交
1918
function isChangeOrInsert(lineChange: editorCommon.IChange): boolean {
E
Erich Gamma 已提交
1919 1920 1921
	return lineChange.modifiedEndLineNumber > 0;
}

J
Johannes Rieken 已提交
1922
function isChangeOrDelete(lineChange: editorCommon.IChange): boolean {
E
Erich Gamma 已提交
1923 1924 1925
	return lineChange.originalEndLineNumber > 0;
}

J
Johannes Rieken 已提交
1926
function createDecoration(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, className: string, isWholeLine: boolean) {
E
Erich Gamma 已提交
1927 1928 1929 1930 1931 1932 1933 1934 1935 1936
	return {
		range: new Range(startLineNumber, startColumn, endLineNumber, endColumn),
		options: {
			className: className,
			isWholeLine: isWholeLine
		}
	};
}

function createFakeLinesDiv(): HTMLElement {
A
Alex Dima 已提交
1937
	let r = document.createElement('div');
E
Erich Gamma 已提交
1938 1939 1940
	r.className = 'diagonal-fill';
	return r;
}