prism-merge 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67c080bc59cb7303a0f2d3da1c3e5518cf57f20bc1e5b0a43e8e003db155209
-  data.tar.gz: 9ddc4c529df3107414dc7c325f230d9224a30d3b828053a4ef76f9c38d05ce1b
+  metadata.gz: 1a36b93898e34e1e7f7b895b191ccdd3a84b1631501b3274de6a239982f2336e
+  data.tar.gz: 14abab7edea6adccdbdddfaf1e00fa42e2fc29f69b6c5c28657d6341dba112f5
 SHA512:
-  metadata.gz: 6a88190811477660b57af41696a567ee899a76f04b918aa98d8e4c0ea45d5b0dca9b3eceb2abb8564dbb3912abdc35bf89b4a3736000b17d583d869e2f688fbd
-  data.tar.gz: 4cd9b298503649db46812dda1cfd2a04f37c0db776ff5dcc684ebe199fd81f6e469c13ed27ac375c7d23c6ae9e14a00afa2db5c8f8698a94ed080db595d8526d
+  metadata.gz: dd82df79c0775bb1d096971350b1f313331f7dbb071d0dae22a2c75593f8f797e8b34236c07e4706a35032276657bc763e4bbb0b7434e5949533b3585055b1b2
+  data.tar.gz: eaf27e5dbb8a47ab74003978f4fff007d1dc14c98fe65b11f94e931360b3eb672dd63c5e6b815247a60413da0208f5be1797aeda6af48b8c946f2056e13a2cdc

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.1.3] - 2025-12-04
+
+- TAG: [v1.1.3][1.1.3t]
+- COVERAGE: 96.71% -- 881/911 lines in 9 files
+- BRANCH COVERAGE: 82.86% -- 348/420 branches in 9 files
+- 100.00% documented
+
+### Fixed
+
+- **Fixed indentation loss** when adding nodes to merge result - the `add_node` method was using `node.slice` which loses leading indentation. Now uses `source_analysis.line_at` to get full lines from the source file, preserving original indentation.
+
 ## [1.1.2] - 2025-12-04
 
 - TAG: [v1.1.2][1.1.2t]
@@ -171,7 +182,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.2...HEAD
+[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.3...HEAD
+[1.1.3]: https://github.com/kettle-rb/prism-merge/compare/v1.1.2...v1.1.3
+[1.1.3t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.3
 [1.1.2]: https://github.com/kettle-rb/prism-merge/compare/v1.1.1...v1.1.2
 [1.1.2t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.2
 [1.1.1]: https://github.com/kettle-rb/prism-merge/compare/v1.1.0...v1.1.1

data/README.md

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

@@ -73,15 +73,21 @@ module Prism
       # @param node_info [Hash] Node information from FileAnalysis
       # @param decision [Symbol] Merge decision
       # @param source [Symbol] :template or :destination
-      # @param source_analysis [FileAnalysis] Source file analysis (unused but kept for compatibility)
+      # @param source_analysis [FileAnalysis] Source file analysis for preserving indentation
       def add_node(node_info, decision:, source:, source_analysis: nil)
         node = node_info[:node]
         start_line = node.location.start_line
+        end_line = node.location.end_line
 
         # Add leading comments
         node_info[:leading_comments].each do |comment|
-          line = comment.slice.rstrip
           comment_line = comment.location.start_line
+          # Use source_analysis to get full line with indentation if available
+          line = if source_analysis
+            source_analysis.line_at(comment_line)&.chomp || comment.slice.rstrip
+          else
+            comment.slice.rstrip
+          end
           if source == :template
             add_line(line, decision: decision, template_line: comment_line)
           else
@@ -89,27 +95,49 @@ module Prism
           end
         end
 
-        # Add node source
-        node_source = node.slice
-        node_lines = node_source.lines(chomp: true)
-
-        # Handle inline comments
-        inline_comments = node_info[:inline_comments]
-        if inline_comments.any?
-          # Inline comments are on the last line
-          last_idx = node_lines.length - 1
-          if last_idx >= 0
-            inline_text = inline_comments.map { |c| c.slice.strip }.join(" ")
-            node_lines[last_idx] = node_lines[last_idx].rstrip + " " + inline_text
+        # Add node source lines
+        # Use source_analysis.line_at to preserve original indentation
+        if source_analysis
+          # Get full lines from source to preserve indentation
+          inline_comments = node_info[:inline_comments]
+          (start_line..end_line).each do |line_num|
+            line = source_analysis.line_at(line_num)&.chomp || ""
+
+            # Handle inline comments on the last line
+            if line_num == end_line && inline_comments.any?
+              inline_text = inline_comments.map { |c| c.slice.strip }.join(" ")
+              line = line.rstrip + " " + inline_text
+            end
+
+            if source == :template
+              add_line(line, decision: decision, template_line: line_num)
+            else
+              add_line(line, decision: decision, dest_line: line_num)
+            end
+          end
+        else
+          # Fallback: use node.slice (loses leading indentation)
+          node_source = node.slice
+          node_lines = node_source.lines(chomp: true)
+
+          # Handle inline comments
+          inline_comments = node_info[:inline_comments]
+          if inline_comments.any?
+            # Inline comments are on the last line
+            last_idx = node_lines.length - 1
+            if last_idx >= 0
+              inline_text = inline_comments.map { |c| c.slice.strip }.join(" ")
+              node_lines[last_idx] = node_lines[last_idx].rstrip + " " + inline_text
+            end
           end
-        end
 
-        node_lines.each_with_index do |line, idx|
-          line_num = start_line + idx
-          if source == :template
-            add_line(line, decision: decision, template_line: line_num)
-          else
-            add_line(line, decision: decision, dest_line: line_num)
+          node_lines.each_with_index do |line, idx|
+            line_num = start_line + idx
+            if source == :template
+              add_line(line, decision: decision, template_line: line_num)
+            else
+              add_line(line, decision: decision, dest_line: line_num)
+            end
           end
         end
       end

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.2"
+      VERSION = "1.1.3"
     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.2
+  version: 1.1.3
 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.2
-  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.1.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.1.3
+  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.1.3/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.2
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.3
   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