Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 20 additions & 2 deletions src/language_server_protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use lsp_types::{
CodeActionContext, CodeActionKind, CodeActionKindLiteralSupport, CodeActionLiteralSupport,
CodeActionOrCommand, CodeActionParams, CodeActionResponse, CodeLens, Command,
CompletionCapability, CompletionItem, CompletionItemCapability, CompletionResponse,
CompletionTextEdit, Diagnostic, DiagnosticSeverity, DidChangeConfigurationParams,
DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
CompletionTextEdit, ConfigurationParams, Diagnostic, DiagnosticSeverity,
DidChangeConfigurationParams, DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
DidChangeWatchedFilesRegistrationOptions, DidCloseTextDocumentParams,
DidOpenTextDocumentParams, DidSaveTextDocumentParams, DocumentChangeOperation, DocumentChanges,
DocumentFormattingParams, DocumentHighlight, DocumentHighlightKind,
Expand Down Expand Up @@ -963,6 +963,7 @@ impl LanguageClient {
}),
workspace: Some(WorkspaceClientCapabilities {
apply_edit: Some(true),
configuration: Some(true),
did_change_watched_files: Some(GenericCapability {
dynamic_registration: Some(true),
}),
Expand Down Expand Up @@ -1791,6 +1792,23 @@ impl LanguageClient {
Ok(())
}

pub fn workspace_configuration(&self, params: &Value) -> Result<Value> {
let config_params = ConfigurationParams::deserialize(params)?;

let settings = self.get_state(|state| state.initialization_options.clone())?;

let configuration_items = config_params
.items
.into_iter()
.filter_map(|item| {
let section = format!("/{}", item.section?.replace(".", "/"));
settings.pointer(&section).cloned()
})
.collect::<Value>();

Ok(configuration_items)
}

pub fn handle_code_lens_action(&self, params: &Value) -> Result<Value> {
let filename = self.vim()?.get_filename(params)?;
let line = self.vim()?.get_position(params)?.line;
Expand Down
1 change: 1 addition & 0 deletions src/rpchandler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ impl LanguageClient {
request::Rename::METHOD => self.text_document_rename(&params),
request::DocumentSymbolRequest::METHOD => self.text_document_document_symbol(&params),
request::ShowMessageRequest::METHOD => self.window_show_message_request(&params),
request::WorkspaceConfiguration::METHOD => self.workspace_configuration(&params),
request::WorkspaceSymbol::METHOD => self.workspace_symbol(&params),
request::CodeActionRequest::METHOD => self.text_document_code_action(&params),
request::Completion::METHOD => self.text_document_completion(&params),
Expand Down