microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-09 19:11:28 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

fixes #15878

Browse Source
This commit is contained in:
Joao Moreno
2016-11-22 11:51:49 +01:00
parent b49d66ee0c
commit beed737999
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/parts/git/common/gitContentProvider.ts
View File

@@ -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(() => {

11
src/vs/workbench/parts/scm/browser/dirtydiffDecorator.ts
View File

@@ -114,12 +114,13 @@ class DirtyDiffModelDecorator {
}
private diff(): winjs.Promise {
if (!this.model || this.model.isDisposed()) {
return winjs.TPromise.as<any>([]); // disposed
}
return this.originalURIPromise.then(originalURI => {
if (!this.model || this.model.isDisposed()) {
return winjs.TPromise.as<any>([]); // 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[] {