Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/syntax_highlighting/format.rs')
| -rw-r--r-- | crates/ide/src/syntax_highlighting/format.rs | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/crates/ide/src/syntax_highlighting/format.rs b/crates/ide/src/syntax_highlighting/format.rs index f83262fc5c..0aa97a6102 100644 --- a/crates/ide/src/syntax_highlighting/format.rs +++ b/crates/ide/src/syntax_highlighting/format.rs @@ -1,8 +1,8 @@ //! Syntax highlighting for format macro strings. -use ide_db::SymbolKind; +use ide_db::{helpers::format_string::is_format_string, SymbolKind}; use syntax::{ ast::{self, FormatSpecifier, HasFormatSpecifier}, - AstNode, AstToken, TextRange, + TextRange, }; use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag}; @@ -13,7 +13,7 @@ pub(super) fn highlight_format_string( expanded_string: &ast::String, range: TextRange, ) { - if is_format_string(expanded_string).is_none() { + if !is_format_string(expanded_string) { return; } @@ -28,32 +28,6 @@ pub(super) fn highlight_format_string( }); } -fn is_format_string(string: &ast::String) -> Option<()> { - // Check if `string` is a format string argument of a macro invocation. - // `string` is a string literal, mapped down into the innermost macro expansion. - // Since `format_args!` etc. remove the format string when expanding, but place all arguments - // in the expanded output, we know that the string token is (part of) the format string if it - // appears in `format_args!` (otherwise it would have been mapped down further). - // - // This setup lets us correctly highlight the components of `concat!("{}", "bla")` format - // strings. It still fails for `concat!("{", "}")`, but that is rare. - - let macro_call = string.syntax().ancestors().find_map(ast::MacroCall::cast)?; - let name = macro_call.path()?.segment()?.name_ref()?; - - if !matches!( - name.text().as_str(), - "format_args" | "format_args_nl" | "const_format_args" | "panic_2015" | "panic_2021" - ) { - return None; - } - - // NB: we match against `panic_2015`/`panic_2021` here because they have a special-cased arm for - // `"{}"`, which otherwise wouldn't get highlighted. - - Some(()) -} - fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HlTag> { Some(match kind { FormatSpecifier::Open |