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

Don't parse source files to generate macro completion details

Browse source
This commit is contained in:
Lukas Wirth 2022-03-10 22:21:58 +01:00
parent b1ab5770c9
commit 6c8c02f625
15 changed files with 157 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ide/src/hover/render.rs
View file

@ -2,7 +2,7 @@
use std::fmt::Display;
use either::Either;
use hir::{AsAssocItem, AttributeTemplate, HasAttrs, HasSource, HirDisplay, Semantics, TypeInfo};
use hir::{AsAssocItem, AttributeTemplate, HasAttrs, HirDisplay, Semantics, TypeInfo};
use ide_db::{
base_db::SourceDatabase,
defs::Definition,
@ -13,9 +13,7 @@ use ide_db::{
use itertools::Itertools;
use stdx::format_to;
use syntax::{
algo, ast,
display::{fn_as_proc_macro_label, macro_label},
match_ast, AstNode, Direction,
algo, ast, match_ast, AstNode, Direction,
SyntaxKind::{LET_EXPR, LET_STMT},
SyntaxToken, T,
};
@ -342,14 +340,8 @@ pub(super) fn definition(
) -> Option<Markup> {
let mod_path = definition_mod_path(db, &def);
let (label, docs) = match def {
Definition::Macro(it) => (
match &it.source(db)?.value {
Either::Left(mac) => macro_label(mac),
Either::Right(mac_fn) => fn_as_proc_macro_label(mac_fn),
},
it.attrs(db).docs(),
),
Definition::Field(def) => label_and_docs(db, def),
Definition::Macro(it) => label_and_docs(db, it),
Definition::Field(it) => label_and_docs(db, it),
Definition::Module(it) => label_and_docs(db, it),
Definition::Function(it) => label_and_docs(db, it),
Definition::Adt(it) => label_and_docs(db, it),

48
crates/ide/src/hover/tests.rs
View file

@ -4102,16 +4102,16 @@ identity!{
}
"#,
expect![[r#"
*Copy*
*Copy*
```rust
test
```
```rust
test
```
```rust
pub macro Copy
```
"#]],
```rust
macro Copy
```
"#]],
);
}
@ -4126,16 +4126,16 @@ pub macro Copy {}
struct Foo;
"#,
expect![[r#"
*Copy*
*Copy*
```rust
test
```
```rust
test
```
```rust
pub macro Copy
```
"#]],
```rust
macro Copy
```
"#]],
);
check(
r#"
@ -4148,16 +4148,16 @@ mod foo {
struct Foo;
"#,
expect![[r#"
*Copy*
*Copy*
```rust
test::foo
```
```rust
test::foo
```
```rust
pub macro Copy
```
"#]],
```rust
macro Copy
```
"#]],
);
}