Skip to content

Fix workspace reloading #5210

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

Merged
merged 1 commit into from
Jul 3, 2020
Merged

Fix workspace reloading #5210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion crates/rust-analyzer/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@

use std::{ffi::OsString, path::PathBuf};

use crate::diagnostics::DiagnosticsConfig;
use flycheck::FlycheckConfig;
use lsp_types::ClientCapabilities;
use ra_db::AbsPathBuf;
use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
use serde::Deserialize;

use crate::diagnostics::DiagnosticsConfig;

#[derive(Debug, Clone)]
pub struct Config {
pub client_caps: ClientCapsConfig,
Expand Down Expand Up @@ -182,8 +183,10 @@ impl Config {
log::info!("Config::update({:#})", value);

let client_caps = self.client_caps.clone();
let linked_projects = self.linked_projects.clone();
*self = Config::new(self.root_path.clone());
self.client_caps = client_caps;
self.linked_projects = linked_projects;

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