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

Move format specifier lexing from syntax to ide_db

Browse source
This commit is contained in:
Lukas Wirth 2022-01-15 13:14:59 +01:00
parent 82fccb971e
commit 91279db2b4
5 changed files with 301 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ use hir::{InFile, Name, Semantics};
use ide_db::RootDatabase;
use rustc_hash::FxHashMap;
use syntax::{
ast::{self, HasFormatSpecifier},
ast::{self, IsString},
AstNode, AstToken, NodeOrToken,
SyntaxKind::*,
SyntaxNode, TextRange, WalkEvent, T,
@ -336,17 +336,19 @@ fn traverse(
}
highlight_format_string(hl, &string, &expanded_string, range);
// Highlight escape sequences
if let Some(char_ranges) = string.char_ranges() {
for (piece_range, _) in char_ranges.iter().filter(|(_, char)| char.is_ok()) {
if string.text()[piece_range.start().into()..].starts_with('\\') {
hl.add(HlRange {
range: piece_range + range.start(),
highlight: HlTag::EscapeSequence.into(),
binding_hash: None,
});
}
string.escaped_char_ranges(&mut |piece_range, char| {
if char.is_err() {
return;
}
}
if string.text()[piece_range.start().into()..].starts_with('\\') {
hl.add(HlRange {
range: piece_range + range.start(),
highlight: HlTag::EscapeSequence.into(),
binding_hash: None,
});
}
});
}
}