language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-03 07:04:53 +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

39
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 {
source: self.state.source_position,
dest: self.state.buffer.text_len(),
});
self.push_marker();
}
fn push_marker(&mut self, marker: SourceMarker) {
fn push_marker(&mut self) {
let marker = SourceMarker {
source: self.state.source_position,
dest: self.state.buffer.text_len(),
};
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(),