language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Lookup lang attribute on assoc item trait directly

Browse source
This commit is contained in:
Lukas Wirth 2022-01-11 10:07:16 +01:00
parent 94b369faa3
commit 4901ea3eef
4 changed files with 67 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/hir_def/src/attr.rs
View file

@ -255,6 +255,10 @@ impl Attrs {
}
}
pub fn lang(&self) -> Option<&SmolStr> {
self.by_key("lang").string_value()
}
pub fn docs(&self) -> Option<Documentation> {
let docs = self.by_key("doc").attrs().flat_map(|attr| match attr.input.as_deref()? {
AttrInput::Literal(s) => Some(s),
@ -754,20 +758,20 @@ impl Attr {
}
#[derive(Debug, Clone, Copy)]
pub struct AttrQuery<'a> {
attrs: &'a Attrs,
pub struct AttrQuery<'attr> {
attrs: &'attr Attrs,
key: &'static str,
}
impl<'a> AttrQuery<'a> {
pub fn tt_values(self) -> impl Iterator<Item = &'a Subtree> {
impl<'attr> AttrQuery<'attr> {
pub fn tt_values(self) -> impl Iterator<Item = &'attr Subtree> {
self.attrs().filter_map(|attr| match attr.input.as_deref()? {
AttrInput::TokenTree(it, _) => Some(it),
_ => None,
})
}
pub fn string_value(self) -> Option<&'a SmolStr> {
pub fn string_value(self) -> Option<&'attr SmolStr> {
self.attrs().find_map(|attr| match attr.input.as_deref()? {
AttrInput::Literal(it) => Some(it),
_ => None,
@ -778,7 +782,7 @@ impl<'a> AttrQuery<'a> {
self.attrs().next().is_some()
}
pub fn attrs(self) -> impl Iterator<Item = &'a Attr> + Clone {
pub fn attrs(self) -> impl Iterator<Item = &'attr Attr> + Clone {
let key = self.key;
self.attrs
.iter()