maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

send out active viewlet change event

Browse source 
fixes #8060
This commit is contained in:
Joao Moreno 2016-07-27 16:28:26 +02:00
parent 20c76bbd21
commit 8ba1d2eed9
4 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
View file

@ -8,6 +8,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
import nls = require('vs/nls');
import {Registry} from 'vs/platform/platform';
import {Action} from 'vs/base/common/actions';
import {IComposite} from 'vs/workbench/common/composite';
import {CompositePart} from 'vs/workbench/browser/parts/compositePart';
import {Viewlet, ViewletRegistry, Extensions as ViewletExtensions} from 'vs/workbench/browser/viewlet';
import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
@ -24,11 +25,15 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IKeybindingService} from 'vs/platform/keybinding/common/keybinding';
import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import Event, {Emitter} from 'vs/base/common/event';
export class SidebarPart extends CompositePart<Viewlet> implements IViewletService {
public static activeViewletSettingsKey = 'workbench.sidebar.activeviewletid';
private _onDidActiveViewletChange = new Emitter<IViewlet>();
onDidActiveViewletChange: Event<IViewlet> = this._onDidActiveViewletChange.event;
public _serviceBrand: any;
private blockOpeningViewlet: boolean;
@ -77,7 +82,10 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
}
}
return this.openComposite(id, focus);
return this.openComposite(id, focus).then(composite => {
this._onDidActiveViewletChange.fire(composite as IComposite as IViewlet);
return composite;
});
}
public getActiveViewlet(): IViewlet {

16
src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
View file

@ -9,10 +9,12 @@ import 'vs/css!./media/extensionEditor';
import { localize } from 'vs/nls';
import { TPromise } from 'vs/base/common/winjs.base';
import { marked } from 'vs/base/common/marked/marked';
import { onUnexpectedError } from 'vs/base/common/errors';
import { IDisposable, empty, dispose, toDisposable } from 'vs/base/common/lifecycle';
import { Builder } from 'vs/base/browser/builder';
import { append, emmet as $, addClass, removeClass, finalHandler } from 'vs/base/browser/dom';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { IViewlet } from 'vs/workbench/common/viewlet';
import { IViewletService } from 'vs/workbench/services/viewlet/common/viewletService';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@ -30,6 +32,7 @@ import product from 'vs/platform/product';
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
import { CombinedInstallAction, UpdateAction, EnableAction } from './extensionsActions';
import WebView from 'vs/workbench/parts/html/browser/webview';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
function renderBody(body: string): string {
return `<!DOCTYPE html>
@ -70,12 +73,15 @@ export class ExtensionEditor extends BaseEditor {
@IRequestService private requestService: IRequestService,
@IViewletService private viewletService: IViewletService,
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
@IThemeService private themeService: IThemeService
@IThemeService private themeService: IThemeService,
@IWorkbenchEditorService private editorService: IWorkbenchEditorService
) {
super(ExtensionEditor.ID, telemetryService);
this._highlight = null;
this.highlightDisposable = empty;
this.disposables = [];
viewletService.onDidActiveViewletChange(this.onActiveViewletChange, this, this.disposables);
}
createEditor(parent: Builder): void {
@ -194,6 +200,14 @@ export class ExtensionEditor extends BaseEditor {
return;
}
private onActiveViewletChange(viewlet: IViewlet): void {
if (!viewlet || viewlet.getId() === VIEWLET_ID) {
return;
}
this.editorService.closeEditor(this.position, this.input).done(null, onUnexpectedError);
}
dispose(): void {
this._highlight = null;
this.transientDisposables = dispose(this.transientDisposables);

3
src/vs/workbench/services/viewlet/common/viewletService.ts
View file

@ -5,6 +5,7 @@
'use strict';
import {TPromise} from 'vs/base/common/winjs.base';
import Event from 'vs/base/common/event';
import {IViewlet} from 'vs/workbench/common/viewlet';
import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation';
@ -13,6 +14,8 @@ export const IViewletService = createDecorator<IViewletService>('viewletService'
export interface IViewletService {
_serviceBrand : ServiceIdentifier<any>;
onDidActiveViewletChange: Event<IViewlet>;
/**
* Opens a viewlet with the given identifier and pass keyboard focus to it if specified.
*/

4
src/vs/workbench/test/browser/services.test.ts
View file

@ -38,6 +38,7 @@ import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletServi
import {IViewlet} from 'vs/workbench/common/viewlet';
import {Position, Direction, IEditor} from 'vs/platform/editor/common/editor';
import {IEventService} from 'vs/platform/event/common/event';
import {Emitter} from 'vs/base/common/event';
let activeViewlet: Viewlet = <any>{};
let activeEditor: BaseEditor = <any>{
@ -110,6 +111,9 @@ class TestEditorPart implements IEditorPart {
class TestViewletService implements IViewletService {
public _serviceBrand: any;
onDidActiveViewletChange = new Emitter<IViewlet>().event;
public openViewlet(id: string, focus?: boolean): Promise {
return TPromise.as(null);
}