fix: rerender welcome view when chat provider is disposed (microsoft#…

…203740)
anyscale · Jan 30, 2024 · c9f0aa5 · c9f0aa5
1 parent 7fd1edb
commit c9f0aa5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -45,6 +45,7 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
  private memento: Memento;
  private readonly viewState: IViewPaneState;
  private didProviderRegistrationFail = false;
+ private didUnregisterProvider = false;
 
  constructor(
  private readonly chatViewOptions: IChatViewOptions,
@@ -78,12 +79,20 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
  try {
  this._widget.setVisible(false);
  this.updateModel(model);
+ this.didProviderRegistrationFail = false;
+ this.didUnregisterProvider = false;
  this._onDidChangeViewWelcomeState.fire();
  } finally {
  this.widget.setVisible(true);
  }
  }
  }));
+ this._register(this.chatService.onDidUnregisterProvider(({ providerId }) => {
+ if (providerId === this.chatViewOptions.providerId) {
+ this.didUnregisterProvider = true;
+ this._onDidChangeViewWelcomeState.fire();
+ }
+ }));
  }
 
  private updateModel(model?: IChatModel | undefined, viewState?: IViewPaneState): void {
@@ -102,7 +111,7 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 
  override shouldShowWelcome(): boolean {
  const noPersistedSessions = !this.chatService.hasSessions(this.chatViewOptions.providerId);
- return !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
+ return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
  }
 
  private getSessionId() {

diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -285,6 +285,7 @@ export interface IChatService {
 
  onDidSubmitAgent: Event<{ agent: IChatAgentData; slashCommand: IChatAgentCommand; sessionId: string }>;
  onDidRegisterProvider: Event<{ providerId: string }>;
+ onDidUnregisterProvider: Event<{ providerId: string }>;
  registerProvider(provider: IChatProvider): IDisposable;
  hasSessions(providerId: string): boolean;
  getProviderInfos(): IChatProviderInfo[];

diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -155,6 +155,9 @@ export class ChatService extends Disposable implements IChatService {
  private readonly _onDidRegisterProvider = this._register(new Emitter<{ providerId: string }>());
  public readonly onDidRegisterProvider = this._onDidRegisterProvider.event;
 
+ private readonly _onDidUnregisterProvider = this._register(new Emitter<{ providerId: string }>());
+ public readonly onDidUnregisterProvider = this._onDidUnregisterProvider.event;
+
  constructor(
  @IStorageService private readonly storageService: IStorageService,
  @ILogService private readonly logService: ILogService,
@@ -718,6 +721,7 @@ export class ChatService extends Disposable implements IChatService {
  Array.from(this._sessionModels.values())
  .filter(model => model.providerId === provider.id)
  .forEach(model => model.deinitialize());
+ this._onDidUnregisterProvider.fire({ providerId: provider.id });
  });
  }