Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ben/stacks

Browse Source
This commit is contained in:
Benjamin Pasero
2016-05-22 11:48:45 +02:00
parent b1fa6534ad 3b0df36835
commit 56de217db7
140 changed files with 5325 additions and 5230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/workbench/common/editor/diffEditorInput.ts
View File

@@ -15,6 +15,7 @@ import {EditorModel, IFileEditorInput, EditorInput, BaseDiffEditorInput} from 'v
import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel';
import {TextDiffEditorModel} from 'vs/workbench/common/editor/textDiffEditorModel';
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
/**
* The base editor input for the diff editor. It is made up of two editor inputs, the original version
@@ -24,7 +25,7 @@ export class DiffEditorInput extends BaseDiffEditorInput {
public static ID = 'workbench.editors.diffEditorInput';
private _toUnbind: { (): void; }[];
private _toUnbind: IDisposable[];
private name: string;
private description: string;
private cachedModel: DiffEditorModel;
@@ -45,13 +46,13 @@ export class DiffEditorInput extends BaseDiffEditorInput {
private registerListeners(): void {
// When the original or modified input gets disposed, dispose this diff editor input
this._toUnbind.push(this.originalInput.addListener(EventType.DISPOSE, () => {
this._toUnbind.push(this.originalInput.addListener2(EventType.DISPOSE, () => {
if (!this.isDisposed()) {
this.dispose();
}
}));
this._toUnbind.push(this.modifiedInput.addListener(EventType.DISPOSE, () => {
this._toUnbind.push(this.modifiedInput.addListener2(EventType.DISPOSE, () => {
if (!this.isDisposed()) {
this.dispose();
}
@@ -167,9 +168,7 @@ export class DiffEditorInput extends BaseDiffEditorInput {
}
public dispose(): void {
while (this._toUnbind.length) {
this._toUnbind.pop()();
}
this._toUnbind = dispose(this._toUnbind);
// Dispose Model
if (this.cachedModel) {