提交 dfd3f574 编写于 作者: B Benjamin Pasero

debt - get rid of onEditorOpening event

上级 30a8ec17
......@@ -14,7 +14,7 @@ import * as paths from 'vs/base/common/paths';
import URI from 'vs/base/common/uri';
import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { Storage, InMemoryLocalStorage } from 'vs/workbench/node/storage';
import { EditorInputEvent, IEditorGroup, ConfirmResult } from 'vs/workbench/common/editor';
import { IEditorGroup, ConfirmResult } from 'vs/workbench/common/editor';
import Event, { Emitter } from 'vs/base/common/event';
import Severity from 'vs/base/common/severity';
import { IConfigurationService, getConfigurationValue, IConfigurationValue } from 'vs/platform/configuration/common/configuration';
......@@ -317,14 +317,12 @@ export class TestEditorGroupService implements IEditorGroupService {
private stacksModel: EditorStacksModel;
private _onEditorsChanged: Emitter<void>;
private _onEditorOpening: Emitter<EditorInputEvent>;
private _onEditorOpenFail: Emitter<IEditorInput>;
private _onEditorsMoved: Emitter<void>;
constructor(callback?: (method: string) => void) {
this._onEditorsMoved = new Emitter<void>();
this._onEditorsChanged = new Emitter<void>();
this._onEditorOpening = new Emitter<EditorInputEvent>();
this._onEditorOpenFail = new Emitter<IEditorInput>();
let services = new ServiceCollection();
......@@ -348,10 +346,6 @@ export class TestEditorGroupService implements IEditorGroupService {
return this._onEditorsChanged.event;
}
public get onEditorOpening(): Event<EditorInputEvent> {
return this._onEditorOpening.event;
}
public get onEditorOpenFail(): Event<IEditorInput> {
return this._onEditorOpenFail.event;
}
......
......@@ -20,7 +20,7 @@ import { toErrorMessage } from 'vs/base/common/errorMessage';
import { Scope as MementoScope } from 'vs/workbench/common/memento';
import { Part } from 'vs/workbench/browser/part';
import { BaseEditor, EditorDescriptor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { IEditorRegistry, Extensions as EditorExtensions, EditorInput, EditorOptions, ConfirmResult, EditorInputEvent, IWorkbenchEditorConfiguration, IEditorDescriptor, TextEditorOptions } from 'vs/workbench/common/editor';
import { IEditorRegistry, Extensions as EditorExtensions, EditorInput, EditorOptions, ConfirmResult, IWorkbenchEditorConfiguration, IEditorDescriptor, TextEditorOptions } from 'vs/workbench/common/editor';
import { SideBySideEditorControl, Rochade, ISideBySideEditorControl, ProgressState } from 'vs/workbench/browser/parts/editor/sideBySideEditorControl';
import { WorkbenchProgressService } from 'vs/workbench/services/progress/browser/progressService';
import { GroupArrangement } from 'vs/workbench/services/group/common/groupService';
......@@ -85,7 +85,6 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
private previewEditors: boolean;
private _onEditorsChanged: Emitter<void>;
private _onEditorOpening: Emitter<EditorInputEvent>;
private _onEditorsMoved: Emitter<void>;
private _onEditorOpenFail: Emitter<EditorInput>;
......@@ -110,7 +109,6 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
super(id);
this._onEditorsChanged = new Emitter<void>();
this._onEditorOpening = new Emitter<EditorInputEvent>();
this._onEditorsMoved = new Emitter<void>();
this._onEditorOpenFail = new Emitter<EditorInput>();
......@@ -171,10 +169,6 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
return this._onEditorsChanged.event;
}
public get onEditorOpening(): Event<EditorInputEvent> {
return this._onEditorOpening.event;
}
public get onEditorsMoved(): Event<void> {
return this._onEditorsMoved.event;
}
......@@ -203,13 +197,6 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
return TPromise.as<BaseEditor>(null);
}
// Emit early open event to allow for veto
const event = new EditorInputEvent(input);
this._onEditorOpening.fire(event);
if (event.isPrevented()) {
return TPromise.as<BaseEditor>(null);
}
// We need an editor descriptor for the input
const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(input);
if (!descriptor) {
......@@ -1137,7 +1124,6 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
// Emitters
this._onEditorsChanged.dispose();
this._onEditorOpening.dispose();
this._onEditorsMoved.dispose();
this._onEditorOpenFail.dispose();
......
......@@ -11,7 +11,6 @@ import URI from 'vs/base/common/uri';
import { IEditor, ICommonCodeEditor, IEditorViewState, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/editorCommon';
import { IEditorInput, IEditorModel, IEditorOptions, ITextEditorOptions, IResourceInput, Position } from 'vs/platform/editor/common/editor';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { Event as BaseEvent } from 'vs/base/common/events';
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
import { SyncDescriptor, AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
......@@ -278,29 +277,6 @@ export abstract class EditorInput implements IEditorInput {
}
}
export class EditorInputEvent extends BaseEvent {
private _editorInput: IEditorInput;
private prevented: boolean;
constructor(editorInput: IEditorInput) {
super(null);
this._editorInput = editorInput;
}
public get editorInput(): IEditorInput {
return this._editorInput;
}
public prevent(): void {
this.prevented = true;
}
public isPrevented(): boolean {
return this.prevented;
}
}
export enum EncodingMode {
/**
......
......@@ -9,7 +9,6 @@ import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/co
import { Position, IEditorInput } from 'vs/platform/editor/common/editor';
import { IEditorStacksModel, IEditorGroup } from 'vs/workbench/common/editor';
import Event from 'vs/base/common/event';
import { EditorInputEvent } from 'vs/workbench/common/editor';
export enum GroupArrangement {
MINIMIZE_OTHERS,
......@@ -30,11 +29,6 @@ export interface IEditorGroupService {
*/
onEditorsChanged: Event<void>;
/**
* Emitted when an editor is about to open.
*/
onEditorOpening: Event<EditorInputEvent>;
/**
* Emitted when opening an editor fails.
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册