prism-merge 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39e0e854397866379ca524e10088fdaa4d31029358962472fec0c174e0780c4
-  data.tar.gz: 2805f8137670b5660f510cc6ca119447ac3e90967da0b0b09cc5cd7ca621fd51
+  metadata.gz: f43aef831e7dd032d7607b541bcc542cb2899514150346632084148b167dc0a5
+  data.tar.gz: 104a80156b7b15d02c8b7f5b237998a4d4c225f22f7d108c46642ddea7e6c51e
 SHA512:
-  metadata.gz: dcc00673756cdb1619b0189b1dfb0a8048b7035c4eee228b46cf9ccc5d215211bb7d39a9721a40027e63f8507b75646643240ddab107004658f0686a9395f30d
-  data.tar.gz: 4c7e388e010b061286dc2e45cc90b482cec283893b9d3862f5153faaebc8b6250207b7952f8ee6463f1e012803e9774f77a4d4f1800c76e4d51697963b977e76
+  metadata.gz: 425c404b3e0396b5db166b0c4e2fca941af3f6b6d0727ece8b0cd19bc60f9901883d587dee4a90c43356b6fa4b6b98d841fbf791785fb410662d72df0e7c5d2b
+  data.tar.gz: eb666082134afb97479cd8dd020baa6b8ef45b489d0b8c3a4df8ad6e19e8100d53cba60d48c930d7ed43ce8830bf2ec5b309fc432a24dfb5440c1fa9eb9a9b7f

data/CHANGELOG.md

@@ -30,6 +30,29 @@ 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]
@@ -315,7 +338,9 @@ 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.1...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

data/README.md

@@ -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.830-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

@@ -94,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)
 
@@ -751,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
@@ -875,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.1"
+      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.1
+  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.1
-  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v2.0.1/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.1
+  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