Fix group by server

src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts

@@ -493,14 +493,15 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 
 	protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewletPanel {
 		if (this.extensionManagementServerService.otherExtensionManagementServer) {
-			if (viewDescriptor.id === `server.extensionsList.${this.extensionManagementServerService.localExtensionManagementServer.authority}`
-				|| viewDescriptor.id === `server.extensionsList.${this.extensionManagementServerService.otherExtensionManagementServer.authority}`) {
+			const extensionManagementServer = viewDescriptor.id === `server.extensionsList.${this.extensionManagementServerService.localExtensionManagementServer.authority}` ? this.extensionManagementServerService.localExtensionManagementServer
+				: viewDescriptor.id === `server.extensionsList.${this.extensionManagementServerService.otherExtensionManagementServer.authority}` ? this.extensionManagementServerService.otherExtensionManagementServer : null;
+			if (extensionManagementServer) {
 				const servicesCollection: ServiceCollection = new ServiceCollection();
-				servicesCollection.set(IExtensionManagementServerService, new SingleServerExtensionManagementServerService(this.extensionManagementServerService.otherExtensionManagementServer));
-				servicesCollection.set(IExtensionManagementService, this.extensionManagementServerService.otherExtensionManagementServer.extensionManagementService);
+				servicesCollection.set(IExtensionManagementServerService, new SingleServerExtensionManagementServerService(extensionManagementServer));
+				servicesCollection.set(IExtensionManagementService, extensionManagementServer.extensionManagementService);
 				servicesCollection.set(IExtensionsWorkbenchService, new SyncDescriptor(ExtensionsWorkbenchService));
 				const instantiationService = this.instantiationService.createChild(servicesCollection);
-				return instantiationService.createInstance(viewDescriptor.ctor, options, [this.extensionManagementServerService.otherExtensionManagementServer]) as ViewletPanel;
+				return instantiationService.createInstance(viewDescriptor.ctor, options, [extensionManagementServer]) as ViewletPanel;
 			}
 		}
 		return this.instantiationService.createInstance(viewDescriptor.ctor, options) as ViewletPanel;