diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts index 6787006461b..eb1b487da37 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts @@ -60,7 +60,7 @@ export class MainThreadEditors implements MainThreadEditorsShape { this._toDispose.push(documentsAndEditors.onTextEditorRemove(editors => editors.forEach(this._onTextEditorRemove, this))); this._toDispose.push(editorGroupService.onEditorsChanged(() => this._updateActiveAndVisibleTextEditors())); - this._toDispose.push(editorGroupService.onEditorsMoved(() => this._updateActiveAndVisibleTextEditors())); + this._toDispose.push(editorGroupService.onEditorGroupMoved(() => this._updateActiveAndVisibleTextEditors())); this._registeredDecorationTypes = Object.create(null); } diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 3e15e6118d3..4dc87d3e133 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -100,7 +100,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService private _onEditorsChanged: Emitter; private _onEditorOpening: Emitter; - private _onEditorsMoved: Emitter; + private _onEditorGroupMoved: Emitter; private _onEditorOpenFail: Emitter; private _onGroupOrientationChanged: Emitter; private _onTabOptionsChanged: Emitter; @@ -134,7 +134,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService this._onEditorsChanged = new Emitter(); this._onEditorOpening = new Emitter(); - this._onEditorsMoved = new Emitter(); + this._onEditorGroupMoved = new Emitter(); this._onEditorOpenFail = new Emitter(); this._onGroupOrientationChanged = new Emitter(); this._onTabOptionsChanged = new Emitter(); @@ -298,8 +298,8 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService return this._onEditorOpening.event; } - public get onEditorsMoved(): Event { - return this._onEditorsMoved.event; + public get onEditorGroupMoved(): Event { + return this._onEditorGroupMoved.event; } public get onEditorOpenFail(): Event { @@ -687,7 +687,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // Emit Editor move event if (rochade !== Rochade.NONE) { - this._onEditorsMoved.fire(); + this._onEditorGroupMoved.fire(); } } @@ -901,7 +901,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService this.focusGroup(fromGroup); // Events - this._onEditorsMoved.fire(); + this._onEditorGroupMoved.fire(); } public moveEditor(input: EditorInput, from: EditorGroup, to: EditorGroup, moveOptions?: IMoveOptions): void; @@ -1376,7 +1376,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // Emitters this._onEditorsChanged.dispose(); this._onEditorOpening.dispose(); - this._onEditorsMoved.dispose(); + this._onEditorGroupMoved.dispose(); this._onEditorOpenFail.dispose(); // Reset Tokens diff --git a/src/vs/workbench/services/group/common/groupService.ts b/src/vs/workbench/services/group/common/groupService.ts index 1cdeceef1ff..a04e26bbd89 100644 --- a/src/vs/workbench/services/group/common/groupService.ts +++ b/src/vs/workbench/services/group/common/groupService.ts @@ -56,9 +56,9 @@ export interface IEditorGroupService { onEditorOpenFail: Event; /** - * Emitted when a editors are moved to another position. + * Emitted when an entire editor group is moved to another position. */ - onEditorsMoved: Event; + onEditorGroupMoved: Event; /** * Emitted when the editor group orientation was changed. diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts index 7b783062321..7fd5cb0883e 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts @@ -49,7 +49,7 @@ suite('MainThreadDocumentsAndEditors', () => { }; const editorGroupService = new class extends mock() { onEditorsChanged = Event.None; - onEditorsMoved = Event.None; + onEditorGroupMoved = Event.None; }; documentAndEditor = new MainThreadDocumentsAndEditors( diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts index cef45043b6b..b470742526b 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts @@ -49,7 +49,7 @@ suite('MainThreadEditors', () => { }; const editorGroupService = new class extends mock() { onEditorsChanged = Event.None; - onEditorsMoved = Event.None; + onEditorGroupMoved = Event.None; }; const testThreadService = new TestThreadService(true); diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index 9490b11cc6d..262634df4a6 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -518,7 +518,7 @@ export class TestEditorGroupService implements IEditorGroupService { return this._onEditorOpenFail.event; } - public get onEditorsMoved(): Event { + public get onEditorGroupMoved(): Event { return this._onEditorsMoved.event; }