super_diff 0.12.1 → 0.15.0

data/lib/super_diff/core/tiered_lines_elider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class TieredLinesElider
@@ -27,7 +29,7 @@ module SuperDiff
       end
 
       def boxes_to_elide
-        @_boxes_to_elide ||=
+        @boxes_to_elide ||=
           panes_to_consider_for_eliding.reduce([]) do |array, pane|
             array + (find_boxes_to_elide_within(pane) || [])
           end
@@ -38,12 +40,12 @@ module SuperDiff
       end
 
       def panes
-        @_panes ||=
+        @panes ||=
           BuildPanes.call(dirty_panes: padded_dirty_panes, lines: lines)
       end
 
       def padded_dirty_panes
-        @_padded_dirty_panes ||=
+        @padded_dirty_panes ||=
           combine_congruent_panes(
             dirty_panes
               .map(&:padded)
@@ -52,33 +54,33 @@ module SuperDiff
       end
 
       def dirty_panes
-        @_dirty_panes ||=
+        @dirty_panes ||=
           lines
-            .each_with_index
-            .select { |line, index| line.type != :noop }
-            .reduce([]) do |panes, (_, index)|
-              if !panes.empty? && panes.last.range.end == index - 1
-                panes[0..-2] + [panes[-1].extended_to(index)]
-              else
-                panes + [Pane.new(type: :dirty, range: index..index)]
-              end
+          .each_with_index
+          .reject { |line, _index| line.type == :noop }
+          .reduce([]) do |panes, (_, index)|
+            if !panes.empty? && panes.last.range.end == index - 1
+              panes[0..-2] + [panes[-1].extended_to(index)]
+            else
+              panes + [Pane.new(type: :dirty, range: index..index)]
             end
+          end
       end
 
       def with_box_elided(box, lines)
         box_at_start_of_lines =
-          if lines.first.complete_bookend?
-            box.range.begin == 1
-          else
-            box.range.begin == 0
-          end
+          box.range.begin == if lines.first.complete_bookend?
+                               1
+                             else
+                               0
+                             end
 
         box_at_end_of_lines =
-          if lines.last.complete_bookend?
-            box.range.end == lines.size - 2
-          else
-            box.range.end == lines.size - 1
-          end
+          box.range.end == if lines.last.complete_bookend?
+                             lines.size - 2
+                           else
+                             lines.size - 1
+                           end
 
         if one_dimensional_line_tree? && outermost_box?(box)
           if box_at_start_of_lines
@@ -108,7 +110,7 @@ module SuperDiff
       def all_indentation_levels
         lines
           .map(&:indentation_level)
-          .select { |indentation_level| indentation_level > 0 }
+          .select(&:positive?)
           .uniq
       end
 
@@ -120,11 +122,11 @@ module SuperDiff
           lines[pane.range].reject(&:complete_bookend?).size
 
         if total_size_before_eliding > maximum
-          if maximum > 0
+          if maximum.positive?
             set_of_boxes.find do |boxes|
               total_size_after_eliding =
                 total_size_before_eliding -
-                  boxes.sum { |box| box.range.size - SIZE_OF_ELISION }
+                boxes.sum { |box| box.range.size - SIZE_OF_ELISION }
               total_size_after_eliding <= maximum
             end
           else
@@ -146,11 +148,11 @@ module SuperDiff
 
         possible_indentation_levels =
           boxes_within_pane
-            .map(&:indentation_level)
-            .select { |indentation_level| indentation_level > 0 }
-            .uniq
-            .sort
-            .reverse
+          .map(&:indentation_level)
+          .select(&:positive?)
+          .uniq
+          .sort
+          .reverse
 
         possible_indentation_levels.map do |indentation_level|
           boxes_within_pane.select do |box|
@@ -183,13 +185,12 @@ module SuperDiff
       def combine(spannables, on:)
         criterion = on
         spannables.reduce([]) do |combined_spannables, spannable|
-          if (
-               !combined_spannables.empty? &&
-                 spannable.range.begin <=
-                   combined_spannables.last.range.end + 1 &&
-                 spannable.public_send(criterion) ==
-                   combined_spannables.last.public_send(criterion)
-             )
+          if !combined_spannables.empty? &&
+             spannable.range.begin <=
+             combined_spannables.last.range.end + 1 &&
+             spannable.public_send(criterion) ==
+             combined_spannables.last.public_send(criterion)
+
             combined_spannables[0..-2] +
               [combined_spannables[-1].extended_to(spannable.range.end)]
           else
@@ -199,12 +200,12 @@ module SuperDiff
       end
 
       def boxes
-        @_boxes ||= BuildBoxes.call(lines)
+        @boxes ||= BuildBoxes.call(lines)
       end
 
       def with_start_of_box_elided(box, lines)
         amount_to_elide =
-          if maximum > 0
+          if maximum.positive?
             box.range.size - maximum + SIZE_OF_ELISION
           else
             box.range.size
@@ -220,14 +221,14 @@ module SuperDiff
 
       def with_end_of_box_elided(box, lines)
         amount_to_elide =
-          if maximum > 0
+          if maximum.positive?
             box.range.size - maximum + SIZE_OF_ELISION
           else
             box.range.size
           end
 
         range =
-          if amount_to_elide > 0
+          if amount_to_elide.positive?
             Range.new(box.range.end - amount_to_elide + 1, box.range.end)
           else
             box.range
@@ -242,15 +243,14 @@ module SuperDiff
 
       def with_middle_of_box_elided(box, lines)
         half_of_maximum, remainder =
-          if maximum > 0
+          if maximum.positive?
             (maximum - SIZE_OF_ELISION).divmod(2)
           else
             [0, 0]
           end
 
-        opening_length, closing_length =
-          half_of_maximum,
-          half_of_maximum + remainder
+        opening_length = half_of_maximum
+        closing_length = half_of_maximum + remainder
 
         with_subset_of_lines_elided(
           lines,
@@ -290,7 +290,7 @@ module SuperDiff
         private
 
         def beginning
-          if (dirty_panes.empty? || dirty_panes.first.range.begin == 0)
+          if dirty_panes.empty? || dirty_panes.first.range.begin.zero?
             []
           else
             [
@@ -324,10 +324,9 @@ module SuperDiff
         end
 
         def ending
-          if (
-               dirty_panes.empty? ||
-                 dirty_panes.last.range.end >= lines.size - 1
-             )
+          if dirty_panes.empty? ||
+             dirty_panes.last.range.end >= lines.size - 1
+
             []
           else
             [
@@ -354,8 +353,8 @@ module SuperDiff
         end
 
         def capped_to(beginning, ending)
-          new_beginning = range.begin < beginning ? beginning : range.begin
-          new_ending = range.end > ending ? ending : range.end
+          new_beginning = [range.begin, beginning].max
+          new_ending = [range.end, ending].min
           self.class.new(
             type: type,
             range: Range.new(new_beginning, new_ending)
@@ -452,11 +451,11 @@ module SuperDiff
         end
 
         def prefix
-          ""
+          ''
         end
 
         def value
-          "# ..."
+          '# ...'
         end
 
         def elided?

data/lib/super_diff/core/tiered_lines_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class TieredLinesFormatter
@@ -29,8 +31,8 @@ module SuperDiff
       class FormattableLine
         extend AttrExtras.mixin
 
-        INDENTATION_UNIT = "  ".freeze
-        ICONS = { delete: "-", insert: "+", elision: " ", noop: " " }.freeze
+        INDENTATION_UNIT = '  '
+        ICONS = { delete: '-', insert: '+', elision: ' ', noop: ' ' }.freeze
         COLORS = {
           delete: :expected,
           insert: :actual,
@@ -41,7 +43,7 @@ module SuperDiff
         pattr_initialize :line
 
         def content
-          icon + " " + indentation + line.prefix + line.value + possible_comma
+          "#{icon} #{indentation}#{line.prefix}#{line.value}#{possible_comma}"
         end
 
         def color
@@ -69,7 +71,7 @@ module SuperDiff
         end
 
         def possible_comma
-          line.add_comma? ? "," : ""
+          line.add_comma? ? ',' : ''
         end
       end
     end

data/lib/super_diff/core/unary_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class UnaryOperation

data/lib/super_diff/core.rb

@@ -1,69 +1,71 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
-    autoload :AbstractDiffer, "super_diff/core/abstract_differ"
+    autoload :AbstractDiffer, 'super_diff/core/abstract_differ'
     autoload(
       :AbstractInspectionTreeBuilder,
-      "super_diff/core/abstract_inspection_tree_builder"
+      'super_diff/core/abstract_inspection_tree_builder'
     )
-    autoload :AbstractOperationTree, "super_diff/core/abstract_operation_tree"
+    autoload :AbstractOperationTree, 'super_diff/core/abstract_operation_tree'
     autoload(
       :AbstractOperationTreeBuilder,
-      "super_diff/core/abstract_operation_tree_builder"
+      'super_diff/core/abstract_operation_tree_builder'
     )
     autoload(
       :AbstractOperationTreeFlattener,
-      "super_diff/core/abstract_operation_tree_flattener"
+      'super_diff/core/abstract_operation_tree_flattener'
     )
-    autoload :BinaryOperation, "super_diff/core/binary_operation"
+    autoload :BinaryOperation, 'super_diff/core/binary_operation'
     autoload(
       :ColorizedDocumentExtensions,
-      "super_diff/core/colorized_document_extensions"
+      'super_diff/core/colorized_document_extensions'
     )
-    autoload :Configuration, "super_diff/core/configuration"
-    autoload :DifferDispatcher, "super_diff/core/differ_dispatcher"
-    autoload :GemVersion, "super_diff/core/gem_version"
-    autoload :Helpers, "super_diff/core/helpers"
-    autoload :ImplementationChecks, "super_diff/core/implementation_checks"
-    autoload :InspectionTree, "super_diff/core/inspection_tree"
+    autoload :Configuration, 'super_diff/core/configuration'
+    autoload :DifferDispatcher, 'super_diff/core/differ_dispatcher'
+    autoload :GemVersion, 'super_diff/core/gem_version'
+    autoload :Helpers, 'super_diff/core/helpers'
+    autoload :ImplementationChecks, 'super_diff/core/implementation_checks'
+    autoload :InspectionTree, 'super_diff/core/inspection_tree'
     autoload(
       :InspectionTreeBuilderDispatcher,
-      "super_diff/core/inspection_tree_builder_dispatcher"
+      'super_diff/core/inspection_tree_builder_dispatcher'
     )
-    autoload :InspectionTreeNodes, "super_diff/core/inspection_tree_nodes"
-    autoload :Line, "super_diff/core/line"
+    autoload :InspectionTreeNodes, 'super_diff/core/inspection_tree_nodes'
+    autoload :Line, 'super_diff/core/line'
     autoload(
       :OperationTreeBuilderDispatcher,
-      "super_diff/core/operation_tree_builder_dispatcher"
+      'super_diff/core/operation_tree_builder_dispatcher'
     )
     autoload(
       :NoDifferAvailableError,
-      "super_diff/core/no_differ_available_error"
+      'super_diff/core/no_differ_available_error'
     )
     autoload(
       :NoInspectionTreeAvailableError,
-      "super_diff/core/no_inspection_tree_builder_available_error"
+      'super_diff/core/no_inspection_tree_builder_available_error'
     )
     autoload(
       :NoOperationTreeBuilderAvailableError,
-      "super_diff/core/no_operation_tree_builder_available_error"
+      'super_diff/core/no_operation_tree_builder_available_error'
     )
     autoload(
       :NoOperationTreeAvailableError,
-      "super_diff/core/no_operation_tree_available_error"
+      'super_diff/core/no_operation_tree_available_error'
     )
-    autoload :OperationTreeFinder, "super_diff/core/operation_tree_finder"
+    autoload :OperationTreeFinder, 'super_diff/core/operation_tree_finder'
     autoload(
       :PrefixForNextInspectionTreeNode,
-      "super_diff/core/prefix_for_next_inspection_tree_node"
+      'super_diff/core/prefix_for_next_inspection_tree_node'
     )
     autoload(
       :PreludeForNextInspectionTreeNode,
-      "super_diff/core/prelude_for_next_inspection_tree_node"
+      'super_diff/core/prelude_for_next_inspection_tree_node'
     )
-    autoload :RecursionGuard, "super_diff/core/recursion_guard"
-    autoload :TieredLines, "super_diff/core/tiered_lines"
-    autoload :TieredLinesElider, "super_diff/core/tiered_lines_elider"
-    autoload :TieredLinesFormatter, "super_diff/core/tiered_lines_formatter"
-    autoload :UnaryOperation, "super_diff/core/unary_operation"
+    autoload :RecursionGuard, 'super_diff/core/recursion_guard'
+    autoload :TieredLines, 'super_diff/core/tiered_lines'
+    autoload :TieredLinesElider, 'super_diff/core/tiered_lines_elider'
+    autoload :TieredLinesFormatter, 'super_diff/core/tiered_lines_formatter'
+    autoload :UnaryOperation, 'super_diff/core/unary_operation'
   end
 end

data/lib/super_diff/csi/bold_sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Csi
     class BoldSequence

data/lib/super_diff/csi/color.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Csi
     class Color
@@ -51,10 +53,8 @@ module SuperDiff
         if %i[foreground background].include?(layer)
           layer
         else
-          raise ArgumentError.new(
-                  "Invalid layer #{layer.inspect}. " +
-                    "Layer must be :foreground or :background."
-                )
+          raise ArgumentError, "Invalid layer #{layer.inspect}. " \
+                               'Layer must be :foreground or :background.'
         end
       end
     end

data/lib/super_diff/csi/color_sequence_block.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Csi
     class ColorSequenceBlock
@@ -14,7 +16,7 @@ module SuperDiff
       def push(color)
         colors.push(color)
       end
-      alias_method :<<, :push
+      alias << push
 
       def to_s
         colors.map(&:to_s).join

data/lib/super_diff/csi/colorized_document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Csi
     class ColorizedDocument < Document
@@ -19,9 +21,9 @@ module SuperDiff
         add_part(Csi.reset_sequence)
 
         color_sequence_to_reopen = color_sequences_open_in_parent.pop
-        if color_sequences_open_in_parent.any?
-          add_part(color_sequence_to_reopen)
-        end
+        return unless color_sequences_open_in_parent.any?
+
+        add_part(color_sequence_to_reopen)
       end
 
       def colorize_inline(contents, colors, opts)
@@ -54,13 +56,9 @@ module SuperDiff
         ColorSequenceBlock
           .new(colors)
           .tap do |sequence|
-            if opts[:fg]
-              sequence << Color.resolve(opts[:fg], layer: :foreground)
-            end
+            sequence << Color.resolve(opts[:fg], layer: :foreground) if opts[:fg]
 
-            if opts[:bg]
-              sequence << Color.resolve(opts[:bg], layer: :background)
-            end
+            sequence << Color.resolve(opts[:bg], layer: :background) if opts[:bg]
           end
       end
     end

data/lib/super_diff/csi/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Csi
     class Document
@@ -14,8 +16,8 @@ module SuperDiff
         parts.each(&block)
       end
 
-      def bold(*args, **opts, &block)
-        colorize(BoldSequence.new, *args, **opts, &block)
+      def bold(...)
+        colorize(BoldSequence.new, ...)
       end
 
       def colorize(*args, **opts, &block)
@@ -23,11 +25,10 @@ module SuperDiff
           args.partition { |arg| arg.is_a?(String) || arg.is_a?(self.class) }
 
         if colors[0].is_a?(Symbol)
-          if colors[0] == :colorize
-            raise ArgumentError, "#colorize can't call itself!"
-          else
-            public_send(colors[0], *contents, *colors[1..-1], **opts, &block)
-          end
+          raise ArgumentError, "#colorize can't call itself!" if colors[0] == :colorize
+
+          public_send(colors[0], *contents, *colors[1..], **opts, &block)
+
         elsif !block && colors.empty? && opts.empty?
           text(*contents)
         elsif block
@@ -35,10 +36,10 @@ module SuperDiff
         elsif contents.any?
           colorize_inline(contents, colors, opts)
         else
-          raise ArgumentError, "Must have something to colorize!"
+          raise ArgumentError, 'Must have something to colorize!'
         end
       end
-      alias_method :colored, :colorize
+      alias colored colorize
 
       def text(*contents, **, &block)
         if block
@@ -46,10 +47,10 @@ module SuperDiff
         elsif contents.any?
           contents.each { |part| add_part(part) }
         else
-          raise ArgumentError.new("Must have something to add to the document!")
+          raise ArgumentError, 'Must have something to add to the document!'
         end
       end
-      alias_method :plain, :text
+      alias plain text
 
       def line(*contents, indent_by: 0, &block)
         indent(by: indent_by) do
@@ -60,9 +61,7 @@ module SuperDiff
           elsif contents.any?
             text(*contents)
           else
-            raise ArgumentError.new(
-                    "Must have something to add to the document!"
-                  )
+            raise ArgumentError, 'Must have something to add to the document!'
           end
         end
 
@@ -75,7 +74,7 @@ module SuperDiff
 
       def indent(by:, &block)
         # TODO: This won't work if using `text` manually to add lines
-        indentation_stack << (by.is_a?(String) ? by : " " * by)
+        indentation_stack << (by.is_a?(String) ? by : ' ' * by)
         evaluate_block(&block)
         indentation_stack.pop
       end
@@ -116,13 +115,11 @@ module SuperDiff
           end
         elsif Csi::Color.exists?(name.to_sym)
           ColorRequest.new(name: name.to_sym, line: false)
-        else
-          nil
         end
       end
 
       def evaluate_block(&block)
-        if block.arity > 0
+        if block.arity.positive?
           block.call(self)
         else
           instance_eval(&block)