diff --git a/librubyfmt/src/intermediary.rs b/librubyfmt/src/intermediary.rs index 82cfd287..c747ba01 100644 --- a/librubyfmt/src/intermediary.rs +++ b/librubyfmt/src/intermediary.rs @@ -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(&self) -> Option<&[ConcreteLineToken<'src>; N]> { self.tokens.last_chunk::() } diff --git a/librubyfmt/src/render_queue_writer.rs b/librubyfmt/src/render_queue_writer.rs index b9fc0081..23a51314 100644 --- a/librubyfmt/src/render_queue_writer.rs +++ b/librubyfmt/src/render_queue_writer.rs @@ -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, @@ -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(); - } } }