canon 0.3.43 → 0.3.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bb496bdbab5cc434e73d3f353563e110bbaf0b73a76f009886e45743206984
-  data.tar.gz: c00284c8cc531ed825633e8e2250a1dbead21ec4db083529a6bef5d3b909bd4b
+  metadata.gz: e7b141fefd0f254d40b0ba7621c7400d882f5a0bcee1fc2f96a51424ce4c7c36
+  data.tar.gz: '018e400f0949c85ca2db99aa362664e6434834b135e32efc891b9f4b1c794f46'
 SHA512:
-  metadata.gz: 7e32bb5f265281f3ba69a7b9c130025d84f27578084a8a90267edaefc7e5cc6cedd8b2aa72db0a930d38def70ac07f826fc80e767cda72089d3ebedbc88219f4
-  data.tar.gz: 82a1b117a2f121dbd436962937b1aec7de7ef691b8d15f51fbf69155d6ff9fe09af5ed5f69efdbfa4724af65dbd3858525a56ac22ebb6d603c91ad9b032ab590
+  metadata.gz: 0d25eaf6dfa12649678fb9e770762fbf1ad51923d7da03b168aa36acbb11fe3242edb958069b9738bf097aa0c90188498b3408f1fd900589bc091394c578d394
+  data.tar.gz: e519ee287d5016becf20d31ad057d825d9c6118273305ce713f13c8c0429172283b576fe6a0c477a91cfbda92328b8a4d4f3491b1e6c34e69425d24ff7f12eb1

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

@@ -87,25 +87,91 @@ module Canon
           end
           return if unlocated.empty?
 
-          lines = []
+          # 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|
-            fmt = dn.formatting?
-            dn.serialized_before&.split("\n")&.each do |line|
+            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: line,
-                type: :removed, diff_node: dn, formatting: fmt
+                line_number: nil, new_position: nil,
+                content: change.old_element, type: :unchanged,
+                diff_node: diff_node
               )
-            end
-            next unless dn.serialized_after
-
-            dn.serialized_after.split("\n").each do |line|
+            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: line,
-                type: :added, diff_node: dn, formatting: fmt
+                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 << Canon::Diff::DiffContext.new(lines: lines)
+          report.contexts.length
         end
 
         # Format a DiffReport for display

data/lib/canon/version.rb

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

metadata

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