提交 3969b8c0 编写于 作者: B Benjamin Pasero

improve lookup

上级 e8f681f9
...@@ -151,8 +151,6 @@ export class EditorGroup implements IEditorGroup { ...@@ -151,8 +151,6 @@ export class EditorGroup implements IEditorGroup {
public openEditor(editor: EditorInput, options?: IEditorOpenOptions): void { public openEditor(editor: EditorInput, options?: IEditorOpenOptions): void {
const index = this.indexOf(editor); const index = this.indexOf(editor);
const indexOfActive = this.indexOf(this.active);
const indexOfPreview = this.indexOf(this.preview);
const makeActive = (options && options.active) || !this.activeEditor; const makeActive = (options && options.active) || !this.activeEditor;
const makePinned = options && options.pinned; const makePinned = options && options.pinned;
...@@ -162,6 +160,7 @@ export class EditorGroup implements IEditorGroup { ...@@ -162,6 +160,7 @@ export class EditorGroup implements IEditorGroup {
// Insert into our list of editors if pinned or we are first // Insert into our list of editors if pinned or we are first
if (makePinned || !this.preview) { if (makePinned || !this.preview) {
const indexOfActive = this.indexOf(this.active);
// Insert to the RIGHT of active editor // Insert to the RIGHT of active editor
if (DEFAULT_OPEN_EDITOR_DIRECTION === Direction.RIGHT) { if (DEFAULT_OPEN_EDITOR_DIRECTION === Direction.RIGHT) {
...@@ -180,6 +179,8 @@ export class EditorGroup implements IEditorGroup { ...@@ -180,6 +179,8 @@ export class EditorGroup implements IEditorGroup {
// Handle preview // Handle preview
if (!makePinned) { if (!makePinned) {
const indexOfPreview = this.indexOf(this.preview);
this.closeEditor(this.preview); this.closeEditor(this.preview);
this.preview = editor; this.preview = editor;
this.splice(indexOfPreview, true, editor); this.splice(indexOfPreview, true, editor);
...@@ -303,7 +304,7 @@ export class EditorGroup implements IEditorGroup { ...@@ -303,7 +304,7 @@ export class EditorGroup implements IEditorGroup {
private splice(index: number, del: boolean, editor?: EditorInput): void { private splice(index: number, del: boolean, editor?: EditorInput): void {
// Perform on editors array // Perform on editors array
const args:any[] = [index, del ? 1 : 0]; const args: any[] = [index, del ? 1 : 0];
if (editor) { if (editor) {
args.push(editor); args.push(editor);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册