Fix microsoft#103938

Rachel Macfarlane · Rachel Macfarlane · commit 5137025abf42 · 2020-08-04T08:54:38.000-07:00
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -360,17 +360,20 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 	}
 
 	private updateGlobalActivity(activityCache: ICompositeActivity[], activityAction: ActivityAction | undefined): void {
-		const globalActivityAction = assertIsDefined(activityAction);
+		if (!activityAction) {
+			return;
+		}
+
 		if (activityCache.length) {
 			const [{ badge, clazz, priority }] = activityCache;
 			if (badge instanceof NumberBadge && activityCache.length > 1) {
 				const cumulativeNumberBadge = this.getCumulativeNumberBadge(priority);
-				globalActivityAction.setBadge(cumulativeNumberBadge);
+				activityAction.setBadge(cumulativeNumberBadge);
 			} else {
-				globalActivityAction.setBadge(badge, clazz);
+				activityAction.setBadge(badge, clazz);
 			}
 		} else {
-			globalActivityAction.setBadge(undefined);
+			activityAction.setBadge(undefined);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -360,17 +360,20 @@ export class ActivitybarPart extends Part implements IActivityBarService {`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`private updateGlobalActivity(activityCache: ICompositeActivity[], activityAction: ActivityAction \| undefined): void {`
`363`		`- const globalActivityAction = assertIsDefined(activityAction);`
	`363`	`+ if (!activityAction) {`
	`364`	`+ return;`
	`365`	`+ }`
	`366`	`+`
`364`	`367`	`if (activityCache.length) {`
`365`	`368`	`const [{ badge, clazz, priority }] = activityCache;`
`366`	`369`	`if (badge instanceof NumberBadge && activityCache.length > 1) {`
`367`	`370`	`const cumulativeNumberBadge = this.getCumulativeNumberBadge(priority);`
`368`		`- globalActivityAction.setBadge(cumulativeNumberBadge);`
	`371`	`+ activityAction.setBadge(cumulativeNumberBadge);`
`369`	`372`	`} else {`
`370`		`- globalActivityAction.setBadge(badge, clazz);`
	`373`	`+ activityAction.setBadge(badge, clazz);`
`371`	`374`	`}`
`372`	`375`	`} else {`
`373`		`- globalActivityAction.setBadge(undefined);`
	`376`	`+ activityAction.setBadge(undefined);`
`374`	`377`	`}`
`375`	`378`	`}`
`376`	`379`