language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-02 14:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Respect indent when measuring with MeasureMode::AllLines (#6120)

Browse source
This commit is contained in:
Micha Reiser 2023-07-27 13:34:36 +02:00 • committed by Charlie Marsh
parent 9574ff3dc7
commit 6bf6646c5d
5 changed files with 109 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,6 @@ impl<'a> Printer<'a> {
self.print_str("\n");
}
self.state.pending_space = false;
self.state.pending_indent = args.indention();
}
}
@ -744,7 +743,6 @@ struct PrinterState<'a> {
source_markers: Vec<SourceMarker>,
source_position: TextSize,
pending_indent: Indention,
pending_space: bool,
measured_group_fits: bool,
generated_line: usize,
generated_column: usize,
@ -1009,12 +1007,12 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
let args = self.stack.top();
match element {
FormatElement::Space => return Ok(self.fits_text(" ")),
FormatElement::Space => return Ok(self.fits_text(" ", args)),
FormatElement::Line(line_mode) => {
match args.mode() {
PrintMode::Flat => match line_mode {
LineMode::SoftOrSpace => return Ok(self.fits_text(" ")),
LineMode::SoftOrSpace => return Ok(self.fits_text(" ", args)),
LineMode::Soft => {}
LineMode::Hard | LineMode::Empty => {
return Ok(if self.must_be_flat {
@ -1036,17 +1034,18 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
MeasureMode::AllLines => {
// Continue measuring on the next line
self.state.line_width = 0;
self.state.pending_indent = args.indention();
}
}
}
}
}
FormatElement::StaticText { text } => return Ok(self.fits_text(text)),
FormatElement::DynamicText { text, .. } => return Ok(self.fits_text(text)),
FormatElement::StaticText { text } => return Ok(self.fits_text(text, args)),
FormatElement::DynamicText { text, .. } => return Ok(self.fits_text(text, args)),
FormatElement::SourceCodeSlice { slice, .. } => {
let text = slice.text(self.printer.source_code);
return Ok(self.fits_text(text));
return Ok(self.fits_text(text, args));
}
FormatElement::LineSuffixBoundary => {
if self.state.has_line_suffix {
@ -1255,7 +1254,7 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
Ok(Fits::Maybe)
}
fn fits_text(&mut self, text: &str) -> Fits {
fn fits_text(&mut self, text: &str, args: PrintElementArgs) -> Fits {
let indent = std::mem::take(&mut self.state.pending_indent);
self.state.line_width += indent.level() as usize * self.options().indent_width() as usize
+ indent.align() as usize;
@ -1264,10 +1263,17 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
let char_width = match c {
'\t' => self.options().tab_width as usize,
'\n' => {
return if self.must_be_flat {
Fits::No
if self.must_be_flat {
return Fits::No;
} else {
Fits::Yes
match args.measure_mode() {
MeasureMode::FirstLine => return Fits::Yes,
MeasureMode::AllLines => {
self.state.line_width = 0;
self.state.pending_indent = args.indention();
continue;
}
}
};
}
c => c.width().unwrap_or(0),