Skip to content

Ensure languageServer value is valid, send event during activate #13064

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 5 commits into from
Jul 21, 2020
Merged

Ensure languageServer value is valid, send event during activate #13064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7539e9a
Ensure languageServer value is valid, send event during activate
jakebailey Jul 21, 2020
86a9240
Tweak code to only assign this.languageServer once
jakebailey Jul 21, 2020
02012d4
Fix enum membership check
jakebailey Jul 21, 2020
20958c9
Fix tests
jakebailey Jul 21, 2020
ee47e39
Just use enum value as test name
jakebailey Jul 21, 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
3 changes: 2 additions & 1 deletion src/client/activation/activationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ export class LanguageServerExtensionActivationService
// Configuration is non-default, so `languageServer` should be present.
const configurationService = this.serviceContainer.get<IConfigurationService>(IConfigurationService);
const lstType = configurationService.getSettings(this.resource).languageServer;
this.sendTelemetryForChosenLanguageServer(lstType).ignoreErrors();
return lstType === LanguageServerType.Jedi;
}

Expand Down Expand Up @@ -253,6 +252,8 @@ export class LanguageServerExtensionActivationService
break;
}

this.sendTelemetryForChosenLanguageServer(serverType).ignoreErrors();

await this.logStartup(serverType);
let server = this.serviceContainer.get<ILanguageServerActivator>(ILanguageServerActivator, serverType);
try {
Expand Down
7 changes: 4 additions & 3 deletions src/client/common/configSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,12 @@ export class PythonSettings implements IPythonSettings {
pythonSettings.get<boolean>('autoUpdateLanguageServer', true)
)!;

let ls = pythonSettings.get<LanguageServerType>('languageServer');
if (!ls) {
let ls = pythonSettings.get<LanguageServerType>('languageServer') ?? LanguageServerType.Jedi;
ls = systemVariables.resolveAny(ls);
if (!Object.values(LanguageServerType).includes(ls)) {
ls = LanguageServerType.Jedi;
}
this.languageServer = systemVariables.resolveAny(ls)!;
this.languageServer = ls;

// tslint:disable-next-line:no-backbone-get-set-outside-model no-non-null-assertion
this.jediPath = systemVariables.resolveAny(pythonSettings.get<string>('jediPath'))!;
Expand Down
25 changes: 25 additions & 0 deletions src/test/common/configSettings/configSettings.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,31 @@ suite('Python Settings', async () => {
config.verifyAll();
});

function testLanguageServer(languageServer: LanguageServerType, expectedValue: LanguageServerType) {
test(languageServer, () => {
expected.pythonPath = 'python3';
expected.languageServer = languageServer;
initializeConfig(expected);
config
.setup((c) => c.get<LanguageServerType>('languageServer'))
.returns(() => expected.languageServer)
.verifiable(TypeMoq.Times.once());

settings.update(config.object);

expect(settings.languageServer).to.be.equal(expectedValue);
config.verifyAll();
});
}

suite('languageServer settings', async () => {
Object.values(LanguageServerType).forEach(async (languageServer) => {
testLanguageServer(languageServer, languageServer);
});

testLanguageServer('invalid' as LanguageServerType, LanguageServerType.Jedi);
});

function testExperiments(enabled: boolean) {
expected.pythonPath = 'python3';
// tslint:disable-next-line:no-any
Expand Down