Skip to content

Commit f8ee70f

Browse files
committed
Make sure to leave the loop if switching works. (#9239)
1 parent c33e872 commit f8ee70f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/client/datascience/interactive-common/interactiveBase.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,10 +1323,10 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
13231323
await this.switchKernelWithRetry(kernel);
13241324
}
13251325
}
1326-
private async switchKernelWithRetry(kernel: KernelSpecInterpreter){
1326+
private async switchKernelWithRetry(kernel: KernelSpecInterpreter) {
13271327
const settings = this.configuration.getSettings();
13281328
const isLocalConnection = this.notebook?.server.getConnectionInfo()?.localLaunch ?? settings.datascience.jupyterServerURI.toLowerCase() === Settings.JupyterServerLocalLaunch;
1329-
if (!isLocalConnection){
1329+
if (!isLocalConnection) {
13301330
return this.switchKernel(kernel);
13311331
}
13321332

@@ -1337,6 +1337,7 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
13371337
while (true) {
13381338
try {
13391339
await this.switchKernel(kernel);
1340+
break;
13401341
} catch (ex) {
13411342
if (ex instanceof JupyterSessionStartError && isLocalConnection) {
13421343
// Looks like we were unable to start a session for the local connection.
@@ -1349,7 +1350,7 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
13491350
const selection = await this.applicationShell.showErrorMessage(message, selectKernel, cancel);
13501351
if (selection === selectKernel) {
13511352
kernel = await this.dataScience.selectLocalJupyterKernel(kernel.kernelSpec || kernel.kernelModel);
1352-
if (Object.keys(kernel).length > 0){
1353+
if (Object.keys(kernel).length > 0) {
13531354
continue;
13541355
}
13551356
}

0 commit comments

Comments
 (0)