Use helper method in is_format_string

This commit is contained in:
btwotwo 2022-10-06 16:29:23 +02:00
parent 55c5014b76
commit 386f46a5a1
No known key found for this signature in database
GPG Key ID: D456A0349D73A0A3

View File

@ -1,9 +1,10 @@
//! Tools to work with format string literals for the `format_args!` family of macros. //! Tools to work with format string literals for the `format_args!` family of macros.
use syntax::{ use syntax::{
ast::{self, IsString}, ast::{self, IsString}, TextRange, TextSize,
AstNode, AstToken, TextRange, TextSize,
}; };
use super::node_ext::get_outer_macro_name;
pub fn is_format_string(string: &ast::String) -> bool { pub fn is_format_string(string: &ast::String) -> bool {
// Check if `string` is a format string argument of a macro invocation. // Check if `string` is a format string argument of a macro invocation.
// `string` is a string literal, mapped down into the innermost macro expansion. // `string` is a string literal, mapped down into the innermost macro expansion.
@ -14,8 +15,7 @@ pub fn is_format_string(string: &ast::String) -> bool {
// This setup lets us correctly highlight the components of `concat!("{}", "bla")` format // This setup lets us correctly highlight the components of `concat!("{}", "bla")` format
// strings. It still fails for `concat!("{", "}")`, but that is rare. // strings. It still fails for `concat!("{", "}")`, but that is rare.
(|| { (|| {
let macro_call = string.syntax().parent_ancestors().find_map(ast::MacroCall::cast)?; let name = get_outer_macro_name(string)?;
let name = macro_call.path()?.segment()?.name_ref()?;
if !matches!( if !matches!(
name.text().as_str(), name.text().as_str(),