Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ExpandAttribute handler #1684

Open
wants to merge 1 commit into
base: spr/main/7587de32
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions scarb/src/ops/proc_macro_server/methods/expand_attribute.rs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing tests

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
use crate::{
compiler::plugin::proc_macro::{ExpansionKind, ProcMacroHost},
ops::proc_macro_server::json_rpc::Handler,
};
use anyhow::Result;
use scarb_proc_macro_server_types::methods::{expand::ExpandAttribute, ProcMacroResult};
use std::sync::Arc;

impl Handler for ExpandAttribute {
fn handle(proc_macros: Arc<ProcMacroHost>, params: Self::Params) -> Result<Self::Response> {
let instance = proc_macros
.macros()
.into_iter()
.find(|e| {
e.get_expansions()
.iter()
.filter(|expansion| expansion.kind == ExpansionKind::Attr)
.any(|expansion| expansion.name == params.attr)
})
.unwrap();

let result = instance.generate_code(params.attr.into(), params.args, params.item);

Ok(ProcMacroResult {
token_stream: result.token_stream,
diagnostics: result.diagnostics,
})
}
}
1 change: 1 addition & 0 deletions scarb/src/ops/proc_macro_server/methods/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pub mod defined_macros;
pub mod expand_attribute;
4 changes: 4 additions & 0 deletions scarb/src/ops/proc_macro_server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use crossbeam_channel::{Receiver, Sender};
use json_rpc::Handler;
use scarb_proc_macro_server_types::jsonrpc::{ResponseError, RpcRequest, RpcResponse};
use scarb_proc_macro_server_types::methods::defined_macros::DefinedMacros;
use scarb_proc_macro_server_types::methods::expand::ExpandAttribute;
use scarb_proc_macro_server_types::methods::Method;
use serde_json::Value;

Expand Down Expand Up @@ -71,6 +72,9 @@ fn handle_requests(
fn route_request(proc_macros: Arc<ProcMacroHost>, request: RpcRequest) -> Result<Value> {
match request.method.as_str() {
DefinedMacros::METHOD => run_handler::<DefinedMacros>(proc_macros.clone(), request.value),
ExpandAttribute::METHOD => {
run_handler::<ExpandAttribute>(proc_macros.clone(), request.value)
}
_ => Err(anyhow!("method not found")),
}
}
Expand Down
Loading