Wait for config to be ready before accessing values (#3799)

iterative · May 2, 2023 · 695719e · 695719e
1 parent c8916ee
commit 695719e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/extension/src/config.ts b/extension/src/config.ts
@@ -57,13 +57,14 @@ export class Config extends DeferredDisposable {
   }
 
   public async setPythonBinPath() {
-    this.pythonBinPath = await this.getConfigOrExtensionPythonBinPath()
-    return this.deferred.resolve()
+    const pythonBinPath = await this.getConfigOrExtensionPythonBinPath()
+    this.pythonBinPath = pythonBinPath
+    this.deferred.resolve()
   }
 
   public async setPythonAndNotifyIfChanged() {
     const oldPath = this.pythonBinPath
-    this.pythonBinPath = await this.getConfigOrExtensionPythonBinPath()
+    await this.setPythonBinPath()
     this.notifyIfChanged(oldPath, this.pythonBinPath)
   }
 

diff --git a/extension/src/setup/index.ts b/extension/src/setup/index.ts
@@ -374,7 +374,8 @@ export class Setup
     return this.sendDataToWebview()
   }
 
-  public getDvcCliDetails(): DvcCliDetails {
+  private async getDvcCliDetails(): Promise<DvcCliDetails> {
+    await this.config.isReady()
     const dvcPath = this.config.getCliPath()
     const pythonBinPath = this.config.getPythonBinPath()
     const cwd = getFirstWorkspaceFolder()
@@ -389,18 +390,14 @@ export class Setup
     }
   }
 
-  private isDVCBeingUsedGlobally() {
-    const dvcPath = this.config.getCliPath()
-    const pythonBinPath = this.config.getPythonBinPath()
-
-    return dvcPath || !pythonBinPath
-  }
-
   private async sendDataToWebview() {
     const projectInitialized = this.hasRoots()
     const hasData = this.getHasData()
 
-    const isPythonExtensionUsed = await this.isPythonExtensionUsed()
+    const [isPythonExtensionUsed, dvcCliDetails] = await Promise.all([
+      this.isPythonExtensionUsed(),
+      this.getDvcCliDetails()
+    ])
 
     const needsGitInitialized =
       !projectInitialized && !!(await this.needsGitInit())
@@ -415,10 +412,9 @@ export class Setup
     this.webviewMessages.sendWebviewMessage({
       canGitInitialize,
       cliCompatible: this.getCliCompatible(),
-      dvcCliDetails: this.getDvcCliDetails(),
+      dvcCliDetails,
       hasData,
-      isPythonExtensionUsed:
-        !this.isDVCBeingUsedGlobally() && isPythonExtensionUsed,
+      isPythonExtensionUsed,
       isStudioConnected: this.studioIsConnected,
       needsGitCommit,
       needsGitInitialized,

diff --git a/extension/src/test/suite/setup/index.test.ts b/extension/src/test/suite/setup/index.test.ts
@@ -577,7 +577,7 @@ suite('Setup Test Suite', () => {
       mockExecuteCommand.restore()
       mockRunSetup.restore()
       stub(config, 'isPythonExtensionUsed').returns(false)
-      stub(config, 'getPythonBinPath').resolves(join('python'))
+      stub(config, 'getPythonBinPath').returns(join('python'))
 
       mockVersion.resetBehavior()
       mockVersion