prism-merge 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd04362b7a3dcb058e1ddf48683905944ba9cd11bf2a3e16ffc977a286cbf707
-  data.tar.gz: 9cee5de60fd6c3d1e28737135d5003cf6c7604780906efed2c2b861a9559e46c
+  metadata.gz: 34ca6071c4cec046f0e1b8b16298c1f11ac5164271ef37a51119d975e699aac6
+  data.tar.gz: 8dcef50c1a8cd597cf471d148a15e2fec5412c6ecdcc20ba6788ea979ff23233
 SHA512:
-  metadata.gz: 2ba7baf55a05e4512c81a5ac78aa0c26eab48576de335659dbffd46fd9b235197132eb85f056591a8b7d7e4bbffa50142c5027ced44db2aca9e320de613ca977
-  data.tar.gz: 495250d6a19a1f0d5893afa191e9ecf1bc8e499f66a401efa93cf6f8efc045d207ceefebf7d889bfe97cbe844f441da6867bec0405aefe303a0bd6974e067703
+  metadata.gz: d1faf2b8c9c7ee00902e65e6d559c931f934293764fcc8b85501b419cf2e2144e9f141d0feba0d4427018cc1f470ed5861ee9a1b06b5f2d0609a5ee39dceb94e
+  data.tar.gz: 67fa40303034e480ce93b5ad4286d5061fbc77afa418364f2689f7667b08779a5394a898bf6df80ee00f165a8ef2ec95818759036b27eb10b5722a5d1fb39f50

data/CHANGELOG.md

@@ -30,6 +30,22 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.1.5] - 2025-12-04
+
+- TAG: [v1.1.5][1.1.5t]
+- COVERAGE: 98.26% -- 906/922 lines in 9 files
+- BRANCH COVERAGE: 87.27% -- 384/440 branches in 9 files
+- 100.00% documented
+
+### Changed
+
+- **Recursive merge now preserves freeze blocks**: When recursively merging nested block bodies (e.g., `Gem::Specification.new do ... end`), freeze blocks inside the body are now properly preserved. Previously, nested mergers were created with `freeze_token: nil`, causing freeze blocks to be lost.
+
+### Fixed
+
+- **Fixed freeze blocks lost in nested block bodies**: Freeze blocks inside class, module, or call-with-block bodies were being lost during recursive merge. The fix passes `freeze_token` to nested mergers and ensures `extract_node_body` includes leading comments/freeze markers that appear between the node's opening line and the first statement.
+- **Fixed duplicate freeze markers in output**: Freeze/unfreeze marker comments were incorrectly attached as leading comments to subsequent nodes, causing duplicate markers in merged output. These markers are now filtered from leading comments since they belong to FreezeNode boundaries.
+
 ## [1.1.4] - 2025-12-04
 
 - TAG: [v1.1.4][1.1.4t]
@@ -207,7 +223,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.4...HEAD
+[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.5...HEAD
+[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
 [1.1.4t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.4
 [1.1.3]: https://github.com/kettle-rb/prism-merge/compare/v1.1.2...v1.1.3

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.918-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.922-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_analysis.rb

@@ -325,6 +325,11 @@ module Prism
       def extract_nodes_with_comments
         return [] unless valid?
 
+        # Build pattern to filter out freeze/unfreeze markers from leading comments
+        freeze_marker_pattern = if @freeze_token
+          /#\s*#{Regexp.escape(@freeze_token)}:(freeze|unfreeze)/i
+        end
+
         statements.map.with_index do |stmt, idx|
           # FreezeNode doesn't have Prism location with comments
           # It's a wrapper with custom Location struct
@@ -338,10 +343,18 @@ 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
+            leading = stmt.location.leading_comments
+            if freeze_marker_pattern
+              leading = leading.reject { |c| c.slice.match?(freeze_marker_pattern) }
+            end
+
             {
               node: stmt,
               index: idx,
-              leading_comments: stmt.location.leading_comments,    # Prism native!
+              leading_comments: leading,
               inline_comments: stmt.location.trailing_comments,    # Prism native!
               signature: generate_signature(stmt),
               line_range: stmt.location.start_line..stmt.location.end_line,

data/lib/prism/merge/smart_merger.rb

@@ -474,11 +474,6 @@ module Prism
 
         return false unless can_merge_recursively
 
-        # Don't recursively merge if either node contains freeze blocks
-        # (they would be lost in the nested merge since we pass freeze_token: nil)
-        return false if node_contains_freeze_blocks?(template_node)
-        return false if node_contains_freeze_blocks?(dest_node)
-
         true
       end
 
@@ -524,9 +519,10 @@ module Prism
       # Check if a node's body contains freeze block markers.
       #
       # @param node [Prism::Node] The node to check
+      # @param analysis [FileAnalysis] The analysis for the file containing this node
       # @return [Boolean] true if the node's body contains freeze block comments
       # @api private
-      def node_contains_freeze_blocks?(node)
+      def node_contains_freeze_blocks?(node, analysis)
         return false unless @freeze_token
 
         # Check if node has nested content that could contain freeze blocks
@@ -550,15 +546,13 @@ module Prism
         return false unless has_content
 
         # Check if any comments in the node's range contain freeze markers
+        # Only check comments from the analysis that owns this node
         freeze_pattern = /#\s*#{Regexp.escape(@freeze_token)}:(freeze|unfreeze)/i
 
         node_start = node.location.start_line
         node_end = node.location.end_line
 
-        @template_analysis.parse_result.comments.any? do |comment|
-          comment_line = comment.location.start_line
-          comment_line > node_start && comment_line < node_end && comment.slice.match?(freeze_pattern)
-        end || @dest_analysis.parse_result.comments.any? do |comment|
+        analysis.parse_result.comments.any? do |comment|
           comment_line = comment.location.start_line
           comment_line > node_start && comment_line < node_end && comment.slice.match?(freeze_pattern)
         end
@@ -575,8 +569,7 @@ module Prism
       # @param anchor [FileAligner::Anchor] The anchor representing this match
       #
       # @note The nested merger is configured with:
-      #   - Same signature_generator, signature_match_preference, and add_template_only_nodes
-      #   - freeze_token: nil (freeze blocks not processed in nested context)
+      #   - Same signature_generator, signature_match_preference, add_template_only_nodes, and freeze_token
       #   - Incremented current_depth to track recursion level
       #
       # @api private
@@ -586,13 +579,14 @@ module Prism
         dest_body = extract_node_body(dest_node, @dest_analysis)
 
         # Recursively merge the bodies with incremented depth
+        # Pass freeze_token so freeze blocks inside nested bodies are preserved
         body_merger = SmartMerger.new(
           template_body,
           dest_body,
           signature_generator: @template_analysis.instance_variable_get(:@signature_generator),
           signature_match_preference: @signature_match_preference,
           add_template_only_nodes: @add_template_only_nodes,
-          freeze_token: nil,  # Don't process freeze blocks in nested context
+          freeze_token: @freeze_token,
           max_recursion_depth: @max_recursion_depth,
           current_depth: @current_depth + 1,
         )
@@ -712,13 +706,25 @@ module Prism
         body_statements = statements_node.body
         return "" if body_statements.empty?
 
-        # Get the line range of the body (between opening line and end)
-        first_stmt_line = body_statements.first.location.start_line
+        # 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
+        body_start_line = case node
+        when Prism::CallNode
+          # Block body starts on line after the `do` or `{`
+          node.block.opening_loc ? node.block.opening_loc.start_line + 1 : body_statements.first.location.start_line
+        when Prism::ClassNode, Prism::ModuleNode, Prism::SingletonClassNode
+          # Body starts on line after class/module declaration
+          node.location.start_line + 1
+        else
+          body_statements.first.location.start_line
+        end
+
         last_stmt_line = body_statements.last.location.end_line
 
         # Extract the source lines for the body
         lines = []
-        (first_stmt_line..last_stmt_line).each do |line_num|
+        (body_start_line..last_stmt_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.4"
+      VERSION = "1.1.5"
     end
     VERSION = Version::VERSION # traditional location
   end

data/sig/prism/merge.rbs

@@ -383,7 +383,9 @@ module Prism
       def mergeable_statement?: (untyped node) -> bool
 
       # Check if a node's body contains freeze block markers
-      def node_contains_freeze_blocks?: (untyped node) -> bool
+      # @param node The node to check for freeze markers
+      # @param analysis The FileAnalysis for the file containing the node
+      def node_contains_freeze_blocks?: (untyped node, FileAnalysis analysis) -> bool
 
       # Recursively merge the body of matching class, module, or call-with-block nodes
       def merge_node_body_recursively: (untyped template_node, untyped dest_node, FileAligner::Anchor anchor) -> void

data.tar.gz.sig

@@ -1,3 +1,2 @@
-��'���ӾP�5t#9ġ_�$`�Z:JH)�M�	���Te���4��͓���V�zLY9�`�)�{�MAȴN2�o�Y�[�n���X
--CR�jf�a������
-�ܐ_S]VƑ����bq�D�}�J��<����B��U�Z�=�VBb��]y�ӟP�sN�Xn���y��d�	���g]�������}���]�
1&���"rX������;����M��X{�t)E���)Ά�IM�^P�̓G'v���pKzQW �m�r��bYr#���iGZ_��o���Նݼ1��OJ s��#��ʳ`_��q��Y�w���'ӮW��D9S|���>��Huu]�-�C��d/3dR�A�i#���s�s��2p�
+%Ϭ0)�촫՟S`�'�WC�J~�8����m:�;��@D��CA��
Q(߸��<�|>r�����������ճ�˒*!U� ��	ėV6�{���7ݏ=�G��n���ί=ơ��
+�^It��*��R����t/��lB+_�ŜFމ�3�Vcx�'O���K0�q4vv����,�g���7���e_���׈��,A։_xI�q+:���N���!D���\k�O�F�+�_YM�nᬹ'"�ʃ�ߍ����^Aŵ
&�:z	�Pk}{v���S/lR�6�'1��O�S�(?xΏse�Гu��9�^�\WR�Ś�"4l��gOV-)@y�CC��}��SN+�B)�����y[.�h��S��<ҩ/��~G���7��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-merge
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 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.4
-  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.1.4/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.4
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.5
   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