From b8671363779863c5f2915ba6214b3c72f421e703 Mon Sep 17 00:00:00 2001 From: marfoldi Date: Tue, 19 Oct 2021 15:51:59 +0200 Subject: [PATCH 1/2] [LOYAL-2704] Add `new_line` option to @definition --- lib/slither/generator.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/slither/generator.rb b/lib/slither/generator.rb index fbd3032..56deb75 100644 --- a/lib/slither/generator.rb +++ b/lib/slither/generator.rb @@ -37,8 +37,8 @@ def stream(data, io) private def generate_file_output - output = @builder.join("\n") - output.concat("\n") if add_trailing_newline? + output = @builder.join(newline) + output.concat(newline) if add_trailing_newline? output end @@ -48,16 +48,20 @@ def add_trailing_newline? end def newline_needed(first_line) - first_line ? "".freeze : "\n".freeze + first_line ? "".freeze : newline end def format_row_for_streaming(row, section, first_line) if add_trailing_newline? - section.format(row) + "\n".freeze + section.format(row) + newline else add_newline = newline_needed(first_line) section.format(row).prepend(add_newline) end end + + def newline + @definition.options[:new_line] || "\n".freeze + end end end From b3e7b25c8113dce7244ec7f15c23ffaed54d19fd Mon Sep 17 00:00:00 2001 From: marfoldi Date: Tue, 19 Oct 2021 16:03:19 +0200 Subject: [PATCH 2/2] [LOYAL-2704] Memoizing `newline` --- lib/slither/generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/slither/generator.rb b/lib/slither/generator.rb index 56deb75..658338a 100644 --- a/lib/slither/generator.rb +++ b/lib/slither/generator.rb @@ -61,7 +61,7 @@ def format_row_for_streaming(row, section, first_line) end def newline - @definition.options[:new_line] || "\n".freeze + @newline ||= @definition.options[:new_line] || "\n".freeze end end end