Skip to content

Commit

Permalink
Return early if Python version check fails (#517)
Browse files Browse the repository at this point in the history
## Summary

This is a follow-up from #516 and adopted from
microsoft/vscode-python-tools-extension-template@723f297.

## Test Plan

Same test plan as #516 but validate that the script failure doesn't
occur now that we exit early.
  • Loading branch information
dhruvmanila authored Jul 5, 2024
1 parent 50e9053 commit e665ec7
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,21 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
restartInProgress = true;

const interpreter = getInterpreterFromSetting(serverId);
if (
interpreter !== undefined &&
interpreter.length > 0 &&
checkVersion(await resolveInterpreter(interpreter))
) {
traceVerbose(
`Using interpreter from ${serverInfo.module}.interpreter: ${interpreter.join(" ")}`,
);
lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);
if (interpreter !== undefined && interpreter.length > 0) {
if (checkVersion(await resolveInterpreter(interpreter))) {
traceVerbose(
`Using interpreter from ${serverInfo.module}.interpreter: ${interpreter.join(" ")}`,
);
lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);

restartInProgress = false;
if (restartQueued) {
restartQueued = false;
await runServer();
restartInProgress = false;
if (restartQueued) {
restartQueued = false;
await runServer();
}
}

restartInProgress = false;
return;
}

Expand Down

0 comments on commit e665ec7

Please sign in to comment.