Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dependency view: Open extension to the side

Browse Source
This commit is contained in:
Sandeep Somavarapu
2016-10-06 18:39:24 +02:00
parent af98e43c37
commit afbba4816d
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/vs/workbench/parts/extensions/electron-browser/dependenciesViewer.ts
View File

@@ -17,8 +17,10 @@ import { domEvent } from 'vs/base/browser/event';
import { Keybinding } from 'vs/base/common/keybinding';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { KeyCode } from 'vs/base/common/keyCodes';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
import { Position } from 'vs/platform/editor/common/editor';
interface IExtensionTemplateData {
icon: HTMLImageElement;
@@ -111,6 +113,8 @@ export class Controller extends DefaultController {
@IExtensionsWorkbenchService private extensionWorkbenchService: IExtensionsWorkbenchService,
@IInstantiationService private instantiationService: IInstantiationService) {
super();
this.downKeyBindingDispatcher.set(OpenExtensionToSideAction.KEY_BINDING.value, (tree: ITree, event: any) => { this.openExtension(tree.getFocus(), true); });
}
protected onLeftClick(tree: ITree, element: IExtensionDependencies, event: IMouseEvent): boolean {
@@ -135,7 +139,8 @@ export class Controller extends DefaultController {
getAnchor: () => anchor,
getActions: () => {
return TPromise.as([this.instantiationService.createInstance(OpenExtensionAction)]);
return TPromise.as([this.instantiationService.createInstance(OpenExtensionAction),
this.instantiationService.createInstance(OpenExtensionToSideAction)]);
},
getActionItem: () => null,
@@ -162,20 +167,22 @@ export class Controller extends DefaultController {
protected onEnter(tree: ITree, event: IKeyboardEvent): boolean {
if (super.onEnter(tree, event)) {
return this.openExtension(tree.getFocus());
return this.openExtension(tree.getFocus(), event.ctrlKey || event.metaKey);
}
return false;
}
private openExtension(element: IExtensionDependencies, sideByside: boolean = false): boolean {
this.extensionWorkbenchService.open(element.extension);
this.extensionWorkbenchService.open(element.extension, sideByside);
return true;
}
private keybindingForAction(id: string): Keybinding {
switch (id) {
case OpenExtensionAction.ID:
return new Keybinding(KeyCode.Enter);
return OpenExtensionAction.KEY_BINDING;
case OpenExtensionToSideAction.ID:
return OpenExtensionToSideAction.KEY_BINDING;
}
return null;
@@ -184,14 +191,37 @@ export class Controller extends DefaultController {
class OpenExtensionAction extends Action {
public static ID = 'extensions.open.extension';
public static ID = 'extensions.action.open';
public static KEY_BINDING = new Keybinding(KeyCode.Enter);
constructor(@IExtensionsWorkbenchService private extensionsWorkdbenchService: IExtensionsWorkbenchService) {
super('extensions.open.extension', localize('extensions.open', "Open"));
super(OpenExtensionAction.ID, localize('extensions.open', "Open"));
}
run(context: { extension: IExtension, sideByside?: boolean }): TPromise<any> {
run(context: { extension: IExtension }): TPromise<any> {
this.extensionsWorkdbenchService.open(context.extension);
return TPromise.as(null);
}
}
class OpenExtensionToSideAction extends Action {
public static ID = 'extensions.action.openSide';
public static KEY_BINDING = new Keybinding(KeyMod.WinCtrl | KeyCode.Enter);
constructor(@IExtensionsWorkbenchService private extensionsWorkdbenchService: IExtensionsWorkbenchService,
@IWorkbenchEditorService private editorService: IWorkbenchEditorService) {
super(OpenExtensionToSideAction.ID, localize('extensions.openSide', "Open to the Side"));
this.updateEnablement();
}
private updateEnablement(): void {
const activeEditor = this.editorService.getActiveEditor();
this.enabled = (!activeEditor || activeEditor.position !== Position.RIGHT);
}
run(context: { extension: IExtension }): TPromise<any> {
this.extensionsWorkdbenchService.open(context.extension, true);
return TPromise.as(null);
}
}

2
src/vs/workbench/parts/extensions/electron-browser/extensions.ts
View File

@@ -70,7 +70,7 @@ export interface IExtensionsWorkbenchService {
install(extension: IExtension, promptToInstallDependencies?: boolean): TPromise<void>;
uninstall(extension: IExtension): TPromise<void>;
loadDependencies(extension: IExtension): TPromise<IExtensionDependencies>;
open(extension: IExtension): void;
open(extension: IExtension, sideByside?: boolean): void;
}
export const ConfigurationKey = 'extensions';

4
src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchService.ts
View File

@@ -368,8 +368,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
});
}
open(extension: IExtension): void {
this.editorService.openEditor(this.instantiationService.createInstance(ExtensionsInput, extension))
open(extension: IExtension, sideByside: boolean = false): void {
this.editorService.openEditor(this.instantiationService.createInstance(ExtensionsInput, extension), null, sideByside)
.done(null, err => this.onError(err));
}