Merge more aggressively

Author: oowekyala

lib/pmdtester/pmd_violation.rb

@@ -62,7 +62,7 @@ def initialize(attrs, branch, fname)
     end
 
     def line_move?(other)
-      message.eql?(other.message) && (line - other.line).abs == 1
+      message.eql?(other.message) && (line - other.line).abs <= 5
     end
 
     def try_merge?(other)

lib/pmdtester/report_diff.rb

@@ -152,7 +152,7 @@ def build_diffs(base_hash, patch_hash)
     def merge_changed_violations(diff_violations)
       diff_violations.each do |fname, different|
         different.sort_by!(&:line)
-        diff_violations[fname] = different.dup.delete_if do |v|
+        diff_violations[fname] = different.delete_if do |v|
           v.branch == BASE &&
             # try_merge will set v2.changed = true if it succeeds
             different.any? { |v2| v2.try_merge?(v) }