canon 0.3.42 → 0.3.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a54063c501419f65316ce159b9ff85c7179d49afc6a0c7d3d17f5adef2981a0
-  data.tar.gz: f535a9131aed98326fe7c8fa13c70fe39f2913451b39a83a82d2df6ab636219c
+  metadata.gz: e7b141fefd0f254d40b0ba7621c7400d882f5a0bcee1fc2f96a51424ce4c7c36
+  data.tar.gz: '018e400f0949c85ca2db99aa362664e6434834b135e32efc891b9f4b1c794f46'
 SHA512:
-  metadata.gz: 82f5cb1c13b63065112deb746b569e9abf902322c8cff3e94568a05db86f605872f739aa15ca0f82ccab425f92494dd5fcfc9f83ee2b99b4a8309c4c34533474
-  data.tar.gz: 72002e2e958716c54fa353ffd6fffda94b98e7eeac8e05510af5fa92f4c576fe37c2f5c06fa9d44feae84ba8e9a698ededd8405504b49f28620cc29418f21f22
+  metadata.gz: 0d25eaf6dfa12649678fb9e770762fbf1ad51923d7da03b168aa36acbb11fe3242edb958069b9738bf097aa0c90188498b3408f1fd900589bc091394c578d394
+  data.tar.gz: e519ee287d5016becf20d31ad057d825d9c6118273305ce713f13c8c0429172283b576fe6a0c477a91cfbda92328b8a4d4f3491b1e6c34e69425d24ff7f12eb1

data/lib/canon/diff_formatter/by_line/xml_formatter.rb

@@ -59,10 +59,121 @@ module Canon
             grouping_lines: @diff_grouping_lines,
           )
 
+          # #85/#86: DiffNodes the enricher could not locate were
+          # previously dropped silently — the absorption mechanism.
+          # Their serialized content renders as a trailing context so
+          # the change is always visible, without perturbing the
+          # located walk's line accounting.
+          append_unlocated_context(report)
+
           # Layer 6: Format the report
           format_report(report, doc1, doc2)
         end
 
+        # Trailing context for DiffNodes with no located char ranges
+        # (multiline reflowed text, relocated content): one removed
+        # DiffLine per serialized_before line, one added per
+        # serialized_after line. Nil positions render as blank line
+        # numbers.
+        def append_unlocated_context(report)
+          unlocated = @differences.select do |dn|
+            dn.char_ranges.nil? || dn.char_ranges.empty?
+          end
+          return if unlocated.empty?
+
+          unlocated = unlocated.reject do |dn|
+            (@show_diffs == :normative && !dn.normative?) ||
+              (@show_diffs == :informative && !dn.informative?)
+          end
+          return if unlocated.empty?
+
+          # Place each unlocated node's context after the report
+          # context containing its nearest preceding LOCATED node
+          # (@differences is comparator-walk order = document order),
+          # so the change reads in position instead of trailing.
+          unlocated.each do |dn|
+            context = Canon::Diff::DiffContext.new(
+              lines: unlocated_lines(dn),
+            )
+            anchor_index = context_index_after(report, preceding_located(dn))
+            report.contexts.insert(anchor_index, context)
+          end
+        end
+
+        # Mini-diff of one unlocated node's serialized sides: shared
+        # lines render as :unchanged context instead of remove-all +
+        # add-all. Blank line numbers throughout — no located position.
+        def unlocated_lines(diff_node)
+          before = diff_node.serialized_before&.split("\n") || []
+          after = diff_node.serialized_after&.split("\n") || []
+          fmt = diff_node.formatting?
+          lines = []
+          require "diff/lcs" unless defined?(::Diff::LCS)
+
+          ::Diff::LCS.sdiff(before, after).each do |change|
+            case change.action
+            when "="
+              lines << Canon::Diff::DiffLine.new(
+                line_number: nil, new_position: nil,
+                content: change.old_element, type: :unchanged,
+                diff_node: diff_node
+              )
+            when "-"
+              lines << Canon::Diff::DiffLine.new(
+                line_number: nil, new_position: nil,
+                content: change.old_element, type: :removed,
+                diff_node: diff_node, formatting: fmt
+              )
+            when "+"
+              lines << Canon::Diff::DiffLine.new(
+                line_number: nil, new_position: nil,
+                content: change.new_element, type: :added,
+                diff_node: diff_node, formatting: fmt
+              )
+            when "!"
+              lines << Canon::Diff::DiffLine.new(
+                line_number: nil, new_position: nil,
+                content: change.old_element, type: :removed,
+                diff_node: diff_node, formatting: fmt
+              )
+              lines << Canon::Diff::DiffLine.new(
+                line_number: nil, new_position: nil,
+                content: change.new_element, type: :added,
+                diff_node: diff_node, formatting: fmt
+              )
+            end
+          end
+          lines
+        end
+
+        # The nearest preceding node (in @differences walk order)
+        # that the enricher DID locate.
+        def preceding_located(diff_node)
+          index = @differences.index(diff_node)
+          return nil unless index
+
+          (index - 1).downto(0) do |i|
+            dn = @differences[i]
+            return dn if dn.char_ranges && !dn.char_ranges.empty?
+          end
+          nil
+        end
+
+        # Index into report.contexts for inserting an unlocated
+        # context: after the context holding the anchor node's lines,
+        # or at the front when the anchor is nil (nothing precedes).
+        def context_index_after(report, anchor_node)
+          return 0 if anchor_node.nil?
+
+          report.contexts.each_with_index do |context, idx|
+            has_anchor = context.lines.any? do |dl|
+              dl.diff_node&.equal?(anchor_node)
+            end
+            return idx + 1 if has_anchor
+          end
+          report.contexts.length
+        end
+
         # Format a DiffReport for display
         def format_report(report, doc1, doc2)
           return "" if report.contexts.empty?
@@ -100,12 +211,12 @@ module Canon
           context.lines.each do |diff_line|
             case diff_line.type
             when :unchanged
-              old_num = diff_line.line_number + 1
-              new_num = (diff_line.new_position || diff_line.line_number) + 1
+              old_num = diff_line.line_number&.+(1)
+              new_num = (diff_line.new_position || diff_line.line_number)&.+(1)
               output << format_unified_line(old_num, new_num, " ",
                                             diff_line.content)
             when :removed
-              line_num = diff_line.line_number + 1
+              line_num = diff_line.line_number&.+(1)
               formatting = diff_line.formatting?
               informative = diff_line.informative?
 
@@ -147,7 +258,7 @@ module Canon
                                               theme_color(:removed, :content))
                         end
             when :added
-              line_num = (diff_line.new_position || diff_line.line_number) + 1
+              line_num = (diff_line.new_position || diff_line.line_number)&.+(1)
               formatting = diff_line.formatting?
               informative = diff_line.informative?
 
@@ -255,8 +366,8 @@ module Canon
         # Format a changed diff line using DiffCharRanges for character-level highlighting.
         # Reads pre-computed char ranges from the DiffLine — NO tokenization, NO LCS.
         def format_changed_line(diff_line, _lines1)
-          old_line_num = diff_line.line_number + 1
-          new_line_num = (diff_line.new_position || diff_line.line_number) + 1
+          old_line_num = diff_line.line_number&.+(1)
+          new_line_num = (diff_line.new_position || diff_line.line_number)&.+(1)
           formatting = diff_line.formatting?
           informative = diff_line.informative?
           old_content = diff_line.old_content || diff_line.content

data/lib/canon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canon
-  VERSION = "0.3.42"
+  VERSION = "0.3.44"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canon
 version: !ruby/object:Gem::Version
-  version: 0.3.42
+  version: 0.3.44
 platform: ruby
 authors:
 - Ribose Inc.