mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #10648

Browse Source 
10648: fix: Don't discard attributed items when a proc-macro unexpectedly fails to expand r=Veykril a=Veykril

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/9205

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-10-29 13:13:12 +00:00 committed by GitHub
commit b9fa37f5b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/hir_expand/src/proc_macro.rs
View File

@ -1,9 +1,10 @@
//! Proc Macro Expander stub
use crate::db::AstDatabase;
use base_db::{CrateId, ProcMacroExpansionError, ProcMacroId};
use base_db::{CrateId, ProcMacroExpansionError, ProcMacroId, ProcMacroKind};
use mbe::ExpandResult;
use crate::db::AstDatabase;
#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
pub struct ProcMacroExpander {
krate: CrateId,
@ -36,20 +37,29 @@ pub fn expand(
let krate_graph = db.crate_graph();
let proc_macro = match krate_graph[self.krate].proc_macro.get(id.0 as usize) {
Some(proc_macro) => proc_macro,
None => return ExpandResult::str_err("No derive macro found.".to_string()),
None => return ExpandResult::str_err("No proc-macro found.".to_string()),
};
// Proc macros have access to the environment variables of the invoking crate.
let env = &krate_graph[calling_crate].env;
proc_macro
.expander
.expand(tt, attr_arg, env)
.map_err(|err| match err {
ProcMacroExpansionError::Panic(text) => mbe::ExpandError::Other(text),
ProcMacroExpansionError::System(text) => mbe::ExpandError::Other(text),
})
.into()
match proc_macro.expander.expand(tt, attr_arg, env) {
Ok(t) => ExpandResult::ok(t),
Err(err) => match err {
// Don't discard the item in case something unexpected happened while expanding attributes
ProcMacroExpansionError::System(text)
if proc_macro.kind == ProcMacroKind::Attr =>
{
ExpandResult {
value: tt.clone(),
err: Some(mbe::ExpandError::Other(text)),
}
}
ProcMacroExpansionError::System(text)
| ProcMacroExpansionError::Panic(text) => {
ExpandResult::only_err(mbe::ExpandError::Other(text))
}
},
}
}
None => ExpandResult::only_err(mbe::ExpandError::UnresolvedProcMacro),
}

2
crates/proc_macro_api/src/lib.rs
View File

@ -167,7 +167,7 @@ pub fn expand(
let request = msg::Request::ExpandMacro(task);
let response = self.process.lock().unwrap_or_else(|e| e.into_inner()).send_task(request)?;
match response {
msg::Response::ExpandMacro(it) => Ok(it.map(|it| it.to_subtree())),
msg::Response::ExpandMacro(it) => Ok(it.map(FlatTree::to_subtree)),
msg::Response::ListMacros { .. } => {
Err(ServerError { message: "unexpected response".to_string(), io: None })
}