language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-21 19:04:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Pass crate environment to proc macros

Browse source
This commit is contained in:
Jonas Schievink 2020-12-11 14:57:50 +01:00
parent 798968e1e3
commit 70877428a8
6 changed files with 42 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/proc_macro_api/src/lib.rs
View file

@ -16,7 +16,7 @@ use std::{
sync::Arc,
};
use base_db::ProcMacro;
use base_db::{Env, ProcMacro};
use tt::{SmolStr, Subtree};
use crate::process::{ProcMacroProcessSrv, ProcMacroProcessThread};
@ -44,12 +44,14 @@ impl base_db::ProcMacroExpander for ProcMacroProcessExpander {
&self,
subtree: &Subtree,
attr: Option<&Subtree>,
env: &Env,
) -> Result<Subtree, tt::ExpansionError> {
let task = ExpansionTask {
macro_body: subtree.clone(),
macro_name: self.name.to_string(),
attributes: attr.cloned(),
lib: self.dylib_path.to_path_buf(),
env: env.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect(),
};
let result: ExpansionResult = self.process.send_task(msg::Request::ExpansionMacro(task))?;

4
crates/proc_macro_api/src/rpc.rs
View file

@ -51,6 +51,9 @@ pub struct ExpansionTask {
pub attributes: Option<Subtree>,
pub lib: PathBuf,
/// Environment variables to set during macro expansion.
pub env: Vec<(String, String)>,
}
#[derive(Clone, Eq, PartialEq, Debug, Default, Serialize, Deserialize)]
@ -251,6 +254,7 @@ mod tests {
macro_name: Default::default(),
attributes: None,
lib: Default::default(),
env: Default::default(),
};
let json = serde_json::to_string(&task).unwrap();