summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2021-12-23 11:35:49 -0500
committerAustin Ziegler <austin@zieglers.ca>2022-07-04 20:26:10 -0400
commite5e78807564a3565a37d385b0898cd58776820f4 (patch)
treeb506eba3f79058a8a98e7a22f84ff530ff4b52cb
parent8992d9c1c13f7852f23ef823257bcf9691049e56 (diff)
downloaddiff-lcs-e5e78807564a3565a37d385b0898cd58776820f4.tar.gz
standardrb --only Style/StringLiteralsInInterpolation --fix and more
-rw-r--r--lib/diff/lcs/hunk.rb17
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index 7f97a7d..8da65c2 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -22,7 +22,7 @@ class Diff::LCS::Hunk
end
if String.method_defined?(:encoding)
- @preferred_data_encoding = data_old.fetch(0) { data_new.fetch(0) { "" } }.encoding
+ @preferred_data_encoding = data_old.fetch(0) { data_new.fetch(0, "") }.encoding
end
@data_old = data_old
@@ -33,7 +33,6 @@ class Diff::LCS::Hunk
@file_length_difference = after # The caller must get this manually
@max_diff_size = @blocks.map { |e| e.diff_size.abs }.max
-
# Save the start & end of each array. If the array doesn't exist (e.g.,
# we're only adding items in this block), then figure out the line number
# based on the line number of the other file and the current difference in
@@ -140,7 +139,7 @@ class Diff::LCS::Hunk
# Calculate item number range. Old diff range is just like a context
# diff range, except the ranges are on one line with the action between
# them.
- s = encode("#{context_range(:old, ',')}#{OLD_DIFF_OP_ACTION[block.op]}#{context_range(:new, ',')}\n")
+ s = encode("#{context_range(:old, ",")}#{OLD_DIFF_OP_ACTION[block.op]}#{context_range(:new, ",")}\n")
# If removing anything, just print out all the remove lines in the hunk
# which is just all the remove lines in the block.
unless block.remove.empty?
@@ -172,7 +171,7 @@ class Diff::LCS::Hunk
# file -- don't take removed items into account.
lo, hi, num_added, num_removed = @start_old, @end_old, 0, 0
- outlist = @data_old[lo..hi].map { |e| String.new("#{encode(' ')}#{e.chomp}") }
+ outlist = @data_old[lo..hi].map { |e| String.new("#{encode(" ")}#{e.chomp}") }
last_block = blocks[-1]
@@ -212,7 +211,7 @@ class Diff::LCS::Hunk
def context_diff(last = false)
s = encode("***************\n")
- s << encode("*** #{context_range(:old, ',', last)} ****\n")
+ s << encode("*** #{context_range(:old, ",", last)} ****\n")
r = context_range(:new, ",", last)
if last
@@ -226,7 +225,7 @@ class Diff::LCS::Hunk
removes = @blocks.reject { |e| e.remove.empty? }
unless removes.empty?
- outlist = @data_old[lo..hi].map { |e| String.new("#{encode(' ')}#{e.chomp}") }
+ outlist = @data_old[lo..hi].map { |e| String.new("#{encode(" ")}#{e.chomp}") }
last_block = removes[-1]
@@ -248,7 +247,7 @@ class Diff::LCS::Hunk
inserts = @blocks.reject { |e| e.insert.empty? }
unless inserts.empty?
- outlist = @data_new[lo..hi].map { |e| String.new("#{encode(' ')}#{e.chomp}") }
+ outlist = @data_new[lo..hi].map { |e| String.new("#{encode(" ")}#{e.chomp}") }
last_block = inserts[-1]
@@ -273,9 +272,9 @@ class Diff::LCS::Hunk
s =
if format == :reverse_ed
- encode("#{ED_DIFF_OP_ACTION[@blocks[0].op]}#{context_range(:old, ',')}\n")
+ encode("#{ED_DIFF_OP_ACTION[@blocks[0].op]}#{context_range(:old, ",")}\n")
else
- encode("#{context_range(:old, ' ')}#{ED_DIFF_OP_ACTION[@blocks[0].op]}\n")
+ encode("#{context_range(:old, " ")}#{ED_DIFF_OP_ACTION[@blocks[0].op]}\n")
end
unless @blocks[0].insert.empty?