development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 14:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

more tests around editor close event

Browse source
This commit is contained in:
Benjamin Pasero 2016-08-29 08:30:17 +02:00
parent 459b4f8ec6
commit f9457a9eb9
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/workbench/services/history/browser/history.ts
View file

@ -14,7 +14,7 @@ import {IEditor as IBaseEditor} from 'vs/platform/editor/common/editor';
import {EditorInput, IGroupEvent, IEditorRegistry, Extensions} from 'vs/workbench/common/editor';
import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {RecentlyClosedEditorInput, IHistoryService} from 'vs/workbench/services/history/common/history';
import {IRecentlyClosedEditor, IHistoryService} from 'vs/workbench/services/history/common/history';
import {Selection} from 'vs/editor/common/core/selection';
import {IEditorInput, ITextEditorOptions} from 'vs/platform/editor/common/editor';
import {IEventService} from 'vs/platform/event/common/event';
@ -228,7 +228,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
private currentFileEditorState: EditorState;
private history: IEditorInput[];
private recentlyClosed: RecentlyClosedEditorInput[];
private recentlyClosed: IRecentlyClosedEditor[];
private loaded: boolean;
private registry: IEditorRegistry;
@ -283,7 +283,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
}
}
public popLastClosedEditor(): RecentlyClosedEditorInput {
public popLastClosedEditor(): IRecentlyClosedEditor {
this.ensureLoaded();
return this.recentlyClosed.pop();

4
src/vs/workbench/services/history/common/history.ts
View file

@ -9,7 +9,7 @@ import {IEditorInput} from 'vs/platform/editor/common/editor';
export const IHistoryService = createDecorator<IHistoryService>('historyService');
export class RecentlyClosedEditorInput {
export class IRecentlyClosedEditor {
editor: IEditorInput;
index: number;
}
@ -21,7 +21,7 @@ export interface IHistoryService {
/**
* Removes and returns the last closed editor if any.
*/
popLastClosedEditor(): RecentlyClosedEditorInput;
popLastClosedEditor(): IRecentlyClosedEditor;
/**
* Navigate forwards in history.

32
src/vs/workbench/test/common/editor/editorStacksModel.test.ts
View file

@ -6,11 +6,11 @@
'use strict';
import * as assert from 'assert';
import {EditorStacksModel, EditorGroup} from 'vs/workbench/common/editor/editorStacksModel';
import {EditorStacksModel, EditorGroup, GroupEvent} from 'vs/workbench/common/editor/editorStacksModel';
import {EditorInput, IFileEditorInput, IEditorIdentifier, IEditorGroup, IStacksModelChangeEvent, IEditorRegistry, Extensions as EditorExtensions, IEditorInputFactory} from 'vs/workbench/common/editor';
import URI from 'vs/base/common/uri';
import {TestStorageService, TestConfigurationService, TestLifecycleService, TestContextService} from 'vs/test/utils/servicesTestUtils';
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
import {TestInstantiationService} from 'vs/test/utils/instantiationTestUtils';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
import {IStorageService} from 'vs/platform/storage/common/storage';
import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
@ -48,7 +48,7 @@ interface ModelEvents {
interface GroupEvents {
opened: EditorInput[];
activated: EditorInput[];
closed: EditorInput[];
closed: GroupEvent[];
pinned: EditorInput[];
unpinned: EditorInput[];
moved: EditorInput[];
@ -87,7 +87,7 @@ function groupListener(group: EditorGroup): GroupEvents {
};
group.onEditorOpened(e => groupEvents.opened.push(e));
group.onEditorClosed(e => groupEvents.closed.push(e.editor));
group.onEditorClosed(e => groupEvents.closed.push(e));
group.onEditorActivated(e => groupEvents.activated.push(e));
group.onEditorPinned(e => groupEvents.pinned.push(e));
group.onEditorUnpinned(e => groupEvents.unpinned.push(e));
@ -494,7 +494,9 @@ suite('Editor Stacks Model', () => {
assert.equal(group.count, 0);
assert.equal(group.getEditors(true).length, 0);
assert.equal(group.activeEditor, void 0);
assert.equal(events.closed[0], input1);
assert.equal(events.closed[0].editor, input1);
assert.equal(events.closed[0].index, 0);
assert.equal(events.closed[0].pinned, true);
// Active && Preview
const input2 = input();
@ -514,13 +516,15 @@ suite('Editor Stacks Model', () => {
assert.equal(group.count, 0);
assert.equal(group.getEditors(true).length, 0);
assert.equal(group.activeEditor, void 0);
assert.equal(events.closed[1], input2);
assert.equal(events.closed[1].editor, input2);
assert.equal(events.closed[1].index, 0);
assert.equal(events.closed[1].pinned, false);
group.closeEditor(input2);
assert.equal(group.count, 0);
assert.equal(group.getEditors(true).length, 0);
assert.equal(group.activeEditor, void 0);
assert.equal(events.closed[1], input2);
assert.equal(events.closed[1].editor, input2);
// Nonactive && Pinned => gets active because its first editor
const input3 = input();
@ -540,7 +544,7 @@ suite('Editor Stacks Model', () => {
assert.equal(group.count, 0);
assert.equal(group.getEditors(true).length, 0);
assert.equal(group.activeEditor, void 0);
assert.equal(events.closed[2], input3);
assert.equal(events.closed[2].editor, input3);
assert.equal(events.opened[2], input3);
assert.equal(events.activated[2], input3);
@ -549,7 +553,7 @@ suite('Editor Stacks Model', () => {
assert.equal(group.count, 0);
assert.equal(group.getEditors(true).length, 0);
assert.equal(group.activeEditor, void 0);
assert.equal(events.closed[2], input3);
assert.equal(events.closed[2].editor, input3);
// Nonactive && Preview => gets active because its first editor
const input4 = input();
@ -569,7 +573,7 @@ suite('Editor Stacks Model', () => {
assert.equal(group.count, 0);
assert.equal(group.getEditors(true).length, 0);
assert.equal(group.activeEditor, void 0);
assert.equal(events.closed[3], input4);
assert.equal(events.closed[3].editor, input4);
});
test('Stack - Multiple Editors - Pinned and Active', function () {
@ -725,8 +729,8 @@ suite('Editor Stacks Model', () => {
assert.equal(events.opened[0], input1);
assert.equal(events.opened[1], input2);
assert.equal(events.opened[2], input3);
assert.equal(events.closed[0], input1);
assert.equal(events.closed[1], input2);
assert.equal(events.closed[0].editor, input1);
assert.equal(events.closed[1].editor, input2);
const mru = group.getEditors(true);
assert.equal(mru[0], input3);
@ -809,7 +813,7 @@ suite('Editor Stacks Model', () => {
assert.equal(group.count, 2); // 2 previews got merged into one
assert.equal(group.getEditors()[0], input2);
assert.equal(group.getEditors()[1], input3);
assert.equal(events.closed[0], input1);
assert.equal(events.closed[0].editor, input1);
assert.equal(group.count, 2);
group.unpin(input3);
@ -817,7 +821,7 @@ suite('Editor Stacks Model', () => {
assert.equal(group.activeEditor, input3);
assert.equal(group.count, 1); // pinning replaced the preview
assert.equal(group.getEditors()[0], input3);
assert.equal(events.closed[1], input2);
assert.equal(events.closed[1].editor, input2);
assert.equal(group.count, 1);
});