Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-25 17:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix missing return

Browse Source
This commit is contained in:
Joao Moreno
2016-11-22 15:49:35 +01:00
parent 42b0a56380
commit e8efbf474e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/scm/browser/dirtydiffDecorator.ts
+5 -5
View File
@@ -59,7 +59,7 @@ class DirtyDiffModelDecorator {
private decorations: string[];
private baselineModel: common.IModel;
private diffDelayer: ThrottledDelayer<void>;
private diffDelayer: ThrottledDelayer<common.IChange[]>;
private toDispose: IDisposable[];
constructor(
@@ -73,7 +73,7 @@ class DirtyDiffModelDecorator {
@ITextModelResolverService private textModelResolverService: ITextModelResolverService
) {
this.decorations = [];
this.diffDelayer = new ThrottledDelayer<void>(200);
this.diffDelayer = new ThrottledDelayer<common.IChange[]>(200);
this.toDispose = [];
this.triggerDiff();
this.toDispose.push(model.onDidChangeContent(() => this.triggerDiff()));
@@ -113,13 +113,13 @@ class DirtyDiffModelDecorator {
});
}
private diff(): winjs.Promise {
private diff(): winjs.TPromise<common.IChange[]> {
return this.originalURIPromise.then(originalURI => {
if (!this.model || this.model.isDisposed()) {
return winjs.TPromise.as<any>([]); // disposed
return winjs.TPromise.as([]); // disposed
}
this.editorWorkerService.computeDirtyDiff(originalURI, this.model.uri, true);
return this.editorWorkerService.computeDirtyDiff(originalURI, this.model.uri, true);
});
}