Skip to content

Manually send didConfigurationChange on interpreter change #12366

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 2 commits into from
Jun 16, 2020
Merged

Manually send didConfigurationChange on interpreter change #12366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3aef52
Manually send didConfigurationChange on interpreter change
jakebailey Jun 15, 2020
8fdc316
Use DI
jakebailey Jun 16, 2020
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
28 changes: 25 additions & 3 deletions src/client/activation/node/languageServerProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
import '../../common/extensions';

import { inject, injectable } from 'inversify';
import { Disposable, LanguageClient, LanguageClientOptions } from 'vscode-languageclient';
import {
DidChangeConfigurationNotification,
Disposable,
LanguageClient,
LanguageClientOptions
} from 'vscode-languageclient';

import { DeprecatePythonPath } from '../../common/experiments/groups';
import { traceDecorators, traceError } from '../../common/logger';
import { IConfigurationService, Resource } from '../../common/types';
import { IConfigurationService, IExperimentsManager, IInterpreterPathService, Resource } from '../../common/types';
import { createDeferred, Deferred, sleep } from '../../common/utils/async';
import { swallowExceptions } from '../../common/utils/decorators';
import { noop } from '../../common/utils/misc';
Expand All @@ -32,7 +38,9 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
@inject(ILanguageClientFactory) private readonly factory: ILanguageClientFactory,
@inject(ITestManagementService) private readonly testManager: ITestManagementService,
@inject(IConfigurationService) private readonly configurationService: IConfigurationService,
@inject(ILanguageServerFolderService) private readonly folderService: ILanguageServerFolderService
@inject(ILanguageServerFolderService) private readonly folderService: ILanguageServerFolderService,
@inject(IExperimentsManager) private readonly experiments: IExperimentsManager,
@inject(IInterpreterPathService) private readonly interpreterPathService: IInterpreterPathService
) {
this.startupCompleted = createDeferred<void>();
}
Expand Down Expand Up @@ -95,6 +103,20 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
const progressReporting = new ProgressReporting(this.languageClient!);
this.disposables.push(progressReporting);

if (this.experiments.inExperiment(DeprecatePythonPath.experiment)) {
this.disposables.push(
this.interpreterPathService.onDidChange(() => {
// Manually send didChangeConfiguration in order to get the server to requery
// the workspace configurations (to then pick up pythonPath set in the middleware).
// This is needed as interpreter changes via the interpreter path service happen
// outside of VS Code's settings (which would mean VS Code sends the config updates itself).
this.languageClient!.sendNotification(DidChangeConfigurationNotification.type, {
settings: null
});
})
);
}

const settings = this.configurationService.getSettings(resource);
if (settings.downloadLanguageServer) {
this.languageClient.onTelemetry((telemetryEvent) => {
Expand Down