From beed7379999c99ff883a671476948d51a897a6de Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 22 Nov 2016 11:51:49 +0100 Subject: [PATCH] fixes #15878 --- .../workbench/parts/git/common/gitContentProvider.ts | 2 +- .../workbench/parts/scm/browser/dirtydiffDecorator.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/parts/git/common/gitContentProvider.ts b/src/vs/workbench/parts/git/common/gitContentProvider.ts index ec68d1a41a0..8dad7f3d5ec 100644 --- a/src/vs/workbench/parts/git/common/gitContentProvider.ts +++ b/src/vs/workbench/parts/git/common/gitContentProvider.ts @@ -44,7 +44,7 @@ export class GitContentProvider implements IWorkbenchContribution, ITextModelCon const treeish = gitModel.getStatus().find(path, StatusType.INDEX) ? '~' : 'HEAD'; return this.gitService.buffer(path, treeish) - .then(contents => this.modelService.createModel(contents, null, uri)) + .then(contents => this.modelService.createModel(contents || '', null, uri)) .then(model => { const trigger = () => { this.throttler.queue(() => { diff --git a/src/vs/workbench/parts/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/browser/dirtydiffDecorator.ts index 8aff40576a2..119f5834ca9 100644 --- a/src/vs/workbench/parts/scm/browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/browser/dirtydiffDecorator.ts @@ -114,12 +114,13 @@ class DirtyDiffModelDecorator { } private diff(): winjs.Promise { - if (!this.model || this.model.isDisposed()) { - return winjs.TPromise.as([]); // disposed - } + return this.originalURIPromise.then(originalURI => { + if (!this.model || this.model.isDisposed()) { + return winjs.TPromise.as([]); // disposed + } - return this.originalURIPromise - .then(originalURI => this.editorWorkerService.computeDirtyDiff(originalURI, this.model.uri, true)); + this.editorWorkerService.computeDirtyDiff(originalURI, this.model.uri, true); + }); } private static changesToDecorations(diff: common.IChange[]): common.IModelDeltaDecoration[] {