Merge #11294

[rust.git] / crates / ide / src / syntax_highlighting / format.rs

diff --git a/crates/ide/src/syntax_highlighting/format.rs b/crates/ide/src/syntax_highlighting/format.rs
index a74ca844b33f89f955e9d2e0327dfe1c9fd9b40f..c74b9f56db62ee961c69a3af3d461281d95d68cc 100644 (file)
--- a/crates/ide/src/syntax_highlighting/format.rs
+++ b/crates/ide/src/syntax_highlighting/format.rs
@@ -1,21 +1,23 @@
 //! Syntax highlighting for format macro strings.
-use syntax::{
-    ast::{self, FormatSpecifier, HasFormatSpecifier},
-    AstNode, AstToken, TextRange,
+use ide_db::{
+    helpers::format_string::{is_format_string, lex_format_specifiers, FormatSpecifier},
+    SymbolKind,
 };
+use syntax::{ast, TextRange};
 
-use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag, SymbolKind};
+use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag};
 
 pub(super) fn highlight_format_string(
     stack: &mut Highlights,
     string: &ast::String,
+    expanded_string: &ast::String,
     range: TextRange,
 ) {
-    if is_format_string(string).is_none() {
+    if !is_format_string(expanded_string) {
         return;
     }
 
-    string.lex_format_specifier(|piece_range, kind| {
+    lex_format_specifiers(string, &mut |piece_range, kind| {
         if let Some(highlight) = highlight_format_specifier(kind) {
             stack.add(HlRange {
                 range: piece_range + range.start(),
@@ -26,25 +28,6 @@ pub(super) fn highlight_format_string(
     });
 }
 
-fn is_format_string(string: &ast::String) -> Option<()> {
-    let parent = string.syntax().parent();
-
-    let name = parent.parent().and_then(ast::MacroCall::cast)?.path()?.segment()?.name_ref()?;
-    if !matches!(name.text().as_str(), "format_args" | "format_args_nl") {
-        return None;
-    }
-
-    let first_literal = parent
-        .children_with_tokens()
-        .filter_map(|it| it.as_token().cloned().and_then(ast::String::cast))
-        .next()?;
-    if &first_literal != string {
-        return None;
-    }
-
-    Some(())
-}
-
 fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HlTag> {
     Some(match kind {
         FormatSpecifier::Open