mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-24 13:33:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove source position from FormatElement::DynamicText (#4619)

Browse source
This commit is contained in:
Micha Reiser 2023-05-24 16:36:14 +02:00 • committed by GitHub
parent 85f094f592
commit 6943beee66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 165 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1900,6 +1900,7 @@ dependencies = [
"rustc-hash",
"schemars",
"serde",
"static_assertions",
"tracing",
"unicode-width",
]

1
crates/ruff_formatter/Cargo.toml
View file

@ -14,6 +14,7 @@ schemars = { workspace = true, optional = true }
serde = { workspace = true, optional = true }
tracing = { version = "0.1.37", default-features = false, features = ["std"] }
unicode-width = { version = "0.1.10" }
static_assertions = "1.1.0"
[dev-dependencies]
insta = { workspace = true }

67
crates/ruff_formatter/src/builders.rs
View file

@ -276,8 +276,62 @@ impl std::fmt::Debug for StaticText {
}
}
/// Creates a text from a dynamic string and a range of the input source
pub fn dynamic_text(text: &str, position: TextSize) -> DynamicText {
/// Creates a source map entry from the passed source `position` to the position in the formatted output.
///
/// ## Examples
///
/// ```
/// /// ```
/// use ruff_formatter::format;
/// use ruff_formatter::prelude::*;
///
/// # fn main() -> FormatResult<()> {
/// // the tab must be encoded as \\t to not literally print a tab character ("Hello{tab}World" vs "Hello\tWorld")
/// use ruff_text_size::TextSize;
/// use ruff_formatter::SourceMarker;
///
///
/// let elements = format!(SimpleFormatContext::default(), [
/// source_position(TextSize::new(0)),
/// text("\"Hello "),
/// source_position(TextSize::new(8)),
/// text("'Ruff'"),
/// source_position(TextSize::new(14)),
/// text("\""),
/// source_position(TextSize::new(20))
/// ])?;
///
/// let printed = elements.print()?;
///
/// assert_eq!(printed.as_code(), r#""Hello 'Ruff'""#);
/// assert_eq!(printed.sourcemap(), [
/// SourceMarker { source: TextSize::new(0), dest: TextSize::new(0) },
/// SourceMarker { source: TextSize::new(0), dest: TextSize::new(7) },
/// SourceMarker { source: TextSize::new(8), dest: TextSize::new(7) },
/// SourceMarker { source: TextSize::new(8), dest: TextSize::new(13) },
/// SourceMarker { source: TextSize::new(14), dest: TextSize::new(13) },
/// SourceMarker { source: TextSize::new(14), dest: TextSize::new(14) },
/// SourceMarker { source: TextSize::new(20), dest: TextSize::new(14) },
/// ]);
///
/// # Ok(())
/// # }
/// ```
pub const fn source_position(position: TextSize) -> SourcePosition {
SourcePosition(position)
}
#[derive(Eq, PartialEq, Copy, Clone, Debug)]
pub struct SourcePosition(TextSize);
impl<Context> Format<Context> for SourcePosition {
fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
f.write_element(FormatElement::SourcePosition(self.0))
}
}
/// Creates a text from a dynamic string with its optional start-position in the source document
pub fn dynamic_text(text: &str, position: Option<TextSize>) -> DynamicText {
debug_assert_no_newlines(text);
DynamicText { text, position }
@ -286,14 +340,17 @@ pub fn dynamic_text(text: &str, position: TextSize) -> DynamicText {
#[derive(Eq, PartialEq)]
pub struct DynamicText<'a> {
text: &'a str,
position: TextSize,
position: Option<TextSize>,
}
impl<Context> Format<Context> for DynamicText<'_> {
fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
if let Some(source_position) = self.position {
f.write_element(FormatElement::SourcePosition(source_position))?;
}
f.write_element(FormatElement::DynamicText {
text: self.text.to_string().into_boxed_str(),
source_position: self.position,
})
}
}
@ -1781,7 +1838,7 @@ impl<Context, T> std::fmt::Debug for FormatWith<Context, T> {
/// let mut join = f.join_with(&separator);
///
/// for item in &self.items {
/// join.entry(&format_with(|f| write!(f, [dynamic_text(item, TextSize::default())])));
/// join.entry(&format_with(|f| write!(f, [dynamic_text(item, None)])));
/// }
/// join.finish()
/// })),

61
crates/ruff_formatter/src/format_element.rs
View file

@ -1,17 +1,15 @@
pub mod document;
pub mod tag;
use crate::format_element::tag::{LabelId, Tag};
use std::borrow::Cow;
#[cfg(target_pointer_width = "64")]
use crate::static_assert;
use crate::{TagKind, TextSize};
use ruff_text_size::TextRange;
use std::hash::{Hash, Hasher};
use std::ops::Deref;
use std::rc::Rc;
use crate::format_element::tag::{LabelId, Tag};
use crate::TagKind;
use ruff_text_size::{TextRange, TextSize};
/// Language agnostic IR for formatting source code.
///
/// Use the helper functions like [crate::builders::space], [crate::builders::soft_line_break] etc. defined in this file to create elements.
@ -26,16 +24,19 @@ pub enum FormatElement {
/// Forces the parent group to print in expanded mode.
ExpandParent,
/// Indicates the position of the elements coming after this element in the source document.
/// The printer will create a source map entry from this position in the source document to the
/// formatted position.
SourcePosition(TextSize),
/// Token constructed by the formatter from a static string
StaticText { text: &'static str },
/// Token constructed from the input source as a dynamic
/// string with its start position in the input document.
/// string.
DynamicText {
/// There's no need for the text to be mutable, using `Box<str>` safes 8 bytes over `String`.
text: Box<str>,
/// The start position of the dynamic token in the unformatted source code
source_position: TextSize,
},
/// Token constructed by slicing a defined range from a static string.
@ -80,6 +81,9 @@ impl std::fmt::Debug for FormatElement {
fmt.debug_list().entries(interned.deref()).finish()
}
FormatElement::Tag(tag) => fmt.debug_tuple("Tag").field(tag).finish(),
FormatElement::SourcePosition(position) => {
fmt.debug_tuple("SourcePosition").field(position).finish()
}
}
}
}
@ -241,9 +245,10 @@ impl FormatElements for FormatElement {
// Traverse into the most flat version because the content is guaranteed to expand when even
// the most flat version contains some content that forces a break.
FormatElement::BestFitting(best_fitting) => best_fitting.most_flat().will_break(),
FormatElement::LineSuffixBoundary | FormatElement::Space | FormatElement::Tag(_) => {
false
}
FormatElement::LineSuffixBoundary
| FormatElement::Space
| FormatElement::Tag(_)
| FormatElement::SourcePosition(_) => false,
}
}
@ -369,20 +374,26 @@ mod tests {
}
#[cfg(target_pointer_width = "64")]
static_assert!(std::mem::size_of::<ruff_text_size::TextRange>() == 8usize);
mod sizes {
// Increasing the size of FormatElement has serious consequences on runtime performance and memory footprint.
// Is there a more efficient way to encode the data to avoid increasing its size? Can the information
// be recomputed at a later point in time?
// You reduced the size of a format element? Excellent work!
#[cfg(target_pointer_width = "64")]
static_assert!(std::mem::size_of::<crate::format_element::tag::VerbatimKind>() == 8usize);
use crate::format_element::BestFitting;
use crate::prelude::tag::VerbatimKind;
use crate::prelude::Interned;
use ruff_text_size::TextRange;
use static_assertions::assert_eq_size;
#[cfg(not(debug_assertions))]
#[cfg(target_pointer_width = "64")]
static_assert!(std::mem::size_of::<crate::format_element::Tag>() == 16usize);
assert_eq_size!(TextRange, [u8; 8]);
assert_eq_size!(VerbatimKind, [u8; 8]);
assert_eq_size!(Interned, [u8; 16]);
assert_eq_size!(BestFitting, [u8; 16]);
// Increasing the size of FormatElement has serious consequences on runtime performance and memory footprint.
// Is there a more efficient way to encode the data to avoid increasing its size? Can the information
// be recomputed at a later point in time?
// You reduced the size of a format element? Excellent work!
#[cfg(not(debug_assertions))]
assert_eq_size!(crate::format_element::Tag, [u8; 16]);
#[cfg(not(debug_assertions))]
#[cfg(target_pointer_width = "64")]
static_assert!(std::mem::size_of::<crate::FormatElement>() == 32usize);
#[cfg(not(debug_assertions))]
assert_eq_size!(crate::FormatElement, [u8; 32]);
}

57
crates/ruff_formatter/src/format_element/document.rs
View file

@ -8,7 +8,6 @@ use crate::{
BufferExtensions, Format, FormatContext, FormatElement, FormatOptions, FormatResult, Formatter,
IndentStyle, LineWidth, PrinterOptions,
};
use ruff_text_size::TextSize;
use rustc_hash::FxHashMap;
use std::collections::HashMap;
use std::ops::Deref;
@ -231,6 +230,16 @@ impl Format<IrFormatContext> for &[FormatElement] {
write!(f, [text("expand_parent")])?;
}
FormatElement::SourcePosition(position) => {
write!(
f,
[dynamic_text(
&std::format!("source_position({:?})", position),
None
)]
)?;
}
FormatElement::LineSuffixBoundary => {
write!(f, [text("line_suffix_boundary")])?;
}
@ -265,10 +274,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
write!(
f,
[
dynamic_text(
&std::format!("<interned {index}>"),
TextSize::default()
),
dynamic_text(&std::format!("<interned {index}>"), None),
space(),
&interned.deref(),
]
@ -279,7 +285,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
f,
[dynamic_text(
&std::format!("<ref interned *{reference}>"),
TextSize::default()
None
)]
)?;
}
@ -300,10 +306,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
f,
[
text("<END_TAG_WITHOUT_START<"),
dynamic_text(
&std::format!("{:?}", tag.kind()),
TextSize::default()
),
dynamic_text(&std::format!("{:?}", tag.kind()), None),
text(">>"),
]
)?;
@ -318,15 +321,9 @@ impl Format<IrFormatContext> for &[FormatElement] {
text(")"),
soft_line_break_or_space(),
text("ERROR<START_END_TAG_MISMATCH<start: "),
dynamic_text(
&std::format!("{start_kind:?}"),
TextSize::default()
),
dynamic_text(&std::format!("{start_kind:?}"), None),
text(", end: "),
dynamic_text(
&std::format!("{:?}", tag.kind()),
TextSize::default()
),
dynamic_text(&std::format!("{:?}", tag.kind()), None),
text(">>")
]
)?;
@ -358,7 +355,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
f,
[
text("align("),
dynamic_text(&count.to_string(), TextSize::default()),
dynamic_text(&count.to_string(), None),
text(","),
space(),
]
@ -380,10 +377,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
write!(
f,
[
dynamic_text(
&std::format!("\"{group_id:?}\""),
TextSize::default()
),
dynamic_text(&std::format!("\"{group_id:?}\""), None),
text(","),
space(),
]
@ -406,7 +400,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
f,
[
text("indent_if_group_breaks("),
dynamic_text(&std::format!("\"{id:?}\""), TextSize::default()),
dynamic_text(&std::format!("\"{id:?}\""), None),
text(","),
space(),
]
@ -427,10 +421,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
write!(
f,
[
dynamic_text(
&std::format!("\"{group_id:?}\""),
TextSize::default()
),
dynamic_text(&std::format!("\"{group_id:?}\""), None),
text(","),
space(),
]
@ -443,10 +434,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
f,
[
text("label("),
dynamic_text(
&std::format!("\"{label_id:?}\""),
TextSize::default()
),
dynamic_text(&std::format!("\"{label_id:?}\""), None),
text(","),
space(),
]
@ -490,10 +478,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
ContentArrayEnd,
text(")"),
soft_line_break_or_space(),
dynamic_text(
&std::format!("<START_WITHOUT_END<{top:?}>>"),
TextSize::default()
),
dynamic_text(&std::format!("<START_WITHOUT_END<{top:?}>>"), None),
]
)?;
}

4
crates/ruff_formatter/src/format_extensions.rs
View file

@ -35,7 +35,7 @@ pub trait MemoizeFormat<Context> {
/// let value = self.value.get();
/// self.value.set(value + 1);
///
/// write!(f, [dynamic_text(&std::format!("Formatted {value} times."), TextSize::from(0))])
/// write!(f, [dynamic_text(&std::format!("Formatted {value} times."), None)])
/// }
/// }
///
@ -114,7 +114,7 @@ where
/// write!(f, [
/// text("Count:"),
/// space(),
/// dynamic_text(&std::format!("{current}"), TextSize::default()),
/// dynamic_text(&std::format!("{current}"), None),
/// hard_line_break()
/// ])?;
///

3
crates/ruff_formatter/src/lib.rs
View file

@ -33,7 +33,6 @@ pub mod group_id;
pub mod macros;
pub mod prelude;
pub mod printer;
mod utility_types;
use crate::formatter::Formatter;
use crate::group_id::UniqueGroupIdBuilder;
@ -428,7 +427,7 @@ pub type FormatResult<F> = Result<F, FormatError>;
/// fn fmt(&self, f: &mut Formatter<SimpleFormatContext>) -> FormatResult<()> {
/// write!(f, [
/// hard_line_break(),
/// dynamic_text(&self.0, TextSize::from(0)),
/// dynamic_text(&self.0, None),
/// hard_line_break(),
/// ])
/// }

37
crates/ruff_formatter/src/printer/mod.rs
View file

@ -95,10 +95,7 @@ impl<'a> Printer<'a> {
}
FormatElement::StaticText { text } => self.print_text(text, None),
FormatElement::DynamicText {
text,
source_position,
} => self.print_text(text, Some(*source_position)),
FormatElement::DynamicText { text } => self.print_text(text, None),
FormatElement::StaticTextSlice { text, range } => self.print_text(&text[*range], None),
FormatElement::Line(line_mode) => {
if args.mode().is_flat()
@ -129,6 +126,11 @@ impl<'a> Printer<'a> {
// Handled in `Document::propagate_expands()
}
FormatElement::SourcePosition(position) => {
self.state.source_position = *position;
self.push_marker();
}
FormatElement::LineSuffixBoundary => {
const HARD_BREAK: &FormatElement = &FormatElement::Line(LineMode::Hard);
self.flush_line_suffixes(queue, stack, Some(HARD_BREAK));
@ -273,7 +275,7 @@ impl<'a> Printer<'a> {
result
}
fn print_text(&mut self, text: &str, source_position: Option<TextSize>) {
fn print_text(&mut self, text: &str, source_range: Option<TextRange>) {
if !self.state.pending_indent.is_empty() {
let (indent_char, repeat_count) = match self.options.indent_style() {
IndentStyle::Tab => ('\t', 1),
@ -311,28 +313,27 @@ impl<'a> Printer<'a> {
// If the token has no source position (was created by the formatter)
// both the start and end marker will use the last known position
// in the input source (from state.source_position)
if let Some(source) = source_position {
self.state.source_position = source;
if let Some(range) = source_range {
self.state.source_position = range.start();
}
self.push_marker(SourceMarker {
source: self.state.source_position,
dest: self.state.buffer.text_len(),
});
self.push_marker();
self.print_str(text);
if source_position.is_some() {
self.state.source_position += text.text_len();
if let Some(range) = source_range {
self.state.source_position = range.end();
}
self.push_marker(SourceMarker {
self.push_marker();
}
fn push_marker(&mut self) {
let marker = SourceMarker {
source: self.state.source_position,
dest: self.state.buffer.text_len(),
});
}
};
fn push_marker(&mut self, marker: SourceMarker) {
if let Some(last) = self.state.source_markers.last() {
if last != &marker {
self.state.source_markers.push(marker)
@ -1008,6 +1009,8 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
}
}
FormatElement::SourcePosition(_) => {}
FormatElement::BestFitting(best_fitting) => {
let slice = match args.mode() {
PrintMode::Flat => best_fitting.most_flat(),

7
crates/ruff_formatter/src/utility_types.rs
View file

@ -1,7 +0,0 @@
#[cfg(target_pointer_width = "64")]
#[macro_export]
macro_rules! static_assert {
($expr:expr) => {
const _: i32 = 0 / $expr as i32;
};
}

5
crates/ruff_python_formatter/src/format/alias.rs
View file

@ -1,6 +1,5 @@
use ruff_formatter::prelude::*;
use ruff_formatter::write;
use ruff_text_size::TextSize;
use crate::context::ASTFormatContext;
use crate::cst::Alias;
@ -23,10 +22,10 @@ impl Format<ASTFormatContext> for FormatAlias<'_> {
fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
let alias = self.item;
write!(f, [dynamic_text(&alias.name, TextSize::default())])?;
write!(f, [dynamic_text(&alias.name, None)])?;
if let Some(asname) = &alias.asname {
write!(f, [text(" as ")])?;
write!(f, [dynamic_text(asname, TextSize::default())])?;
write!(f, [dynamic_text(asname, None)])?;
}
write!(f, [end_of_line_comments(alias)])?;

3
crates/ruff_python_formatter/src/format/arg.rs
View file

@ -1,6 +1,5 @@
use ruff_formatter::prelude::*;
use ruff_formatter::write;
use ruff_text_size::TextSize;
use crate::context::ASTFormatContext;
use crate::cst::Arg;
@ -23,7 +22,7 @@ impl Format<ASTFormatContext> for FormatArg<'_> {
fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
let arg = self.item;
write!(f, [dynamic_text(&arg.arg, TextSize::default())])?;
write!(f, [dynamic_text(&arg.arg, None)])?;
if let Some(annotation) = &arg.annotation {
write!(f, [text(": ")])?;
write!(f, [annotation.format()])?;

4
crates/ruff_python_formatter/src/format/builders.rs
View file

@ -1,6 +1,6 @@
use ruff_formatter::prelude::*;
use ruff_formatter::{write, Format};
use ruff_text_size::{TextRange, TextSize};
use ruff_text_size::TextRange;
use crate::context::ASTFormatContext;
use crate::cst::{Body, Stmt};
@ -98,7 +98,7 @@ impl<Context> Format<Context> for JoinNames<'_> {
fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
let mut join = f.join_with(text(", "));
for name in self.names {
join.entry(&dynamic_text(name, TextSize::default()));
join.entry(&dynamic_text(name, None));
}
join.finish()
}

11
crates/ruff_python_formatter/src/format/excepthandler.rs
View file

@ -1,6 +1,5 @@
use ruff_formatter::prelude::*;
use ruff_formatter::write;
use ruff_text_size::TextSize;
use crate::context::ASTFormatContext;
use crate::cst::{Excepthandler, ExcepthandlerKind};
@ -29,15 +28,7 @@ impl Format<ASTFormatContext> for FormatExcepthandler<'_> {
if let Some(type_) = &type_ {
write!(f, [space(), type_.format()])?;
if let Some(name) = &name {
write!(
f,
[
space(),
text("as"),
space(),
dynamic_text(name, TextSize::default()),
]
)?;
write!(f, [space(), text("as"), space(), dynamic_text(name, None)])?;
}
}
write!(f, [text(":")])?;

3
crates/ruff_python_formatter/src/format/expr.rs
View file

@ -4,7 +4,6 @@ use rustpython_parser::ast::{Constant, ConversionFlag};
use ruff_formatter::prelude::*;
use ruff_formatter::{format_args, write};
use ruff_text_size::TextSize;
use crate::context::ASTFormatContext;
use crate::cst::{
@ -676,7 +675,7 @@ fn format_attribute(
) -> FormatResult<()> {
write!(f, [value.format()])?;
write!(f, [text(".")])?;
write!(f, [dynamic_text(attr, TextSize::default())])?;
write!(f, [dynamic_text(attr, None)])?;
write!(f, [end_of_line_comments(expr)])?;
Ok(())
}

3
crates/ruff_python_formatter/src/format/keyword.rs
View file

@ -1,6 +1,5 @@
use ruff_formatter::prelude::*;
use ruff_formatter::write;
use ruff_text_size::TextSize;
use crate::context::ASTFormatContext;
use crate::cst::Keyword;
@ -25,7 +24,7 @@ impl Format<ASTFormatContext> for FormatKeyword<'_> {
write!(f, [leading_comments(keyword)])?;
if let Some(arg) = &keyword.arg {
write!(f, [dynamic_text(arg, TextSize::default())])?;
write!(f, [dynamic_text(arg, None)])?;
write!(f, [text("=")])?;
write!(f, [keyword.value.format()])?;
} else {

4
crates/ruff_python_formatter/src/format/numbers.rs
View file

@ -136,8 +136,8 @@ impl Format<ASTFormatContext> for IntLiteral {
write!(
f,
[
dynamic_text(&prefix.to_lowercase(), TextSize::default()),
dynamic_text(&suffix.to_uppercase(), TextSize::default())
dynamic_text(&prefix.to_lowercase(), None),
dynamic_text(&suffix.to_uppercase(), None)
]
)?;
} else {

14
crates/ruff_python_formatter/src/format/pattern.rs
View file

@ -2,7 +2,6 @@ use rustpython_parser::ast::Constant;
use ruff_formatter::prelude::*;
use ruff_formatter::write;
use ruff_text_size::TextSize;
use crate::context::ASTFormatContext;
use crate::cst::{Pattern, PatternKind};
@ -79,7 +78,7 @@ impl Format<ASTFormatContext> for FormatPattern<'_> {
space(),
text("**"),
space(),
dynamic_text(rest, TextSize::default())
dynamic_text(rest, None)
]
)?;
}
@ -105,13 +104,10 @@ impl Format<ASTFormatContext> for FormatPattern<'_> {
if !kwd_attrs.is_empty() {
write!(f, [text("(")])?;
if let Some(attr) = kwd_attrs.first() {
write!(f, [dynamic_text(attr, TextSize::default())])?;
write!(f, [dynamic_text(attr, None)])?;
}
for attr in kwd_attrs.iter().skip(1) {
write!(
f,
[text(","), space(), dynamic_text(attr, TextSize::default())]
)?;
write!(f, [text(","), space(), dynamic_text(attr, None)])?;
}
write!(f, [text(")")])?;
}
@ -128,7 +124,7 @@ impl Format<ASTFormatContext> for FormatPattern<'_> {
}
PatternKind::MatchStar { name } => {
if let Some(name) = name {
write!(f, [text("*"), dynamic_text(name, TextSize::default())])?;
write!(f, [text("*"), dynamic_text(name, None)])?;
} else {
write!(f, [text("*_")])?;
}
@ -141,7 +137,7 @@ impl Format<ASTFormatContext> for FormatPattern<'_> {
write!(f, [space()])?;
}
if let Some(name) = name {
write!(f, [dynamic_text(name, TextSize::default())])?;
write!(f, [dynamic_text(name, None)])?;
} else {
write!(f, [text("_")])?;
}

14
crates/ruff_python_formatter/src/format/stmt.rs
View file

@ -2,7 +2,6 @@
use ruff_formatter::prelude::*;
use ruff_formatter::{format_args, write};
use ruff_text_size::TextSize;
use crate::context::ASTFormatContext;
use crate::cst::{
@ -110,14 +109,7 @@ fn format_class_def(
write!(f, [leading_comments(body)])?;
write!(
f,
[
text("class"),
space(),
dynamic_text(name, TextSize::default())
]
)?;
write!(f, [text("class"), space(), dynamic_text(name, None)])?;
if !bases.is_empty() || !keywords.is_empty() {
let format_bases = format_with(|f| {
@ -180,7 +172,7 @@ fn format_func_def(
[
text("def"),
space(),
dynamic_text(name, TextSize::default()),
dynamic_text(name, None),
text("("),
group(&soft_block_indent(&format_with(|f| {
if stmt.trivia.iter().any(|c| c.kind.is_magic_trailing_comma()) {
@ -653,7 +645,7 @@ fn format_import_from(
}
}
if let Some(module) = module {
write!(f, [dynamic_text(module, TextSize::default())])?;
write!(f, [dynamic_text(module, None)])?;
}
write!(f, [space()])?;

6
crates/ruff_python_formatter/src/format/strings.rs
View file

@ -3,7 +3,7 @@ use rustpython_parser::{Mode, Tok};
use ruff_formatter::prelude::*;
use ruff_formatter::{write, Format};
use ruff_python_ast::str::{leading_quote, trailing_quote};
use ruff_text_size::{TextRange, TextSize};
use ruff_text_size::TextRange;
use crate::context::ASTFormatContext;
use crate::cst::Expr;
@ -64,7 +64,6 @@ impl Format<ASTFormatContext> for StringLiteralPart {
} else {
double_escape(body).into()
},
source_position: TextSize::default(),
})?;
f.write_element(FormatElement::StaticText { text: "\"" })?;
Ok(())
@ -76,7 +75,6 @@ impl Format<ASTFormatContext> for StringLiteralPart {
} else {
single_escape(body).into()
},
source_position: TextSize::default(),
})?;
f.write_element(FormatElement::StaticText { text: "'" })?;
Ok(())
@ -90,7 +88,6 @@ impl Format<ASTFormatContext> for StringLiteralPart {
f.write_element(FormatElement::StaticText { text: "'''" })?;
f.write_element(FormatElement::DynamicText {
text: body.to_string().into_boxed_str(),
source_position: TextSize::default(),
})?;
f.write_element(FormatElement::StaticText { text: "'''" })?;
Ok(())
@ -98,7 +95,6 @@ impl Format<ASTFormatContext> for StringLiteralPart {
f.write_element(FormatElement::StaticText { text: "\"\"\"" })?;
f.write_element(FormatElement::DynamicText {
text: body.to_string().into_boxed_str(),
source_position: TextSize::default(),
})?;
f.write_element(FormatElement::StaticText { text: "\"\"\"" })?;
Ok(())

3
crates/ruff_python_formatter/src/lib.rs
View file

@ -67,7 +67,6 @@ mod tests {
use insta::assert_snapshot;
use ruff_testing_macros::fixture;
use ruff_text_size::TextSize;
use similar::TextDiff;
use crate::fmt;
@ -208,7 +207,7 @@ mod tests {
while let Some(word) = words.next() {
let is_last = words.peek().is_none();
let format_word = format_with(|f| {
write!(f, [dynamic_text(word, TextSize::default())])?;
write!(f, [dynamic_text(word, None)])?;
if is_last {
write!(f, [text("\"")])?;