1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379
|
# frozen_string_literal: true
require "diff/lcs/block"
# A Hunk is a group of Blocks which overlap because of the context surrounding
# each block. (So if we're not using context, every hunk will contain one
# block.) Used in the diff program (bin/ldiff).
class Diff::LCS::Hunk
OLD_DIFF_OP_ACTION = {"+" => "a", "-" => "d", "!" => "c"}.freeze # :nodoc:
ED_DIFF_OP_ACTION = {"+" => "a", "-" => "d", "!" => "c"}.freeze # :nodoc:
private_constant :OLD_DIFF_OP_ACTION, :ED_DIFF_OP_ACTION if respond_to?(:private_constant)
# Create a hunk using references to both the old and new data, as well as the
# piece of data.
def initialize(data_old, data_new, piece, flag_context, file_length_difference)
# At first, a hunk will have just one Block in it
@blocks = [Diff::LCS::Block.new(piece)]
if @blocks[0].remove.empty? && @blocks[0].insert.empty?
fail "Cannot build a hunk from #{piece.inspect}; has no add or remove actions"
end
if String.method_defined?(:encoding)
@preferred_data_encoding = data_old.fetch(0) { data_new.fetch(0) { "" } }.encoding
end
@data_old = data_old
@data_new = data_new
@old_empty = data_old.empty? || (data_old.size == 1 && data_old[0].empty?)
@new_empty = data_new.empty? || (data_new.size == 1 && data_new[0].empty?)
before = after = file_length_difference
after += @blocks[0].diff_size
@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
# file lengths.
if @blocks[0].remove.empty?
a1 = a2 = nil
else
a1 = @blocks[0].remove[0].position
a2 = @blocks[0].remove[-1].position
end
if @blocks[0].insert.empty?
b1 = b2 = nil
else
b1 = @blocks[0].insert[0].position
b2 = @blocks[0].insert[-1].position
end
@start_old = a1 || (b1 - before)
@start_new = b1 || (a1 + before)
@end_old = a2 || (b2 - after)
@end_new = b2 || (a2 + after)
self.flag_context = flag_context
end
attr_reader :blocks
attr_reader :start_old, :start_new
attr_reader :end_old, :end_new
attr_reader :file_length_difference
# Change the "start" and "end" fields to note that context should be added
# to this hunk.
attr_accessor :flag_context
undef :flag_context=
def flag_context=(context) # :nodoc: # standard:disable Lint/DuplicateMethods
return if context.nil? || context.zero?
add_start = (context > @start_old) ? @start_old : context
@start_old -= add_start
@start_new -= add_start
old_size = @data_old.size
add_end =
if (@end_old + context) >= old_size
old_size - @end_old - 1
else
context
end
@end_old += add_end
@end_new += add_end
end
# Merges this hunk and the provided hunk together if they overlap. Returns
# a truthy value so that if there is no overlap, you can know the merge
# was skipped.
def merge(hunk)
return unless overlaps?(hunk)
@start_old = hunk.start_old
@start_new = hunk.start_new
blocks.unshift(*hunk.blocks)
end
alias_method :unshift, :merge
# Determines whether there is an overlap between this hunk and the
# provided hunk. This will be true if the difference between the two hunks
# start or end positions is within one position of each other.
def overlaps?(hunk)
hunk and (((@start_old - hunk.end_old) <= 1) or
((@start_new - hunk.end_new) <= 1))
end
# Returns a diff string based on a format.
def diff(format, last = false)
case format
when :old
old_diff(last)
when :unified
unified_diff(last)
when :context
context_diff(last)
when :ed
self
when :reverse_ed, :ed_finish
ed_diff(format, last)
else
fail "Unknown diff format #{format}."
end
end
# Note that an old diff can't have any context. Therefore, we know that
# there's only one block in the hunk.
def old_diff(last = false)
warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
block = @blocks[0]
if last
old_missing_newline = !@old_empty && missing_last_newline?(@data_old)
new_missing_newline = !@new_empty && missing_last_newline?(@data_new)
end
# 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")
# 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?
@data_old[@start_old..@end_old].each { |e| s << encode("< ") + e.chomp + encode("\n") }
end
s << encode("\\ No newline at end of file\n") if old_missing_newline && !new_missing_newline
s << encode("---\n") if block.op == "!"
unless block.insert.empty?
@data_new[@start_new..@end_new].each { |e| s << encode("> ") + e.chomp + encode("\n") }
end
s << encode("\\ No newline at end of file\n") if new_missing_newline && !old_missing_newline
s
end
private :old_diff
def unified_diff(last = false)
# Calculate item number range.
s = encode("@@ -#{unified_range(:old)} +#{unified_range(:new)} @@\n")
# Outlist starts containing the hunk of the old file. Removing an item
# just means putting a '-' in front of it. Inserting an item requires
# getting it from the new file and splicing it in. We splice in
# +num_added+ items. Remove blocks use +num_added+ because splicing
# changed the length of outlist.
#
# We remove +num_removed+ items. Insert blocks use +num_removed+
# because their item numbers -- corresponding to positions in the NEW
# file -- don't take removed items into account.
lo, hi, num_added, num_removed = @start_old, @end_old, 0, 0
# standard:disable Performance/UnfreezeString
outlist = @data_old[lo..hi].map { |e| String.new("#{encode(" ")}#{e.chomp}") }
# standard:enable Performance/UnfreezeString
last_block = blocks[-1]
if last
old_missing_newline = !@old_empty && missing_last_newline?(@data_old)
new_missing_newline = !@new_empty && missing_last_newline?(@data_new)
end
@blocks.each do |block|
block.remove.each do |item|
op = item.action.to_s # -
offset = item.position - lo + num_added
outlist[offset][0, 1] = encode(op)
num_removed += 1
end
if last && block == last_block && old_missing_newline && !new_missing_newline
outlist << encode('\\ No newline at end of file')
num_removed += 1
end
block.insert.each do |item|
op = item.action.to_s # +
offset = item.position - @start_new + num_removed
outlist[offset, 0] = encode(op) + @data_new[item.position].chomp
num_added += 1
end
end
outlist << encode('\\ No newline at end of file') if last && new_missing_newline
s << outlist.join(encode("\n"))
s
end
private :unified_diff
def context_diff(last = false)
s = encode("***************\n")
s << encode("*** #{context_range(:old, ",")} ****\n")
r = context_range(:new, ",")
if last
old_missing_newline = missing_last_newline?(@data_old)
new_missing_newline = missing_last_newline?(@data_new)
end
# Print out file 1 part for each block in context diff format if there
# are any blocks that remove items
lo, hi = @start_old, @end_old
removes = @blocks.reject { |e| e.remove.empty? }
unless removes.empty?
# standard:disable Performance/UnfreezeString
outlist = @data_old[lo..hi].map { |e| String.new("#{encode(" ")}#{e.chomp}") }
# standard:enable Performance/UnfreezeString
last_block = removes[-1]
removes.each do |block|
block.remove.each do |item|
outlist[item.position - lo][0, 1] = encode(block.op) # - or !
end
if last && block == last_block && old_missing_newline
outlist << encode('\\ No newline at end of file')
end
end
s << outlist.join(encode("\n")) << encode("\n")
end
s << encode("--- #{r} ----\n")
lo, hi = @start_new, @end_new
inserts = @blocks.reject { |e| e.insert.empty? }
unless inserts.empty?
# standard:disable Performance/UnfreezeString
outlist = @data_new[lo..hi].map { |e| String.new("#{encode(" ")}#{e.chomp}") }
# standard:enable Performance/UnfreezeString
last_block = inserts[-1]
inserts.each do |block|
block.insert.each do |item|
outlist[item.position - lo][0, 1] = encode(block.op) # + or !
end
if last && block == last_block && new_missing_newline
outlist << encode('\\ No newline at end of file')
end
end
s << outlist.join(encode("\n"))
end
s
end
private :context_diff
def ed_diff(format, last)
warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
if last
# ed script doesn't support well incomplete lines
warn "<old_file>: No newline at end of file\n" if !@old_empty && missing_last_newline?(@data_old)
warn "<new_file>: No newline at end of file\n" if !@new_empty && missing_last_newline?(@data_new)
if @blocks[0].op == "!"
return +"" if @blocks[0].changes[0].element == @blocks[0].changes[1].element + "\n"
return +"" if @blocks[0].changes[0].element + "\n" == @blocks[0].changes[1].element
end
end
s =
if format == :reverse_ed
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")
end
unless @blocks[0].insert.empty?
@data_new[@start_new..@end_new].each do |e|
s << e.chomp + encode("\n")
end
s << encode(".\n")
end
s
end
private :ed_diff
# Generate a range of item numbers to print. Only print 1 number if the
# range has only one item in it. Otherwise, it's 'start,end'
def context_range(mode, op)
case mode
when :old
s, e = (@start_old + 1), (@end_old + 1)
when :new
s, e = (@start_new + 1), (@end_new + 1)
end
(s < e) ? "#{s}#{op}#{e}" : e.to_s
end
private :context_range
# Generate a range of item numbers to print for unified diff. Print number
# where block starts, followed by number of lines in the block
# (don't print number of lines if it's 1)
def unified_range(mode)
case mode
when :old
return "0,0" if @old_empty
s, e = (@start_old + 1), (@end_old + 1)
when :new
return "0,0" if @new_empty
s, e = (@start_new + 1), (@end_new + 1)
end
length = e - s + 1
(length <= 1) ? e.to_s : "#{s},#{length}"
end
private :unified_range
def missing_last_newline?(data)
newline = encode("\n")
if data[-2]
data[-2].end_with?(newline) && !data[-1].end_with?(newline)
elsif data[-1]
!data[-1].end_with?(newline)
else
true
end
end
if String.method_defined?(:encoding)
def encode(literal, target_encoding = @preferred_data_encoding)
literal.encode target_encoding
end
def encode_as(string, *args)
args.map { |arg| arg.encode(string.encoding) }
end
else
def encode(literal, _target_encoding = nil)
literal
end
def encode_as(_string, *args)
args
end
end
private :encode
private :encode_as
end
|