Skip to content

Commit 59002b3

Browse files
VeykrilVeykril
committed
Fix processing of ratoml files
1 parent d726854 commit 59002b3

File tree

10 files changed

+115
-166
lines changed

10 files changed

+115
-166
lines changed

‎src/tools/rust-analyzer/crates/load-cargo/src/lib.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -272,25 +272,24 @@ impl SourceRootConfig {
272272
/// If a `SourceRoot` doesn't have a parent and is local then it is not contained in this mapping but it can be asserted that it is a root `SourceRoot`.
273273
pub fn source_root_parent_map(&self) -> FxHashMap<SourceRootId, SourceRootId> {
274274
let roots = self.fsc.roots();
275-
let mut map = FxHashMap::<SourceRootId, SourceRootId>::default();
275+
let mut i = 0;
276276
roots
277277
.iter()
278278
.enumerate()
279279
.filter(|(_, (_, id))| self.local_filesets.contains(id))
280280
.filter_map(|(idx, (root, root_id))| {
281281
// We are interested in parents if they are also local source roots.
282282
// So instead of a non-local parent we may take a local ancestor as a parent to a node.
283-
roots.iter().take(idx).find_map(|(root2, root2_id)| {
283+
roots[..idx].iter().find_map(|(root2, root2_id)| {
284+
i += 1;
284285
if self.local_filesets.contains(root2_id) && root.starts_with(root2) {
285286
return Some((root_id, root2_id));
286287
}
287288
None
288289
})
289290
})
290-
.for_each(|(child, parent)| {
291-
map.insert(SourceRootId(*child as u32), SourceRootId(*parent as u32));
292-
});
293-
map
291+
.map(|(&child, &parent)| (SourceRootId(child as u32), SourceRootId(parent as u32)))
292+
.collect()
294293
}
295294
}
296295

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

+9-2
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,13 @@ impl Config {
703703
&self.user_config_path
704704
}
705705

706+
pub fn same_source_root_parent_map(
707+
&self,
708+
other: &Arc<FxHashMap<SourceRootId, SourceRootId>>,
709+
) -> bool {
710+
Arc::ptr_eq(&self.source_root_parent_map, other)
711+
}
712+
706713
// FIXME @alibektas : Server's health uses error sink but in other places it is not used atm.
707714
/// Changes made to client and global configurations will partially not be reflected even after `.apply_change()` was called.
708715
/// The return tuple's bool component signals whether the `GlobalState` should call its `update_configuration()` method.
@@ -927,7 +934,7 @@ impl ConfigChange {
927934
}
928935

929936
pub fn change_root_ratoml(&mut self, content: Option<Arc<str>>) {
930-
assert!(self.user_config_change.is_none()); // Otherwise it is a double write.
937+
assert!(self.root_ratoml_change.is_none()); // Otherwise it is a double write.
931938
self.root_ratoml_change = content;
932939
}
933940

@@ -1204,10 +1211,10 @@ impl Config {
12041211
workspace_roots,
12051212
visual_studio_code_version,
12061213
client_config: (FullConfigInput::default(), ConfigErrors(vec![])),
1207-
user_config: None,
12081214
ratoml_files: FxHashMap::default(),
12091215
default_config: DEFAULT_CONFIG_DATA.get_or_init(|| Box::leak(Box::default())),
12101216
source_root_parent_map: Arc::new(FxHashMap::default()),
1217+
user_config: None,
12111218
user_config_path,
12121219
root_ratoml: None,
12131220
root_ratoml_path,

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,9 @@ impl GlobalState {
345345

346346
let _p = span!(Level::INFO, "GlobalState::process_changes/apply_change").entered();
347347
self.analysis_host.apply_change(change);
348-
if !modified_ratoml_files.is_empty() {
348+
if !modified_ratoml_files.is_empty()
349+
|| !self.config.same_source_root_parent_map(&self.local_roots_parent_map)
350+
{
349351
let config_change = {
350352
let user_config_path = self.config.user_config_path();
351353
let root_ratoml_path = self.config.root_ratoml_path();
@@ -386,7 +388,7 @@ impl GlobalState {
386388
span!(Level::ERROR, "Mapping to SourceRootId failed.");
387389
}
388390
}
389-
391+
change.change_source_root_parent_map(self.local_roots_parent_map.clone());
390392
change
391393
};
392394

‎src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs

+25
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ use crate::{
4242
hack_recover_crate_name,
4343
line_index::LineEndings,
4444
lsp::{
45+
ext::InternalTestingFetchConfigParams,
4546
from_proto, to_proto,
4647
utils::{all_edits_are_disjoint, invalid_params_error},
4748
LspError,
@@ -2231,6 +2232,30 @@ pub(crate) fn fetch_dependency_list(
22312232
Ok(FetchDependencyListResult { crates: crate_infos })
22322233
}
22332234

2235+
pub(crate) fn internal_testing_fetch_config(
2236+
state: GlobalStateSnapshot,
2237+
params: InternalTestingFetchConfigParams,
2238+
) -> anyhow::Result<serde_json::Value> {
2239+
let source_root = params
2240+
.text_document
2241+
.map(|it| {
2242+
state
2243+
.analysis
2244+
.source_root_id(from_proto::file_id(&state, &it.uri)?)
2245+
.map_err(anyhow::Error::from)
2246+
})
2247+
.transpose()?;
2248+
serde_json::to_value(match &*params.config {
2249+
"local" => state.config.assist(source_root).assist_emit_must_use,
2250+
"global" => matches!(
2251+
state.config.rustfmt(),
2252+
RustfmtConfig::Rustfmt { enable_range_formatting: true, .. }
2253+
),
2254+
_ => return Err(anyhow::anyhow!("Unknown test config key: {}", params.config)),
2255+
})
2256+
.map_err(Into::into)
2257+
}
2258+
22342259
/// Searches for the directory of a Rust crate given this crate's root file path.
22352260
///
22362261
/// # Arguments

‎src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/ext.rs

+14
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ use serde::{Deserialize, Serialize};
1717

1818
use crate::line_index::PositionEncoding;
1919

20+
pub enum InternalTestingFetchConfig {}
21+
22+
impl Request for InternalTestingFetchConfig {
23+
type Params = InternalTestingFetchConfigParams;
24+
type Result = serde_json::Value;
25+
const METHOD: &'static str = "rust-analyzer-internal/internalTestingFetchConfig";
26+
}
27+
28+
#[derive(Deserialize, Serialize, Debug)]
29+
#[serde(rename_all = "camelCase")]
30+
pub struct InternalTestingFetchConfigParams {
31+
pub text_document: Option<TextDocumentIdentifier>,
32+
pub config: String,
33+
}
2034
pub enum AnalyzerStatus {}
2135

2236
impl Request for AnalyzerStatus {

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

+3
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ impl GlobalState {
486486

487487
fn update_diagnostics(&mut self) {
488488
let db = self.analysis_host.raw_database();
489+
// spawn a task per subscription?
489490
let subscriptions = {
490491
let vfs = &self.vfs.read().0;
491492
self.mem_docs
@@ -986,6 +987,8 @@ impl GlobalState {
986987
.on::<NO_RETRY, lsp_ext::ExternalDocs>(handlers::handle_open_docs)
987988
.on::<NO_RETRY, lsp_ext::OpenCargoToml>(handlers::handle_open_cargo_toml)
988989
.on::<NO_RETRY, lsp_ext::MoveItem>(handlers::handle_move_item)
990+
//
991+
.on::<NO_RETRY, lsp_ext::InternalTestingFetchConfig>(handlers::internal_testing_fetch_config)
989992
.finish();
990993
}
991994

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -473,13 +473,11 @@ impl GlobalState {
473473
// When they're not, integrate the base to make them into absolute patterns
474474
filter
475475
.flat_map(|root| {
476-
root.include.into_iter().flat_map(|it| {
476+
root.include.into_iter().flat_map(|base| {
477477
[
478-
format!("{it}/**/*.rs"),
479-
// FIXME @alibektas : Following dbarsky's recomm I merged toml and lock patterns into one.
480-
// Is this correct?
481-
format!("{it}/**/Cargo.{{toml,lock}}"),
482-
format!("{it}/**/rust-analyzer.toml"),
478+
format!("{base}/**/*.rs"),
479+
format!("{base}/**/Cargo.{{toml,lock}}"),
480+
format!("{base}/**/rust-analyzer.toml"),
483481
]
484482
})
485483
})

0 commit comments

Comments
 (0)