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.

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

Try to extract config when using multiple servers #1011

Merged
merged 1 commit into from
Feb 2, 2024
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Fixed

- When `workspace/didChangeConfiguration` contains the configuration of multiple LSP servers, `texlab` will try
to extract the `texlab` configuration instead of falling back to the default settings
([#1003](https://github.com/latex-lsp/texlab/issues/1003))

## [5.12.3] - 2024-01-27

### Fixed
Expand Down
10 changes: 8 additions & 2 deletions crates/texlab/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,14 @@ impl LspClient {
Ok(())
}

pub fn parse_options(&self, value: serde_json::Value) -> Result<Options> {
let options = match serde_json::from_value(value) {
pub fn parse_options(&self, mut value: serde_json::Value) -> Result<Options> {
// if there are multiple servers, we need to extract the options for texlab first
let options = match value.get_mut("texlab") {
Some(section) => section.take(),
None => value,
};

let options = match serde_json::from_value(options) {
Ok(new_options) => new_options,
Err(why) => {
let message = format!(
Expand Down
Loading