zashed
diff --git a/‎src/client/application/diagnostics/checks/jediPython27NotSupported.ts‎
Lines changed: 9 additions & 4 deletions b/‎src/client/application/diagnostics/checks/jediPython27NotSupported.ts‎
Lines changed: 9 additions & 4 deletions
@@ -48,6 +48,8 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe
         const interpreter = await this.interpreterService.getActiveInterpreter(resource);
         const { languageServer } = this.configurationService.getSettings(resource);
 
+        await this.updateLanguageServerSetting(resource);
+
         // We don't need to check for JediLSP here, because we retrieve the setting from the configuration service,
         // Which already switched the JediLSP option to Jedi.
         if (interpreter && (interpreter.version?.major ?? 0) < 3 && languageServer === LanguageServerType.Jedi) {
@@ -66,8 +68,6 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe
             return;
         }
 
-        this.updateLanguageServerSetting(diagnostic.resource);
-
         const commandFactory = this.serviceContainer.get<IDiagnosticsCommandFactory>(IDiagnosticsCommandFactory);
         const options = [
             {
@@ -82,7 +82,7 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe
         await this.messageService.handle(diagnostic, { commandPrompts: options });
     }
 
-    private updateLanguageServerSetting(resource: Resource): void {
+    private async updateLanguageServerSetting(resource: Resource): Promise<void | undefined> {
         // Update settings.json value to Jedi if it's JediLSP.
         const settings = this.workspaceService
             .getConfiguration('python', resource)
@@ -98,6 +98,11 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe
             return;
         }
 
-        this.configurationService.updateSetting('languageServer', LanguageServerType.Jedi, resource, configTarget);
+        await this.configurationService.updateSetting(
+            'languageServer',
+            LanguageServerType.Jedi,
+            resource,
+            configTarget,
+        );
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe`
`48`	`48`	`const interpreter = await this.interpreterService.getActiveInterpreter(resource);`
`49`	`49`	`const { languageServer } = this.configurationService.getSettings(resource);`
`50`	`50`
	`51`	`+ await this.updateLanguageServerSetting(resource);`
	`52`	`+`
`51`	`53`	`// We don't need to check for JediLSP here, because we retrieve the setting from the configuration service,`
`52`	`54`	`// Which already switched the JediLSP option to Jedi.`
`53`	`55`	`if (interpreter && (interpreter.version?.major ?? 0) < 3 && languageServer === LanguageServerType.Jedi) {`
`@@ -66,8 +68,6 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe`
`66`	`68`	`return;`
`67`	`69`	`}`
`68`	`70`
`69`		`- this.updateLanguageServerSetting(diagnostic.resource);`
`70`		`-`
`71`	`71`	`const commandFactory = this.serviceContainer.get<IDiagnosticsCommandFactory>(IDiagnosticsCommandFactory);`
`72`	`72`	`const options = [`
`73`	`73`	`{`
`@@ -82,7 +82,7 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe`
`82`	`82`	`await this.messageService.handle(diagnostic, { commandPrompts: options });`
`83`	`83`	`}`
`84`	`84`
`85`		`- private updateLanguageServerSetting(resource: Resource): void {`
	`85`	`+ private async updateLanguageServerSetting(resource: Resource): Promise<void \| undefined> {`
`86`	`86`	`// Update settings.json value to Jedi if it's JediLSP.`
`87`	`87`	`const settings = this.workspaceService`
`88`	`88`	`.getConfiguration('python', resource)`
`@@ -98,6 +98,11 @@ export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsSe`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`	`100`
`101`		`- this.configurationService.updateSetting('languageServer', LanguageServerType.Jedi, resource, configTarget);`
	`101`	`+ await this.configurationService.updateSetting(`
	`102`	`+ 'languageServer',`
	`103`	`+ LanguageServerType.Jedi,`
	`104`	`+ resource,`
	`105`	`+ configTarget,`
	`106`	`+ );`
`102`	`107`	`}`
`103`	`108`	`}`