Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 30fbeba4 编写于 作者: B Benjamin Pasero
浏览文件
操作

move actions business into side by side control

上级 1622aa99
隐藏空白更改
内联 并排
Showing with 108 addition and 113 deletion
src/vs/base/common/arrays.ts
浏览文件 @ 30fbeba4
......@@ -200,3 +200,11 @@ export function commonPrefixLength<T>(one: T[], other: T[], equals: (a: T, b: T)
export function flatten<T>(arr: T[][]): T[] {
return arr.reduce((r, v) => r.concat(v), []);
}
export function fill<T>(num: number, valueFn: () => T, arr: T[] = []): T[] {
for (let i = 0; i < num; i++) {
arr[i] = valueFn();
}
return arr;
}
\ No newline at end of file
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @ 30fbeba4
......@@ -20,11 +20,10 @@ import types = require('vs/base/common/types');
import {IEditorViewState, IEditor} from 'vs/editor/common/editorCommon';
import errors = require('vs/base/common/errors');
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 {Scope} from 'vs/workbench/browser/actionBarRegistry';
import {Part} from 'vs/workbench/browser/part';
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 {IEditorRegistry, Extensions as EditorExtensions, BaseEditor, 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';
import {SideBySideEditorControl, Rochade} from 'vs/workbench/browser/parts/editor/sideBySideEditorControl';
......@@ -44,11 +43,6 @@ import {EditorStacksModel} from 'vs/workbench/common/editor/editorStacksModel';
const EDITOR_STATE_STORAGE_KEY = 'editorpart.editorState';
interface IEditorActions {
primary: IAction[];
secondary: IAction[];
}
interface IEditorStateEntry {
inputId: string;
inputValue: string;
......@@ -72,12 +66,11 @@ export class EditorPart extends Part implements IEditorPart {
// The following data structures are partitioned into array of Position as provided by Services.POSITION array
private visibleInputs: EditorInput[];
private visibleInputListeners: { (): void; }[];
private visibleInputListeners: Function[];
private visibleEditors: BaseEditor[];
private visibleEditorListeners: { (): void; }[][];
private visibleEditorListeners: Function[][];
private instantiatedEditors: BaseEditor[][];
private mapEditorToEditorContainers: { [editorId: string]: Builder; }[];
private mapActionsToEditors: { [editorId: string]: IEditorActions; }[];
private mapEditorLoadingPromiseToEditor: { [editorId: string]: TPromise<BaseEditor>; }[];
private mapEditorCreationPromiseToEditor: { [editorId: string]: TPromise<BaseEditor>; }[];
private editorOpenToken: number[];
......@@ -100,23 +93,15 @@ export class EditorPart extends Part implements IEditorPart {
this.visibleInputListeners = [];
this.visibleEditors = [];
this.editorOpenToken = [];
for (let i = 0; i < POSITIONS.length; i++) {
this.editorOpenToken[i] = 0;
}
this.editorSetInputErrorCounter = [];
for (let i = 0; i < POSITIONS.length; i++) {
this.editorSetInputErrorCounter[i] = 0;
}
this.editorOpenToken = arrays.fill(POSITIONS.length, () => 0);
this.editorSetInputErrorCounter = arrays.fill(POSITIONS.length, () => 0);
this.visibleEditorListeners = this.createPositionArray(true);
this.instantiatedEditors = this.createPositionArray(true);
this.visibleEditorListeners = arrays.fill(POSITIONS.length, () => []);
this.instantiatedEditors = arrays.fill(POSITIONS.length, () => []);
this.mapEditorToEditorContainers = this.createPositionArray(false);
this.mapActionsToEditors = this.createPositionArray(false);
this.mapEditorLoadingPromiseToEditor = this.createPositionArray(false);
this.mapEditorCreationPromiseToEditor = this.createPositionArray(false);
this.mapEditorToEditorContainers = arrays.fill(POSITIONS.length, () => Object.create(null));
this.mapEditorLoadingPromiseToEditor = arrays.fill(POSITIONS.length, () => Object.create(null));
this.mapEditorCreationPromiseToEditor = arrays.fill(POSITIONS.length, () => Object.create(null));
this.pendingEditorInputsToClose = [];
this.pendingEditorInputCloseTimeout = null;
......@@ -124,16 +109,6 @@ export class EditorPart extends Part implements IEditorPart {
this.stacksModel = this.instantiationService.createInstance(EditorStacksModel);
}
private createPositionArray(multiArray: boolean): any[] {
let array: any[] = [];
for (let i = 0; i < POSITIONS.length; i++) {
array[i] = multiArray ? [] : {};
}
return array;
}
public getStacksModel(): EditorStacksModel {
return this.stacksModel;
}
......@@ -616,7 +591,6 @@ export class EditorPart extends Part implements IEditorPart {
this.doRochade(this.visibleEditorListeners, from, to, []);
this.doRochade(this.instantiatedEditors, from, to, []);
this.doRochade(this.mapEditorToEditorContainers, from, to, {});
this.doRochade(this.mapActionsToEditors, from, to, {});
}
}
......@@ -643,10 +617,9 @@ export class EditorPart extends Part implements IEditorPart {
arrays.move(this.mapEditorCreationPromiseToEditor, from, to);
arrays.move(this.instantiatedEditors, from, to);
arrays.move(this.mapEditorToEditorContainers, from, to);
arrays.move(this.mapActionsToEditors, from, to);
// Update all title areas
this.updateEditorTitleArea();
this.sideBySideControl.updateEditorTitleArea();
// Restore focus
let activeEditor = this.sideBySideControl.getActiveEditor();
......@@ -692,7 +665,7 @@ export class EditorPart extends Part implements IEditorPart {
// in that case notify others about the input change event as well as to make sure that the
// editor title area is up to date.
if (this.visibleInputs[position] && this.visibleInputs[position].matches(input)) {
this.updateEditorTitleArea();
this.sideBySideControl.updateEditorTitleArea();
this.emit(WorkbenchEventType.EDITOR_INPUT_CHANGED, new EditorEvent(editor, editor.getId(), this.visibleInputs[position], options, position));
}
......@@ -714,7 +687,7 @@ export class EditorPart extends Part implements IEditorPart {
// Update Title Area if input changed
if (inputChanged) {
this.updateEditorTitleArea();
this.sideBySideControl.updateEditorTitleArea();
}
// Emit Input-Changed Event (if input changed)
......@@ -823,71 +796,6 @@ export class EditorPart extends Part implements IEditorPart {
});
}
private updateEditorTitleArea(): void {
let activePosition = this.sideBySideControl.getActivePosition();
// Update each position individually
for (let i = 0; i < POSITIONS.length; i++) {
let editor = this.visibleEditors[i];
let input = editor ? editor.input : null;
if (input && editor) {
this.doUpdateEditorTitleArea(editor, input, i, activePosition === i);
}
}
}
private doUpdateEditorTitleArea(editor: BaseEditor, input: EditorInput, position: Position, isActive?: boolean): void {
let primaryActions: IAction[] = [];
let secondaryActions: IAction[] = [];
// Handle toolbar only if side is active
if (isActive) {
// Handle Editor Actions
let editorActions = this.mapActionsToEditors[position][editor.getId()];
if (!editorActions) {
editorActions = this.getEditorActionsForContext(editor, editor, position);
this.mapActionsToEditors[position][editor.getId()] = editorActions;
}
primaryActions.push(...editorActions.primary);
secondaryActions.push(...editorActions.secondary);
// Handle Editor Input Actions
let editorInputActions = this.getEditorActionsForContext({ input: input, editor: editor, position: position }, editor, position);
primaryActions.push(...editorInputActions.primary);
secondaryActions.push(...editorInputActions.secondary);
}
// Apply to title in side by side control
this.sideBySideControl.setTitle(position, input, prepareActions(primaryActions), prepareActions(secondaryActions), isActive);
}
private getEditorActionsForContext(context: BaseEditor, editor: BaseEditor, position: Position): IEditorActions;
private getEditorActionsForContext(context: IEditorInputActionContext, editor: BaseEditor, position: Position): IEditorActions;
private getEditorActionsForContext(context: any, editor: BaseEditor, position: Position): IEditorActions {
let primaryActions: IAction[] = [];
let secondaryActions: IAction[] = [];
// From Editor
if (context instanceof BaseEditor) {
primaryActions.push(...(<BaseEditor>context).getActions());
secondaryActions.push(...(<BaseEditor>context).getSecondaryActions());
}
// From Contributions
let actionBarRegistry = <IActionBarRegistry>Registry.as(ActionBarExtensions.Actionbar);
primaryActions.push(...actionBarRegistry.getActionBarActionsForContext(Scope.EDITOR, context));
secondaryActions.push(...actionBarRegistry.getSecondaryActionBarActionsForContext(Scope.EDITOR, context));
return {
primary: primaryActions,
secondary: secondaryActions
};
}
public createContentArea(parent: Builder): Builder {
// Content Container
......@@ -1014,7 +922,7 @@ export class EditorPart extends Part implements IEditorPart {
}
// Update Title Area
this.updateEditorTitleArea();
this.sideBySideControl.updateEditorTitleArea();
}
public layout(dimension: Dimension): Dimension[] {
......@@ -1076,7 +984,6 @@ export class EditorPart extends Part implements IEditorPart {
public dispose(): void {
this.mapEditorToEditorContainers = null;
this.mapActionsToEditors = null;
// Reset Tokens
this.editorOpenToken = [];
......
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
浏览文件 @ 30fbeba4
......@@ -8,7 +8,7 @@
import 'vs/css!./media/sidebyside';
import nls = require('vs/nls');
import {Registry} from 'vs/platform/platform';
import {Scope, IActionBarRegistry, Extensions} from 'vs/workbench/browser/actionBarRegistry';
import {Scope, IActionBarRegistry, Extensions, prepareActions} from 'vs/workbench/browser/actionBarRegistry';
import {IAction, Action} from 'vs/base/common/actions';
import arrays = require('vs/base/common/arrays');
import Event, {Emitter} from 'vs/base/common/event';
......@@ -19,7 +19,7 @@ import types = require('vs/base/common/types');
import {Dimension, Builder, $} from 'vs/base/browser/builder';
import {Sash, ISashEvent, IVerticalSashLayoutProvider} from 'vs/base/browser/ui/sash/sash';
import {ProgressBar} from 'vs/base/browser/ui/progressbar/progressbar';
import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
import {BaseEditor, IEditorInputActionContext} from 'vs/workbench/browser/parts/editor/baseEditor';
import {EditorInput, IInputStatus} from 'vs/workbench/common/editor';
import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
import {EventType as BaseEventType} from 'vs/base/common/events';
......@@ -44,6 +44,11 @@ export enum Rochade {
CENTER_AND_RIGHT_TO_LEFT
}
interface IEditorActions {
primary: IAction[];
secondary: IAction[];
}
/**
* Helper class to manage multiple side by side editors for the editor part.
*/
......@@ -68,6 +73,8 @@ export class SideBySideEditorControl implements IVerticalSashLayoutProvider {
private progressBar: ProgressBar[];
private editorActionsToolbar: ToolBar[];
private mapActionsToEditors: { [editorId: string]: IEditorActions; }[];
private closeEditorAction: CloseEditorAction[];
private splitEditorAction: SplitEditorAction;
......@@ -115,6 +122,8 @@ export class SideBySideEditorControl implements IVerticalSashLayoutProvider {
this.visibleEditorContainers = [];
this.visibleEditorFocusTrackers = [];
this.mapActionsToEditors = arrays.fill(POSITIONS.length, () => Object.create(null));
this._onEditorFocusChange = new Emitter<void>();
this.closeEditorAction = POSITIONS.map((position) => this.instantiationService.createInstance(CloseEditorAction, CLOSE_EDITOR_ACTION_ID, CLOSE_EDITOR_ACTION_LABEL));
......@@ -518,13 +527,18 @@ export class SideBySideEditorControl implements IVerticalSashLayoutProvider {
// Change data structures
let listeners = this.visibleEditorFocusTrackers[from];
this.visibleEditorContainers[to] = editorContainer;
this.visibleEditors[to] = editor;
this.visibleEditorFocusTrackers[to] = listeners;
this.visibleEditorFocusTrackers[from] = null;
this.visibleEditorContainers[to] = editorContainer;
this.visibleEditorContainers[from] = null;
this.visibleEditors[to] = editor;
this.visibleEditors[from] = null;
this.visibleEditorFocusTrackers[from] = null;
let actions = this.mapActionsToEditors[from];
this.mapActionsToEditors[to] = actions;
this.mapActionsToEditors[from] = null;
// Update last active position
if (this.lastActivePosition === from) {
......@@ -614,6 +628,7 @@ export class SideBySideEditorControl implements IVerticalSashLayoutProvider {
arrays.move(this.visibleEditors, from, to);
arrays.move(this.visibleEditorFocusTrackers, from, to);
arrays.move(this.containerWidth, from, to);
arrays.move(this.mapActionsToEditors, from, to);
// Layout
if (!this.leftSash.isHidden()) {
......@@ -769,6 +784,71 @@ export class SideBySideEditorControl implements IVerticalSashLayoutProvider {
return false;
}
public updateEditorTitleArea(): void {
let activePosition = this.lastActivePosition;
// Update each position individually
for (let i = 0; i < POSITIONS.length; i++) {
let editor = this.visibleEditors[i];
let input = editor ? editor.input : null;
if (input && editor) {
this.doUpdateEditorTitleArea(editor, input, i, activePosition === i);
}
}
}
private doUpdateEditorTitleArea(editor: BaseEditor, input: EditorInput, position: Position, isActive?: boolean): void {
let primaryActions: IAction[] = [];
let secondaryActions: IAction[] = [];
// Handle toolbar only if side is active
if (isActive) {
// Handle Editor Actions
let editorActions = this.mapActionsToEditors[position][editor.getId()];
if (!editorActions) {
editorActions = this.getEditorActionsForContext(editor, editor, position);
this.mapActionsToEditors[position][editor.getId()] = editorActions;
}
primaryActions.push(...editorActions.primary);
secondaryActions.push(...editorActions.secondary);
// Handle Editor Input Actions
let editorInputActions = this.getEditorActionsForContext({ input: input, editor: editor, position: position }, editor, position);
primaryActions.push(...editorInputActions.primary);
secondaryActions.push(...editorInputActions.secondary);
}
// Apply to title in side by side control
this.setTitle(position, input, prepareActions(primaryActions), prepareActions(secondaryActions), isActive);
}
private getEditorActionsForContext(context: BaseEditor, editor: BaseEditor, position: Position): IEditorActions;
private getEditorActionsForContext(context: IEditorInputActionContext, editor: BaseEditor, position: Position): IEditorActions;
private getEditorActionsForContext(context: any, editor: BaseEditor, position: Position): IEditorActions {
let primaryActions: IAction[] = [];
let secondaryActions: IAction[] = [];
// From Editor
if (context instanceof BaseEditor) {
primaryActions.push(...(<BaseEditor>context).getActions());
secondaryActions.push(...(<BaseEditor>context).getSecondaryActions());
}
// From Contributions
let actionBarRegistry = <IActionBarRegistry>Registry.as(Extensions.Actionbar);
primaryActions.push(...actionBarRegistry.getActionBarActionsForContext(Scope.EDITOR, context));
secondaryActions.push(...actionBarRegistry.getSecondaryActionBarActionsForContext(Scope.EDITOR, context));
return {
primary: primaryActions,
secondary: secondaryActions
};
}
private fillTitleArea(parent: Builder, position: Position): void {
let ignoreClick = false;
let wasDragged = false;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或