Skip to content
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

Disable reloading when changing language servers #18884

Merged
merged 32 commits into from
Apr 18, 2022
Merged

Disable reloading when changing language servers #18884

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b43f2e4
Remove LSFolderService dependency
kimadeline Mar 11, 2022
f6b36cf
No DI proof of concept
kimadeline Mar 17, 2022
41a9900
Add safeguard when connecting/disconnecting
kimadeline Mar 17, 2022
e78d55b
Proper Pylance LS disposal
kimadeline Mar 17, 2022
b2a6d8b
Fix Jedi LS startup/disposal
kimadeline Mar 17, 2022
44308c7
Add cache support
kimadeline Mar 19, 2022
4811fa8
Remove DI decorators + registry activation
kimadeline Mar 19, 2022
df4682f
Do not reload window when Pylance not installed
kimadeline Mar 25, 2022
8bf6fba
Merge branch 'main' into 18509-disable-jedi-pvsc
kimadeline Apr 4, 2022
3c7ca8b
Merge branch 'main' into 18509-disable-jedi-pvsc
kimadeline Apr 5, 2022
dbff16e
Comment/remove unused telemetry
kimadeline Apr 5, 2022
b8e10ca
languageServerCapabilities.unit.test.ts
kimadeline Apr 6, 2022
069ef45
jedi/pylance/none extension managers
kimadeline Apr 7, 2022
fcbb2c5
languageServer/watcher.unit.test.ts
kimadeline Apr 7, 2022
5bbfa63
Fix pylanceLS manager + watcher tests
kimadeline Apr 8, 2022
c021d75
Fix existing tests
kimadeline Apr 8, 2022
3a07460
News entry
kimadeline Apr 8, 2022
ab634c0
Cleanup (comments + unused files) + linting
kimadeline Apr 8, 2022
8577f04
Forgot a file + linting
kimadeline Apr 8, 2022
8ddbcef
Undo language client factory change
kimadeline Apr 8, 2022
3df9996
Stray comment
kimadeline Apr 8, 2022
97bf699
Revert "Undo language client factory change"
kimadeline Apr 8, 2022
a981526
Add 2.7 behaviour + fix linting
kimadeline Apr 8, 2022
e704589
Remove deprecated LS settings
kimadeline Apr 13, 2022
1345fed
Add support for 1 LS per workspace folder
kimadeline Apr 14, 2022
a2cb694
Add tests
kimadeline Apr 15, 2022
ca38b34
Update src/client/languageServer/watcher.ts
kimadeline Apr 18, 2022
b009b91
Add resource path to "starting ls" message
kimadeline Apr 18, 2022
9f5c698
Fix issues with automatically applied change
kimadeline Apr 18, 2022
3dbfb35
Fix issue with get()
kimadeline Apr 18, 2022
48927ae
Only display basename
kimadeline Apr 18, 2022
6e455e2
Amend ILanguageServerExtensionManager comment
kimadeline Apr 18, 2022
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
12 changes: 0 additions & 12 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ src/test/terminals/codeExecution/terminalCodeExec.unit.test.ts
src/test/terminals/codeExecution/codeExecutionManager.unit.test.ts
src/test/terminals/codeExecution/djangoShellCodeExect.unit.test.ts

src/test/activation/activationService.unit.test.ts
src/test/activation/activeResource.unit.test.ts
src/test/activation/node/languageServerChangeHandler.unit.test.ts
src/test/activation/node/activator.unit.test.ts
src/test/activation/extensionSurvey.unit.test.ts

src/test/utils/fs.ts
Expand Down Expand Up @@ -176,18 +173,9 @@ src/client/terminals/codeExecution/djangoContext.ts
src/client/activation/commands.ts
src/client/activation/progress.ts
src/client/activation/extensionSurvey.ts
src/client/activation/common/languageServerChangeHandler.ts
src/client/activation/common/activatorBase.ts
src/client/activation/common/analysisOptions.ts
src/client/activation/refCountedLanguageServer.ts
src/client/activation/languageClientMiddleware.ts
src/client/activation/node/manager.ts
src/client/activation/node/languageServerProxy.ts
src/client/activation/node/languageClientFactory.ts
src/client/activation/node/languageServerFolderService.ts
src/client/activation/node/analysisOptions.ts
src/client/activation/node/activator.ts
src/client/activation/none/activator.ts

src/client/formatters/serviceRegistry.ts
src/client/formatters/helper.ts
Expand Down
1 change: 1 addition & 0 deletions news/1 Enhancements/18509.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Do not require a reload when swapping between language servers.
6 changes: 3 additions & 3 deletions package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@
"LanguageService.extractionCompletedOutputMessage": "Language server download complete",
"LanguageService.extractionDoneOutputMessage": "done",
"LanguageService.reloadVSCodeIfSeachPathHasChanged": "Search paths have changed for this Python interpreter. Please reload the extension to ensure that the IntelliSense works correctly",
"LanguageService.startingPylance": "Starting Pylance language server.",
"LanguageService.startingJedi": "Starting Jedi language server.",
"LanguageService.startingNone": "Editor support is inactive since language server is set to None.",
"LanguageService.startingPylance": "Starting Pylance language server for {0}.",
"LanguageService.startingJedi": "Starting Jedi language server for {0}.",
"LanguageService.startingNone": "Editor support is inactive since language server is set to None for {0}.",
"LanguageService.reloadAfterLanguageServerChange": "Please reload the window switching between language servers.",
"AttachProcess.unsupportedOS": "Operating system '{0}' not supported.",
"AttachProcess.attachTitle": "Attach to process",
Expand Down
2 changes: 0 additions & 2 deletions resources/report_issue_user_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"onDidChange": false,
"defaultInterpreterPath": "placeholder",
"defaultLS": true,
"downloadLanguageServer": true,
"envFile": "placeholder",
"venvPath": "placeholder",
"venvFolders": "placeholder",
Expand All @@ -14,7 +13,6 @@
"devOptions": false,
"disableInstallationChecks": false,
"globalModuleInstallation": false,
"autoUpdateLanguageServer": false,
"languageServer": true,
"languageServerIsDefault": false,
"logging": true,
Expand Down
318 changes: 0 additions & 318 deletions src/client/activation/activationService.ts
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/client/activation/common/defaultlanguageServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { injectable } from 'inversify';
import { PYLANCE_EXTENSION_ID } from '../../common/constants';
import { IDefaultLanguageServer, IExtensions, DefaultLSType } from '../../common/types';
import { IServiceManager } from '../../ioc/types';
import { ILSExtensionApi } from '../node/languageServerFolderService';
import { LanguageServerType } from '../types';

@injectable()
Expand All @@ -29,7 +28,7 @@ export async function setDefaultLanguageServer(
}

async function getDefaultLanguageServer(extensions: IExtensions): Promise<DefaultLSType> {
if (extensions.getExtension<ILSExtensionApi>(PYLANCE_EXTENSION_ID)) {
if (extensions.getExtension(PYLANCE_EXTENSION_ID)) {
return LanguageServerType.Node;
}

Expand Down
Loading