Skip to content

[RFC] watch pyrefly settings #25041

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[RFC] watch pyrefly settings #25041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a23c1e9
watch pyrefly settings
kinto0 May 7, 2025
c59147e
Forcefully restart the server when reacquiring it
rchiodo May 16, 2025
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
22 changes: 10 additions & 12 deletions src/client/languageServer/watcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,34 +164,30 @@ export class LanguageServerWatcher implements IExtensionActivationService, ILang
// We only need to instantiate the language server once, even in multiroot workspace scenarios,
// so we only need one language server extension manager.
const key = this.getWorkspaceKey(resource, serverType);
const languageServer = this.workspaceLanguageServers.get(key);
if ((serverType === LanguageServerType.Node || serverType === LanguageServerType.None) && languageServer) {
logStartup(serverType, lsResource);
return languageServer;
let languageServer = this.workspaceLanguageServers.get(key);
if (!languageServer || serverType === LanguageServerType.Jedi || serverType === LanguageServerType.JediLSP) {
languageServer = this.createLanguageServer(serverType);
this.workspaceLanguageServers.set(key, languageServer);
}

// Instantiate the language server extension manager.
const languageServerExtensionManager = this.createLanguageServer(serverType);
this.workspaceLanguageServers.set(key, languageServerExtensionManager);

if (languageServerExtensionManager.canStartLanguageServer(interpreter)) {
if (languageServer.canStartLanguageServer(interpreter)) {
// Start the language server.
if (startupStopWatch) {
// It means that startup is triggering this code, track time it takes since startup to activate this code.
sendTelemetryEvent(EventName.LANGUAGE_SERVER_TRIGGER_TIME, startupStopWatch.elapsedTime, {
triggerTime: startupStopWatch.elapsedTime,
});
}
await languageServerExtensionManager.startLanguageServer(lsResource, interpreter);
await languageServer.startLanguageServer(lsResource, interpreter);

logStartup(languageServerType, lsResource);
this.languageServerType = languageServerType;
this.workspaceInterpreters.set(lsResource.fsPath, interpreter);
} else {
await languageServerExtensionManager.languageServerNotAvailable();
await languageServer.languageServerNotAvailable();
}

return languageServerExtensionManager;
return languageServer;
}

public async restartLanguageServers(): Promise<void> {
Expand Down Expand Up @@ -297,6 +293,8 @@ export class LanguageServerWatcher implements IExtensionActivationService, ILang
await this.refreshLanguageServer(resource);
} else if (event.affectsConfiguration(`python.analysis.pylanceLspClientEnabled`, resource)) {
await this.refreshLanguageServer(resource, /* forced */ true);
} else if (event.affectsConfiguration(`python.pyrefly.disableLanguageServices`, resource)) {
await this.refreshLanguageServer(resource);
}
});
}
Expand Down