From bdd1a312855ef9ca1bc221fb5fb611421b0766ae Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 25 Oct 2016 18:02:40 +0200 Subject: [PATCH] Fixes #14253: Uncaught TypeError: Cannot read property 'getLineLastNonWhitespaceColumn' of null --- src/vs/editor/browser/widget/diffEditorWidget.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 5229ebc3ca3..f6f7c2191f0 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -825,6 +825,9 @@ export class DiffEditorWidget extends EventEmitter implements editorBrowser.IDif } private _updateDecorations(): void { + if (!this.originalEditor.getModel() || !this.modifiedEditor.getModel()) { + return; + } var lineChanges = this._lineChanges || []; var foreignOriginal = this._originalEditorState.getForeignViewZones(this.originalEditor.getWhitespaces()); -- GitLab