forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#16137 - unexge:complete-macros-in-macro-use, …
…r=Veykril Complete exported macros in `#[macro_use($0)]` Closes rust-lang/rust-analyzer#15657. Originally added a test case for incomplete input: ```rust #[test] fn completes_incomplete_syntax() { check( r#" //- /dep.rs crate:dep #[macro_export] macro_rules! foo { () => {}; } //- /main.rs crate:main deps:dep #[macro_use($0 extern crate dep; "#, expect![[r#" ma foo "#]], ) } ``` but couldn't make it pass and removed it 😅 Our current recovering logic doesn't work for token trees and for this code: ```rust #[macro_use( extern crate lazy_static; fn main() {} ``` we ended up with this syntax tree: ``` SOURCE_FILE@0..53 ATTR@0..52 POUND@0..1 "#" L_BRACK@1..2 "[" META@2..52 PATH@2..11 PATH_SEGMENT@2..11 NAME_REF@2..11 IDENT@2..11 "macro_use" TOKEN_TREE@11..52 L_PAREN@11..12 "(" WHITESPACE@12..13 "\n" EXTERN_KW@13..19 "extern" WHITESPACE@19..20 " " CRATE_KW@20..25 "crate" WHITESPACE@25..26 " " IDENT@26..37 "lazy_static" SEMICOLON@37..38 ";" WHITESPACE@38..40 "\n\n" FN_KW@40..42 "fn" WHITESPACE@42..43 " " IDENT@43..47 "main" TOKEN_TREE@47..49 L_PAREN@47..48 "(" R_PAREN@48..49 ")" WHITESPACE@49..50 " " TOKEN_TREE@50..52 L_CURLY@50..51 "{" R_CURLY@51..52 "}" WHITESPACE@52..53 "\n" ``` Maybe we can try to parse the token tree in `crates/ide-completion/src/context/analysis.rs` but I'm not sure what's the best way forward.
- Loading branch information
Showing
7 changed files
with
194 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
crates/ide-completion/src/completions/attribute/macro_use.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
//! Completion for macros in `#[macro_use(...)]` | ||
use hir::ModuleDef; | ||
use ide_db::SymbolKind; | ||
use syntax::ast; | ||
|
||
use crate::{context::CompletionContext, item::CompletionItem, Completions}; | ||
|
||
pub(super) fn complete_macro_use( | ||
acc: &mut Completions, | ||
ctx: &CompletionContext<'_>, | ||
extern_crate: Option<&ast::ExternCrate>, | ||
existing_imports: &[ast::Path], | ||
) { | ||
let Some(extern_crate) = extern_crate else { return }; | ||
let Some(extern_crate) = ctx.sema.to_def(extern_crate) else { return }; | ||
let Some(krate) = extern_crate.resolved_crate(ctx.db) else { return }; | ||
|
||
for mod_def in krate.root_module().declarations(ctx.db) { | ||
if let ModuleDef::Macro(mac) = mod_def { | ||
let mac_name = mac.name(ctx.db); | ||
let Some(mac_name) = mac_name.as_str() else { continue }; | ||
|
||
let existing_import = existing_imports | ||
.iter() | ||
.filter_map(|p| p.as_single_name_ref()) | ||
.find(|n| n.text() == mac_name); | ||
if existing_import.is_some() { | ||
continue; | ||
} | ||
|
||
let item = CompletionItem::new(SymbolKind::Macro, ctx.source_range(), mac_name); | ||
item.add_to(acc, ctx.db); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters