language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-28 10:39:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implement next trait solver

Browse source
This commit is contained in:
jackh726 2025-08-01 14:29:21 +00:00
parent 44bdfdf768
commit 9418a3f2df
109 changed files with 19148 additions and 1317 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ use std::ops::ControlFlow;
use either::Either;
use hir::{DefWithBody, EditionedFileId, InFile, InRealFile, MacroKind, Name, Semantics};
use ide_db::{FxHashMap, FxHashSet, Ranker, RootDatabase, SymbolKind};
use ide_db::{FxHashMap, FxHashSet, Ranker, RootDatabase, SymbolKind, base_db::salsa};
use syntax::{
AstNode, AstToken, NodeOrToken,
SyntaxKind::*,
@ -434,15 +434,17 @@ fn traverse(
|node| unsafe_ops.contains(&InFile::new(descended_element.file_id, node));
let element = match descended_element.value {
NodeOrToken::Node(name_like) => {
let hl = highlight::name_like(
sema,
krate,
bindings_shadow_count,
&is_unsafe_node,
config.syntactic_name_ref_highlighting,
name_like,
edition,
);
let hl = salsa::attach(sema.db, || {
highlight::name_like(
sema,
krate,
bindings_shadow_count,
&is_unsafe_node,
config.syntactic_name_ref_highlighting,
name_like,
edition,
)
});
if hl.is_some() && !in_macro {
// skip highlighting the contained token of our name-like node
// as that would potentially overwrite our result