prism-merge 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1425ee625e5f45061e5faa4d942371f94498082aa00660a4e8b42d50c49b1368
-  data.tar.gz: 45b4f7343c85a8b87b95929c4a17da4db132cb69dfdcfdf3a4078e2ea88f1838
+  metadata.gz: f43aef831e7dd032d7607b541bcc542cb2899514150346632084148b167dc0a5
+  data.tar.gz: 104a80156b7b15d02c8b7f5b237998a4d4c225f22f7d108c46642ddea7e6c51e
 SHA512:
-  metadata.gz: 45baf957dc196b7f81084a98ae8c52a3d9121e40d8b39355320825cf02b033b2381ae30ce54b439519808fc3dc859ba653e29b2042770497cbef5b53dd796a7c
-  data.tar.gz: cb6bab2681c92c7900265fbc5fe136dc712bfe1d20cade3aa3145962f7966c4db66aa5d3f34b19887aa707ad362429edae8e7bdb5d371de46acd6ee3221f39c6
+  metadata.gz: 425c404b3e0396b5db166b0c4e2fca941af3f6b6d0727ece8b0cd19bc60f9901883d587dee4a90c43356b6fa4b6b98d841fbf791785fb410662d72df0e7c5d2b
+  data.tar.gz: eb666082134afb97479cd8dd020baa6b8ef45b489d0b8c3a4df8ad6e19e8100d53cba60d48c930d7ed43ce8830bf2ec5b309fc432a24dfb5440c1fa9eb9a9b7f

data/CHANGELOG.md

@@ -30,6 +30,63 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.0.2] - 2026-02-22
+
+- TAG: [v2.0.2][2.0.2t]
+- COVERAGE: 98.80% -- 823/833 lines in 12 files
+- BRANCH COVERAGE: 85.61% -- 452/528 branches in 12 files
+- 93.51% documented
+
+### Fixed
+
+- Fix node duplication when merging files with inline trailing comments (e.g.,
+  gemspec `add_dependency` lines with `# ruby >= 3.2.0`). `add_node_to_result`
+  output the full source line (which already includes inline comments via
+  `analysis.line_at`), then also iterated `trailing_comments` and re-emitted any
+  comment on the same line — duplicating the entire line. Now skips trailing
+  comments whose `start_line` falls within the node's own line range. This was the
+  root cause of every `add_dependency` / `add_development_dependency` being
+  duplicated in gemspec and gemfile merges when inline comments were present.
+- Prevent potential double-wrapping in `merge_node_body_recursively` — store the
+  raw (unwrapped) `signature_generator` as `@raw_signature_generator` and pass it
+  (instead of the already-effective generator) to inner `SmartMerger` instances.
+  This ensures `build_effective_signature_generator` wraps it only once when
+  `node_typing` is also configured.
+
+## [2.0.1] - 2026-02-22
+
+- TAG: [v2.0.1][2.0.1t]
+- COVERAGE: 98.80% -- 820/830 lines in 12 files
+- BRANCH COVERAGE: 85.55% -- 450/526 branches in 12 files
+- 93.51% documented
+
+### Added
+
+- `SmartMerger#emit_dest_prefix_lines` preserves magic comments (e.g., `# frozen_string_literal: true`)
+  and blank lines that appear before the first AST node in the destination file
+- `SmartMerger#emit_dest_gap_lines` preserves blank lines between consecutive top-level blocks
+  in the destination, preventing them from being silently stripped during merge
+
+### Changed
+
+- `SmartMerger#merge_with_debug` now uses `merge_result` (returns `MergeResult` object)
+  instead of `merge` (returns `String`), so `statistics` and `decision_summary` are accessible
+- `SmartMerger#build_result` now passes `template_analysis` and `dest_analysis` to
+  `MergeResult.new` for consistency with `SmartMergerBase` API
+
+### Removed
+
+- Removed redundant `attr_reader :node_typing` from `SmartMerger` — already provided
+  by `SmartMergerBase`
+
+### Fixed
+
+- Inter-node blank line stripping: blank lines between top-level blocks (e.g., between
+  `appraise` blocks in Appraisals, between `gem` calls in Gemfiles) are now preserved
+  from the destination source during merge
+- Prefix line stripping: magic comments and blank lines before the first AST statement
+  (e.g., `# frozen_string_literal: true` in Appraisal.root.gemfile) are now preserved
+
 ## [2.0.0] - 2026-02-19
 
 - TAG: [v2.0.0][2.0.0t]
@@ -281,7 +338,11 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v2.0.0...HEAD
+[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v2.0.2...HEAD
+[2.0.2]: https://github.com/kettle-rb/prism-merge/compare/v2.0.1...v2.0.2
+[2.0.2t]: https://github.com/kettle-rb/prism-merge/releases/tag/v2.0.2
+[2.0.1]: https://github.com/kettle-rb/prism-merge/compare/v2.0.0...v2.0.1
+[2.0.1t]: https://github.com/kettle-rb/prism-merge/releases/tag/v2.0.1
 [2.0.0]: https://github.com/kettle-rb/prism-merge/compare/v1.1.6...v2.0.0
 [2.0.0t]: https://github.com/kettle-rb/prism-merge/releases/tag/v2.0.0
 [1.1.6]: https://github.com/kettle-rb/prism-merge/compare/v1.1.5...v1.1.6

data/CITATION.cff

@@ -7,8 +7,8 @@ type: software
 authors:
   - given-names: Peter Hurn
     family-names: Boling
-    email: peter@railsbling.com
-    affiliation: railsbling.com
+    email: floss@galtzo.com
+    affiliation: galtzo.com
     orcid: 'https://orcid.org/0009-0008-8519-441X'
 identifiers:
   - type: url

data/README.md

@@ -80,7 +80,7 @@ The `*-merge` gem family provides intelligent, AST-based merging for various fil
 | [markly-merge][markly-merge]             |             [![Version][markly-merge-gem-i]][markly-merge-gem] <br/> [![CI][markly-merge-ci-i]][markly-merge-ci]             | Markdown             | [Markly][markly] (via tree_haver)                                                                     | Smart merge for Markdown (CommonMark via cmark-gfm C)                            |
 | [prism-merge][prism-merge]               |               [![Version][prism-merge-gem-i]][prism-merge-gem] <br/> [![CI][prism-merge-ci-i]][prism-merge-ci]               | Ruby                 | [Prism][prism] (`prism` std lib gem)                                                                  | Smart merge for Ruby source files                                                |
 | [psych-merge][psych-merge]               |               [![Version][psych-merge-gem-i]][psych-merge-gem] <br/> [![CI][psych-merge-ci-i]][psych-merge-ci]               | YAML                 | [Psych][psych] (`psych` std lib gem)                                                                  | Smart merge for YAML files                                                       |
-| [rbs-merge][rbs-merge]                   |                   [![Version][rbs-merge-gem-i]][rbs-merge-gem] <br/> [![CI][rbs-merge-ci-i]][rbs-merge-ci]                   | RBS                  | [tree-sitter-bash][ts-rbs] (via tree_haver), [RBS][rbs] (`rbs` std lib gem)                           | Smart merge for Ruby type signatures                                             |
+| [rbs-merge][rbs-merge]                   |                   [![Version][rbs-merge-gem-i]][rbs-merge-gem] <br/> [![CI][rbs-merge-ci-i]][rbs-merge-ci]                   | RBS                  | [tree-sitter-rbs][ts-rbs] (via tree_haver), [RBS][rbs] (`rbs` std lib gem)                            | Smart merge for Ruby type signatures                                             |
 | [toml-merge][toml-merge]                 |                 [![Version][toml-merge-gem-i]][toml-merge-gem] <br/> [![CI][toml-merge-ci-i]][toml-merge-ci]                 | TOML                 | [Parslet + toml][toml], [Citrus + toml-rb][toml-rb], [tree-sitter-toml][ts-toml] (all via tree_haver) | Smart merge for TOML files                                                       |
 
 #### Backend Platform Compatibility
@@ -1564,7 +1564,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.802-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.833-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/smart_merger.rb

@@ -46,9 +46,6 @@ module Prism
     #   result = merger.merge
     #
     class SmartMerger < ::Ast::Merge::SmartMergerBase
-      # @return [Hash{Symbol,String => #call}, nil] Node typing configuration
-      attr_reader :node_typing
-
       # @return [Integer, Float] Maximum recursion depth for body merging
       attr_reader :max_recursion_depth
 
@@ -97,6 +94,11 @@ module Prism
         @current_depth = current_depth
         @text_merger_options = text_merger_options
 
+        # Store the raw (unwrapped) signature_generator so that
+        # merge_node_body_recursively can pass it to inner SmartMergers
+        # without double-wrapping.
+        @raw_signature_generator = signature_generator
+
         # Wrap signature_generator to include node_typing processing
         effective_signature_generator = build_effective_signature_generator(signature_generator, node_typing)
 
@@ -139,9 +141,9 @@ module Prism
       #
       # @return [Hash] Hash with :content, :debug, and :statistics keys
       def merge_with_debug
-        result = merge
+        result_obj = merge_result
         {
-          content: result.to_s,
+          content: result_obj.to_s,
           debug: {
             template_statements: @template_analysis&.statements&.size || 0,
             dest_statements: @dest_analysis&.statements&.size || 0,
@@ -149,7 +151,7 @@ module Prism
             add_template_only_nodes: @add_template_only_nodes,
             freeze_token: @freeze_token,
           },
-          statistics: result.respond_to?(:statistics) ? result.statistics : {},
+          statistics: result_obj.respond_to?(:statistics) ? result_obj.statistics : result_obj.decision_summary,
         }
       end
 
@@ -180,9 +182,12 @@ module Prism
         nil
       end
 
-      # Build the result (no-arg constructor for Prism)
+      # Build the result with analysis references
       def build_result
-        MergeResult.new
+        MergeResult.new(
+          template_analysis: @template_analysis,
+          dest_analysis: @dest_analysis,
+        )
       end
 
       # @return [Class] The template parse error class for Ruby
@@ -240,6 +245,10 @@ module Prism
 
         # Phase 2: Process dest nodes in their original order
         # This preserves dest-only nodes in their original position relative to matched nodes
+
+        # Emit prefix lines from the dest source (magic comments, blank lines before first node)
+        last_output_dest_line = emit_dest_prefix_lines(@result, @dest_analysis)
+
         @dest_analysis.statements.each do |dest_node|
           dest_signature = @dest_analysis.generate_signature(dest_node)
 
@@ -250,6 +259,9 @@ module Prism
           node_range = dest_node.location.start_line..dest_node.location.end_line
           next if output_dest_line_ranges.any? { |range| range.cover?(node_range.begin) && range.cover?(node_range.end) }
 
+          # Emit inter-node gap lines from the dest source (blank lines between blocks)
+          last_output_dest_line = emit_dest_gap_lines(@result, @dest_analysis, last_output_dest_line, dest_node)
+
           if dest_signature && template_by_signature.key?(dest_signature)
             # Matched node - merge with template version
             template_node = template_by_signature[dest_signature]
@@ -277,6 +289,12 @@ module Prism
             output_dest_line_ranges << node_range
             output_signatures << dest_signature if dest_signature
           end
+
+          # Update last_output_dest_line to track trailing blank line from add_node_to_result
+          last_output_dest_line = dest_node.location.end_line
+          trailing_line = last_output_dest_line + 1
+          trailing_content = @dest_analysis.line_at(trailing_line)
+          last_output_dest_line = trailing_line if trailing_content && trailing_content.strip.empty?
         end
 
         @result
@@ -596,6 +614,64 @@ module Prism
         }
       end
 
+      # Emit prefix lines from the destination source that appear before the first node.
+      # This preserves magic comments (e.g., `# frozen_string_literal: true`) and blank
+      # lines that precede any AST statements.
+      #
+      # @param result [MergeResult] The merge result
+      # @param analysis [FileAnalysis] The destination file analysis
+      # @return [Integer] The last line number emitted (0 if none)
+      def emit_dest_prefix_lines(result, analysis)
+        return 0 if analysis.statements.empty?
+
+        first_node = analysis.statements.first
+        # Find the first line of content: either leading comment or node start
+        leading_comments = first_node.location.respond_to?(:leading_comments) ? first_node.location.leading_comments : []
+        first_content_line = leading_comments.any? ? leading_comments.first.location.start_line : first_node.location.start_line
+
+        return 0 if first_content_line <= 1
+
+        # Emit lines before the first node (magic comments, blank lines)
+        last_emitted = 0
+        (1...first_content_line).each do |line_num|
+          line = analysis.line_at(line_num)&.chomp || ""
+          result.add_line(line, decision: MergeResult::DECISION_KEPT_DEST, dest_line: line_num)
+          last_emitted = line_num
+        end
+        last_emitted
+      end
+
+      # Emit blank/gap lines from the destination source between the last output line
+      # and the next node (including its leading comments). This preserves blank lines
+      # that separate top-level blocks.
+      #
+      # @param result [MergeResult] The merge result
+      # @param analysis [FileAnalysis] The destination file analysis
+      # @param last_output_line [Integer] The last dest line number that was output
+      # @param next_node [Prism::Node] The next node about to be output
+      # @return [Integer] The updated last output line number
+      def emit_dest_gap_lines(result, analysis, last_output_line, next_node)
+        return last_output_line if last_output_line == 0
+
+        # Find where the next node's content starts (leading comment or node itself)
+        leading_comments = next_node.location.respond_to?(:leading_comments) ? next_node.location.leading_comments : []
+        next_start_line = leading_comments.any? ? leading_comments.first.location.start_line : next_node.location.start_line
+
+        # Emit gap lines (blank lines between last output and next node)
+        gap_start = last_output_line + 1
+        return last_output_line if gap_start >= next_start_line
+
+        (gap_start...next_start_line).each do |line_num|
+          line = analysis.line_at(line_num)&.chomp || ""
+          # Only emit blank lines in the gap (don't re-emit content)
+          next unless line.strip.empty?
+
+          result.add_line(line, decision: MergeResult::DECISION_KEPT_DEST, dest_line: line_num)
+        end
+
+        last_output_line
+      end
+
       # Add a node to the result, including its leading and trailing comments.
       #
       # @param result [MergeResult] The merge result
@@ -680,10 +756,15 @@ module Prism
           end
         end
 
-        # Add trailing comments attached to the node (e.g., end-of-file comments)
+        # Add trailing comments attached to the node (e.g., end-of-file comments).
+        # Skip comments on the same line as the node — inline comments are already
+        # included when we output the node's source lines via analysis.line_at.
         trailing_comments = node.location.respond_to?(:trailing_comments) ? node.location.trailing_comments : []
+        node_line_range = node.location.start_line..node.location.end_line
         trailing_comments.each do |comment|
           line_num = comment.location.start_line
+          next if node_line_range.cover?(line_num)
+
           line = analysis.line_at(line_num)&.chomp || comment.slice.rstrip
 
           if source == :template
@@ -804,11 +885,15 @@ module Prism
         template_body = extract_node_body(actual_template, @template_analysis)
         dest_body = extract_node_body(actual_dest, @dest_analysis)
 
-        # Recursively merge the bodies with incremented depth
+        # Recursively merge the bodies with incremented depth.
+        # Use the raw (unwrapped) signature_generator so the inner SmartMerger
+        # can wrap it fresh via build_effective_signature_generator. Using the
+        # already-effective generator would cause double-wrapping when
+        # node_typing is also passed, making is_a? checks fail.
         body_merger = SmartMerger.new(
           template_body,
           dest_body,
-          signature_generator: @template_analysis.instance_variable_get(:@signature_generator),
+          signature_generator: @raw_signature_generator,
           preference: @preference,
           add_template_only_nodes: @add_template_only_nodes,
           freeze_token: @freeze_token,

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 = "2.0.0"
+      VERSION = "2.0.2"
     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: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Peter H. Boling
@@ -314,10 +314,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://prism-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v2.0.0
-  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v2.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v2.0.2
+  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v2.0.2/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/prism-merge/2.0.0
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/2.0.2
   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