Fix bugs related to discovery blocking other features

src/client/common/utils/multiStepInput.ts

@@ -47,7 +47,7 @@ export interface IQuickPickParameters<T extends QuickPickItem, E = any> {
  totalSteps?: number;
  canGoBack?: boolean;
  items: T[];
- activeItem?: T | Promise<T>;
+ activeItem?: T | ((quickPick: QuickPick<T>) => Promise<T>);
  placeholder: string | undefined;
  customButtonSetups?: QuickInputButtonSetup[];
  matchOnDescription?: boolean;
@@ -156,7 +156,13 @@ export class MultiStepInput<S> implements IMultiStepInput<S> {
  initialize(input);
  }
  if (activeItem) {
- input.activeItems = [await activeItem];
+ if (typeof activeItem === 'function') {
+ activeItem(input).then((item) => {
+ if (input.activeItems.length === 0) {
+ input.activeItems = [item];
+ }
+ });
+ }
  } else {
  input.activeItems = [];
  }

src/client/interpreter/autoSelection/index.ts

@@ -181,6 +181,11 @@ export class InterpreterAutoSelectionService implements IInterpreterAutoSelectio
  return this.stateFactory.createWorkspacePersistentState(key, undefined);
  }
 
+ private getAutoSelectionQueriedOnceState(): IPersistentState<boolean | undefined> {
+ const key = `autoSelectionInterpretersQueriedOnce`;
+ return this.stateFactory.createWorkspacePersistentState(key, undefined);
+ }
+
  /**
  * Auto-selection logic:
  * 1. If there are cached interpreters (not the first session in this workspace)
@@ -200,7 +205,12 @@ export class InterpreterAutoSelectionService implements IInterpreterAutoSelectio
  });
  }
 
- await this.interpreterService.refreshPromise;
+ const globalQueriedState = this.getAutoSelectionQueriedOnceState();
+ if (!globalQueriedState.value) {
+ // Global interpreters are loaded the first time an extension loads, after which we don't need to
+ // wait on global interpreter promise refresh.
+ await this.interpreterService.refreshPromise;
+ }
  const interpreters = this.interpreterService.getInterpreters(resource);
  const workspaceUri = this.interpreterHelper.getActiveWorkspaceUri(resource);
 
@@ -215,6 +225,7 @@ export class InterpreterAutoSelectionService implements IInterpreterAutoSelectio
  }
 
  queriedState.updateValue(true);
+ globalQueriedState.updateValue(true);
 
  this.didAutoSelectedInterpreterEmitter.fire();
  }

src/client/interpreter/configuration/interpreterSelector/commands/setInterpreter.ts

@@ -177,7 +177,7 @@ export class SetInterpreterCommand extends BaseInterpreterSelectorCommand implem
  items: suggestions,
  sortByLabel: !preserveOrderWhenFiltering,
  keepScrollPosition: true,
- activeItem: this.getActiveItem(state.workspace, suggestions), // Use a promise here to ensure quickpick is initialized synchronously.
+ activeItem: (quickPick) => this.getActiveItem(state.workspace, quickPick), // Use a promise here to ensure quickpick is initialized synchronously.
  matchOnDetail: true,
  matchOnDescription: true,
  title,
@@ -277,8 +277,9 @@ export class SetInterpreterCommand extends BaseInterpreterSelectorCommand implem
  return getGroupedQuickPickItems(items, recommended, workspaceFolder?.uri.fsPath);
  }
 
- private async getActiveItem(resource: Resource, suggestions: QuickPickType[]) {
+ private async getActiveItem(resource: Resource, quickPick: QuickPick<QuickPickType>) {
  const interpreter = await this.interpreterService.getActiveInterpreter(resource);
+ const suggestions = quickPick.items;
  const activeInterpreterItem = suggestions.find(
  (i) => isInterpreterQuickPickItem(i) && i.interpreter.id === interpreter?.id,
  );
@@ -339,7 +340,9 @@ export class SetInterpreterCommand extends BaseInterpreterSelectorCommand implem
  return false;
  })
  : undefined;
- quickPick.activeItems = activeItem ? [activeItem] : [];
+ if (activeItem) {
+ quickPick.activeItems = [activeItem];
+ }
  }
 
  /**

src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts

@@ -115,9 +115,9 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
  // Do not trigger another refresh if a refresh has previously finished.
  return Promise.resolve();
  }
- refreshPromise = this.startRefresh(query);
+ refreshPromise = this.startRefresh(query).then(() => this.sendTelemetry(query, stopWatch));
  }
- return refreshPromise.then(() => this.sendTelemetry(query, stopWatch));
+ return refreshPromise;
  }
 
  private startRefresh(query: PythonLocatorQuery | undefined): Promise<void> {