language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-27 18:26:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #20418 from A4-Tacks/fix-extract-expr-from-fmtstr-on-write
Some checks are pending
metrics / other_metrics (self) (push) Blocked by required conditions
Details
metrics / other_metrics (webrender-2022) (push) Blocked by required conditions
Details
metrics / generate_final_metrics (push) Blocked by required conditions
Details
metrics / build_metrics (push) Waiting to run
Details
metrics / other_metrics (diesel-1.4.8) (push) Blocked by required conditions
Details
metrics / other_metrics (hyper-0.14.18) (push) Blocked by required conditions
Details
metrics / other_metrics (ripgrep-13.0.0) (push) Blocked by required conditions
Details
rustdoc / rustdoc (push) Waiting to run
Details

Browse source 
Fix extract_expressions_from_format_string on write!
This commit is contained in:
Chayim Refael Friedman 2025-08-10 07:10:10 +00:00 • committed by GitHub
commit d307bc614e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/ide-assists/src/handlers/extract_expressions_from_format_string.rs
View file

@ -7,8 +7,8 @@ use itertools::Itertools;
use syntax::{
AstNode, AstToken, NodeOrToken,
SyntaxKind::WHITESPACE,
T,
ast::{self, make, syntax_factory::SyntaxFactory},
SyntaxToken, T,
ast::{self, TokenTree, make, syntax_factory::SyntaxFactory},
};
// Assist: extract_expressions_from_format_string
@ -58,10 +58,11 @@ pub(crate) fn extract_expressions_from_format_string(
tt.syntax().text_range(),
|edit| {
// Extract existing arguments in macro
let tokens = tt.token_trees_and_tokens().collect_vec();
let mut raw_tokens = tt.token_trees_and_tokens().skip(1).collect_vec();
let format_string_index = format_str_index(&raw_tokens, &fmt_string);
let tokens = raw_tokens.split_off(format_string_index);
let existing_args = if let [
_opening_bracket,
NodeOrToken::Token(_format_string),
_args_start_comma,
tokens @ ..,
@ -90,9 +91,11 @@ pub(crate) fn extract_expressions_from_format_string(
// Start building the new args
let mut existing_args = existing_args.into_iter();
let mut new_tt_bits = vec![NodeOrToken::Token(make::tokens::literal(&new_fmt))];
let mut new_tt_bits = raw_tokens;
let mut placeholder_indexes = vec![];
new_tt_bits.push(NodeOrToken::Token(make::tokens::literal(&new_fmt)));
for arg in extracted_args {
if matches!(arg, Arg::Expr(_) | Arg::Placeholder) {
// insert ", " before each arg
@ -150,7 +153,9 @@ pub(crate) fn extract_expressions_from_format_string(
}
// Add the final tabstop after the format literal
if let Some(NodeOrToken::Token(literal)) = new_tt.token_trees_and_tokens().nth(1) {
if let Some(NodeOrToken::Token(literal)) =
new_tt.token_trees_and_tokens().nth(1 + format_string_index)
{
let annotation = edit.make_tabstop_after(cap);
editor.add_annotation(literal, annotation);
}
@ -163,6 +168,17 @@ pub(crate) fn extract_expressions_from_format_string(
Some(())
}
fn format_str_index(
raw_tokens: &[NodeOrToken<TokenTree, SyntaxToken>],
fmt_string: &ast::String,
) -> usize {
let fmt_string = fmt_string.syntax();
raw_tokens
.iter()
.position(|tt| tt.as_token().is_some_and(|tt| tt == fmt_string))
.unwrap_or_default()
}
#[cfg(test)]
mod tests {
use super::*;
@ -186,6 +202,24 @@ fn main() {
);
}
#[test]
fn multiple_middle_arg_on_write() {
check_assist(
extract_expressions_from_format_string,
r#"
//- minicore: write
fn main() {
write!(writer(), "{} {x + 1:b} {}$0", y + 2, 2);
}
"#,
r#"
fn main() {
write!(writer(), "{} {:b} {}"$0, y + 2, x + 1, 2);
}
"#,
);
}
#[test]
fn single_arg() {
check_assist(