canon 0.3.42 → 0.3.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a54063c501419f65316ce159b9ff85c7179d49afc6a0c7d3d17f5adef2981a0
-  data.tar.gz: f535a9131aed98326fe7c8fa13c70fe39f2913451b39a83a82d2df6ab636219c
+  metadata.gz: 88bb496bdbab5cc434e73d3f353563e110bbaf0b73a76f009886e45743206984
+  data.tar.gz: c00284c8cc531ed825633e8e2250a1dbead21ec4db083529a6bef5d3b909bd4b
 SHA512:
-  metadata.gz: 82f5cb1c13b63065112deb746b569e9abf902322c8cff3e94568a05db86f605872f739aa15ca0f82ccab425f92494dd5fcfc9f83ee2b99b4a8309c4c34533474
-  data.tar.gz: 72002e2e958716c54fa353ffd6fffda94b98e7eeac8e05510af5fa92f4c576fe37c2f5c06fa9d44feae84ba8e9a698ededd8405504b49f28620cc29418f21f22
+  metadata.gz: 7e32bb5f265281f3ba69a7b9c130025d84f27578084a8a90267edaefc7e5cc6cedd8b2aa72db0a930d38def70ac07f826fc80e767cda72089d3ebedbc88219f4
+  data.tar.gz: 82a1b117a2f121dbd436962937b1aec7de7ef691b8d15f51fbf69155d6ff9fe09af5ed5f69efdbfa4724af65dbd3858525a56ac22ebb6d603c91ad9b032ab590

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

@@ -59,10 +59,55 @@ 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?
+
+          lines = []
+          unlocated.each do |dn|
+            fmt = dn.formatting?
+            dn.serialized_before&.split("\n")&.each do |line|
+              lines << Canon::Diff::DiffLine.new(
+                line_number: nil, new_position: nil, content: line,
+                type: :removed, diff_node: dn, formatting: fmt
+              )
+            end
+            next unless dn.serialized_after
+
+            dn.serialized_after.split("\n").each do |line|
+              lines << Canon::Diff::DiffLine.new(
+                line_number: nil, new_position: nil, content: line,
+                type: :added, diff_node: dn, formatting: fmt
+              )
+            end
+          end
+          report.contexts << Canon::Diff::DiffContext.new(lines: lines)
+        end
+
         # Format a DiffReport for display
         def format_report(report, doc1, doc2)
           return "" if report.contexts.empty?
@@ -100,12 +145,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 +192,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 +300,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.43"
 end

metadata

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