Skip to content

Commit 44da9e1

Browse files
Eric Amodioeamodio
Eric Amodio
authored and
eamodio
committed
Removes getInstantiated* methods
1 parent 101beaa commit 44da9e1

8 files changed

Lines changed: 9 additions & 38 deletions

File tree

‎src/vs/workbench/browser/parts/compositePart.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,6 @@ export abstract class CompositePart<T extends Composite> extends Part {
158158
return composite;
159159
}
160160

161-
protected getInstantiatedComposite(id: string) {
162-
return this.instantiatedCompositeItems.get(id)?.composite;
163-
}
164-
165161
protected createComposite(id: string, isActive?: boolean): Composite {
166162

167163
// Check if composite is already created

‎src/vs/workbench/browser/parts/panel/panelPart.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
434434
return this.getActiveComposite();
435435
}
436436

437-
getInstantiatedPanel(id: string): IPanel | undefined {
438-
return this.getInstantiatedComposite(id) as IPanel | undefined;
439-
}
440-
441437
getLastActivePanelId(): string {
442438
return this.getLastActiveCompositetId();
443439
}

‎src/vs/workbench/browser/parts/sidebar/sidebarPart.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
225225
return <IViewlet>this.getActiveComposite();
226226
}
227227

228-
getInstantiatedViewlet(id: string): IViewlet | undefined {
229-
return this.getInstantiatedComposite(id) as IViewlet | undefined;
230-
}
231-
232228
getLastActiveViewletId(): string {
233229
return this.getLastActiveCompositetId();
234230
}

‎src/vs/workbench/browser/parts/views/views.ts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@ export class ViewsService extends Disposable implements IViewsService {
466466

467467
private readonly visibleViewContextKeys: Map<string, IContextKey<boolean>>;
468468

469+
private readonly viewPaneContainers: Map<string, ViewPaneContainer>;
470+
469471
constructor(
470472
@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
471473
@IPanelService private readonly panelService: IPanelService,
@@ -477,6 +479,7 @@ export class ViewsService extends Disposable implements IViewsService {
477479
this.viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry);
478480
this.viewDisposable = new Map<IViewDescriptor, IDisposable>();
479481
this.visibleViewContextKeys = new Map<string, IContextKey<boolean>>();
482+
this.viewPaneContainers = new Map<string, ViewPaneContainer>();
480483

481484
this._register(toDisposable(() => {
482485
this.viewDisposable.forEach(disposable => disposable.dispose());
@@ -485,12 +488,16 @@ export class ViewsService extends Disposable implements IViewsService {
485488

486489
this.viewContainersRegistry.all.forEach(viewContainer => this.onDidRegisterViewContainer(viewContainer, this.viewContainersRegistry.getViewContainerLocation(viewContainer)));
487490
this._register(this.viewContainersRegistry.onDidRegister(({ viewContainer, viewContainerLocation }) => this.onDidRegisterViewContainer(viewContainer, viewContainerLocation)));
491+
492+
this._register(this.viewContainersRegistry.onDidDeregister(e => this.viewPaneContainers.delete(e.viewContainer.id)));
488493
}
489494

490495
private registerViewPaneContainer(viewPaneContainer: ViewPaneContainer): void {
491496
this._register(viewPaneContainer.onDidAddViews(views => this.onViewsAdded(views)));
492497
this._register(viewPaneContainer.onDidChangeViewVisibility(view => this.onViewsVisibilityChanged(view, view.isBodyVisible())));
493498
this._register(viewPaneContainer.onDidRemoveViews(views => this.onViewsRemoved(views)));
499+
500+
this.viewPaneContainers.set(viewPaneContainer.getId(), viewPaneContainer);
494501
}
495502

496503
private onViewsAdded(added: IView[]): void {
@@ -706,18 +713,7 @@ export class ViewsService extends Disposable implements IViewsService {
706713
return undefined;
707714
}
708715

709-
const location = this.viewContainersRegistry.getViewContainerLocation(viewContainer);
710-
711-
let viewPaneContainer;
712-
if (location === ViewContainerLocation.Sidebar) {
713-
const viewlet = this.viewletService.getInstantiatedViewlet(viewContainer.id);
714-
viewPaneContainer = viewlet?.getViewPaneContainer();
715-
} else if (location === ViewContainerLocation.Panel) {
716-
const panel = this.panelService.getInstantiatedPanel(viewContainer.id);
717-
viewPaneContainer = (panel as IPaneComposite)?.getViewPaneContainer();
718-
}
719-
720-
const view = viewPaneContainer?.getView(id);
716+
const view = this.viewPaneContainers.get(viewContainer.id)?.getView(id);
721717
return view?.getProgressIndicator();
722718
}
723719

‎src/vs/workbench/services/panel/common/panelService.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ export interface IPanelService {
3535
*/
3636
getActivePanel(): IPanel | undefined;
3737

38-
/**
39-
* Returns an instantiated panel by id, if any.
40-
*/
41-
getInstantiatedPanel(id: string): IPanel | undefined;
42-
4338
/**
4439
* Returns the panel by id.
4540
*/

‎src/vs/workbench/services/progress/browser/progressService.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,7 @@ export class ProgressService extends Disposable implements IProgressService {
423423
if (d < minTimeVisible) {
424424
// should at least show for Nms
425425
setTimeout(() => handle.dispose(), minTimeVisible - d);
426-
}
427-
else {
426+
} else {
428427
// shown long enough
429428
handle.dispose();
430429
}

‎src/vs/workbench/services/viewlet/browser/viewlet.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ export interface IViewletService {
3030
*/
3131
getActiveViewlet(): IViewlet | undefined;
3232

33-
/**
34-
* Returns an instantiated viewlet by id, if any.
35-
*/
36-
getInstantiatedViewlet(id: string): IViewlet | undefined;
37-
3833
/**
3934
* Returns the id of the default viewlet.
4035
*/

‎src/vs/workbench/test/browser/workbenchTestServices.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@ export class TestViewletService implements IViewletService {
434434
getViewlets(): ViewletDescriptor[] { return []; }
435435
getAllViewlets(): ViewletDescriptor[] { return []; }
436436
getActiveViewlet(): IViewlet { return activeViewlet; }
437-
getInstantiatedViewlet(): IViewlet | undefined { return undefined; }
438437
getDefaultViewletId(): string { return 'workbench.view.explorer'; }
439438
getViewlet(id: string): ViewletDescriptor | undefined { return undefined; }
440439
getProgressIndicator(id: string) { return undefined; }
@@ -454,7 +453,6 @@ export class TestPanelService implements IPanelService {
454453
getPanels() { return []; }
455454
getPinnedPanels() { return []; }
456455
getActivePanel(): IPanel { return activeViewlet; }
457-
getInstantiatedPanel(): IPanel | undefined { return undefined; }
458456
setPanelEnablement(id: string, enabled: boolean): void { }
459457
dispose() { }
460458
showActivity(panelId: string, badge: IBadge, clazz?: string): IDisposable { throw new Error('Method not implemented.'); }

0 commit comments

Comments
 (0)