diff-lcs 1.5.0 → 1.6.0

data/lib/diff/lcs/backports.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 unless 0.respond_to?(:positive?)
-  class Fixnum # rubocop:disable Lint/UnifiedInteger, Style/Documentation
+  class Fixnum # standard:disable Lint/UnifiedInteger
     def positive?
-      self > 0 # rubocop:disable Style/NumericPredicate
+      self > 0
     end
   end
 end

data/lib/diff/lcs/block.rb

@@ -25,13 +25,13 @@ class Diff::LCS::Block
   def op
     case [@remove.empty?, @insert.empty?]
     when [false, false]
-      '!'
+      "!"
     when [false, true]
-      '-'
+      "-"
     when [true, false]
-      '+'
+      "+"
     else # [true, true]
-      '^'
+      "^"
     end
   end
 end

data/lib/diff/lcs/callbacks.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'diff/lcs/change'
+require "diff/lcs/change"
 
-module Diff::LCS # rubocop:disable Style/Documentation
+module Diff::LCS
   # This callback object implements the default set of callback events,
   # which only returns the event itself. Note that #finished_a and
   # #finished_b are not implemented -- I haven't yet figured out where they
@@ -50,7 +50,9 @@ module Diff::LCS # rubocop:disable Style/Documentation
   BalancedCallbacks = DefaultCallbacks
 
   def self.callbacks_for(callbacks)
-    callbacks.new rescue callbacks
+    callbacks.new
+  rescue
+    callbacks
   end
 end
 
@@ -107,7 +109,7 @@ class Diff::LCS::DiffCallbacks
   # Returns the difference set collected during the diff process.
   attr_reader :diffs
 
-  def initialize # :yields self:
+  def initialize # :yields: self
     @hunk = []
     @diffs = []
 
@@ -131,11 +133,11 @@ class Diff::LCS::DiffCallbacks
   end
 
   def discard_a(event)
-    @hunk << Diff::LCS::Change.new('-', event.old_position, event.old_element)
+    @hunk << Diff::LCS::Change.new("-", event.old_position, event.old_element)
   end
 
   def discard_b(event)
-    @hunk << Diff::LCS::Change.new('+', event.new_position, event.new_element)
+    @hunk << Diff::LCS::Change.new("+", event.new_position, event.new_element)
   end
 
   def finish_hunk
@@ -302,7 +304,7 @@ class Diff::LCS::SDiffCallbacks
   # Returns the difference set collected during the diff process.
   attr_reader :diffs
 
-  def initialize #:yields self:
+  def initialize # :yields: self
     @diffs = []
     yield self if block_given?
   end

data/lib/diff/lcs/change.rb

@@ -4,13 +4,13 @@
 # addition of an element from either the old or the new sequenced
 # enumerable.
 class Diff::LCS::Change
-  IntClass = 1.class # Fixnum is deprecated in Ruby 2.4 # rubocop:disable Naming/ConstantName
+  IntClass = 1.class # Fixnum is deprecated in Ruby 2.4 # standard:disable Naming/ConstantName
 
   # The only actions valid for changes are '+' (add), '-' (delete), '='
   # (no change), '!' (changed), '<' (tail changes from first sequence), or
   # '>' (tail changes from second sequence). The last two ('<>') are only
   # found with Diff::LCS::diff and Diff::LCS::sdiff.
-  VALID_ACTIONS = %w(+ - = ! > <).freeze
+  VALID_ACTIONS = %w[+ - = ! > <].freeze
 
   def self.valid_action?(action)
     VALID_ACTIONS.include? action
@@ -28,7 +28,7 @@ class Diff::LCS::Change
     @action, @position, @element = *args
 
     fail "Invalid Change Action '#{@action}'" unless Diff::LCS::Change.valid_action?(@action)
-    fail 'Invalid Position Type' unless @position.kind_of? IntClass
+    fail "Invalid Position Type" unless @position.is_a? IntClass
   end
 
   def inspect(*_args)
@@ -39,7 +39,7 @@ class Diff::LCS::Change
     [@action, @position, @element]
   end
 
-  alias to_ary to_a
+  alias_method :to_ary, :to_a
 
   def self.from_a(arr)
     arr = arr.flatten(1)
@@ -49,7 +49,7 @@ class Diff::LCS::Change
     when 3
       Diff::LCS::Change.new(*(arr[0...3]))
     else
-      fail 'Invalid change array format provided.'
+      fail "Invalid change array format provided."
     end
   end
 
@@ -70,27 +70,27 @@ class Diff::LCS::Change
   end
 
   def adding?
-    @action == '+'
+    @action == "+"
   end
 
   def deleting?
-    @action == '-'
+    @action == "-"
   end
 
   def unchanged?
-    @action == '='
+    @action == "="
   end
 
   def changed?
-    @action == '!'
+    @action == "!"
   end
 
   def finished_a?
-    @action == '>'
+    @action == ">"
   end
 
   def finished_b?
-    @action == '<'
+    @action == "<"
   end
 end
 
@@ -115,8 +115,8 @@ class Diff::LCS::ContextChange < Diff::LCS::Change
     @action, @old_position, @old_element, @new_position, @new_element = *args
 
     fail "Invalid Change Action '#{@action}'" unless Diff::LCS::Change.valid_action?(@action)
-    fail 'Invalid (Old) Position Type' unless @old_position.nil? or @old_position.kind_of? IntClass
-    fail 'Invalid (New) Position Type' unless @new_position.nil? or @new_position.kind_of? IntClass
+    fail "Invalid (Old) Position Type" unless @old_position.nil? || @old_position.is_a?(IntClass)
+    fail "Invalid (New) Position Type" unless @new_position.nil? || @new_position.is_a?(IntClass)
   end
 
   def to_a
@@ -127,7 +127,7 @@ class Diff::LCS::ContextChange < Diff::LCS::Change
     ]
   end
 
-  alias to_ary to_a
+  alias_method :to_ary, :to_a
 
   def self.from_a(arr)
     Diff::LCS::Change.from_a(arr)
@@ -139,15 +139,15 @@ class Diff::LCS::ContextChange < Diff::LCS::Change
     ea = event.to_a
 
     case ea[0]
-    when '-'
+    when "-"
       ea[2][1] = nil
-    when '<'
-      ea[0] = '-'
+    when "<"
+      ea[0] = "-"
       ea[2][1] = nil
-    when '+'
+    when "+"
       ea[1][1] = nil
-    when '>'
-      ea[0] = '+'
+    when ">"
+      ea[0] = "+"
       ea[1][1] = nil
     end
 

data/lib/diff/lcs/htmldiff.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require "cgi"
 
 # Produce a simple HTML diff view.
 class Diff::LCS::HTMLDiff
   class << self
-    attr_accessor :can_expand_tabs #:nodoc:
+    # standard:disable ThreadSafety/ClassAndModuleAttributes
+    attr_accessor :can_expand_tabs # :nodoc:
+    # standard:enable ThreadSafety/ClassAndModuleAttributes
   end
   self.can_expand_tabs = true
 
-  class Callbacks #:nodoc:
+  class Callbacks # :nodoc:
     attr_accessor :output
     attr_accessor :match_class
     attr_accessor :only_a_class
@@ -19,14 +21,14 @@ class Diff::LCS::HTMLDiff
       @output = output
       options ||= {}
 
-      @match_class = options[:match_class] || 'match'
-      @only_a_class = options[:only_a_class] || 'only_a'
-      @only_b_class = options[:only_b_class] || 'only_b'
+      @match_class = options[:match_class] || "match"
+      @only_a_class = options[:only_a_class] || "only_a"
+      @only_b_class = options[:only_b_class] || "only_b"
     end
 
     def htmlize(element, css_class)
-      element = '&nbsp;' if element.empty?
-      %Q(<pre class="#{__send__(css_class)}">#{element}</pre>\n)
+      element = "&nbsp;" if element.empty?
+      %(<pre class="#{__send__(css_class)}">#{element}</pre>\n)
     end
     private :htmlize
 
@@ -46,13 +48,16 @@ class Diff::LCS::HTMLDiff
     end
   end
 
+  # standard:disable Style/HashSyntax
   DEFAULT_OPTIONS = {
     :expand_tabs => nil,
     :output => nil,
     :css => nil,
     :title => nil
   }.freeze
+  # standard:enable Style/HashSyntax
 
+  # standard:disable Layout/HeredocIndentation
   DEFAULT_CSS = <<-CSS
 body { margin: 0; }
 .diff
@@ -86,11 +91,12 @@ pre
 }
 h1 { margin-left: 2em; }
   CSS
+  # standard:enable Layout/HeredocIndentation
 
   def initialize(left, right, options = nil)
-    @left     = left
-    @right    = right
-    @options  = options
+    @left = left
+    @right = right
+    @options = options
 
     @options = DEFAULT_OPTIONS.dup if @options.nil?
   end
@@ -103,7 +109,7 @@ h1 { margin-left: 2em; }
 
     @options[:css] ||= DEFAULT_CSS.dup
 
-    @options[:title] ||= 'diff'
+    @options[:title] ||= "diff"
   end
   private :verify_options
 
@@ -116,13 +122,14 @@ h1 { margin-left: 2em; }
       formatter = Text::Format.new
       formatter.tabstop = @options[:expand_tabs]
 
-      @left.map! do |line| formatter.expand(line.chomp) end
-      @right.map! do |line| formatter.expand(line.chomp) end
+      @left.map! { |line| formatter.expand(line.chomp) }
+      @right.map! { |line| formatter.expand(line.chomp) }
     end
 
-    @left.map! do |line| CGI.escapeHTML(line.chomp) end
-    @right.map! do |line| CGI.escapeHTML(line.chomp) end
+    @left.map! { |line| CGI.escapeHTML(line.chomp) }
+    @right.map! { |line| CGI.escapeHTML(line.chomp) }
 
+    # standard:disable Layout/HeredocIndentation
     @options[:output] << <<-OUTPUT
 <html>
   <head>
@@ -137,14 +144,17 @@ h1 { margin-left: 2em; }
     <span class="only_b">Only in New</span></p>
     <div class="diff">
     OUTPUT
+    # standard:enable Layout/HeredocIndentation
 
     callbacks = Callbacks.new(@options[:output])
     Diff::LCS.traverse_sequences(@left, @right, callbacks)
 
+    # standard:disable Layout/HeredocIndentation
     @options[:output] << <<-OUTPUT
     </div>
   </body>
 </html>
     OUTPUT
+    # standard:enable Layout/HeredocIndentation
   end
 end

data/lib/diff/lcs/hunk.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'diff/lcs/block'
+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:
+  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)
 
@@ -22,18 +22,19 @@ 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
     @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
@@ -54,8 +55,8 @@ class Diff::LCS::Hunk
 
     @start_old = a1 || (b1 - before)
     @start_new = b1 || (a1 + before)
-    @end_old   = a2 || (b2 - after)
-    @end_new   = b2 || (a2 + after)
+    @end_old = a2 || (b2 - after)
+    @end_new = b2 || (a2 + after)
 
     self.flag_context = flag_context
   end
@@ -67,12 +68,12 @@ class Diff::LCS::Hunk
 
   # Change the "start" and "end" fields to note that context should be added
   # to this hunk.
-  attr_accessor :flag_context # rubocop:disable Layout/EmptyLinesAroundAttributeAccessor
+  attr_accessor :flag_context
   undef :flag_context=
-  def flag_context=(context) #:nodoc: # rubocop:disable Lint/DuplicateMethods
-    return if context.nil? or context.zero?
+  def flag_context=(context) # :nodoc: # standard:disable Lint/DuplicateMethods
+    return if context.nil? || context.zero?
 
-    add_start = context > @start_old ? @start_old : context
+    add_start = (context > @start_old) ? @start_old : context
 
     @start_old -= add_start
     @start_new -= add_start
@@ -80,14 +81,12 @@ class Diff::LCS::Hunk
     old_size = @data_old.size
 
     add_end =
-      if (@end_old + context) > old_size
-        old_size - @end_old
+      if (@end_old + context) >= old_size
+        old_size - @end_old - 1
       else
         context
       end
 
-    add_end = @max_diff_size if add_end >= old_size
-
     @end_old += add_end
     @end_new += add_end
   end
@@ -102,7 +101,7 @@ class Diff::LCS::Hunk
     @start_new = hunk.start_new
     blocks.unshift(*hunk.blocks)
   end
-  alias unshift merge
+  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
@@ -132,34 +131,42 @@ class Diff::LCS::Hunk
 
   # 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
+  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")
+    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") }
+      @data_old[@start_old..@end_old].each { |e| s << encode("< ") + e.chomp + encode("\n") }
     end
 
-    s << encode("---\n") if block.op == '!'
+    s << encode("\\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") }
+      @data_new[@start_new..@end_new].each { |e| s << encode("> ") + e.chomp + encode("\n") }
     end
 
+    s << encode("\\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, last)} +#{unified_range(:new, last)} @@\n")
+    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
@@ -172,18 +179,20 @@ 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}") }
+    # 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 = missing_last_newline?(@data_old)
-      new_missing_newline = missing_last_newline?(@data_new)
+      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 # -
+        op = item.action.to_s # -
         offset = item.position - lo + num_added
         outlist[offset][0, 1] = encode(op)
         num_removed += 1
@@ -195,7 +204,7 @@ class Diff::LCS::Hunk
       end
 
       block.insert.each do |item|
-        op     = item.action.to_s # +
+        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
@@ -212,8 +221,8 @@ class Diff::LCS::Hunk
 
   def context_diff(last = false)
     s = encode("***************\n")
-    s << encode("*** #{context_range(:old, ',', last)} ****\n")
-    r = context_range(:new, ',', last)
+    s << encode("*** #{context_range(:old, ",")} ****\n")
+    r = context_range(:new, ",")
 
     if last
       old_missing_newline = missing_last_newline?(@data_old)
@@ -226,7 +235,9 @@ 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}") }
+      # standard:disable Performance/UnfreezeString
+      outlist = @data_old[lo..hi].map { |e| String.new("#{encode("  ")}#{e.chomp}") }
+      # standard:enable Performance/UnfreezeString
 
       last_block = removes[-1]
 
@@ -248,7 +259,9 @@ 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}") }
+      # standard:disable Performance/UnfreezeString
+      outlist = @data_new[lo..hi].map { |e| String.new("#{encode("  ")}#{e.chomp}") }
+      # standard:enable Performance/UnfreezeString
 
       last_block = inserts[-1]
 
@@ -268,14 +281,24 @@ class Diff::LCS::Hunk
   end
   private :context_diff
 
-  def ed_diff(format, _last = false)
-    warn 'Expecting only one block in an old diff hunk!' if @blocks.size > 1
+  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")
+        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?
@@ -290,7 +313,7 @@ class Diff::LCS::Hunk
 
   # 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, last = false)
+  def context_range(mode, op)
     case mode
     when :old
       s, e = (@start_old + 1), (@end_old + 1)
@@ -298,28 +321,26 @@ class Diff::LCS::Hunk
       s, e = (@start_new + 1), (@end_new + 1)
     end
 
-    e -= 1 if last
-    e = 1 if e.zero?
-
-    s < e ? "#{s}#{op}#{e}" : e.to_s
+    (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, last)
+  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 + (last ? 0 : 1)
+    length = e - s + 1
 
-    first = length < 2 ? e : s # "strange, but correct"
-    length <= 1 ? first.to_s : "#{first},#{length}"
+    (length <= 1) ? e.to_s : "#{s},#{length}"
   end
   private :unified_range