From 5e99a59f8d246c51e6359366e10a27fda14c24ad Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 29 Sep 2026 17:05:29 +0200 Subject: [PATCH] feat: reload LSP configuration --- src/lsp.rs | 39 +++++++++++++++++++++++++++++++++------ tasks.md | 2 +- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/lsp.rs b/src/lsp.rs index 048d0fd..4e629a5 100644 --- a/src/lsp.rs +++ b/src/lsp.rs @@ -9,10 +9,11 @@ use tower_lsp_server::{ ls_types::{ CodeAction, CodeActionKind, CodeActionOptions, CodeActionOrCommand, CodeActionParams, CodeActionProviderCapability, CodeActionResponse, Diagnostic, DiagnosticSeverity, - DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams, - DocumentChanges, InitializeParams, InitializeResult, InitializedParams, NumberOrString, - OneOf, OptionalVersionedTextDocumentIdentifier, Position, Range, ServerCapabilities, - ServerInfo, TextDocumentEdit, TextDocumentSyncCapability, TextDocumentSyncKind, + DidChangeConfigurationParams, DidChangeTextDocumentParams, DidCloseTextDocumentParams, + DidOpenTextDocumentParams, DocumentChanges, InitializeParams, InitializeResult, + InitializedParams, MessageType, NumberOrString, OneOf, + OptionalVersionedTextDocumentIdentifier, Position, Range, ServerCapabilities, ServerInfo, + TextDocumentEdit, TextDocumentSyncCapability, TextDocumentSyncKind, TextEdit as LspTextEdit, Uri, WorkspaceEdit, }, }; @@ -254,13 +255,19 @@ impl DocumentStore { fn get(&self, uri: &Uri) -> Option { self.documents.get(uri).cloned() } + + fn uris(&self) -> Vec { + let mut uris = self.documents.keys().cloned().collect::>(); + uris.sort(); + uris + } } /// Stdio LSP backend backed by authoritative snapshots of open documents. #[derive(Debug)] pub struct LspBackend { client: Client, - _config_loader: ConfigLoader, + config_loader: ConfigLoader, config: RwLock, documents: RwLock, } @@ -270,7 +277,7 @@ impl LspBackend { pub fn new(client: Client, config_loader: ConfigLoader, config: Config) -> Self { Self { client, - _config_loader: config_loader, + config_loader, config: RwLock::new(config), documents: RwLock::new(DocumentStore::default()), } @@ -347,6 +354,26 @@ impl LanguageServer for LspBackend { self.client.publish_diagnostics(uri, Vec::new(), None).await; } + async fn did_change_configuration(&self, _: DidChangeConfigurationParams) { + let config = match self.config_loader.load() { + Ok(config) => config, + Err(error) => { + self.client + .show_message( + MessageType::ERROR, + format!("John Slop configuration reload failed: {error}"), + ) + .await; + return; + } + }; + *self.config.write().await = config; + let uris = self.documents.read().await.uris(); + for uri in uris { + self.publish_replacements(uri).await; + } + } + async fn code_action( &self, params: CodeActionParams, diff --git a/tasks.md b/tasks.md index 4eaa4ce..7b7bacf 100644 --- a/tasks.md +++ b/tasks.md @@ -199,7 +199,7 @@ first formatter milestone tag. initial release. Include stable codes and source `john-slop`. - [x] Expose quick fixes/code actions using the exact edits from the shared replacement engine; reject stale-version requests. -- [ ] Recompute after open/change/configuration updates, clear on close, and avoid +- [x] Recompute after open/change/configuration updates, clear on close, and avoid publishing obsolete results when analysis overlaps newer edits. - [ ] Keep all protocol bytes on stdout and diagnostics/logging on stderr. Add opt-in structured logging without document contents.