Skip to content

Register Jedi regardless of what language server is configured #15452

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
Feb 19, 2021
Merged

Register Jedi regardless of what language server is configured #15452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
170daaf
Register Jedi regardless of what language server is configured
Feb 18, 2021
51a9c4b
News entry
Feb 18, 2021
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
1 change: 1 addition & 0 deletions news/2 Fixes/15452.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Register Jedi regardless of what language server is configured.
1 change: 1 addition & 0 deletions src/client/activation/activationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ export class LanguageServerExtensionActivationService
if (serverType === LanguageServerType.Jedi) {
throw ex;
}
traceError(ex);
this.output.appendLine(LanguageService.lsFailedToStart());
serverType = LanguageServerType.Jedi;
server = this.serviceContainer.get<ILanguageServerActivator>(ILanguageServerActivator, serverType);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Voila

Expand Down
11 changes: 5 additions & 6 deletions src/client/activation/serviceRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,6 @@ export function registerTypes(serviceManager: IServiceManager, languageServerTyp
ILanguageServerFolderService,
NodeLanguageServerFolderService,
);
} else if (languageServerType === LanguageServerType.Jedi) {
serviceManager.add<ILanguageServerActivator>(
ILanguageServerActivator,
JediExtensionActivator,
LanguageServerType.Jedi,
);
} else if (languageServerType === LanguageServerType.JediLSP) {
serviceManager.add<ILanguageServerActivator>(
ILanguageServerActivator,
Expand All @@ -165,6 +159,11 @@ export function registerTypes(serviceManager: IServiceManager, languageServerTyp
LanguageServerType.None,
);
}
serviceManager.add<ILanguageServerActivator>(
ILanguageServerActivator,
JediExtensionActivator,
LanguageServerType.Jedi,
); // We fallback to Jedi if for some reason we're unable to use other language servers, hence register this always.

serviceManager.addSingleton<IDownloadChannelRule>(
IDownloadChannelRule,
Expand Down
8 changes: 8 additions & 0 deletions src/test/activation/serviceRegistry.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { DownloadBetaChannelRule, DownloadDailyChannelRule } from '../../client/
import { LanguageServerDownloader } from '../../client/activation/common/downloader';
import { LanguageServerDownloadChannel } from '../../client/activation/common/packageRepository';
import { ExtensionSurveyPrompt } from '../../client/activation/extensionSurvey';
import { JediExtensionActivator } from '../../client/activation/jedi';
import { DotNetLanguageServerActivator } from '../../client/activation/languageServer/activator';
import { DotNetLanguageServerAnalysisOptions } from '../../client/activation/languageServer/analysisOptions';
import { DotNetLanguageClientFactory } from '../../client/activation/languageServer/languageClientFactory';
Expand Down Expand Up @@ -161,6 +162,13 @@ suite('Unit Tests - Language Server Activation Service Registry', () => {
LanguageServerType.Microsoft,
),
).once();
verify(
serviceManager.add<ILanguageServerActivator>(
ILanguageServerActivator,
JediExtensionActivator,
LanguageServerType.Jedi,
),
).once();
verify(serviceManager.add<ILanguageServerProxy>(ILanguageServerProxy, DotNetLanguageServerProxy)).once();
verify(serviceManager.add<ILanguageServerManager>(ILanguageServerManager, DotNetLanguageServerManager)).once();
verify(
Expand Down