diff --git a/src/vs/workbench/browser/events.ts b/src/vs/workbench/browser/events.ts deleted file mode 100644 index 73f19ddc71e..00000000000 --- a/src/vs/workbench/browser/events.ts +++ /dev/null @@ -1,71 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; - -import {Event} from 'vs/base/common/events'; -import {IEditorSelection} from 'vs/editor/common/editorCommon'; -import CommonEvents = require('vs/workbench/common/events'); -import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; -import {EditorInput, EditorOptions} from 'vs/workbench/common/editor'; -import {Position} from 'vs/platform/editor/common/editor'; - -export import EventType = CommonEvents.EventType; - -/** - * Editor events are being emitted when the editor input changes, shows, is being saved or when the editor content changes. - */ -export class EditorEvent extends Event { - public editor: BaseEditor; - public editorId: string; - public editorInput: EditorInput; - public editorOptions: EditorOptions; - public position: Position; - - private prevented: boolean; - - constructor(editor: BaseEditor, editorId: string, editorInput: EditorInput, editorOptions: EditorOptions, position: Position, originalEvent?: any) { - super(originalEvent); - - this.editor = editor; - this.editorId = editorId; - this.editorInput = editorInput; - this.editorOptions = editorOptions; - this.position = position; - } - - public prevent(): void { - this.prevented = true; - } - - public isPrevented(): boolean { - return this.prevented; - } -} - -/** - * Editor input events are being emitted when the editor input state changes. - */ -export class EditorInputEvent extends Event { - public editorInput: EditorInput; - - constructor(editorInput: EditorInput, originalEvent?: any) { - super(originalEvent); - - this.editorInput = editorInput; - } -} - -/** - * A subclass of EditorEvent for text editor selection changes. - */ -export class TextEditorSelectionEvent extends EditorEvent { - public selection: IEditorSelection; - - constructor(selection: IEditorSelection, editor: BaseEditor, editorId: string, editorInput: EditorInput, editorOptions: EditorOptions, position: Position, originalEvent?: any) { - super(editor, editorId, editorInput, editorOptions, position, originalEvent); - - this.selection = selection; - } -} \ No newline at end of file diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index 4cb3e6c0639..015427ff28d 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -6,7 +6,7 @@ import {Dimension, Builder, Box} from 'vs/base/browser/builder'; import {Preferences} from 'vs/workbench/common/constants'; -import {EditorEvent, EventType} from 'vs/workbench/browser/events'; +import {EditorEvent, EventType} from 'vs/workbench/common/events'; import {Part} from 'vs/workbench/browser/part'; import {QuickOpenController} from 'vs/workbench/browser/parts/quickopen/quickOpenController'; import {Sash, ISashEvent, IVerticalSashLayoutProvider} from 'vs/base/browser/ui/sash/sash'; diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index d03308c331f..84ed615c146 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -23,7 +23,7 @@ import {Scope as MementoScope} from 'vs/workbench/common/memento'; import {Scope, IActionBarRegistry, Extensions as ActionBarExtensions, prepareActions} from 'vs/workbench/browser/actionBarRegistry'; import {IAction} from 'vs/base/common/actions'; import {Part} from 'vs/workbench/browser/part'; -import {EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/browser/events'; +import {EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/common/events'; import {IEditorRegistry, Extensions as EditorExtensions, BaseEditor, IEditorInputActionContext, EditorDescriptor} from 'vs/workbench/browser/parts/editor/baseEditor'; import {EditorInput, EditorOptions, TextEditorOptions} from 'vs/workbench/common/editor'; import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor'; diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index e2ef7f26a50..d0a8e1de6e0 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -19,15 +19,14 @@ import {IStatusbarItem} from 'vs/workbench/browser/parts/statusbar/statusbar'; import {Action} from 'vs/base/common/actions'; import {IEditorModesRegistry, Extensions} from 'vs/editor/common/modes/modesRegistry'; import {Registry} from 'vs/platform/platform'; -import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEditorInput'; import {IFileEditorInput, EncodingMode, IEncodingSupport, asFileEditorInput, getUntitledOrFileResource} from 'vs/workbench/common/editor'; import {IDisposable, combinedDispose} from 'vs/base/common/lifecycle'; import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser'; import {EndOfLineSequence, ITokenizedModel, EditorType, IEditorSelection, ITextModel, IDiffEditorModel, IEditor} from 'vs/editor/common/editorCommon'; -import {EditorEvent, TextEditorSelectionEvent} from 'vs/workbench/browser/events'; -import {EventType, ResourceEvent} from 'vs/workbench/common/events'; +import {EventType, ResourceEvent, EditorEvent, TextEditorSelectionEvent} from 'vs/workbench/common/events'; import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor'; +import {IEditor as IBaseEditor} from 'vs/platform/editor/common/editor'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IQuickOpenService, IPickOpenEntry} from 'vs/workbench/services/quickopen/common/quickOpenService'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; @@ -244,7 +243,7 @@ export class EditorStatus implements IStatusbarItem { } } - private onEditorInputChange(e: BaseEditor): void { + private onEditorInputChange(e: IBaseEditor): void { this.onSelectionChange(e); this.onModeChange(e); this.onEOLChange(e); @@ -252,7 +251,7 @@ export class EditorStatus implements IStatusbarItem { this.onTabFocusModeChange(e); } - private onModeChange(e: BaseEditor): void { + private onModeChange(e: IBaseEditor): void { if (e && !this.isActiveEditor(e)) { return; } @@ -279,7 +278,7 @@ export class EditorStatus implements IStatusbarItem { this.updateState(info); } - private onSelectionChange(e: BaseEditor): void { + private onSelectionChange(e: IBaseEditor): void { if (e && !this.isActiveEditor(e)) { return; } @@ -316,7 +315,7 @@ export class EditorStatus implements IStatusbarItem { this.updateState({ selectionStatus: info }); } - private onEOLChange(e: BaseEditor): void { + private onEOLChange(e: IBaseEditor): void { if (e && !this.isActiveEditor(e)) { return; } @@ -335,7 +334,7 @@ export class EditorStatus implements IStatusbarItem { this.updateState(info); } - private onEncodingChange(e: BaseEditor): void { + private onEncodingChange(e: IBaseEditor): void { if (e && !this.isActiveEditor(e)) { return; } @@ -364,12 +363,12 @@ export class EditorStatus implements IStatusbarItem { if (activeEditor) { let activeResource = getUntitledOrFileResource(activeEditor.input, true); if (activeResource && activeResource.toString() === resource.toString()) { - return this.onEncodingChange(activeEditor); // only update if the encoding changed for the active resource + return this.onEncodingChange(activeEditor); // only update if the encoding changed for the active resource } } } - private onTabFocusModeChange(e: BaseEditor): void { + private onTabFocusModeChange(e: IBaseEditor): void { if (e && !this.isActiveEditor(e)) { return; } @@ -384,7 +383,7 @@ export class EditorStatus implements IStatusbarItem { this.updateState(info); } - private isActiveEditor(e: BaseEditor): boolean { + private isActiveEditor(e: IBaseEditor): boolean { let activeEditor = this.editorService.getActiveEditor(); return activeEditor && e && activeEditor === e; diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts index db846a06978..2d22ec01e74 100644 --- a/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts +++ b/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts @@ -23,7 +23,7 @@ import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; import {EditorInput, IInputStatus, TextEditorOptions} from 'vs/workbench/common/editor'; import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput'; import {EventType as BaseEventType} from 'vs/base/common/events'; -import {EditorInputEvent, EventType as WorkbenchEventType} from 'vs/workbench/browser/events'; +import {EditorInputEvent, EventType as WorkbenchEventType} from 'vs/workbench/common/events'; import DOM = require('vs/base/browser/dom'); import {IActionItem, ActionsOrientation} from 'vs/base/browser/ui/actionbar/actionbar'; import {ToolBar} from 'vs/base/browser/ui/toolbar/toolbar'; diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index 9cd9d06ba8a..4fa0fa543ea 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -13,8 +13,7 @@ import errors = require('vs/base/common/errors'); import {CodeEditorWidget} from 'vs/editor/browser/widget/codeEditorWidget'; import {Preferences} from 'vs/workbench/common/constants'; import {IEditorViewState} from 'vs/editor/common/editorCommon'; -import {EventType as WorkbenchEventType, EditorEvent, TextEditorSelectionEvent} from 'vs/workbench/browser/events'; -import {OptionsChangeEvent} from 'vs/workbench/common/events'; +import {OptionsChangeEvent, EventType as WorkbenchEventType, EditorEvent, TextEditorSelectionEvent} from 'vs/workbench/common/events'; import {Scope} from 'vs/workbench/common/memento'; import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; import {EditorConfiguration} from 'vs/editor/common/config/commonEditorConfig'; diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index fbdcba06408..2b6d5b55e80 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -20,7 +20,7 @@ import {ContributableActionProvider} from 'vs/workbench/browser/actionBarRegistr import {ITree, IElementCallback} from 'vs/base/parts/tree/common/tree'; import {Registry} from 'vs/platform/platform'; import {WorkbenchComponent} from 'vs/workbench/browser/component'; -import {EditorEvent, EventType} from 'vs/workbench/browser/events'; +import {EditorEvent, EventType} from 'vs/workbench/common/events'; import Event, {Emitter} from 'vs/base/common/event'; import {Identifiers} from 'vs/workbench/common/constants'; import {Scope} from 'vs/workbench/common/memento'; diff --git a/src/vs/workbench/browser/services.ts b/src/vs/workbench/browser/services.ts index 9bd2b0bdc07..a8521e3c47c 100644 --- a/src/vs/workbench/browser/services.ts +++ b/src/vs/workbench/browser/services.ts @@ -4,8 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {EditorEvent} from 'vs/workbench/browser/events'; -import {EventType, ViewletEvent} from 'vs/workbench/common/events'; +import {EditorEvent, EventType, ViewletEvent} from 'vs/workbench/common/events'; import {IEventService} from 'vs/platform/event/common/event'; export abstract class ScopedService { diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts index 02b75caf767..21a2d7d6000 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -19,7 +19,7 @@ import timer = require('vs/base/common/timer'); import errors = require('vs/base/common/errors'); import {Registry} from 'vs/platform/platform'; import {Identifiers, Preferences} from 'vs/workbench/common/constants'; -import {EventType} from 'vs/workbench/browser/events'; +import {EventType} from 'vs/workbench/common/events'; import {IOptions} from 'vs/workbench/common/options'; import {IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions} from 'vs/workbench/common/contributions'; import {IEditorRegistry, Extensions as EditorExtensions} from 'vs/workbench/browser/parts/editor/baseEditor'; diff --git a/src/vs/workbench/common/events.ts b/src/vs/workbench/common/events.ts index dc08d1ca0fe..8d491d92442 100644 --- a/src/vs/workbench/common/events.ts +++ b/src/vs/workbench/common/events.ts @@ -4,8 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {Event} from 'vs/base/common/events'; import URI from 'vs/base/common/uri'; +import {Event} from 'vs/base/common/events'; +import {IEditorSelection} from 'vs/editor/common/editorCommon'; +import CommonEvents = require('vs/workbench/common/events'); +import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; +import {IEditor} from 'vs/platform/editor/common/editor'; +import {EditorInput, EditorOptions} from 'vs/workbench/common/editor'; +import {Position} from 'vs/platform/editor/common/editor'; /** * All workbench events are listed here. For DOM events, see Monaco.Base.DomUtils.EventType. @@ -135,6 +141,63 @@ export class EventType { static WORKBENCH_OPTIONS_CHANGED = 'workbenchOptionsChanged'; } +/** + * Editor events are being emitted when the editor input changes, shows, is being saved or when the editor content changes. + */ +export class EditorEvent extends Event { + public editor: IEditor; + public editorId: string; + public editorInput: EditorInput; + public editorOptions: EditorOptions; + public position: Position; + + private prevented: boolean; + + constructor(editor: IEditor, editorId: string, editorInput: EditorInput, editorOptions: EditorOptions, position: Position, originalEvent?: any) { + super(originalEvent); + + this.editor = editor; + this.editorId = editorId; + this.editorInput = editorInput; + this.editorOptions = editorOptions; + this.position = position; + } + + public prevent(): void { + this.prevented = true; + } + + public isPrevented(): boolean { + return this.prevented; + } +} + +/** + * Editor input events are being emitted when the editor input state changes. + */ +export class EditorInputEvent extends Event { + public editorInput: EditorInput; + + constructor(editorInput: EditorInput, originalEvent?: any) { + super(originalEvent); + + this.editorInput = editorInput; + } +} + +/** + * A subclass of EditorEvent for text editor selection changes. + */ +export class TextEditorSelectionEvent extends EditorEvent { + public selection: IEditorSelection; + + constructor(selection: IEditorSelection, editor: IEditor, editorId: string, editorInput: EditorInput, editorOptions: EditorOptions, position: Position, originalEvent?: any) { + super(editor, editorId, editorInput, editorOptions, position, originalEvent); + + this.selection = selection; + } +} + /** * Option change events are send when the options in the running instance change. */ diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index f15db882a1e..671639ada45 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -9,7 +9,7 @@ import platform = require('vs/base/common/platform'); import paths = require('vs/base/common/paths'); import uri from 'vs/base/common/uri'; import {Identifiers} from 'vs/workbench/common/constants'; -import {EventType, EditorEvent} from 'vs/workbench/browser/events'; +import {EventType, EditorEvent} from 'vs/workbench/common/events'; import workbenchEditorCommon = require('vs/workbench/common/editor'); import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletService'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index 2101422c375..6c7534d4462 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -22,7 +22,7 @@ import {Action, IAction} from 'vs/base/common/actions'; import {MessageType, IInputValidator} from 'vs/base/browser/ui/inputbox/inputBox'; import {ITree, IHighlightEvent} from 'vs/base/parts/tree/common/tree'; import {disposeAll, IDisposable} from 'vs/base/common/lifecycle'; -import {EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/browser/events'; +import {EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/common/events'; import Files = require('vs/workbench/parts/files/common/files'); import {IFileService, IFileStat, IImportResult} from 'vs/platform/files/common/files'; import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor'; diff --git a/src/vs/workbench/parts/files/browser/fileTracker.ts b/src/vs/workbench/parts/files/browser/fileTracker.ts index c6583648944..7c8c34b4e03 100644 --- a/src/vs/workbench/parts/files/browser/fileTracker.ts +++ b/src/vs/workbench/parts/files/browser/fileTracker.ts @@ -20,8 +20,7 @@ import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEdit import {DerivedFrameEditorInput} from 'vs/workbench/parts/files/browser/editors/derivedFrameEditorInput'; import {State, TextFileEditorModel, CACHE} from 'vs/workbench/parts/files/browser/editors/textFileEditorModel'; import {IFrameEditor} from 'vs/workbench/browser/parts/editor/iframeEditor'; -import {EditorInputEvent} from 'vs/workbench/browser/events'; -import {EventType as WorkbenchEventType, UntitledEditorEvent} from 'vs/workbench/common/events'; +import {EventType as WorkbenchEventType, EditorInputEvent, UntitledEditorEvent} from 'vs/workbench/common/events'; import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService'; diff --git a/src/vs/workbench/parts/files/browser/textFileServices.ts b/src/vs/workbench/parts/files/browser/textFileServices.ts index c0399cf7546..3df40f390d9 100644 --- a/src/vs/workbench/parts/files/browser/textFileServices.ts +++ b/src/vs/workbench/parts/files/browser/textFileServices.ts @@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri'; import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput'; import {CACHE, TextFileEditorModel} from 'vs/workbench/parts/files/browser/editors/textFileEditorModel'; import {IResult, ITextFileOperationResult, ConfirmResult, ITextFileService} from 'vs/workbench/parts/files/common/files'; -import {EventType} from 'vs/workbench/browser/events'; +import {EventType} from 'vs/workbench/common/events'; import {WorkingFilesModel} from 'vs/workbench/parts/files/browser/workingFilesModel'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IFileOperationResult, FileOperationResult} from 'vs/platform/files/common/files'; diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts index 75859614754..986f730e6b8 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerView.ts @@ -14,7 +14,7 @@ import {Action, IActionRunner} from 'vs/base/common/actions'; import {prepareActions} from 'vs/workbench/browser/actionBarRegistry'; import {ITree} from 'vs/base/parts/tree/common/tree'; import {Tree} from 'vs/base/parts/tree/browser/treeImpl'; -import {EditorEvent, EventType as WorkbenchEventType} from 'vs/workbench/browser/events'; +import {EditorEvent, EventType as WorkbenchEventType} from 'vs/workbench/common/events'; import {LocalFileChangeEvent, IFilesConfiguration} from 'vs/workbench/parts/files/common/files'; import {IFileStat, IResolveFileOptions, FileChangeType, FileChangesEvent, IFileChange, EventType as FileEventType, IFileService} from 'vs/platform/files/common/files'; import {FileImportedEvent, RefreshViewExplorerAction, NewFolderAction, NewFileAction} from 'vs/workbench/parts/files/browser/fileActions'; diff --git a/src/vs/workbench/parts/files/browser/views/workingFilesView.ts b/src/vs/workbench/parts/files/browser/views/workingFilesView.ts index d98519b89e1..4e8429e6b48 100644 --- a/src/vs/workbench/parts/files/browser/views/workingFilesView.ts +++ b/src/vs/workbench/parts/files/browser/views/workingFilesView.ts @@ -16,8 +16,7 @@ import {IWorkingFileEntry, IWorkingFilesModel, IWorkingFileModelChangeEvent, Loc import dom = require('vs/base/browser/dom'); import {IDisposable} from 'vs/base/common/lifecycle'; import errors = require('vs/base/common/errors'); -import {EditorEvent} from 'vs/workbench/browser/events'; -import {EventType as WorkbenchEventType, UntitledEditorEvent} from 'vs/workbench/common/events'; +import {EventType as WorkbenchEventType, UntitledEditorEvent, EditorEvent} from 'vs/workbench/common/events'; import {AdaptiveCollapsibleViewletView} from 'vs/workbench/browser/viewlet'; import {CloseWorkingFileAction, SaveAllAction} from 'vs/workbench/parts/files/browser/fileActions'; import {WorkingFileEntry} from 'vs/workbench/parts/files/browser/workingFilesModel'; diff --git a/src/vs/workbench/parts/files/browser/workingFilesModel.ts b/src/vs/workbench/parts/files/browser/workingFilesModel.ts index ebfd8a6544f..be3bcab458d 100644 --- a/src/vs/workbench/parts/files/browser/workingFilesModel.ts +++ b/src/vs/workbench/parts/files/browser/workingFilesModel.ts @@ -13,8 +13,7 @@ import labels = require('vs/base/common/labels'); import {disposeAll, IDisposable} from 'vs/base/common/lifecycle'; import filesCommon = require('vs/workbench/parts/files/common/files'); import {IFileStat, FileChangeType, FileChangesEvent, EventType as FileEventType} from 'vs/platform/files/common/files'; -import {EditorEvent} from 'vs/workbench/browser/events'; -import {UntitledEditorEvent, EventType as WorkbenchEventType} from 'vs/workbench/common/events'; +import {UntitledEditorEvent, EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/common/events'; import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IPartService} from 'vs/workbench/services/part/common/partService'; diff --git a/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts b/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts index 20fec2073be..8a4b49b5434 100644 --- a/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts +++ b/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts @@ -12,7 +12,7 @@ import {OpenResourcesAction} from 'vs/workbench/parts/files/browser/fileActions' import plat = require('vs/base/common/platform'); import errors = require('vs/base/common/errors'); import URI from 'vs/base/common/uri'; -import {EventType as WorkbenchEventType} from 'vs/workbench/browser/events'; +import {EventType as WorkbenchEventType} from 'vs/workbench/common/events'; import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService'; import {IPartService} from 'vs/workbench/services/part/common/partService'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; diff --git a/src/vs/workbench/parts/files/test/browser/events.test.ts b/src/vs/workbench/parts/files/test/browser/events.test.ts index 3591e8f89f2..5ae54d3d52f 100644 --- a/src/vs/workbench/parts/files/test/browser/events.test.ts +++ b/src/vs/workbench/parts/files/test/browser/events.test.ts @@ -8,8 +8,7 @@ import * as assert from 'assert'; import URI from 'vs/base/common/uri'; import {Event, PropertyChangeEvent} from 'vs/base/common/events'; -import {EditorEvent} from 'vs/workbench/browser/events'; -import {CommandEvent, ViewletEvent} from 'vs/workbench/common/events'; +import {CommandEvent, ViewletEvent, EditorEvent} from 'vs/workbench/common/events'; import {LocalFileChangeEvent} from 'vs/workbench/parts/files/common/files'; import {FileImportedEvent} from 'vs/workbench/parts/files/browser/fileActions'; diff --git a/src/vs/workbench/parts/git/browser/gitServices.ts b/src/vs/workbench/parts/git/browser/gitServices.ts index 8667320355d..6736211befd 100644 --- a/src/vs/workbench/parts/git/browser/gitServices.ts +++ b/src/vs/workbench/parts/git/browser/gitServices.ts @@ -14,7 +14,7 @@ import errors = require('vs/base/common/errors'); import mime = require('vs/base/common/mime'); import paths = require('vs/base/common/paths'); import ee = require('vs/base/common/eventEmitter'); -import wbevents = require('vs/workbench/browser/events'); +import wbevents = require('vs/workbench/common/events'); import WorkbenchEditorCommon = require('vs/workbench/common/editor'); import git = require('vs/workbench/parts/git/common/git'); import model = require('vs/workbench/parts/git/common/gitModel'); diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts index 80fa3d09ef1..c07ab15fe08 100644 --- a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts +++ b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts @@ -16,7 +16,7 @@ import Severity from 'vs/base/common/severity'; import winjs = require('vs/base/common/winjs.base'); import ext = require('vs/workbench/common/contributions'); import git = require('vs/workbench/parts/git/common/git'); -import workbenchEvents = require('vs/workbench/browser/events'); +import workbenchEvents = require('vs/workbench/common/events'); import common = require('vs/editor/common/editorCommon'); import widget = require('vs/editor/browser/widget/codeEditorWidget'); import viewlet = require('vs/workbench/browser/viewlet'); diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts index 5fcc6c18408..c3d14762dd3 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts @@ -20,7 +20,7 @@ import Actions = require('vs/base/common/actions'); import ActionBar = require('vs/base/browser/ui/actionbar/actionbar'); import Tree = require('vs/base/parts/tree/common/tree'); import TreeImpl = require('vs/base/parts/tree/browser/treeImpl'); -import WorkbenchEvents = require('vs/workbench/browser/events'); +import WorkbenchEvents = require('vs/workbench/common/events'); import git = require('vs/workbench/parts/git/common/git'); import GitView = require('vs/workbench/parts/git/browser/views/view'); import GitActions = require('vs/workbench/parts/git/browser/gitActions'); diff --git a/src/vs/workbench/parts/markdown/browser/markdownExtension.ts b/src/vs/workbench/parts/markdown/browser/markdownExtension.ts index 69990f67139..f803aab3191 100644 --- a/src/vs/workbench/parts/markdown/browser/markdownExtension.ts +++ b/src/vs/workbench/parts/markdown/browser/markdownExtension.ts @@ -17,7 +17,7 @@ import {IWorkbenchContribution} from 'vs/workbench/common/contributions'; import {IFrameEditor} from 'vs/workbench/browser/parts/editor/iframeEditor'; import {MarkdownEditorInput} from 'vs/workbench/parts/markdown/browser/markdownEditorInput'; import {ShowWelcomeAction} from 'vs/workbench/parts/markdown/browser/markdownActions'; -import {EditorEvent, EventType as WorkbenchEventType} from 'vs/workbench/browser/events'; +import {EditorEvent, EventType as WorkbenchEventType} from 'vs/workbench/common/events'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IStorageService, StorageScope, StorageEvent, StorageEventType} from 'vs/platform/storage/common/storage'; diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts index 6482bec07a8..1106074d02f 100644 --- a/src/vs/workbench/services/history/browser/history.ts +++ b/src/vs/workbench/services/history/browser/history.ts @@ -9,10 +9,10 @@ import platform = require('vs/base/common/platform'); import nls = require('vs/nls'); import {EventType} from 'vs/base/common/events'; import {IEditorSelection} from 'vs/editor/common/editorCommon'; -import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; +import {IEditor as IBaseEditor} from 'vs/platform/editor/common/editor'; import {TextEditorOptions, EditorInput} from 'vs/workbench/common/editor'; import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor'; -import {EditorEvent, TextEditorSelectionEvent, EventType as WorkbenchEventType, EditorInputEvent} from 'vs/workbench/browser/events'; +import {EditorEvent, TextEditorSelectionEvent, EventType as WorkbenchEventType, EditorInputEvent} from 'vs/workbench/common/events'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService'; import {IHistoryService} from 'vs/workbench/services/history/common/history'; @@ -119,7 +119,7 @@ export abstract class BaseHistoryService { this.onEditorEvent(event.editor); } - private onEditorEvent(editor: BaseEditor): void { + private onEditorEvent(editor: IBaseEditor): void { let input = editor ? editor.input : null; // If an active editor is set, but is different from the one from the event, prevent update because the editor is not active. @@ -146,9 +146,9 @@ export abstract class BaseHistoryService { window.document.title = windowTitle; } - protected abstract handleEditorSelectionChangeEvent(editor?: BaseEditor): void; + protected abstract handleEditorSelectionChangeEvent(editor?: IBaseEditor): void; - protected abstract handleEditorInputChangeEvent(editor?: BaseEditor): void; + protected abstract handleEditorInputChangeEvent(editor?: IBaseEditor): void; protected getWindowTitle(input?: IEditorInput): string { let title = this.doGetWindowTitle(input); @@ -293,15 +293,15 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic }); } - protected handleEditorSelectionChangeEvent(editor?: BaseEditor): void { + protected handleEditorSelectionChangeEvent(editor?: IBaseEditor): void { this.handleEditorEvent(editor, true); } - protected handleEditorInputChangeEvent(editor?: BaseEditor): void { + protected handleEditorInputChangeEvent(editor?: IBaseEditor): void { this.handleEditorEvent(editor, false); } - private handleEditorEvent(editor: BaseEditor, storeSelection: boolean): void { + private handleEditorEvent(editor: IBaseEditor, storeSelection: boolean): void { if (this.blockEditorEvent) { return; // while we open an editor due to a navigation, we do not want to update our stack } @@ -334,7 +334,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic } } - private handleNonTextEditorEvent(editor: BaseEditor): void { + private handleNonTextEditorEvent(editor: IBaseEditor): void { let currentStack = this.stack[this.index]; if (currentStack && currentStack.input.matches(editor.input)) { return; // do not push same editor input again diff --git a/src/vs/workbench/test/browser/events.test.ts b/src/vs/workbench/test/browser/events.test.ts index 0de109bd36b..06f6e52c0cb 100644 --- a/src/vs/workbench/test/browser/events.test.ts +++ b/src/vs/workbench/test/browser/events.test.ts @@ -10,8 +10,7 @@ import URI from 'vs/base/common/uri'; import * as Paths from 'vs/base/common/paths'; import * as Files from 'vs/platform/files/common/files'; import {Event, PropertyChangeEvent} from 'vs/base/common/events'; -import {EditorEvent} from 'vs/workbench/browser/events'; -import {CommandEvent, ViewletEvent} from 'vs/workbench/common/events'; +import {CommandEvent, ViewletEvent, EditorEvent} from 'vs/workbench/common/events'; let FileChangesEvent = Files.FileChangesEvent; diff --git a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts index f5ecf8044fb..a6b383ad1aa 100644 --- a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts +++ b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts @@ -20,7 +20,7 @@ import {join} from 'vs/base/common/paths'; import {BaseEditor, EditorInputAction, EditorInputActionContributor, EditorDescriptor, Extensions, IEditorRegistry, IEditorInputFactory} from 'vs/workbench/browser/parts/editor/baseEditor'; import URI from 'vs/base/common/uri'; import {create} from 'vs/platform/instantiation/common/instantiationService'; -import {EventType, EditorEvent} from 'vs/workbench/browser/events'; +import {EventType, EditorEvent} from 'vs/workbench/common/events'; import {Promise, TPromise} from 'vs/base/common/winjs.base'; import {IEditorInput, IEditorModel, IEditorOptions, ITextInput, Position, IEditor, IResourceInput, ITextEditorModel} from 'vs/platform/editor/common/editor'; diff --git a/src/vs/workbench/test/browser/services.test.ts b/src/vs/workbench/test/browser/services.test.ts index 235522f4923..90f94a55951 100644 --- a/src/vs/workbench/test/browser/services.test.ts +++ b/src/vs/workbench/test/browser/services.test.ts @@ -19,7 +19,7 @@ import {TextFileEditorModel} from 'vs/workbench/parts/files/browser/editors/text import {TextFileService} from 'vs/workbench/parts/files/browser/textFileServices'; import {TestEventService, TestPartService, TestStorageService, TestRequestService, TestContextService, TestWorkspace, TestEditorService, MockRequestService} from 'vs/workbench/test/browser/servicesTestUtils'; import {Viewlet} from 'vs/workbench/browser/viewlet'; -import {EventType} from 'vs/workbench/browser/events'; +import {EventType} from 'vs/workbench/common/events'; import {MainTelemetryService} from 'vs/platform/telemetry/browser/mainTelemetryService'; import Severity from 'vs/base/common/severity'; import {UntitledEditorService} from 'vs/workbench/services/untitled/browser/untitledEditorService';