prism-merge 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b8b8c576a7a4a0d26192b08d55617c26b6ab21cd411f5f2f083750c09bf9c8
-  data.tar.gz: bd229507398b4437f9039759e8d5b7b688268816b1fc65bb54d6b1740ea7ea10
+  metadata.gz: 0befc378c1d1327b7fc85602de26936828c6420473d09f1775971594f76fb66b
+  data.tar.gz: bb38bf548e627ae00dc77f6b5f2745bdc7cbe0e05e4e5aea380eb992c2521dcb
 SHA512:
-  metadata.gz: febeb559c0f42a3d7f1d4f7059b2cb88ac959708fa1b18ac6fb5f7f4d194df3f10cd0b56e0ad3b64f60ae46a71645a4195bc3aea63216208a6220acc4c48d254
-  data.tar.gz: 7ff60f6e075f358b8d3b0a7cbbfffb2444a43bb17061a03c9ccc3f7f2dad03f5fb40b3409aa843eb3e32900eae058fafe92eef2201dc4e227d3359840cf8e05c
+  metadata.gz: 9e4a4fddfdba58791bab748377fbb8ae7ba68f806f9c68c3f81ab5aa2d826508d7c16e7c9178ad282ed00a82873ca1592c106a9e2d9e7f7e1b27569b5f9a7c32
+  data.tar.gz: 8f38c2209fbe7de1b60c63dc0c94b5073db50ecd5ef356e18a3eab79cdc8c6c61474ad222c03bb811ec226b6fc0796fd5d78c95c9b4df7d51757787f58c175a8

data/CHANGELOG.md

@@ -30,6 +30,20 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.0.1] - 2025-12-03
+
+- TAG: [v1.0.1][1.0.1t]
+- COVERAGE: 95.48% -- 613/642 lines in 7 files
+- BRANCH COVERAGE: 81.39% -- 188/231 branches in 7 files
+- 100.00% documented
+
+### Fixed
+
+- `SmartMerger` now correctly handles merge conflicts that involve `kettle-dev:freeze` blocks
+  - Entire freeze block from destination is preserved
+  - Still allows template-only nodes to be added
+  - Resolves an issue where template-only nodes were dropped if destination contained a freeze block
+
 ## [1.0.0] - 2025-12-03
 
 - TAG: [v1.0.0][1.0.0t]
@@ -41,6 +55,8 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.0.1...HEAD
+[1.0.1]: https://github.com/kettle-rb/prism-merge/compare/v1.0.0...v1.0.1
+[1.0.1t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.0.1
 [1.0.0]: https://github.com/kettle-rb/prism-merge/compare/71fcddaa659cd6e9e94053e67524e5a400423ced...v1.0.0
 [1.0.0t]: https://github.com/kettle-rb/prism-merge/tags/v1.0.0

data/README.md

@@ -965,7 +965,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.636-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.642-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/conflict_resolver.rb

@@ -71,7 +71,9 @@ module Prism
         @add_template_only_nodes = add_template_only_nodes
       end
 
-      # Resolve a boundary by deciding which content to keep
+      # Resolve a boundary by deciding which content to keep.
+      # If the boundary contains a `kettle-dev:freeze` block, the entire
+      # block from the destination is preserved.
       # @param boundary [FileAligner::Boundary] Boundary to resolve
       # @param result [MergeResult] Result object to populate
       def resolve(boundary, result)
@@ -79,12 +81,6 @@ module Prism
         template_content = extract_boundary_content(@template_analysis, boundary.template_range)
         dest_content = extract_boundary_content(@dest_analysis, boundary.dest_range)
 
-        # If destination is in freeze block, always keep destination
-        if boundary.dest_range && dest_content[:has_freeze_block]
-          add_content_to_result(dest_content, result, :destination, MergeResult::DECISION_FREEZE_BLOCK)
-          return
-        end
-
         # If both sides are empty, nothing to do
         return if template_content[:lines].empty? && dest_content[:lines].empty?
 
@@ -153,12 +149,29 @@ module Prism
         template_nodes = template_content[:nodes]
         dest_nodes = dest_content[:nodes]
 
-        # Build signature map for destination nodes
-        dest_sig_map = build_signature_map(dest_nodes)
-
         # Track which dest nodes have been matched
         matched_dest_indices = Set.new
 
+        # Handle freeze blocks first
+        if dest_content[:has_freeze_block]
+          line_in_freeze = dest_content[:line_range].find { |ln| @dest_analysis.in_freeze_block?(ln) }
+          if line_in_freeze
+            freeze_block = @dest_analysis.freeze_block_at(line_in_freeze)
+            freeze_content = extract_boundary_content(@dest_analysis, freeze_block[:line_range])
+            add_content_to_result(freeze_content, result, :destination, MergeResult::DECISION_FREEZE_BLOCK)
+
+            # Mark all nodes within the freeze block as matched
+            dest_nodes.each do |d_node_info|
+              if freeze_block[:line_range].cover?(d_node_info[:line_range].begin)
+                matched_dest_indices << d_node_info[:index]
+              end
+            end
+          end
+        end
+
+        # Build signature map for destination nodes
+        dest_sig_map = build_signature_map(dest_nodes)
+
         # Build a set of line numbers that are covered by leading comments of nodes
         # so we don't duplicate them when processing non-node lines
         leading_comment_lines = Set.new

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