diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index b091344a8117c9abe6402314487f4ba160ddb2da..6ecac8f38cf04b41875d142635a4984b2944b4c9 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { TPromise } from 'vs/base/common/winjs.base'; import * as DOM from 'vs/base/browser/dom'; import { dispose, IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { IAction } from 'vs/base/common/actions'; @@ -194,7 +193,7 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView .map((view) => view.setVisible(visible)); } - openView(id: string, focus?: boolean): TPromise { + openView(id: string, focus?: boolean): IView { if (focus) { this.focus(); } @@ -207,7 +206,7 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView if (focus) { view.focus(); } - return Promise.resolve(view); + return view; } movePanel(from: ViewletPanel, to: ViewletPanel): void { diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index c51a17c5c3af2ca8670567cec5944e2425dc01d9..2148acc60e40e457569e628a37a720473422d064 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -219,7 +219,7 @@ export interface IView { export interface IViewsViewlet extends IViewlet { - openView(id: string, focus?: boolean): TPromise; + openView(id: string, focus?: boolean): IView; } @@ -344,4 +344,4 @@ export interface ITreeViewDataProvider { getChildren(element?: ITreeItem): TPromise; -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index 0f0de4f8102a7f9496031f1ccb9186f6314abf2c..f11099184444b7ea694aa9b2b045081310dae226 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -1477,7 +1477,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle return super.isSingleView() && this.repositoryPanels.length + this.contributedViews.visibleViewDescriptors.length === 1; } - openView(id: string, focus?: boolean): TPromise { + openView(id: string, focus?: boolean): IView { if (focus) { this.focus(); } @@ -1490,7 +1490,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle if (focus) { panel.focus(); } - return TPromise.as(panel); + return panel; } hide(repository: ISCMRepository): void {