prism-merge 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ca6071c4cec046f0e1b8b16298c1f11ac5164271ef37a51119d975e699aac6
-  data.tar.gz: 8dcef50c1a8cd597cf471d148a15e2fec5412c6ecdcc20ba6788ea979ff23233
+  metadata.gz: 421f226a53add89905b9160c76fd3f18130bb7ab65a9b2da410e29237d0ee0d9
+  data.tar.gz: 35a0b3a827749be34717d4e9c58842ae589fc8a0028c50175465fd99504f0bc7
 SHA512:
-  metadata.gz: d1faf2b8c9c7ee00902e65e6d559c931f934293764fcc8b85501b419cf2e2144e9f141d0feba0d4427018cc1f470ed5861ee9a1b06b5f2d0609a5ee39dceb94e
-  data.tar.gz: 67fa40303034e480ce93b5ad4286d5061fbc77afa418364f2689f7667b08779a5394a898bf6df80ee00f165a8ef2ec95818759036b27eb10b5722a5d1fb39f50
+  metadata.gz: 31948037aa1cf05744a46649d0bddc73ed2920714c1c08d6f00c0bb337da25e479c77f80594b1a9ee0e2f32d16b58dcbd41c3dc1449408170d90095ef579081b
+  data.tar.gz: 8bdcc61811f3b70e338c3a34a1e2953b5eb81dd8186180c47d277dffe6cc5f944504ac2833c5d1f431593e9f221c726ed977b6120d43db7a744c6c1e07be06bf

data/CHANGELOG.md

@@ -30,6 +30,20 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.1.6] - 2025-12-05
+
+- TAG: [v1.1.6][1.1.6t]
+- COVERAGE: 98.31% -- 929/945 lines in 9 files
+- BRANCH COVERAGE: 87.08% -- 391/449 branches in 9 files
+- 100.00% documented
+
+### Fixed
+
+- **Fixed duplicate content when freeze blocks precede nodes with leading comments**: When a freeze block appeared before a node that had leading comments attached from earlier in the file, the merge would output duplicate content. Fixed by:
+  - Filtering out comments inside freeze blocks from being attached as leading comments to subsequent nodes
+  - Not including leading comments in anchor ranges when other nodes exist between the comments and the node
+  - Extending `extract_node_body` to include content after the last statement up to the closing line, ensuring freeze blocks at the end of block bodies are preserved
+
 ## [1.1.5] - 2025-12-04
 
 - TAG: [v1.1.5][1.1.5t]
@@ -223,7 +237,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.5...HEAD
+[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.6...HEAD
+[1.1.6]: https://github.com/kettle-rb/prism-merge/compare/v1.1.5...v1.1.6
+[1.1.6t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.6
 [1.1.5]: https://github.com/kettle-rb/prism-merge/compare/v1.1.4...v1.1.5
 [1.1.5t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.5
 [1.1.4]: https://github.com/kettle-rb/prism-merge/compare/v1.1.3...v1.1.4

data/README.md

@@ -1194,7 +1194,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.922-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.945-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/prism/merge/file_aligner.rb

@@ -254,17 +254,28 @@ module Prism
           d_node_info = dest_sig_map[sig].find { |d| !matched_dest.include?(d[:index]) }
           next unless d_node_info
 
-          # Create anchor for this matched node (including its leading comments)
-          t_start = t_node_info[:leading_comments].any? ? t_node_info[:leading_comments].first.location.start_line : t_node_info[:line_range].begin
+          # Create anchor for this matched node
+          # Only include leading comments if they are immediately before the node
+          # (no other nodes/content between comments and this node)
+          t_start = calculate_anchor_start(t_node_info, template_nodes)
           t_end = t_node_info[:line_range].end
-          d_start = d_node_info[:leading_comments].any? ? d_node_info[:leading_comments].first.location.start_line : d_node_info[:line_range].begin
+          d_start = calculate_anchor_start(d_node_info, dest_nodes)
           d_end = d_node_info[:line_range].end
 
-          # Check if this would completely overlap with existing anchors
-          # Only skip if an anchor already covers the EXACT same range
+          # Check if this would overlap with existing anchors in BOTH template AND dest
+          # (same position in both files indicates a true overlap/conflict)
+          # Also check for exact match (already covered)
           overlaps = @anchors.any? do |a|
-            a.template_start == t_start && a.template_end == t_end &&
+            # Exact match - already have this anchor
+            exact_match = a.template_start == t_start && a.template_end == t_end &&
               a.dest_start == d_start && a.dest_end == d_end
+
+            # Check if the proposed anchor's range overlaps with existing anchor
+            # AND it's the same relative position (both template ranges overlap AND both dest ranges overlap)
+            template_overlaps = ranges_overlap?(t_start..t_end, a.template_start..a.template_end)
+            dest_overlaps = ranges_overlap?(d_start..d_end, a.dest_start..a.dest_end)
+
+            exact_match || (template_overlaps && dest_overlaps)
           end
 
           unless overlaps
@@ -281,6 +292,33 @@ module Prism
         end
       end
 
+      # Calculate the start line for an anchor, considering leading comments
+      # Only include leading comments if they are immediately adjacent to the node
+      # (no other nodes between the comments and this node)
+      def calculate_anchor_start(node_info, all_nodes)
+        node_start = node_info[:line_range].begin
+        leading_comments = node_info[:leading_comments]
+
+        return node_start if leading_comments.empty?
+
+        first_comment_line = leading_comments.first.location.start_line
+
+        # Check if any other node exists between the first comment and this node
+        # If so, don't include the leading comments in the anchor
+        has_intervening_node = all_nodes.any? do |other|
+          next false if other[:index] == node_info[:index]
+          other_range = other[:line_range]
+          # Check if other node is between first comment and this node
+          other_range.begin > first_comment_line && other_range.end < node_start
+        end
+
+        if has_intervening_node
+          node_start
+        else
+          first_comment_line
+        end
+      end
+
       def add_freeze_block_anchors
         # Freeze blocks in destination should always be preserved as anchors
         # Match freeze blocks by their index/order in the file

data/lib/prism/merge/file_analysis.rb

@@ -319,9 +319,24 @@ module Prism
         end
       end
 
-      # Extract nodes with their comments and metadata
-      # Uses Prism's native comment attachment via node.location
-      # @return [Array<Hash>]
+      # Extract nodes with their comments and metadata.
+      #
+      # Uses Prism's native comment attachment via node.location. Leading comments
+      # are filtered to exclude:
+      # 1. Freeze/unfreeze marker comments (they belong to FreezeNode boundaries)
+      # 2. Comments inside freeze blocks (they belong to FreezeNode content)
+      #
+      # This filtering prevents duplicate content when freeze blocks precede other
+      # nodes, as Prism attaches ALL preceding comments to a node's leading_comments.
+      #
+      # @return [Array<Hash>] Array of node info hashes with keys:
+      #   - :node [Prism::Node, FreezeNode] The AST node
+      #   - :index [Integer] Position in statements array
+      #   - :leading_comments [Array<Prism::Comment>] Filtered leading comments
+      #   - :inline_comments [Array<Prism::Comment>] Trailing/inline comments
+      #   - :signature [Array, nil] Structural signature for matching
+      #   - :line_range [Range] Line range covered by the node
+      # @api private
       def extract_nodes_with_comments
         return [] unless valid?
 
@@ -330,6 +345,13 @@ module Prism
           /#\s*#{Regexp.escape(@freeze_token)}:(freeze|unfreeze)/i
         end
 
+        # Build a set of line numbers that are inside freeze blocks
+        # Comments on these lines should not be attached as leading comments to other nodes
+        freeze_block_lines = Set.new
+        freeze_blocks.each do |fb|
+          (fb.start_line..fb.end_line).each { |line| freeze_block_lines << line }
+        end
+
         statements.map.with_index do |stmt, idx|
           # FreezeNode doesn't have Prism location with comments
           # It's a wrapper with custom Location struct
@@ -343,12 +365,17 @@ module Prism
               line_range: stmt.location.start_line..stmt.location.end_line,
             }
           else
-            # Filter out freeze/unfreeze marker comments from leading comments
-            # These markers are part of FreezeNode boundaries and should not be
-            # attached to subsequent nodes
+            # Filter out comments that are:
+            # 1. Freeze/unfreeze markers (part of FreezeNode boundaries)
+            # 2. Inside freeze blocks (belong to FreezeNode content, not this node)
             leading = stmt.location.leading_comments
-            if freeze_marker_pattern
-              leading = leading.reject { |c| c.slice.match?(freeze_marker_pattern) }
+            if freeze_marker_pattern || freeze_block_lines.any?
+              leading = leading.reject do |c|
+                comment_line = c.location.start_line
+                # Reject if it's a freeze marker OR if it's inside a freeze block
+                (freeze_marker_pattern && c.slice.match?(freeze_marker_pattern)) ||
+                  freeze_block_lines.include?(comment_line)
+              end
             end
 
             {

data/lib/prism/merge/smart_merger.rb

@@ -708,7 +708,7 @@ module Prism
 
         # Get the line range of the body
         # Start from line after node opening (to include any leading comments/freeze markers)
-        # For nodes with blocks, the body starts after the block opening
+        # End at the line before the closing `end` (to include trailing comments/freeze markers)
         body_start_line = case node
         when Prism::CallNode
           # Block body starts on line after the `do` or `{`
@@ -720,11 +720,22 @@ module Prism
           body_statements.first.location.start_line
         end
 
-        last_stmt_line = body_statements.last.location.end_line
+        # End line should be the line before the closing keyword (end, }, etc.)
+        # This ensures we capture trailing comments and freeze blocks after the last statement
+        body_end_line = case node
+        when Prism::CallNode
+          # Block ends at the closing `end` or `}`
+          node.block.closing_loc ? node.block.closing_loc.start_line - 1 : body_statements.last.location.end_line
+        when Prism::ClassNode, Prism::ModuleNode, Prism::SingletonClassNode
+          # Body ends at the line before `end`
+          node.end_keyword_loc ? node.end_keyword_loc.start_line - 1 : body_statements.last.location.end_line
+        else
+          body_statements.last.location.end_line
+        end
 
         # Extract the source lines for the body
         lines = []
-        (body_start_line..last_stmt_line).each do |line_num|
+        (body_start_line..body_end_line).each do |line_num|
           lines << analysis.line_at(line_num).chomp
         end
         lines.join("\n") + "\n"

data/lib/prism/merge/version.rb

@@ -5,7 +5,7 @@ module Prism
     # Version information for Prism::Merge
     module Version
       # Current version of the prism-merge gem
-      VERSION = "1.1.5"
+      VERSION = "1.1.6"
     end
     VERSION = Version::VERSION # traditional location
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-merge
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Peter H. Boling
@@ -265,10 +265,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://prism-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.1.5
-  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.1.5/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.1.6
+  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.1.6/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.5
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.6
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/prism-merge/wiki
   news_uri: https://www.railsbling.com/tags/prism-merge