Skip to content

Commit dceec61

Browse files
bors[bot]matklad
andauthored
Merge #5210
5210: Fix workspace reloading r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
2 parents f5a4a4b + b8ef853 commit dceec61

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

crates/rust-analyzer/src/config.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
1010
use std::{ffi::OsString, path::PathBuf};
1111

12-
use crate::diagnostics::DiagnosticsConfig;
1312
use flycheck::FlycheckConfig;
1413
use lsp_types::ClientCapabilities;
1514
use ra_db::AbsPathBuf;
1615
use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
1716
use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
1817
use serde::Deserialize;
1918

19+
use crate::diagnostics::DiagnosticsConfig;
20+
2021
#[derive(Debug, Clone)]
2122
pub struct Config {
2223
pub client_caps: ClientCapsConfig,
@@ -182,8 +183,10 @@ impl Config {
182183
log::info!("Config::update({:#})", value);
183184

184185
let client_caps = self.client_caps.clone();
186+
let linked_projects = self.linked_projects.clone();
185187
*self = Config::new(self.root_path.clone());
186188
self.client_caps = client_caps;
189+
self.linked_projects = linked_projects;
187190

188191
set(value, "/withSysroot", &mut self.with_sysroot);
189192
set(value, "/diagnostics/enable", &mut self.publish_diagnostics);

0 commit comments

Comments
 (0)