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

fix: don't panic in semantics due to cfg_attr disrupting offsets

Browse source
This commit is contained in:
Lukas Wirth 2022-01-23 17:29:31 +01:00
parent baa5cd9527
commit ebd723995a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/hir/src/semantics.rs
View file

@ -931,7 +931,8 @@ impl<'db> SemanticsImpl<'db> {
file.with_value(derive.clone()), file.with_value(derive.clone()),
)?; )?;
let attrs = adt_def.attrs(self.db); let attrs = adt_def.attrs(self.db);
let mut derive_paths = attrs[attr_id].parse_path_comma_token_tree()?; // FIXME: https://github.com/rust-analyzer/rust-analyzer/issues/11298
let mut derive_paths = attrs.get(attr_id)?.parse_path_comma_token_tree()?;
let derive_idx = tt let derive_idx = tt
.syntax() .syntax()

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

@ -72,6 +72,11 @@ impl ops::Deref for RawAttrs {
} }
} }
} }
impl Attrs {
pub fn get(&self, AttrId { ast_index, .. }: AttrId) -> Option<&Attr> {
(**self).get(ast_index as usize)
}
}
impl ops::Deref for Attrs { impl ops::Deref for Attrs {
type Target = [Attr]; type Target = [Attr];