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

Do not replace items annotated with builtin attrs with the attr input

Browse source
This commit is contained in:
Lukas Wirth 2021-08-18 15:35:14 +02:00
parent 8dd3a71730
commit 351cec0cb4
4 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/hir_def/src/builtin_attr.rs
View file

@ -34,9 +34,6 @@ macro_rules! rustc_attr {
}; };
} }
/// Built-in macro-like attributes.
pub const EXTRA_ATTRIBUTES: &[BuiltinAttribute] = &["test", "bench"];
/// "Inert" built-in attributes that have a special meaning to rustc or rustdoc. /// "Inert" built-in attributes that have a special meaning to rustc or rustdoc.
#[rustfmt::skip] #[rustfmt::skip]
pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[

19
crates/hir_def/src/nameres/collector.rs
View file

@ -1712,27 +1712,24 @@ impl ModCollector<'_, '_> {
if path.kind == PathKind::Plain { if path.kind == PathKind::Plain {
if let Some(tool_module) = path.segments().first() { if let Some(tool_module) = path.segments().first() {
let tool_module = tool_module.to_string(); let tool_module = tool_module.to_string();
if builtin_attr::TOOL_MODULES let is_tool = builtin_attr::TOOL_MODULES
.iter() .iter()
.copied() .copied()
.chain(self.def_collector.registered_tools.iter().map(|s| &**s)) .chain(self.def_collector.registered_tools.iter().map(AsRef::as_ref))
.any(|m| tool_module == *m) .any(|m| tool_module == *m);
{ if is_tool {
return true; return true;
} }
} }
if let Some(name) = path.as_ident() { if let Some(name) = path.as_ident() {
let name = name.to_string(); let name = name.to_string();
if builtin_attr::INERT_ATTRIBUTES let is_inert = builtin_attr::INERT_ATTRIBUTES
.iter() .iter()
.chain(builtin_attr::EXTRA_ATTRIBUTES)
.copied() .copied()
.chain(self.def_collector.registered_attrs.iter().map(|s| &**s)) .chain(self.def_collector.registered_attrs.iter().map(AsRef::as_ref))
.any(|attr| name == *attr) .any(|attr| name == *attr);
{ return is_inert;
return true;
}
} }
} }

8
crates/hir_expand/src/builtin_attr.rs
View file

@ -17,11 +17,12 @@ macro_rules! register_builtin {
db: &dyn AstDatabase, db: &dyn AstDatabase,
id: MacroCallId, id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
item: &tt::Subtree,
) -> Result<tt::Subtree, mbe::ExpandError> { ) -> Result<tt::Subtree, mbe::ExpandError> {
let expander = match *self { let expander = match *self {
$( BuiltinAttrExpander::$variant => $expand, )* $( BuiltinAttrExpander::$variant => $expand, )*
}; };
expander(db, id, tt) expander(db, id, tt, item)
} }
fn find_by_name(name: &name::Name) -> Option<Self> { fn find_by_name(name: &name::Name) -> Option<Self> {
@ -61,7 +62,8 @@ pub fn find_builtin_attr(
fn dummy_attr_expand( fn dummy_attr_expand(
_db: &dyn AstDatabase, _db: &dyn AstDatabase,
_id: MacroCallId, _id: MacroCallId,
tt: &tt::Subtree, _tt: &tt::Subtree,
item: &tt::Subtree,
) -> Result<tt::Subtree, mbe::ExpandError> { ) -> Result<tt::Subtree, mbe::ExpandError> {
Ok(tt.clone()) Ok(item.clone())
} }

13
crates/hir_expand/src/db.rs
View file

@ -54,7 +54,18 @@ impl TokenExpander {
TokenExpander::MacroDef { mac, .. } => mac.expand(tt), TokenExpander::MacroDef { mac, .. } => mac.expand(tt),
TokenExpander::Builtin(it) => it.expand(db, id, tt), TokenExpander::Builtin(it) => it.expand(db, id, tt),
// FIXME switch these to ExpandResult as well // FIXME switch these to ExpandResult as well
TokenExpander::BuiltinAttr(it) => it.expand(db, id, tt).into(), TokenExpander::BuiltinAttr(it) => {
let macro_arg = match db.macro_arg(id) {
Some(it) => it,
None => {
return mbe::ExpandResult::only_err(
mbe::ExpandError::Other("No item argument for attribute".to_string())
.into(),
);
}
};
it.expand(db, id, tt, &macro_arg.0).into()
}
TokenExpander::BuiltinDerive(it) => it.expand(db, id, tt).into(), TokenExpander::BuiltinDerive(it) => it.expand(db, id, tt).into(),
TokenExpander::ProcMacro(_) => { TokenExpander::ProcMacro(_) => {
// We store the result in salsa db to prevent non-deterministic behavior in // We store the result in salsa db to prevent non-deterministic behavior in