Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18410 from Veykril/veykril/push-lvwxpnowqrxk

Browse source 
internal: Invert token iteration order in macro mapping
This commit is contained in:
Lukas Wirth 2024-10-27 10:44:32 +00:00 committed by GitHub
commit 715b67c425
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 67 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -945,6 +945,10 @@ impl<'db> SemanticsImpl<'db> {
};
while let Some((expansion, ref mut tokens)) = stack.pop() {
// Reverse the tokens so we prefer first tokens (to accommodate for popping from the
// back)
// alternatively we could pop from the front but that would shift the content on every pop
tokens.reverse();
while let Some((token, ctx)) = tokens.pop() {
let was_not_remapped = (|| {
// First expand into attribute invocations

32
crates/ide-db/src/lib.rs
View file

@ -293,3 +293,35 @@ impl SnippetCap {
}
}
}
pub struct Ranker<'a> {
pub kind: parser::SyntaxKind,
pub text: &'a str,
pub ident_kind: bool,
}
impl<'a> Ranker<'a> {
pub const MAX_RANK: usize = 0b1110;
pub fn from_token(token: &'a syntax::SyntaxToken) -> Self {
let kind = token.kind();
Ranker { kind, text: token.text(), ident_kind: kind.is_any_identifier() }
}
/// A utility function that ranks a token again a given kind and text, returning a number that
/// represents how close the token is to the given kind and text.
pub fn rank_token(&self, tok: &syntax::SyntaxToken) -> usize {
let tok_kind = tok.kind();
let exact_same_kind = tok_kind == self.kind;
let both_idents = exact_same_kind || (tok_kind.is_any_identifier() && self.ident_kind);
let same_text = tok.text() == self.text;
// anything that mapped into a token tree has likely no semantic information
let no_tt_parent =
tok.parent().map_or(false, |it| it.kind() != parser::SyntaxKind::TOKEN_TREE);
(both_idents as usize)
| ((exact_same_kind as usize) << 1)
| ((same_text as usize) << 2)
| ((no_tt_parent as usize) << 3)
}
}

5
crates/ide/src/call_hierarchy.rs
View file

@ -510,6 +510,7 @@ fn caller$0() {
expect![[]],
);
}
#[test]
fn test_call_hierarchy_in_macros_incoming_different_files() {
check_hierarchy(
@ -591,9 +592,9 @@ macro_rules! call {
"#,
expect!["callee Function FileId(0) 22..37 30..36"],
expect![[r#"
callee Function FileId(0) 38..52 44..50 : FileId(0):44..50
caller Function FileId(0) 38..52 : FileId(0):44..50
caller Function FileId(1) 130..136 130..136 : FileId(0):44..50"#]],
caller Function FileId(1) 130..136 130..136 : FileId(0):44..50
callee Function FileId(0) 38..52 44..50 : FileId(0):44..50"#]],
expect![[]],
);
}

22
crates/ide/src/hover.rs
View file

@ -11,7 +11,7 @@ use ide_db::{
defs::{Definition, IdentClass, NameRefClass, OperatorClass},
famous_defs::FamousDefs,
helpers::pick_best_token,
FileRange, FxIndexSet, RootDatabase,
FileRange, FxIndexSet, Ranker, RootDatabase,
};
use itertools::{multizip, Itertools};
use span::Edition;
@ -182,27 +182,13 @@ fn hover_offset(
// equivalency is more important
let mut descended = sema.descend_into_macros(original_token.clone());
let kind = original_token.kind();
let text = original_token.text();
let ident_kind = kind.is_any_identifier();
let ranker = Ranker::from_token(&original_token);
descended.sort_by_cached_key(|tok| {
let tok_kind = tok.kind();
let exact_same_kind = tok_kind == kind;
let both_idents = exact_same_kind || (tok_kind.is_any_identifier() && ident_kind);
let same_text = tok.text() == text;
// anything that mapped into a token tree has likely no semantic information
let no_tt_parent = tok.parent().map_or(false, |it| it.kind() != TOKEN_TREE);
!((both_idents as usize)
| ((exact_same_kind as usize) << 1)
| ((same_text as usize) << 2)
| ((no_tt_parent as usize) << 3))
});
descended.sort_by_cached_key(|tok| !ranker.rank_token(tok));
let mut res = vec![];
for token in descended {
let is_same_kind = token.kind() == kind;
let is_same_kind = token.kind() == ranker.kind;
let lint_hover = (|| {
// FIXME: Definition should include known lints and the like instead of having this special case here
let attr = token.parent_ancestors().find_map(ast::Attr::cast)?;

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

@ -288,19 +288,6 @@ m!(ab$0c);
expect![[r#"
*abc*
```rust
test::module
```
```rust
fn abc()
```
---
Inner
---
```rust
test
```
@ -312,6 +299,19 @@ m!(ab$0c);
---
Outer
---
```rust
test::module
```
```rust
fn abc()
```
---
Inner
"#]],
);
}

10
crates/ide/src/references.rs
View file

@ -1701,14 +1701,14 @@ fn f() {
}
"#,
expect![[r#"
func Function FileId(0) 137..146 140..144
FileId(0) 161..165
func Function FileId(0) 137..146 140..144 module
FileId(0) 181..185
func Function FileId(0) 137..146 140..144
FileId(0) 161..165
"#]],
)
}

23
crates/ide/src/syntax_highlighting.rs
View file

@ -16,7 +16,7 @@ mod tests;
use std::ops::ControlFlow;
use hir::{InRealFile, Name, Semantics};
use ide_db::{FxHashMap, RootDatabase, SymbolKind};
use ide_db::{FxHashMap, Ranker, RootDatabase, SymbolKind};
use span::EditionedFileId;
use syntax::{
ast::{self, IsString},
@ -397,13 +397,12 @@ fn traverse(
Some(AttrOrDerive::Derive(_)) => inside_attribute,
None => false,
};
let descended_element = if in_macro {
// Attempt to descend tokens into macro-calls.
let res = match element {
NodeOrToken::Token(token) if token.kind() != COMMENT => {
let kind = token.kind();
let text = token.text();
let ident_kind = kind.is_any_identifier();
let ranker = Ranker::from_token(&token);
let mut t = None;
let mut r = 0;
@ -412,21 +411,9 @@ fn traverse(
|tok, _ctx| {
// FIXME: Consider checking ctx transparency for being opaque?
let tok = tok.value;
let tok_kind = tok.kind();
let my_rank = ranker.rank_token(&tok);
let exact_same_kind = tok_kind == kind;
let both_idents =
exact_same_kind || (tok_kind.is_any_identifier() && ident_kind);
let same_text = tok.text() == text;
// anything that mapped into a token tree has likely no semantic information
let no_tt_parent =
tok.parent().map_or(false, |it| it.kind() != TOKEN_TREE);
let my_rank = (both_idents as usize)
| ((exact_same_kind as usize) << 1)
| ((same_text as usize) << 2)
| ((no_tt_parent as usize) << 3);
if my_rank > 0b1110 {
if my_rank >= Ranker::MAX_RANK {
// a rank of 0b1110 means that we have found a maximally interesting
// token so stop early.
t = Some(tok);

2
crates/ide/src/syntax_highlighting/test_data/highlight_issue_18089.html
View file

@ -50,4 +50,4 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
<span class="brace">}</span>
<span class="attribute_bracket attribute">#</span><span class="attribute_bracket attribute">[</span><span class="module attribute crate_root library">proc_macros</span><span class="operator attribute">::</span><span class="attribute attribute library">issue_18089</span><span class="attribute_bracket attribute">]</span>
<span class="keyword">fn</span> <span class="function declaration">template</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span></code></pre>
<span class="keyword">fn</span> <span class="macro declaration">template</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span></code></pre>

1
rust-bors.toml
View file

@ -1 +0,0 @@
timeout = 3600