Skip to content

Commit d726854

Browse files
VeykrilVeykril
committed
Fix file loading of r-a toml files
1 parent 003106c commit d726854

File tree

3 files changed

+37
-90
lines changed

3 files changed

+37
-90
lines changed

‎src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -902,10 +902,10 @@ impl Config {
902902

903903
#[derive(Default, Debug)]
904904
pub struct ConfigChange {
905-
user_config_change: Option<String>,
906-
root_ratoml_change: Option<String>,
905+
user_config_change: Option<Arc<str>>,
906+
root_ratoml_change: Option<Arc<str>>,
907907
client_config_change: Option<serde_json::Value>,
908-
ratoml_file_change: Option<FxHashMap<SourceRootId, (VfsPath, Option<String>)>>,
908+
ratoml_file_change: Option<FxHashMap<SourceRootId, (VfsPath, Option<Arc<str>>)>>,
909909
source_map_change: Option<Arc<FxHashMap<SourceRootId, SourceRootId>>>,
910910
}
911911

@@ -914,19 +914,19 @@ impl ConfigChange {
914914
&mut self,
915915
source_root: SourceRootId,
916916
vfs_path: VfsPath,
917-
content: Option<String>,
918-
) -> Option<(VfsPath, Option<String>)> {
917+
content: Option<Arc<str>>,
918+
) -> Option<(VfsPath, Option<Arc<str>>)> {
919919
self.ratoml_file_change
920920
.get_or_insert_with(Default::default)
921921
.insert(source_root, (vfs_path, content))
922922
}
923923

924-
pub fn change_user_config(&mut self, content: Option<String>) {
924+
pub fn change_user_config(&mut self, content: Option<Arc<str>>) {
925925
assert!(self.user_config_change.is_none()); // Otherwise it is a double write.
926926
self.user_config_change = content;
927927
}
928928

929-
pub fn change_root_ratoml(&mut self, content: Option<String>) {
929+
pub fn change_root_ratoml(&mut self, content: Option<Arc<str>>) {
930930
assert!(self.user_config_change.is_none()); // Otherwise it is a double write.
931931
self.root_ratoml_change = content;
932932
}
@@ -1206,8 +1206,7 @@ impl Config {
12061206
client_config: (FullConfigInput::default(), ConfigErrors(vec![])),
12071207
user_config: None,
12081208
ratoml_files: FxHashMap::default(),
1209-
default_config: DEFAULT_CONFIG_DATA
1210-
.get_or_init(|| Box::leak(Box::new(DefaultConfigData::default()))),
1209+
default_config: DEFAULT_CONFIG_DATA.get_or_init(|| Box::leak(Box::default())),
12111210
source_root_parent_map: Arc::new(FxHashMap::default()),
12121211
user_config_path,
12131212
root_ratoml: None,
@@ -3548,7 +3547,8 @@ mod tests {
35483547
[cargo.sysroot]
35493548
non-table = "expected"
35503549
}
3551-
.to_string(),
3550+
.to_string()
3551+
.into(),
35523552
));
35533553

35543554
let (config, e, _) = config.apply_change(change);
@@ -3582,9 +3582,9 @@ mod tests {
35823582
be = "be"
35833583
valid = "valid"
35843584
}
3585-
.to_string(),
3585+
.to_string()
3586+
.into(),
35863587
));
3587-
35883588
let (_, e, _) = config.apply_change(change);
35893589
expect_test::expect![[r#"
35903590
ConfigErrors(

‎src/tools/rust-analyzer/crates/rust-analyzer/src/global_state.rs

+23-38
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use project_model::{
2525
use rustc_hash::{FxHashMap, FxHashSet};
2626
use tracing::{span, Level};
2727
use triomphe::Arc;
28-
use vfs::{AnchoredPathBuf, Vfs, VfsPath};
28+
use vfs::{AnchoredPathBuf, ChangeKind, Vfs};
2929

3030
use crate::{
3131
config::{Config, ConfigChange, ConfigErrors},
@@ -262,19 +262,9 @@ impl GlobalState {
262262
// that can be used by the config module because config talks
263263
// in `SourceRootId`s instead of `FileId`s and `FileId` -> `SourceRootId`
264264
// mapping is not ready until `AnalysisHost::apply_changes` has been called.
265-
let mut modified_ratoml_files: FxHashMap<FileId, vfs::VfsPath> = FxHashMap::default();
266-
let mut ratoml_text_map: FxHashMap<FileId, (vfs::VfsPath, Option<String>)> =
265+
let mut modified_ratoml_files: FxHashMap<FileId, (ChangeKind, vfs::VfsPath)> =
267266
FxHashMap::default();
268267

269-
let mut user_config_file: Option<Option<String>> = None;
270-
let mut root_path_ratoml: Option<Option<String>> = None;
271-
272-
let root_vfs_path = {
273-
let mut root_vfs_path = self.config.root_path().to_path_buf();
274-
root_vfs_path.push("rust-analyzer.toml");
275-
VfsPath::new_real_path(root_vfs_path.to_string())
276-
};
277-
278268
let (change, modified_rust_files, workspace_structure_change) = {
279269
let mut change = ChangeWithProcMacros::new();
280270
let mut guard = self.vfs.write();
@@ -296,7 +286,7 @@ impl GlobalState {
296286
let vfs_path = vfs.file_path(file.file_id);
297287
if let Some(("rust-analyzer", Some("toml"))) = vfs_path.name_and_extension() {
298288
// Remember ids to use them after `apply_changes`
299-
modified_ratoml_files.insert(file.file_id, vfs_path.clone());
289+
modified_ratoml_files.insert(file.file_id, (file.kind(), vfs_path.clone()));
300290
}
301291

302292
if let Some(path) = vfs_path.as_path() {
@@ -344,17 +334,7 @@ impl GlobalState {
344334
Some(text)
345335
}
346336
};
347-
348-
change.change_file(file_id, text.clone());
349-
if let Some(vfs_path) = modified_ratoml_files.get(&file_id) {
350-
if vfs_path == self.config.user_config_path() {
351-
user_config_file = Some(text);
352-
} else if vfs_path == &root_vfs_path {
353-
root_path_ratoml = Some(text);
354-
} else {
355-
ratoml_text_map.insert(file_id, (vfs_path.clone(), text));
356-
}
357-
}
337+
change.change_file(file_id, text);
358338
});
359339
if has_structure_changes {
360340
let roots = self.source_root_config.partition(vfs);
@@ -365,22 +345,35 @@ impl GlobalState {
365345

366346
let _p = span!(Level::INFO, "GlobalState::process_changes/apply_change").entered();
367347
self.analysis_host.apply_change(change);
368-
if !(ratoml_text_map.is_empty() && user_config_file.is_none() && root_path_ratoml.is_none())
369-
{
348+
if !modified_ratoml_files.is_empty() {
370349
let config_change = {
350+
let user_config_path = self.config.user_config_path();
351+
let root_ratoml_path = self.config.root_ratoml_path();
371352
let mut change = ConfigChange::default();
372353
let db = self.analysis_host.raw_database();
373354

374-
for (file_id, (vfs_path, text)) in ratoml_text_map {
355+
for (file_id, (_change_kind, vfs_path)) in modified_ratoml_files {
356+
if vfs_path == *user_config_path {
357+
change.change_user_config(Some(db.file_text(file_id)));
358+
continue;
359+
}
360+
361+
if vfs_path == *root_ratoml_path {
362+
change.change_root_ratoml(Some(db.file_text(file_id)));
363+
continue;
364+
}
365+
375366
// If change has been made to a ratoml file that
376367
// belongs to a non-local source root, we will ignore it.
377368
// As it doesn't make sense a users to use external config files.
378369
let sr_id = db.file_source_root(file_id);
379370
let sr = db.source_root(sr_id);
380371
if !sr.is_library {
381-
if let Some((old_path, old_text)) =
382-
change.change_ratoml(sr_id, vfs_path.clone(), text)
383-
{
372+
if let Some((old_path, old_text)) = change.change_ratoml(
373+
sr_id,
374+
vfs_path.clone(),
375+
Some(db.file_text(file_id)),
376+
) {
384377
// SourceRoot has more than 1 RATOML files. In this case lexicographically smaller wins.
385378
if old_path < vfs_path {
386379
span!(Level::ERROR, "Two `rust-analyzer.toml` files were found inside the same crate. {vfs_path} has no effect.");
@@ -394,14 +387,6 @@ impl GlobalState {
394387
}
395388
}
396389

397-
if let Some(Some(txt)) = user_config_file {
398-
change.change_user_config(Some(txt));
399-
}
400-
401-
if let Some(Some(txt)) = root_path_ratoml {
402-
change.change_root_ratoml(Some(txt));
403-
}
404-
405390
change
406391
};
407392

‎src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs

+2-40
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//! project is currently loading and we don't have a full project model, we
1414
//! still want to respond to various requests.
1515
// FIXME: This is a mess that needs some untangling work
16-
use std::{iter, mem, ops::Not as _};
16+
use std::{iter, mem};
1717

1818
use flycheck::{FlycheckConfig, FlycheckHandle};
1919
use hir::{db::DefDatabase, ChangeWithProcMacros, ProcMacros};
@@ -28,12 +28,11 @@ use lsp_types::FileSystemWatcher;
2828
use proc_macro_api::ProcMacroServer;
2929
use project_model::{ManifestPath, ProjectWorkspace, ProjectWorkspaceKind, WorkspaceBuildScripts};
3030
use stdx::{format_to, thread::ThreadIntent};
31-
use tracing::error;
3231
use triomphe::Arc;
3332
use vfs::{AbsPath, AbsPathBuf, ChangeKind};
3433

3534
use crate::{
36-
config::{Config, ConfigChange, FilesWatcher, LinkedProject},
35+
config::{Config, FilesWatcher, LinkedProject},
3736
global_state::GlobalState,
3837
lsp_ext,
3938
main_loop::Task,
@@ -573,43 +572,6 @@ impl GlobalState {
573572
self.source_root_config = project_folders.source_root_config;
574573
self.local_roots_parent_map = Arc::new(self.source_root_config.source_root_parent_map());
575574

576-
let user_config_path = self.config.user_config_path();
577-
let root_ratoml_path = self.config.root_ratoml_path();
578-
579-
{
580-
let vfs = &mut self.vfs.write().0;
581-
let loader = &mut self.loader;
582-
583-
if vfs.file_id(user_config_path).is_none() {
584-
if let Some(user_cfg_abs) = user_config_path.as_path() {
585-
let contents = loader.handle.load_sync(user_cfg_abs);
586-
vfs.set_file_contents(user_config_path.clone(), contents);
587-
} else {
588-
error!("Non-abs virtual path for user config.");
589-
}
590-
}
591-
592-
if vfs.file_id(root_ratoml_path).is_none() {
593-
// FIXME @alibektas : Sometimes root_path_ratoml collide with a regular ratoml.
594-
// Although this shouldn't be a problem because everything is mapped to a `FileId`.
595-
// We may want to further think about this.
596-
if let Some(root_ratoml_abs) = root_ratoml_path.as_path() {
597-
let contents = loader.handle.load_sync(root_ratoml_abs);
598-
vfs.set_file_contents(root_ratoml_path.clone(), contents);
599-
} else {
600-
error!("Non-abs virtual path for user config.");
601-
}
602-
}
603-
}
604-
605-
let mut config_change = ConfigChange::default();
606-
config_change.change_source_root_parent_map(self.local_roots_parent_map.clone());
607-
608-
let (config, e, _) = self.config.apply_change(config_change);
609-
self.config_errors = e.is_empty().not().then_some(e);
610-
611-
self.config = Arc::new(config);
612-
613575
self.recreate_crate_graph(cause);
614576

615577
tracing::info!("did switch workspaces");

0 commit comments

Comments
 (0)