Skip to content

Remove unneeded heredoc checks in render queue #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reese merged 1 commit into from
Jan 30, 2026
Merged

Remove unneeded heredoc checks in render queue #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions librubyfmt/src/intermediary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,11 @@ impl<'src> Intermediary<'src> {
self.tokens.len()
}

pub fn pop_heredoc_mistake(&mut self) {
self.tokens.remove(self.tokens.len() - 1);
self.tokens.remove(self.tokens.len() - 1);
self.index_of_last_hard_newline = self.tokens.len() - 1;
}

pub fn fix_heredoc_duplicate_indent_mistake(&mut self) {
// Remove duplicate indent
self.tokens.remove(self.tokens.len() - 3);
}

pub fn fix_heredoc_arg_newline_mistake(&mut self) {
// Remove duplicate newline
self.tokens.remove(self.tokens.len() - 1);
self.index_of_last_hard_newline = self.tokens.len() - 1;
}

pub fn last<const N: usize>(&self) -> Option<&[ConcreteLineToken<'src>; N]> {
self.tokens.last_chunk::<N>()
}
Expand Down
27 changes: 0 additions & 27 deletions librubyfmt/src/render_queue_writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,6 @@ impl<'src> RenderQueueWriter<'src> {
},
}

if let Some(
[
ConcreteLineToken::HeredocClose { .. },
ConcreteLineToken::HardNewLine,
ConcreteLineToken::Indent { .. },
ConcreteLineToken::HardNewLine,
],
) = accum.last::<4>()
{
accum.pop_heredoc_mistake();
}

if let Some(
[
ConcreteLineToken::End,
Expand Down Expand Up @@ -210,21 +198,6 @@ impl<'src> RenderQueueWriter<'src> {
{
accum.fix_heredoc_duplicate_indent_mistake();
}

if let Some(
[
ConcreteLineToken::HeredocClose { .. },
ConcreteLineToken::HardNewLine,
ConcreteLineToken::Indent { .. },
ConcreteLineToken::Delim { .. },
ConcreteLineToken::Comma,
ConcreteLineToken::HardNewLine,
ConcreteLineToken::HardNewLine,
],
) = accum.last::<7>()
{
accum.fix_heredoc_arg_newline_mistake();
}
}
}

Expand Down
Loading