From 106d1749c965b8af857c976197814707b66cbef0 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 10:43:29 -0500
Subject: Fix issues reported by fasterer

---
 lib/diff/lcs.rb      | 2 +-
 lib/diff/lcs/hunk.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 288cfc2..234fd03 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -145,7 +145,7 @@ class << Diff::LCS
     matches = Diff::LCS::Internals.lcs(seq1, seq2)
     ret = []
     string = seq1.kind_of? String
-    matches.each_with_index do |_e, i|
+    matches.each_index do |i|
       next if matches[i].nil?
 
       v = string ? seq1[i, 1] : seq1[i]
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index 49b520e..d27b024 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
-- 
cgit v1.2.1


From f85ec381137c6838600b16c353ff9dba3a05452c Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 10:44:44 -0500
Subject: standardrb --only Style/StringLiterals --fix

---
 lib/diff/lcs.rb           | 64 +++++++++++++++++++++++------------------------
 lib/diff/lcs/array.rb     |  2 +-
 lib/diff/lcs/block.rb     |  8 +++---
 lib/diff/lcs/callbacks.rb |  6 ++---
 lib/diff/lcs/change.rb    | 32 ++++++++++++------------
 lib/diff/lcs/htmldiff.rb  | 12 ++++-----
 lib/diff/lcs/hunk.rb      | 20 +++++++--------
 lib/diff/lcs/internals.rb | 16 ++++++------
 lib/diff/lcs/ldiff.rb     | 46 +++++++++++++++++-----------------
 9 files changed, 103 insertions(+), 103 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 234fd03..e6d817b 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -49,11 +49,11 @@ module Diff; end unless defined? Diff # rubocop:disable Style/Documentation
 #          a x b y c z p d q
 #    a b c a x b y c z
 module Diff::LCS
-  VERSION = '1.5.0'
+  VERSION = "1.5.0"
 end
 
-require 'diff/lcs/callbacks'
-require 'diff/lcs/internals'
+require "diff/lcs/callbacks"
+require "diff/lcs/internals"
 
 module Diff::LCS # rubocop:disable Style/Documentation
   # Returns an Array containing the longest common subsequence(s) between
@@ -299,7 +299,7 @@ class << Diff::LCS
           ax = string ? seq1[ai, 1] : seq1[ai]
           bx = string ? seq2[bj, 1] : seq2[bj]
 
-          event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
+          event = Diff::LCS::ContextChange.new("-", ai, ax, bj, bx)
           event = yield event if block_given?
           callbacks.discard_a(event)
         end
@@ -310,13 +310,13 @@ class << Diff::LCS
           break unless bj < b_line
 
           bx = string ? seq2[bj, 1] : seq2[bj]
-          event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
+          event = Diff::LCS::ContextChange.new("+", ai, ax, bj, bx)
           event = yield event if block_given?
           callbacks.discard_b(event)
           bj += 1
         end
         bx = string ? seq2[bj, 1] : seq2[bj]
-        event = Diff::LCS::ContextChange.new('=', ai, ax, bj, bx)
+        event = Diff::LCS::ContextChange.new("=", ai, ax, bj, bx)
         event = yield event if block_given?
         callbacks.match(event)
         bj += 1
@@ -332,7 +332,7 @@ class << Diff::LCS
         if callbacks.respond_to?(:finished_a) and !run_finished_a
           ax = string ? seq1[-1, 1] : seq1[-1]
           bx = string ? seq2[bj, 1] : seq2[bj]
-          event = Diff::LCS::ContextChange.new('>', (a_size - 1), ax, bj, bx)
+          event = Diff::LCS::ContextChange.new(">", (a_size - 1), ax, bj, bx)
           event = yield event if block_given?
           callbacks.finished_a(event)
           run_finished_a = true
@@ -340,7 +340,7 @@ class << Diff::LCS
           ax = string ? seq1[ai, 1] : seq1[ai]
           loop do
             bx = string ? seq2[bj, 1] : seq2[bj]
-            event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
+            event = Diff::LCS::ContextChange.new("+", ai, ax, bj, bx)
             event = yield event if block_given?
             callbacks.discard_b(event)
             bj += 1
@@ -354,7 +354,7 @@ class << Diff::LCS
         if callbacks.respond_to?(:finished_b) and !run_finished_b
           ax = string ? seq1[ai, 1] : seq1[ai]
           bx = string ? seq2[-1, 1] : seq2[-1]
-          event = Diff::LCS::ContextChange.new('<', ai, ax, (b_size - 1), bx)
+          event = Diff::LCS::ContextChange.new("<", ai, ax, (b_size - 1), bx)
           event = yield event if block_given?
           callbacks.finished_b(event)
           run_finished_b = true
@@ -362,7 +362,7 @@ class << Diff::LCS
           bx = string ? seq2[bj, 1] : seq2[bj]
           loop do
             ax = string ? seq1[ai, 1] : seq1[ai]
-            event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
+            event = Diff::LCS::ContextChange.new("-", ai, ax, bj, bx)
             event = yield event if block_given?
             callbacks.discard_a(event)
             ai += 1
@@ -374,7 +374,7 @@ class << Diff::LCS
       if ai < a_size
         ax = string ? seq1[ai, 1] : seq1[ai]
         bx = string ? seq2[bj, 1] : seq2[bj]
-        event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
+        event = Diff::LCS::ContextChange.new("-", ai, ax, bj, bx)
         event = yield event if block_given?
         callbacks.discard_a(event)
         ai += 1
@@ -383,7 +383,7 @@ class << Diff::LCS
       if bj < b_size
         ax = string ? seq1[ai, 1] : seq1[ai]
         bx = string ? seq2[bj, 1] : seq2[bj]
-        event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
+        event = Diff::LCS::ContextChange.new("+", ai, ax, bj, bx)
         event = yield event if block_given?
         callbacks.discard_b(event)
         bj += 1
@@ -500,29 +500,29 @@ class << Diff::LCS
         case [(ai < ma), (bj < mb)]
         when [true, true]
           if callbacks.respond_to?(:change)
-            event = Diff::LCS::ContextChange.new('!', ai, ax, bj, bx)
+            event = Diff::LCS::ContextChange.new("!", ai, ax, bj, bx)
             event = yield event if block_given?
             callbacks.change(event)
             ai += 1
           else
-            event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
+            event = Diff::LCS::ContextChange.new("-", ai, ax, bj, bx)
             event = yield event if block_given?
             callbacks.discard_a(event)
             ai += 1
             ax = string ? seq1[ai, 1] : seq1[ai]
-            event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
+            event = Diff::LCS::ContextChange.new("+", ai, ax, bj, bx)
             event = yield event if block_given?
             callbacks.discard_b(event)
           end
 
           bj += 1
         when [true, false]
-          event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
+          event = Diff::LCS::ContextChange.new("-", ai, ax, bj, bx)
           event = yield event if block_given?
           callbacks.discard_a(event)
           ai += 1
         when [false, true]
-          event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
+          event = Diff::LCS::ContextChange.new("+", ai, ax, bj, bx)
           event = yield event if block_given?
           callbacks.discard_b(event)
           bj += 1
@@ -532,7 +532,7 @@ class << Diff::LCS
       # Match
       ax = string ? seq1[ai, 1] : seq1[ai]
       bx = string ? seq2[bj, 1] : seq2[bj]
-      event = Diff::LCS::ContextChange.new('=', ai, ax, bj, bx)
+      event = Diff::LCS::ContextChange.new("=", ai, ax, bj, bx)
       event = yield event if block_given?
       callbacks.match(event)
       ai += 1
@@ -546,29 +546,29 @@ class << Diff::LCS
       case [(ai < a_size), (bj < b_size)]
       when [true, true]
         if callbacks.respond_to?(:change)
-          event = Diff::LCS::ContextChange.new('!', ai, ax, bj, bx)
+          event = Diff::LCS::ContextChange.new("!", ai, ax, bj, bx)
           event = yield event if block_given?
           callbacks.change(event)
           ai += 1
         else
-          event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
+          event = Diff::LCS::ContextChange.new("-", ai, ax, bj, bx)
           event = yield event if block_given?
           callbacks.discard_a(event)
           ai += 1
           ax = string ? seq1[ai, 1] : seq1[ai]
-          event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
+          event = Diff::LCS::ContextChange.new("+", ai, ax, bj, bx)
           event = yield event if block_given?
           callbacks.discard_b(event)
         end
 
         bj += 1
       when [true, false]
-        event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
+        event = Diff::LCS::ContextChange.new("-", ai, ax, bj, bx)
         event = yield event if block_given?
         callbacks.discard_a(event)
         ai += 1
       when [false, true]
-        event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
+        event = Diff::LCS::ContextChange.new("+", ai, ax, bj, bx)
         event = yield event if block_given?
         callbacks.discard_b(event)
         bj += 1
@@ -577,8 +577,8 @@ class << Diff::LCS
   end
 
   PATCH_MAP = { #:nodoc:
-    :patch => { '+' => '+', '-' => '-', '!' => '!', '=' => '=' }.freeze,
-    :unpatch => { '+' => '-', '-' => '+', '!' => '!', '=' => '=' }.freeze
+    :patch => { "+" => "+", "-" => "-", "!" => "!", "=" => "=" }.freeze,
+    :unpatch => { "+" => "-", "-" => "+", "!" => "!", "=" => "=" }.freeze
   }.freeze
 
   # Applies a +patchset+ to the sequence +src+ according to the +direction+
@@ -655,14 +655,14 @@ class << Diff::LCS
         end
 
         case action
-        when '-' # Remove details from the old string
+        when "-" # Remove details from the old string
           while ai < op
             res << (string ? src[ai, 1] : src[ai])
             ai += 1
             bj += 1
           end
           ai += 1
-        when '+'
+        when "+"
           while bj < np
             res << (string ? src[ai, 1] : src[ai])
             ai += 1
@@ -671,7 +671,7 @@ class << Diff::LCS
 
           res << el
           bj += 1
-        when '='
+        when "="
           # This only appears in sdiff output with the SDiff callback.
           # Therefore, we only need to worry about dealing with a single
           # element.
@@ -679,7 +679,7 @@ class << Diff::LCS
 
           ai += 1
           bj += 1
-        when '!'
+        when "!"
           while ai < op
             res << (string ? src[ai, 1] : src[ai])
             ai += 1
@@ -693,14 +693,14 @@ class << Diff::LCS
         end
       when Diff::LCS::Change
         case action
-        when '-'
+        when "-"
           while ai < change.position
             res << (string ? src[ai, 1] : src[ai])
             ai += 1
             bj += 1
           end
           ai += 1
-        when '+'
+        when "+"
           while bj < change.position
             res << (string ? src[ai, 1] : src[ai])
             ai += 1
@@ -736,4 +736,4 @@ class << Diff::LCS
   end
 end
 
-require 'diff/lcs/backports'
+require "diff/lcs/backports"
diff --git a/lib/diff/lcs/array.rb b/lib/diff/lcs/array.rb
index 5c250f6..663918a 100644
--- a/lib/diff/lcs/array.rb
+++ b/lib/diff/lcs/array.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'diff/lcs'
+require "diff/lcs"
 
 class Array
   include Diff::LCS
diff --git a/lib/diff/lcs/block.rb b/lib/diff/lcs/block.rb
index 430702d..226ed6f 100644
--- a/lib/diff/lcs/block.rb
+++ b/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
diff --git a/lib/diff/lcs/callbacks.rb b/lib/diff/lcs/callbacks.rb
index 2a7665b..c075327 100644
--- a/lib/diff/lcs/callbacks.rb
+++ b/lib/diff/lcs/callbacks.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'diff/lcs/change'
+require "diff/lcs/change"
 
 module Diff::LCS # rubocop:disable Style/Documentation
   # This callback object implements the default set of callback events,
@@ -131,11 +131,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
diff --git a/lib/diff/lcs/change.rb b/lib/diff/lcs/change.rb
index 76faf83..aa55360 100644
--- a/lib/diff/lcs/change.rb
+++ b/lib/diff/lcs/change.rb
@@ -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.kind_of? IntClass
   end
 
   def inspect(*_args)
@@ -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? or @old_position.kind_of? IntClass
+    fail "Invalid (New) Position Type" unless @new_position.nil? or @new_position.kind_of? IntClass
   end
 
   def to_a
@@ -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
 
diff --git a/lib/diff/lcs/htmldiff.rb b/lib/diff/lcs/htmldiff.rb
index f12220b..41858d5 100644
--- a/lib/diff/lcs/htmldiff.rb
+++ b/lib/diff/lcs/htmldiff.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require "cgi"
 
 # Produce a simple HTML diff view.
 class Diff::LCS::HTMLDiff
@@ -19,13 +19,13 @@ 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?
+      element = "&nbsp;" if element.empty?
       %Q(<pre class="#{__send__(css_class)}">#{element}</pre>\n)
     end
     private :htmlize
@@ -103,7 +103,7 @@ h1 { margin-left: 2em; }
 
     @options[:css] ||= DEFAULT_CSS.dup
 
-    @options[:title] ||= 'diff'
+    @options[:title] ||= "diff"
   end
   private :verify_options
 
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index d27b024..2a9645d 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/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,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
@@ -133,7 +133,7 @@ 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
+    warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
 
     block = @blocks[0]
 
@@ -144,13 +144,13 @@ class Diff::LCS::Hunk
     # 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 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
@@ -213,7 +213,7 @@ class Diff::LCS::Hunk
   def context_diff(last = false)
     s = encode("***************\n")
     s << encode("*** #{context_range(:old, ',', last)} ****\n")
-    r = context_range(:new, ',', last)
+    r = context_range(:new, ",", last)
 
     if last
       old_missing_newline = missing_last_newline?(@data_old)
@@ -269,7 +269,7 @@ class Diff::LCS::Hunk
   private :context_diff
 
   def ed_diff(format, _last = false)
-    warn 'Expecting only one block in an old diff hunk!' if @blocks.size > 1
+    warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
 
     s =
       if format == :reverse_ed
diff --git a/lib/diff/lcs/internals.rb b/lib/diff/lcs/internals.rb
index ef77667..2ed713f 100644
--- a/lib/diff/lcs/internals.rb
+++ b/lib/diff/lcs/internals.rb
@@ -100,7 +100,7 @@ class << Diff::LCS::Internals
   # the object form of same) and detection of whether the patchset represents
   # changes to be made.
   def analyze_patchset(patchset, depth = 0)
-    fail 'Patchset too complex' if depth > 1
+    fail "Patchset too complex" if depth > 1
 
     has_changes = false
     new_patchset = []
@@ -157,22 +157,22 @@ class << Diff::LCS::Internals
         re = string ? src[change.new_position, 1] : src[change.new_position]
 
         case change.action
-        when '-' # Remove details from the old string
+        when "-" # Remove details from the old string
           if le == change.old_element
             left_match += 1
           else
             left_miss += 1
           end
-        when '+'
+        when "+"
           if re == change.new_element
             right_match += 1
           else
             right_miss += 1
           end
-        when '='
+        when "="
           left_miss += 1 if le != change.old_element
           right_miss += 1 if re != change.new_element
-        when '!'
+        when "!"
           if le == change.old_element
             left_match += 1
           elsif re == change.new_element
@@ -189,19 +189,19 @@ class << Diff::LCS::Internals
         element = string ? src[change.position, 1] : src[change.position]
 
         case change.action
-        when '-'
+        when "-"
           if element == change.element
             left_match += 1
           else
             left_miss += 1
           end
-        when '+'
+        when "+"
           if element == change.element
             right_match += 1
           else
             right_miss += 1
           end
-        when '='
+        when "="
           if element != change.element
             left_miss += 1
             right_miss += 1
diff --git a/lib/diff/lcs/ldiff.rb b/lib/diff/lcs/ldiff.rb
index 17b374c..c4a60d0 100644
--- a/lib/diff/lcs/ldiff.rb
+++ b/lib/diff/lcs/ldiff.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'optparse'
-require 'ostruct'
-require 'diff/lcs/hunk'
+require "optparse"
+require "ostruct"
+require "diff/lcs/hunk"
 
 module Diff::LCS::Ldiff #:nodoc:
   BANNER = <<-COPYRIGHT
@@ -28,48 +28,48 @@ class << Diff::LCS::Ldiff
 
     args.options do |o|
       o.banner = "Usage: #{File.basename($0)} [options] oldfile newfile"
-      o.separator ''
+      o.separator ""
       o.on(
-        '-c', '-C', '--context [LINES]', Integer,
-        'Displays a context diff with LINES lines', 'of context. Default 3 lines.'
+        "-c", "-C", "--context [LINES]", Integer,
+        "Displays a context diff with LINES lines", "of context. Default 3 lines."
       ) do |ctx|
         @format = :context
         @lines  = ctx || 3
       end
       o.on(
-        '-u', '-U', '--unified [LINES]', Integer,
-        'Displays a unified diff with LINES lines', 'of context. Default 3 lines.'
+        "-u", "-U", "--unified [LINES]", Integer,
+        "Displays a unified diff with LINES lines", "of context. Default 3 lines."
       ) do |ctx|
         @format = :unified
         @lines  = ctx || 3
       end
-      o.on('-e', 'Creates an \'ed\' script to change', 'oldfile to newfile.') do |_ctx|
+      o.on("-e", "Creates an 'ed' script to change", "oldfile to newfile.") do |_ctx|
         @format = :ed
       end
-      o.on('-f', 'Creates an \'ed\' script to change', 'oldfile to newfile in reverse order.') do |_ctx|
+      o.on("-f", "Creates an 'ed' script to change", "oldfile to newfile in reverse order.") do |_ctx|
         @format = :reverse_ed
       end
       o.on(
-        '-a', '--text',
-        'Treat the files as text and compare them', 'line-by-line, even if they do not seem', 'to be text.'
+        "-a", "--text",
+        "Treat the files as text and compare them", "line-by-line, even if they do not seem", "to be text."
       ) do |_txt|
         @binary = false
       end
-      o.on('--binary', 'Treats the files as binary.') do |_bin|
+      o.on("--binary", "Treats the files as binary.") do |_bin|
         @binary = true
       end
-      o.on('-q', '--brief', 'Report only whether or not the files', 'differ, not the details.') do |_ctx|
+      o.on("-q", "--brief", "Report only whether or not the files", "differ, not the details.") do |_ctx|
         @format = :report
       end
-      o.on_tail('--help', 'Shows this text.') do
+      o.on_tail("--help", "Shows this text.") do
         error << o
         return 0
       end
-      o.on_tail('--version', 'Shows the version of Diff::LCS.') do
+      o.on_tail("--version", "Shows the version of Diff::LCS.") do
         error << Diff::LCS::Ldiff::BANNER
         return 0
       end
-      o.on_tail ''
+      o.on_tail ""
       o.on_tail 'By default, runs produces an "old-style" diff, with output like UNIX diff.'
       o.parse!
     end
@@ -87,11 +87,11 @@ class << Diff::LCS::Ldiff
 
     case @format
     when :context
-      char_old = '*' * 3
-      char_new = '-' * 3
+      char_old = "*" * 3
+      char_new = "-" * 3
     when :unified
-      char_old = '-' * 3
-      char_new = '+' * 3
+      char_old = "-" * 3
+      char_new = "+" * 3
     end
 
     # After we've read up to a certain point in each file, the number of
@@ -129,9 +129,9 @@ class << Diff::LCS::Ldiff
     end
 
     if (@format == :unified) or (@format == :context)
-      ft = File.stat(file_old).mtime.localtime.strftime('%Y-%m-%d %H:%M:%S.000000000 %z')
+      ft = File.stat(file_old).mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
       output << "#{char_old} #{file_old}\t#{ft}\n"
-      ft = File.stat(file_new).mtime.localtime.strftime('%Y-%m-%d %H:%M:%S.000000000 %z')
+      ft = File.stat(file_new).mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
       output << "#{char_new} #{file_new}\t#{ft}\n"
     end
 
-- 
cgit v1.2.1


From cb9bebb30477e815cdbe8f8460f227f0940599a1 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 10:45:50 -0500
Subject: standardrb --only Style/PercentLiteralDelimiters --fix

---
 lib/diff/lcs/change.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/change.rb b/lib/diff/lcs/change.rb
index aa55360..a82f3e6 100644
--- a/lib/diff/lcs/change.rb
+++ b/lib/diff/lcs/change.rb
@@ -10,7 +10,7 @@ class Diff::LCS::Change
   # (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
-- 
cgit v1.2.1


From 089f932537a540af9c27dd03caf30eff6b4a0306 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 10:50:34 -0500
Subject: standardrb --only Layout/ExtraSpacing --fix and ignore

---
 lib/diff/lcs/htmldiff.rb  | 6 +++---
 lib/diff/lcs/hunk.rb      | 8 ++++----
 lib/diff/lcs/internals.rb | 2 +-
 lib/diff/lcs/ldiff.rb     | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/htmldiff.rb b/lib/diff/lcs/htmldiff.rb
index 41858d5..a66c9ed 100644
--- a/lib/diff/lcs/htmldiff.rb
+++ b/lib/diff/lcs/htmldiff.rb
@@ -88,9 +88,9 @@ h1 { margin-left: 2em; }
   CSS
 
   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
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index 2a9645d..3e4133d 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -54,8 +54,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
@@ -183,7 +183,7 @@ class Diff::LCS::Hunk
 
     @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 +195,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
diff --git a/lib/diff/lcs/internals.rb b/lib/diff/lcs/internals.rb
index 2ed713f..0454c8a 100644
--- a/lib/diff/lcs/internals.rb
+++ b/lib/diff/lcs/internals.rb
@@ -63,7 +63,7 @@ class << Diff::LCS::Internals
     b_matches = position_hash(b, b_start..b_finish)
 
     thresh = []
-    links  = []
+    links = []
     string = a.kind_of?(String)
 
     (a_start..a_finish).each do |i|
diff --git a/lib/diff/lcs/ldiff.rb b/lib/diff/lcs/ldiff.rb
index c4a60d0..2cbd704 100644
--- a/lib/diff/lcs/ldiff.rb
+++ b/lib/diff/lcs/ldiff.rb
@@ -34,14 +34,14 @@ class << Diff::LCS::Ldiff
         "Displays a context diff with LINES lines", "of context. Default 3 lines."
       ) do |ctx|
         @format = :context
-        @lines  = ctx || 3
+        @lines = ctx || 3
       end
       o.on(
         "-u", "-U", "--unified [LINES]", Integer,
         "Displays a unified diff with LINES lines", "of context. Default 3 lines."
       ) do |ctx|
         @format = :unified
-        @lines  = ctx || 3
+        @lines = ctx || 3
       end
       o.on("-e", "Creates an 'ed' script to change", "oldfile to newfile.") do |_ctx|
         @format = :ed
@@ -81,7 +81,7 @@ class << Diff::LCS::Ldiff
 
     # Defaults are for old-style diff
     @format ||= :old
-    @lines  ||= 0
+    @lines ||= 0
 
     file_old, file_new = *ARGV
 
-- 
cgit v1.2.1


From f5781c06b2c297caf58c97824c77f557831094a7 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 10:54:52 -0500
Subject: ignore Layout/heredocIndentation due to old Ruby

---
 lib/diff/lcs/htmldiff.rb | 6 ++++++
 lib/diff/lcs/ldiff.rb    | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/htmldiff.rb b/lib/diff/lcs/htmldiff.rb
index a66c9ed..37bbc4a 100644
--- a/lib/diff/lcs/htmldiff.rb
+++ b/lib/diff/lcs/htmldiff.rb
@@ -53,6 +53,7 @@ class Diff::LCS::HTMLDiff
     :title => nil
   }.freeze
 
+  # standard:disable Layout/HeredocIndentation
   DEFAULT_CSS = <<-CSS
 body { margin: 0; }
 .diff
@@ -86,6 +87,7 @@ pre
 }
 h1 { margin-left: 2em; }
   CSS
+  # standard:enable Layout/HeredocIndentation
 
   def initialize(left, right, options = nil)
     @left = left
@@ -123,6 +125,7 @@ h1 { margin-left: 2em; }
     @left.map! do |line| CGI.escapeHTML(line.chomp) end
     @right.map! do |line| CGI.escapeHTML(line.chomp) end
 
+    # standard:disable Layout/HeredocIndentation
     @options[:output] << <<-OUTPUT
 <html>
   <head>
@@ -137,14 +140,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
diff --git a/lib/diff/lcs/ldiff.rb b/lib/diff/lcs/ldiff.rb
index 2cbd704..59625aa 100644
--- a/lib/diff/lcs/ldiff.rb
+++ b/lib/diff/lcs/ldiff.rb
@@ -5,6 +5,7 @@ require "ostruct"
 require "diff/lcs/hunk"
 
 module Diff::LCS::Ldiff #:nodoc:
+  # standard:disable Layout/HeredocIndentation
   BANNER = <<-COPYRIGHT
 ldiff #{Diff::LCS::VERSION}
   Copyright 2004-2019 Austin Ziegler
@@ -16,6 +17,7 @@ ldiff #{Diff::LCS::VERSION}
   the terms of the GPL version 2 (or later), the Perl Artistic licence, or the
   MIT licence.
   COPYRIGHT
+  # standard:enable Layout/HeredocIndentation
 end
 
 class << Diff::LCS::Ldiff
-- 
cgit v1.2.1


From 22303f04b44d97455b5c862176d2d93c02a2b2ba Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 10:58:14 -0500
Subject: Fix Style/AndOr

---
 lib/diff/lcs.rb           | 16 ++++++++--------
 lib/diff/lcs/change.rb    |  4 ++--
 lib/diff/lcs/hunk.rb      |  2 +-
 lib/diff/lcs/internals.rb |  8 ++++----
 lib/diff/lcs/ldiff.rb     |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index e6d817b..bd0147e 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -326,10 +326,10 @@ class << Diff::LCS
 
     # The last entry (if any) processed was a match. +ai+ and +bj+ point just
     # past the last matching lines in their sequences.
-    while (ai < a_size) or (bj < b_size)
+    while (ai < a_size) || (bj < b_size)
       # last A?
-      if ai == a_size and bj < b_size
-        if callbacks.respond_to?(:finished_a) and !run_finished_a
+      if ai == a_size && bj < b_size
+        if callbacks.respond_to?(:finished_a) && !run_finished_a
           ax = string ? seq1[-1, 1] : seq1[-1]
           bx = string ? seq2[bj, 1] : seq2[bj]
           event = Diff::LCS::ContextChange.new(">", (a_size - 1), ax, bj, bx)
@@ -350,8 +350,8 @@ class << Diff::LCS
       end
 
       # last B?
-      if bj == b_size and ai < a_size
-        if callbacks.respond_to?(:finished_b) and !run_finished_b
+      if bj == b_size && ai < a_size
+        if callbacks.respond_to?(:finished_b) && !run_finished_b
           ax = string ? seq1[ai, 1] : seq1[ai]
           bx = string ? seq2[-1, 1] : seq2[-1]
           event = Diff::LCS::ContextChange.new("<", ai, ax, (b_size - 1), bx)
@@ -485,7 +485,7 @@ class << Diff::LCS
       # Find next match indices +ma+ and +mb+
       loop do
         ma += 1
-        break unless ma < matches.size and matches[ma].nil?
+        break unless ma < matches.size && matches[ma].nil?
       end
 
       break if ma >= matches.size # end of matches?
@@ -493,7 +493,7 @@ class << Diff::LCS
       mb = matches[ma]
 
       # Change(seq2)
-      while (ai < ma) or (bj < mb)
+      while (ai < ma) || (bj < mb)
         ax = string ? seq1[ai, 1] : seq1[ai]
         bx = string ? seq2[bj, 1] : seq2[bj]
 
@@ -539,7 +539,7 @@ class << Diff::LCS
       bj += 1
     end
 
-    while (ai < a_size) or (bj < b_size)
+    while (ai < a_size) || (bj < b_size)
       ax = string ? seq1[ai, 1] : seq1[ai]
       bx = string ? seq2[bj, 1] : seq2[bj]
 
diff --git a/lib/diff/lcs/change.rb b/lib/diff/lcs/change.rb
index a82f3e6..f20d804 100644
--- a/lib/diff/lcs/change.rb
+++ b/lib/diff/lcs/change.rb
@@ -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.kind_of?(IntClass)
+    fail "Invalid (New) Position Type" unless @new_position.nil? || @new_position.kind_of?(IntClass)
   end
 
   def to_a
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index 3e4133d..eccfc7a 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -70,7 +70,7 @@ class Diff::LCS::Hunk
   attr_accessor :flag_context # rubocop:disable Layout/EmptyLinesAroundAttributeAccessor
   undef :flag_context=
   def flag_context=(context) #:nodoc: # rubocop:disable Lint/DuplicateMethods
-    return if context.nil? or context.zero?
+    return if context.nil? || context.zero?
 
     add_start = context > @start_old ? @start_old : context
 
diff --git a/lib/diff/lcs/internals.rb b/lib/diff/lcs/internals.rb
index 0454c8a..b968917 100644
--- a/lib/diff/lcs/internals.rb
+++ b/lib/diff/lcs/internals.rb
@@ -45,14 +45,14 @@ class << Diff::LCS::Internals
     vector = []
 
     # Collect any common elements at the beginning...
-    while (a_start <= a_finish) and (b_start <= b_finish) and (a[a_start] == b[b_start])
+    while (a_start <= a_finish) && (b_start <= b_finish) && (a[a_start] == b[b_start])
       vector[a_start] = b_start
       a_start += 1
       b_start += 1
     end
 
     # Now the end...
-    while (a_start <= a_finish) and (b_start <= b_finish) and (a[a_finish] == b[b_finish])
+    while (a_start <= a_finish) && (b_start <= b_finish) && (a[a_finish] == b[b_finish])
       vector[a_finish] = b_finish
       a_finish -= 1
       b_finish -= 1
@@ -75,7 +75,7 @@ class << Diff::LCS::Internals
         # it may have an optimization purpose
         # An attempt to remove it: https://github.com/halostatue/diff-lcs/pull/72
         # Why it is reintroduced: https://github.com/halostatue/diff-lcs/issues/78
-        if k and (thresh[k] > j) and (thresh[k - 1] < j)
+        if k && (thresh[k] > j) && (thresh[k - 1] < j)
           thresh[k] = j
         else
           k = replace_next_larger(thresh, j, k)
@@ -251,7 +251,7 @@ enumerable as either source or destination value."
   # This operation preserves the sort order.
   def replace_next_larger(enum, value, last_index = nil)
     # Off the end?
-    if enum.empty? or (value > enum[-1])
+    if enum.empty? || (value > enum[-1])
       enum << value
       return enum.size - 1
     end
diff --git a/lib/diff/lcs/ldiff.rb b/lib/diff/lcs/ldiff.rb
index 59625aa..1896203 100644
--- a/lib/diff/lcs/ldiff.rb
+++ b/lib/diff/lcs/ldiff.rb
@@ -130,7 +130,7 @@ class << Diff::LCS::Ldiff
       return 1
     end
 
-    if (@format == :unified) or (@format == :context)
+    if (@format == :unified) || (@format == :context)
       ft = File.stat(file_old).mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
       output << "#{char_old} #{file_old}\t#{ft}\n"
       ft = File.stat(file_new).mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
@@ -152,7 +152,7 @@ class << Diff::LCS::Ldiff
         file_length_difference = hunk.file_length_difference
 
         next unless oldhunk
-        next if @lines.positive? and hunk.merge(oldhunk)
+        next if @lines.positive? && hunk.merge(oldhunk)
 
         output << oldhunk.diff(@format)
         output << "\n" if @format == :unified
-- 
cgit v1.2.1


From 5da19290c4b33f579f3b176192b7b15c151bdd00 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:02:38 -0500
Subject: Fix :yields: directive for rdoc

---
 lib/diff/lcs.rb           | 10 +++++-----
 lib/diff/lcs/callbacks.rb |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index bd0147e..db2b03d 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -67,7 +67,7 @@ module Diff::LCS # rubocop:disable Style/Documentation
   # identically for key purposes. That is:
   #
   #   O.new('a').eql?(O.new('a')) == true
-  def lcs(other, &block) #:yields self[i] if there are matched subsequences:
+  def lcs(other, &block) #:yields: self[i] if there are matched subsequences
     Diff::LCS.lcs(self, other, &block)
   end
 
@@ -141,7 +141,7 @@ module Diff::LCS # rubocop:disable Style/Documentation
 end
 
 class << Diff::LCS
-  def lcs(seq1, seq2, &block) #:yields seq1[i] for each matched:
+  def lcs(seq1, seq2, &block) #:yields: seq1[i] for each matched
     matches = Diff::LCS::Internals.lcs(seq1, seq2)
     ret = []
     string = seq1.kind_of? String
@@ -165,7 +165,7 @@ class << Diff::LCS
   # Class argument is provided for +callbacks+, #diff will attempt to
   # initialise it. If the +callbacks+ object (possibly initialised) responds to
   # #finish, it will be called.
-  def diff(seq1, seq2, callbacks = nil, &block) # :yields diff changes:
+  def diff(seq1, seq2, callbacks = nil, &block) # :yields: diff changes
     diff_traversal(:diff, seq1, seq2, callbacks || Diff::LCS::DiffCallbacks, &block)
   end
 
@@ -197,7 +197,7 @@ class << Diff::LCS
   #       # insert
   #     end
   #   end
-  def sdiff(seq1, seq2, callbacks = nil, &block) #:yields diff changes:
+  def sdiff(seq1, seq2, callbacks = nil, &block) #:yields: diff changes
     diff_traversal(:sdiff, seq1, seq2, callbacks || Diff::LCS::SDiffCallbacks, &block)
   end
 
@@ -282,7 +282,7 @@ class << Diff::LCS
   # <tt>callbacks#discard_b</tt> will be called after the end of the sequence
   # is reached, if +a+ has not yet reached the end of +A+ or +b+ has not yet
   # reached the end of +B+.
-  def traverse_sequences(seq1, seq2, callbacks = Diff::LCS::SequenceCallbacks) #:yields change events:
+  def traverse_sequences(seq1, seq2, callbacks = Diff::LCS::SequenceCallbacks) #:yields: change events
     callbacks ||= Diff::LCS::SequenceCallbacks
     matches = Diff::LCS::Internals.lcs(seq1, seq2)
 
diff --git a/lib/diff/lcs/callbacks.rb b/lib/diff/lcs/callbacks.rb
index c075327..54b3686 100644
--- a/lib/diff/lcs/callbacks.rb
+++ b/lib/diff/lcs/callbacks.rb
@@ -107,7 +107,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 = []
 
@@ -302,7 +302,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
-- 
cgit v1.2.1


From 396a82c4d56bc0067c86de7cd32a4ae75f292c41 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:03:11 -0500
Subject: standardrb --only Layout/LeadingCommentSpace --fix

---
 lib/diff/lcs.rb           | 10 +++++-----
 lib/diff/lcs/callbacks.rb |  2 +-
 lib/diff/lcs/htmldiff.rb  |  4 ++--
 lib/diff/lcs/hunk.rb      |  6 +++---
 lib/diff/lcs/ldiff.rb     | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index db2b03d..031e2d7 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -67,7 +67,7 @@ module Diff::LCS # rubocop:disable Style/Documentation
   # identically for key purposes. That is:
   #
   #   O.new('a').eql?(O.new('a')) == true
-  def lcs(other, &block) #:yields: self[i] if there are matched subsequences
+  def lcs(other, &block) # :yields: self[i] if there are matched subsequences
     Diff::LCS.lcs(self, other, &block)
   end
 
@@ -141,7 +141,7 @@ module Diff::LCS # rubocop:disable Style/Documentation
 end
 
 class << Diff::LCS
-  def lcs(seq1, seq2, &block) #:yields: seq1[i] for each matched
+  def lcs(seq1, seq2, &block) # :yields: seq1[i] for each matched
     matches = Diff::LCS::Internals.lcs(seq1, seq2)
     ret = []
     string = seq1.kind_of? String
@@ -197,7 +197,7 @@ class << Diff::LCS
   #       # insert
   #     end
   #   end
-  def sdiff(seq1, seq2, callbacks = nil, &block) #:yields: diff changes
+  def sdiff(seq1, seq2, callbacks = nil, &block) # :yields: diff changes
     diff_traversal(:sdiff, seq1, seq2, callbacks || Diff::LCS::SDiffCallbacks, &block)
   end
 
@@ -282,7 +282,7 @@ class << Diff::LCS
   # <tt>callbacks#discard_b</tt> will be called after the end of the sequence
   # is reached, if +a+ has not yet reached the end of +A+ or +b+ has not yet
   # reached the end of +B+.
-  def traverse_sequences(seq1, seq2, callbacks = Diff::LCS::SequenceCallbacks) #:yields: change events
+  def traverse_sequences(seq1, seq2, callbacks = Diff::LCS::SequenceCallbacks) # :yields: change events
     callbacks ||= Diff::LCS::SequenceCallbacks
     matches = Diff::LCS::Internals.lcs(seq1, seq2)
 
@@ -576,7 +576,7 @@ class << Diff::LCS
     end
   end
 
-  PATCH_MAP = { #:nodoc:
+  PATCH_MAP = { # :nodoc:
     :patch => { "+" => "+", "-" => "-", "!" => "!", "=" => "=" }.freeze,
     :unpatch => { "+" => "-", "-" => "+", "!" => "!", "=" => "=" }.freeze
   }.freeze
diff --git a/lib/diff/lcs/callbacks.rb b/lib/diff/lcs/callbacks.rb
index 54b3686..cdda2dd 100644
--- a/lib/diff/lcs/callbacks.rb
+++ b/lib/diff/lcs/callbacks.rb
@@ -302,7 +302,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
diff --git a/lib/diff/lcs/htmldiff.rb b/lib/diff/lcs/htmldiff.rb
index 37bbc4a..7eab41d 100644
--- a/lib/diff/lcs/htmldiff.rb
+++ b/lib/diff/lcs/htmldiff.rb
@@ -5,11 +5,11 @@ require "cgi"
 # Produce a simple HTML diff view.
 class Diff::LCS::HTMLDiff
   class << self
-    attr_accessor :can_expand_tabs #:nodoc:
+    attr_accessor :can_expand_tabs # :nodoc:
   end
   self.can_expand_tabs = true
 
-  class Callbacks #:nodoc:
+  class Callbacks # :nodoc:
     attr_accessor :output
     attr_accessor :match_class
     attr_accessor :only_a_class
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index eccfc7a..d886ba2 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -6,8 +6,8 @@ require "diff/lcs/block"
 # 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)
 
@@ -69,7 +69,7 @@ class Diff::LCS::Hunk
   # to this hunk.
   attr_accessor :flag_context # rubocop:disable Layout/EmptyLinesAroundAttributeAccessor
   undef :flag_context=
-  def flag_context=(context) #:nodoc: # rubocop:disable Lint/DuplicateMethods
+  def flag_context=(context) # :nodoc: # rubocop:disable Lint/DuplicateMethods
     return if context.nil? || context.zero?
 
     add_start = context > @start_old ? @start_old : context
diff --git a/lib/diff/lcs/ldiff.rb b/lib/diff/lcs/ldiff.rb
index 1896203..961458c 100644
--- a/lib/diff/lcs/ldiff.rb
+++ b/lib/diff/lcs/ldiff.rb
@@ -4,7 +4,7 @@ require "optparse"
 require "ostruct"
 require "diff/lcs/hunk"
 
-module Diff::LCS::Ldiff #:nodoc:
+module Diff::LCS::Ldiff # :nodoc:
   # standard:disable Layout/HeredocIndentation
   BANNER = <<-COPYRIGHT
 ldiff #{Diff::LCS::VERSION}
@@ -21,11 +21,11 @@ ldiff #{Diff::LCS::VERSION}
 end
 
 class << Diff::LCS::Ldiff
-  attr_reader :format, :lines #:nodoc:
-  attr_reader :file_old, :file_new #:nodoc:
-  attr_reader :data_old, :data_new #:nodoc:
+  attr_reader :format, :lines # :nodoc:
+  attr_reader :file_old, :file_new # :nodoc:
+  attr_reader :data_old, :data_new # :nodoc:
 
-  def run(args, _input = $stdin, output = $stdout, error = $stderr) #:nodoc:
+  def run(args, _input = $stdin, output = $stdout, error = $stderr) # :nodoc:
     @binary = nil
 
     args.options do |o|
-- 
cgit v1.2.1


From 927b9b3c935f08a1611059e81b411c2ee2ff9724 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:13:21 -0500
Subject: Ignore Style/HashSyntax

---
 lib/diff/lcs.rb          | 2 ++
 lib/diff/lcs/htmldiff.rb | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 031e2d7..4461af0 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -576,10 +576,12 @@ class << Diff::LCS
     end
   end
 
+  # standard:disable Style/HashSyntax
   PATCH_MAP = { # :nodoc:
     :patch => { "+" => "+", "-" => "-", "!" => "!", "=" => "=" }.freeze,
     :unpatch => { "+" => "-", "-" => "+", "!" => "!", "=" => "=" }.freeze
   }.freeze
+  # standard:enable Style/HashSyntax
 
   # Applies a +patchset+ to the sequence +src+ according to the +direction+
   # (<tt>:patch</tt> or <tt>:unpatch</tt>), producing a new sequence.
diff --git a/lib/diff/lcs/htmldiff.rb b/lib/diff/lcs/htmldiff.rb
index 7eab41d..a57dd51 100644
--- a/lib/diff/lcs/htmldiff.rb
+++ b/lib/diff/lcs/htmldiff.rb
@@ -46,12 +46,14 @@ 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
-- 
cgit v1.2.1


From 99af1369a86b38585f6c63e9d50ac7040932916a Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:14:10 -0500
Subject: standardrb --only Style/ClassCheck --fix

---
 lib/diff/lcs.rb           | 8 ++++----
 lib/diff/lcs/change.rb    | 6 +++---
 lib/diff/lcs/internals.rb | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 4461af0..2214240 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -144,7 +144,7 @@ class << Diff::LCS
   def lcs(seq1, seq2, &block) # :yields: seq1[i] for each matched
     matches = Diff::LCS::Internals.lcs(seq1, seq2)
     ret = []
-    string = seq1.kind_of? String
+    string = seq1.is_a? String
     matches.each_index do |i|
       next if matches[i].nil?
 
@@ -287,7 +287,7 @@ class << Diff::LCS
     matches = Diff::LCS::Internals.lcs(seq1, seq2)
 
     run_finished_a = run_finished_b = false
-    string = seq1.kind_of?(String)
+    string = seq1.is_a?(String)
 
     a_size = seq1.size
     b_size = seq2.size
@@ -478,7 +478,7 @@ class << Diff::LCS
     b_size = seq2.size
     ai = bj = mb = 0
     ma = -1
-    string = seq1.kind_of?(String)
+    string = seq1.is_a?(String)
 
     # Process all the lines in the match vector.
     loop do
@@ -629,7 +629,7 @@ class << Diff::LCS
 
     return src.respond_to?(:dup) ? src.dup : src unless has_changes
 
-    string = src.kind_of?(String)
+    string = src.is_a?(String)
     # Start with a new empty type of the source's class
     res = src.class.new
 
diff --git a/lib/diff/lcs/change.rb b/lib/diff/lcs/change.rb
index f20d804..cebd3af 100644
--- a/lib/diff/lcs/change.rb
+++ b/lib/diff/lcs/change.rb
@@ -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)
@@ -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? || @old_position.kind_of?(IntClass)
-    fail "Invalid (New) Position Type" unless @new_position.nil? || @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
diff --git a/lib/diff/lcs/internals.rb b/lib/diff/lcs/internals.rb
index b968917..8a9160a 100644
--- a/lib/diff/lcs/internals.rb
+++ b/lib/diff/lcs/internals.rb
@@ -13,7 +13,7 @@ class << Diff::LCS
 
     if block
       callbacks.diffs.map do |hunk|
-        if hunk.kind_of? Array
+        if hunk.is_a? Array
           hunk.map { |hunk_block| block[hunk_block] }
         else
           block[hunk]
@@ -64,7 +64,7 @@ class << Diff::LCS::Internals
 
     thresh = []
     links = []
-    string = a.kind_of?(String)
+    string = a.is_a?(String)
 
     (a_start..a_finish).each do |i|
       ai = string ? a[i, 1] : a[i]
@@ -145,7 +145,7 @@ class << Diff::LCS::Internals
   # Diff::LCS::Change as its source, as an array will cause the creation
   # of one of the above.
   def intuit_diff_direction(src, patchset, limit = nil)
-    string = src.kind_of?(String)
+    string = src.is_a?(String)
     count = left_match = left_miss = right_match = right_miss = 0
 
     patchset.each do |change|
@@ -296,7 +296,7 @@ enumerable as either source or destination value."
   # positions it occupies in the Enumerable, optionally restricted to the
   # elements specified in the range of indexes specified by +interval+.
   def position_hash(enum, interval)
-    string = enum.kind_of?(String)
+    string = enum.is_a?(String)
     hash = Hash.new { |h, k| h[k] = [] }
     interval.each do |i|
       k = string ? enum[i, 1] : enum[i]
-- 
cgit v1.2.1


From 63bb988f761da3fa061c9e3b5d13785477bf44c5 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:14:33 -0500
Subject: standardrb --only Layout/SpaceInsideHashLiteralBraces --fix

---
 lib/diff/lcs.rb      | 4 ++--
 lib/diff/lcs/hunk.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 2214240..77b508f 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -578,8 +578,8 @@ class << Diff::LCS
 
   # standard:disable Style/HashSyntax
   PATCH_MAP = { # :nodoc:
-    :patch => { "+" => "+", "-" => "-", "!" => "!", "=" => "=" }.freeze,
-    :unpatch => { "+" => "-", "-" => "+", "!" => "!", "=" => "=" }.freeze
+    :patch => {"+" => "+", "-" => "-", "!" => "!", "=" => "="}.freeze,
+    :unpatch => {"+" => "-", "-" => "+", "!" => "!", "=" => "="}.freeze
   }.freeze
   # standard:enable Style/HashSyntax
 
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index d886ba2..9ff3638 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -6,8 +6,8 @@ require "diff/lcs/block"
 # 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)
 
-- 
cgit v1.2.1


From 7d087cc973685105e2bc1c69dca60d719138dcbc Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:25:24 -0500
Subject: Clean up lint directives

---
 lib/diff/lcs.rb           | 4 ++--
 lib/diff/lcs/backports.rb | 4 ++--
 lib/diff/lcs/callbacks.rb | 2 +-
 lib/diff/lcs/hunk.rb      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 77b508f..30385f8 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Diff; end unless defined? Diff # rubocop:disable Style/Documentation
+module Diff; end unless defined? Diff
 
 # == How Diff Works (by Mark-Jason Dominus)
 #
@@ -55,7 +55,7 @@ end
 require "diff/lcs/callbacks"
 require "diff/lcs/internals"
 
-module Diff::LCS # rubocop:disable Style/Documentation
+module Diff::LCS
   # Returns an Array containing the longest common subsequence(s) between
   # +self+ and +other+. See Diff::LCS#lcs.
   #
diff --git a/lib/diff/lcs/backports.rb b/lib/diff/lcs/backports.rb
index 642fc9c..3d2a768 100644
--- a/lib/diff/lcs/backports.rb
+++ b/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
diff --git a/lib/diff/lcs/callbacks.rb b/lib/diff/lcs/callbacks.rb
index cdda2dd..6fc229b 100644
--- a/lib/diff/lcs/callbacks.rb
+++ b/lib/diff/lcs/callbacks.rb
@@ -2,7 +2,7 @@
 
 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
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index 9ff3638..9f596f3 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -67,9 +67,9 @@ 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
+  def flag_context=(context) # :nodoc: # standard:disable Lint/DuplicateMethods
     return if context.nil? || context.zero?
 
     add_start = context > @start_old ? @start_old : context
-- 
cgit v1.2.1


From b160187f3d94f84b38faadb0726f7b0ae773d7eb Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:25:43 -0500
Subject: standardrb --only Style/Alias --fix

---
 lib/diff/lcs.rb        | 4 ++--
 lib/diff/lcs/change.rb | 4 ++--
 lib/diff/lcs/hunk.rb   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 30385f8..54ef893 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -101,7 +101,7 @@ module Diff::LCS
   def patch(patchset)
     Diff::LCS.patch(self, patchset)
   end
-  alias unpatch patch
+  alias_method :unpatch, :patch
 
   # Attempts to patch +self+ with the provided +patchset+. A new sequence based
   # on +self+ and the +patchset+ will be created. See Diff::LCS#patch. Does no
@@ -154,7 +154,7 @@ class << Diff::LCS
     end
     ret
   end
-  alias LCS lcs
+  alias_method :LCS, :lcs
 
   # #diff computes the smallest set of additions and deletions necessary to
   # turn the first sequence into the second, and returns a description of these
diff --git a/lib/diff/lcs/change.rb b/lib/diff/lcs/change.rb
index cebd3af..c86f102 100644
--- a/lib/diff/lcs/change.rb
+++ b/lib/diff/lcs/change.rb
@@ -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)
@@ -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)
diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index 9f596f3..7f97a7d 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -102,7 +102,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
-- 
cgit v1.2.1


From a7e532ead1780f94d11bf42ac613b8428d808597 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:26:15 -0500
Subject: standardrb --only Style/RescueModifier --fix

---
 lib/diff/lcs/callbacks.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/callbacks.rb b/lib/diff/lcs/callbacks.rb
index 6fc229b..818c013 100644
--- a/lib/diff/lcs/callbacks.rb
+++ b/lib/diff/lcs/callbacks.rb
@@ -50,7 +50,11 @@ module Diff::LCS
   BalancedCallbacks = DefaultCallbacks
 
   def self.callbacks_for(callbacks)
-    callbacks.new rescue callbacks
+    begin
+      callbacks.new
+    rescue
+      callbacks
+    end
   end
 end
 
-- 
cgit v1.2.1


From dce58acce9d3993b4992b2f2f7b53cdf72f9d7f8 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:30:59 -0500
Subject: standardrb --only Standard/BlockSingleLineBraces --fix

---
 lib/diff/lcs/htmldiff.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/htmldiff.rb b/lib/diff/lcs/htmldiff.rb
index a57dd51..325dc95 100644
--- a/lib/diff/lcs/htmldiff.rb
+++ b/lib/diff/lcs/htmldiff.rb
@@ -120,12 +120,12 @@ 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
-- 
cgit v1.2.1


From 8992d9c1c13f7852f23ef823257bcf9691049e56 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:31:46 -0500
Subject: standardrb --only Style/RedundantBegin --fix

---
 lib/diff/lcs/callbacks.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/callbacks.rb b/lib/diff/lcs/callbacks.rb
index 818c013..2c5a779 100644
--- a/lib/diff/lcs/callbacks.rb
+++ b/lib/diff/lcs/callbacks.rb
@@ -50,11 +50,9 @@ module Diff::LCS
   BalancedCallbacks = DefaultCallbacks
 
   def self.callbacks_for(callbacks)
-    begin
-      callbacks.new
-    rescue
-      callbacks
-    end
+    callbacks.new
+  rescue
+    callbacks
   end
 end
 
-- 
cgit v1.2.1


From e5e78807564a3565a37d385b0898cd58776820f4 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:35:49 -0500
Subject: standardrb --only Style/StringLiteralsInInterpolation --fix and more

---
 lib/diff/lcs/hunk.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'lib/diff')

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?
-- 
cgit v1.2.1


From c00ef1d173c3663a3edd0adaee21cbcad7e1b3c3 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:37:31 -0500
Subject: standardrb --only Style/StringLiteralsInInterpolation

---
 lib/diff/lcs/hunk.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/hunk.rb b/lib/diff/lcs/hunk.rb
index 8da65c2..2cef5ed 100644
--- a/lib/diff/lcs/hunk.rb
+++ b/lib/diff/lcs/hunk.rb
@@ -171,7 +171,9 @@ class Diff::LCS::Hunk
     # 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]
 
@@ -225,7 +227,9 @@ class Diff::LCS::Hunk
     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]
 
@@ -247,7 +251,9 @@ class Diff::LCS::Hunk
     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]
 
-- 
cgit v1.2.1


From e31bc57c0d863a6eb77f2c19df2dc49a1e72db67 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Thu, 23 Dec 2021 11:37:49 -0500
Subject: standardrb --only Style/BarePercentLiterals --fix

---
 lib/diff/lcs/htmldiff.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/diff')

diff --git a/lib/diff/lcs/htmldiff.rb b/lib/diff/lcs/htmldiff.rb
index 325dc95..54adc2a 100644
--- a/lib/diff/lcs/htmldiff.rb
+++ b/lib/diff/lcs/htmldiff.rb
@@ -26,7 +26,7 @@ class Diff::LCS::HTMLDiff
 
     def htmlize(element, css_class)
       element = "&nbsp;" if element.empty?
-      %Q(<pre class="#{__send__(css_class)}">#{element}</pre>\n)
+      %(<pre class="#{__send__(css_class)}">#{element}</pre>\n)
     end
     private :htmlize
 
-- 
cgit v1.2.1