From 445052f6d426043b543033f3fa4594fc1a09d7fa Mon Sep 17 00:00:00 2001
From: Leander Tentrup <leander.tentrup@gmail.com>
Date: Wed, 22 Apr 2020 15:28:35 +0200
Subject: Adapt format specifier highlighting to support escaped squences and
 unicode identifiers

---
 crates/ra_ide/src/syntax_highlighting.rs | 63 +++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 22 deletions(-)

(limited to 'crates/ra_ide/src/syntax_highlighting.rs')

diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 8ee3a78c6..b5fd3390f 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -245,28 +245,29 @@ pub(crate) fn highlight(
                 stack.push();
                 if is_format_string {
                     string.lex_format_specifier(|piece_range, kind| {
-                        let highlight = match kind {
-                            FormatSpecifier::Open
-                            | FormatSpecifier::Close
-                            | FormatSpecifier::Colon
-                            | FormatSpecifier::Fill
-                            | FormatSpecifier::Align
-                            | FormatSpecifier::Sign
-                            | FormatSpecifier::NumberSign
-                            | FormatSpecifier::DollarSign
-                            | FormatSpecifier::Dot
-                            | FormatSpecifier::Asterisk
-                            | FormatSpecifier::QuestionMark => HighlightTag::Attribute,
-                            FormatSpecifier::Integer | FormatSpecifier::Zero => {
-                                HighlightTag::NumericLiteral
-                            }
-                            FormatSpecifier::Identifier => HighlightTag::Local,
-                        };
-                        stack.add(HighlightedRange {
-                            range: piece_range + range.start(),
-                            highlight: highlight.into(),
-                            binding_hash: None,
-                        });
+                        if let Some(highlight) = highlight_format_specifier(kind) {
+                            stack.add(HighlightedRange {
+                                range: piece_range + range.start(),
+                                highlight: highlight.into(),
+                                binding_hash: None,
+                            });
+                        }
+                    });
+                }
+                stack.pop();
+            } else if let Some(string) =
+                element_to_highlight.as_token().cloned().and_then(ast::RawString::cast)
+            {
+                stack.push();
+                if is_format_string {
+                    string.lex_format_specifier(|piece_range, kind| {
+                        if let Some(highlight) = highlight_format_specifier(kind) {
+                            stack.add(HighlightedRange {
+                                range: piece_range + range.start(),
+                                highlight: highlight.into(),
+                                binding_hash: None,
+                            });
+                        }
                     });
                 }
                 stack.pop();
@@ -277,6 +278,24 @@ pub(crate) fn highlight(
     stack.flattened()
 }
 
+fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HighlightTag> {
+    Some(match kind {
+        FormatSpecifier::Open
+        | FormatSpecifier::Close
+        | FormatSpecifier::Colon
+        | FormatSpecifier::Fill
+        | FormatSpecifier::Align
+        | FormatSpecifier::Sign
+        | FormatSpecifier::NumberSign
+        | FormatSpecifier::DollarSign
+        | FormatSpecifier::Dot
+        | FormatSpecifier::Asterisk
+        | FormatSpecifier::QuestionMark => HighlightTag::Attribute,
+        FormatSpecifier::Integer | FormatSpecifier::Zero => HighlightTag::NumericLiteral,
+        FormatSpecifier::Identifier => HighlightTag::Local,
+    })
+}
+
 fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
     let path = macro_call.path()?;
     let name_ref = path.segment()?.name_ref()?;
-- 
cgit v1.2.3