Skip to content

Cherry pick "Wait for pylance instead of failing in the browser" #17036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2021
Merged

Cherry pick "Wait for pylance instead of failing in the browser" #17036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/client/browser/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,28 @@ interface BrowserConfig {

export async function activate(context: vscode.ExtensionContext): Promise<void> {
// Run in a promise and return early so that VS Code can go activate Pylance.
runPylance(context);
}

async function runPylance(context: vscode.ExtensionContext): Promise<void> {
const pylanceExtension = vscode.extensions.getExtension<ILSExtensionApi>(PYLANCE_EXTENSION_ID);
const pylanceApi = await pylanceExtension?.activate();
if (!pylanceApi?.languageServerFolder) {
if (pylanceExtension) {
runPylance(context, pylanceExtension);
return;
}

const changeDisposable = vscode.extensions.onDidChange(() => {
const newPylanceExtension = vscode.extensions.getExtension<ILSExtensionApi>(PYLANCE_EXTENSION_ID);
if (newPylanceExtension) {
changeDisposable.dispose();
runPylance(context, newPylanceExtension);
}
});
}

async function runPylance(
context: vscode.ExtensionContext,
pylanceExtension: vscode.Extension<ILSExtensionApi>,
): Promise<void> {
const pylanceApi = await pylanceExtension.activate();
if (!pylanceApi.languageServerFolder) {
throw new Error('Could not find Pylance extension');
}

Expand Down