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

Simplify highlighting infra

Browse source 
This also fixes the killer whale bug
This commit is contained in:
Aleksey Kladov 2021-01-08 01:39:02 +03:00
parent 981a0d708e
commit e30c1c3fbf
11 changed files with 287 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ide/src/syntax_highlighting/format.rs
View file

@ -4,9 +4,9 @@ use syntax::{
AstNode, AstToken, SyntaxElement, SyntaxKind, SyntaxNode, TextRange,
};
use crate::{
syntax_highlighting::HighlightedRangeStack, HighlightTag, HighlightedRange, SymbolKind,
};
use crate::{HighlightTag, HighlightedRange, SymbolKind};
use super::highlights::Highlights;
#[derive(Default)]
pub(super) struct FormatStringHighlighter {
@ -39,22 +39,20 @@ impl FormatStringHighlighter {
}
pub(super) fn highlight_format_string(
&self,
range_stack: &mut HighlightedRangeStack,
stack: &mut Highlights,
string: &impl HasFormatSpecifier,
range: TextRange,
) {
if self.format_string.as_ref() == Some(&SyntaxElement::from(string.syntax().clone())) {
range_stack.push();
string.lex_format_specifier(|piece_range, kind| {
if let Some(highlight) = highlight_format_specifier(kind) {
range_stack.add(HighlightedRange {
stack.add(HighlightedRange {
range: piece_range + range.start(),
highlight: highlight.into(),
binding_hash: None,
});
}
});
range_stack.pop();
}
}
}