Skip to content

Commit dfa0033

Browse files
sandy081sandy081
committed
1 parent 99ffd06 commit dfa0033

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

‎src/vs/workbench/browser/parts/activitybar/activitybarActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export class GlobalActivityActionViewItem extends ActivityActionViewItem {
165165
export class PlaceHolderViewletActivityAction extends ViewletActivityAction {
166166

167167
constructor(
168-
id: string, iconUrl: URI,
168+
id: string, name: string, iconUrl: URI,
169169
@IViewletService viewletService: IViewletService,
170170
@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
171171
@ITelemetryService telemetryService: ITelemetryService

‎src/vs/workbench/browser/parts/activitybar/activitybarPart.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { Schemas } from 'vs/base/common/network';
3737

3838
interface ICachedViewlet {
3939
id: string;
40+
name?: string;
4041
iconUrl?: UriComponents;
4142
pinned: boolean;
4243
order?: number;
@@ -89,7 +90,9 @@ export class ActivitybarPart extends Part implements IActivityBarService {
8990
}
9091
}
9192

92-
this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, this.cachedViewlets.map(v => ({ id: v.id, name: undefined, visible: v.visible, order: v.order, pinned: v.pinned })), {
93+
const cachedItems = this.cachedViewlets
94+
.map(v => ({ id: v.id, name: v.name, visible: v.visible, order: v.order, pinned: v.pinned }));
95+
this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, cachedItems, {
9396
icon: true,
9497
orientation: ActionsOrientation.VERTICAL,
9598
openComposite: (compositeId: string) => this.viewletService.openViewlet(compositeId, true),
@@ -252,7 +255,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
252255
} else {
253256
const cachedComposite = this.cachedViewlets.filter(c => c.id === compositeId)[0];
254257
compositeActions = {
255-
activityAction: this.instantiationService.createInstance(PlaceHolderViewletActivityAction, compositeId, cachedComposite && cachedComposite.iconUrl ? URI.revive(cachedComposite.iconUrl) : undefined),
258+
activityAction: this.instantiationService.createInstance(PlaceHolderViewletActivityAction, compositeId, cachedComposite && cachedComposite.name ? cachedComposite.name : compositeId, cachedComposite && cachedComposite.iconUrl ? URI.revive(cachedComposite.iconUrl) : undefined),
256259
pinnedAction: new PlaceHolderToggleCompositePinnedAction(compositeId, this.compositeBar)
257260
};
258261
}
@@ -428,7 +431,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
428431
}
429432
}
430433
}
431-
state.push({ id: compositeItem.id, iconUrl: viewlet.iconUrl && viewlet.iconUrl.scheme === Schemas.file ? viewlet.iconUrl : undefined, views, pinned: compositeItem.pinned, order: compositeItem.order, visible: compositeItem.visible });
434+
state.push({ id: compositeItem.id, name: viewlet.name, iconUrl: viewlet.iconUrl && viewlet.iconUrl.scheme === Schemas.file ? viewlet.iconUrl : undefined, views, pinned: compositeItem.pinned, order: compositeItem.order, visible: compositeItem.visible });
432435
} else {
433436
state.push({ id: compositeItem.id, pinned: compositeItem.pinned, order: compositeItem.order, visible: false });
434437
}
@@ -440,14 +443,15 @@ export class ActivitybarPart extends Part implements IActivityBarService {
440443
private getCachedViewlets(): ICachedViewlet[] {
441444
const storedStates: Array<string | ICachedViewlet> = JSON.parse(this.cachedViewletsValue);
442445
const cachedViewlets = storedStates.map(c => {
443-
const serialized: ICachedViewlet = typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true, order: undefined, visible: true, iconUrl: undefined, views: undefined } : c;
446+
const serialized: ICachedViewlet = typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true, order: undefined, visible: true, name: undefined, iconUrl: undefined, views: undefined } : c;
444447
serialized.visible = isUndefinedOrNull(serialized.visible) ? true : serialized.visible;
445448
return serialized;
446449
});
447450

448451
for (const old of this.loadOldCachedViewlets()) {
449452
const cachedViewlet = cachedViewlets.filter(cached => cached.id === old.id)[0];
450453
if (cachedViewlet) {
454+
cachedViewlet.name = old.name;
451455
cachedViewlet.iconUrl = old.iconUrl;
452456
cachedViewlet.views = old.views;
453457
}

0 commit comments

Comments
 (0)