language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

subscriptions

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-30 16:27:09 +03:00
parent 7570d85869
commit 9fcebbc512
6 changed files with 85 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/libanalysis/src/imp.rs
View file

@ -39,11 +39,11 @@ impl AnalysisHostImpl {
pub fn analysis(
&self,
file_resolver: impl FileResolver,
file_resolver: Arc<dyn FileResolver>,
) -> AnalysisImpl {
AnalysisImpl {
needs_reindex: AtomicBool::new(false),
file_resolver: Arc::new(file_resolver),
file_resolver,
data: self.data.clone(),
}
}
@ -78,7 +78,7 @@ impl AnalysisHostImpl {
pub(crate) struct AnalysisImpl {
needs_reindex: AtomicBool,
file_resolver: Arc<FileResolver>,
file_resolver: Arc<dyn FileResolver>,
data: Arc<WorldData>,
}
@ -236,15 +236,13 @@ impl AnalysisImpl {
("add `#[derive]`", libeditor::add_derive(&file, offset).map(|f| f())),
("add impl", libeditor::add_impl(&file, offset).map(|f| f())),
];
let mut res = Vec::new();
for (name, local_edit) in actions {
if let Some(local_edit) = local_edit {
res.push(SourceChange::from_local_edit(
file_id, name, local_edit
actions.into_iter()
.filter_map(|(name, local_edit)| {
Some(SourceChange::from_local_edit(
file_id, name, local_edit?,
))
}
}
res
})
.collect()
}
fn index_resolve(&self, name_ref: ast::NameRef) -> Vec<(FileId, FileSymbol)> {