rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Syntax highlighting for escape sequences in strings

Browse Source
This commit is contained in:
Leander Tentrup
2020-06-17 15:27:13 +02:00
parent 931f317399
commit 2145e2d878
12 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/ra_ide/src/syntax_highlighting.rs
View File

@@ -212,8 +212,8 @@ pub(crate) fn highlight(
if let Some(string) =
element_to_highlight.as_token().cloned().and_then(ast::String::cast)
{
stack.push();
if is_format_string {
stack.push();
string.lex_format_specifier(|piece_range, kind| {
if let Some(highlight) = highlight_format_specifier(kind) {
stack.add(HighlightedRange {
@@ -223,13 +223,27 @@ pub(crate) fn highlight(
});
}
});
stack.pop();
}
// Highlight escape sequences
if let Some(char_ranges) = string.char_ranges() {
stack.push();
for (piece_range, _) in char_ranges.iter().filter(|(_, char)| char.is_ok()) {
if string.text()[piece_range.start().into()..].starts_with('\\') {
stack.add(HighlightedRange {
range: piece_range + range.start(),
highlight: HighlightTag::EscapeSequence.into(),
binding_hash: None,
});
}
}
stack.pop_and_inject(false);
}
stack.pop();
} else if let Some(string) =
element_to_highlight.as_token().cloned().and_then(ast::RawString::cast)
{
stack.push();
if is_format_string {
stack.push();
string.lex_format_specifier(|piece_range, kind| {
if let Some(highlight) = highlight_format_specifier(kind) {
stack.add(HighlightedRange {
@@ -239,8 +253,8 @@ pub(crate) fn highlight(
});
}
});
stack.pop();
}
stack.pop();
}
}
}