prism-merge 7.1.7 → 7.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0bc8c7452f0d13ea4262bb6376b302c026a394824c73b922962635fc36a6b9a
-  data.tar.gz: 23eaa65f69dc5a6b95ecb6039bf01a58cc55a2214ab68f5ff51312cc8e5cf0c7
+  metadata.gz: c9bb0cd6d347f5231bdc73d9fdf4f752dc4900a8a4fda3d1a93e8749673e1d94
+  data.tar.gz: 1d0763e1c290d0026f1bf2a6d44b4657b3353c8cb6813597e0943eaa8a4b2369
 SHA512:
-  metadata.gz: c9e82f316f95a010d1572c5144fff209269fc23e6c1f2957fed7fe041dabd6bdd7d00a3a743b668859270a88796e9f2e8a1098a702f9be88ee8949be1e440731
-  data.tar.gz: 645f34de438d18fc26f57cfca03f59cdb2601514cd44ddafcccecf01fa67ffccc3ef9da305b3747f1eb4f186f0b37579580a41ecce54b18b97aa9e8a05dcb21c
+  metadata.gz: 23a30711093805e44d7faa6888f24db54d51f741ab033e6d1f8353375df03941ef65007bcb0ce0f1af1137ce86ac4bfebedd3f15aa47035acb1964c4f5333488
+  data.tar.gz: 958a34605f7d99be74c799f77072e95b8490184b04e7318c16efc3f00983cb1c16ac1dcb5585e05927548bc39e44c81fb9a01403fd2338428ea26b7d6d783bd4

data/lib/prism/merge/node_emission_support.rb

@@ -402,6 +402,19 @@ module Prism
         inline_comment_entries = analysis.send(:owner_inline_comment_entries, node)
 
         if source == :template
+          if leading_comments.empty?
+            last_emitted_template_line = result.line_metadata.reverse_each.find do |metadata|
+              metadata[:template_line]
+            end&.fetch(:template_line, 0) || 0
+            emit_layout_leading_gap_lines(
+              result: result,
+              analysis: analysis,
+              owner: node,
+              source: source,
+              decision: decision,
+              last_output_line: last_emitted_template_line
+            )
+          end
           emit_template_blank_lines_before_leading_comments(
             result: result,
             node: node,

data/lib/prism/merge/provider.rb

@@ -88,6 +88,8 @@ module Prism
 
         exact_role = exact_revision_role(request)
         decision = decide(documents, include_unmanaged_conflict: exact_role.nil?)
+        nested = render_nested_composite(request, documents, decision)
+        return nested if nested
         return render_conflicts(request, documents, decision) unless decision.conflicts.empty?
 
         return render_exact(request, documents, decision, exact_role) if exact_role
@@ -144,6 +146,8 @@ module Prism
           by_id: owners.to_h { |owner| [owner.id, owner] }.freeze,
           unmanaged_fingerprint: unmanaged_fingerprint(source, owners)
         )
+      rescue Prism::Merge::Error => e
+        { parse_error: e.message, source_role: role }
       end
 
       def unmanaged_fingerprint(source, owners)
@@ -363,6 +367,97 @@ module Prism
         )
       end
 
+      # Top-level Prism owners intentionally include a class body as one source
+      # range. When both revisions edit different direct methods, compose those
+      # method ranges before falling back to a class-level conflict.
+      def render_nested_composite(request, documents, decision)
+        return unless decision.conflicts.length == 1
+
+        conflict = decision.conflicts.first
+        ours_owner = documents.fetch(:ours).by_id[conflict[:owner_id]]
+        base_owner = documents.fetch(:base).by_id[conflict[:owner_id]]
+        theirs_owner = documents.fetch(:theirs).by_id[conflict[:owner_id]]
+        return unless [ours_owner, base_owner, theirs_owner].all?
+        return unless %i[class module].include?(ours_owner.signature.first)
+
+        nodes = {
+          base: owner_node(documents.fetch(:base), base_owner),
+          ours: owner_node(documents.fetch(:ours), ours_owner),
+          theirs: owner_node(documents.fetch(:theirs), theirs_owner)
+        }
+        return unless nodes.values.all?
+
+        replacements = nested_method_replacements(documents, nodes)
+        return if replacements.nil? || replacements.empty?
+
+        output_lines = documents.fetch(:ours).source.lines
+        replacements.sort_by { |replacement| -replacement.fetch(:start_line) }.each do |replacement|
+          start = replacement.fetch(:start_line) - 1
+          length = replacement.fetch(:end_line) - replacement.fetch(:start_line) + 1
+          output_lines[start, length] = replacement.fetch(:source).lines
+        end
+        output = output_lines.join
+        parsed = parse_source(output, :output)
+        return if provider_failure?(parsed)
+
+        result(
+          :merge3,
+          request,
+          output: output,
+          changes: decision.changes,
+          render_report: {
+            strategy: :nested_owner_composite,
+            parent_path: owner_path(ours_owner),
+            replacements: replacements.map do |replacement|
+              replacement.slice(:path, :start_line, :end_line, :source_role)
+            end
+          },
+          verification: { base_participated: true, output_reparsed: true, semantic_match: true }
+        )
+      end
+
+      def owner_node(document, owner)
+        document.analysis.nodes_with_comments.find { |info| info[:signature] == owner.signature }&.fetch(:node)
+      end
+
+      def nested_method_replacements(documents, nodes)
+        methods = nodes.transform_values do |node|
+          body = node.respond_to?(:body) ? node.body : nil
+          statements = body.respond_to?(:body) ? body.body : []
+          statements.select { |statement| statement.is_a?(::Prism::DefNode) }.to_h do |method|
+            [[method.name, method.parameters&.signature], method]
+          end
+        end
+        replacements = []
+        methods.fetch(:base).each do |signature, base_method|
+          ours_method = methods.fetch(:ours)[signature]
+          theirs_method = methods.fetch(:theirs)[signature]
+          next unless ours_method && theirs_method
+
+          base_source = node_source(documents.fetch(:base).source, base_method)
+          ours_source = node_source(documents.fetch(:ours).source, ours_method)
+          theirs_source = node_source(documents.fetch(:theirs).source, theirs_method)
+          next if ours_source == theirs_source || base_source == theirs_source
+          return nil if base_source != ours_source && base_source != theirs_source
+
+          next unless base_source == ours_source
+
+          replacements << {
+            path: "/method:#{signature.first}",
+            start_line: ours_method.location.start_line,
+            end_line: ours_method.location.end_line,
+            source: theirs_source,
+            source_role: :theirs
+          }
+        end
+        replacements
+      end
+
+      def node_source(source, node)
+        lines = source.lines
+        lines[node.location.start_line - 1, node.location.end_line - node.location.start_line + 1].join
+      end
+
       def composite_fragments(documents, decision)
         ours = documents.fetch(:ours)
         edits = replacement_edits(documents, decision)

data/lib/prism/merge/rspec/provider_snapshot_extension.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'prism/merge'
+
+module Prism
+  module Merge
+    module RSpec
+      # Reuses Prism::Merge's established directive and node-path projection as
+      # native evidence for portable provider contract snapshots.
+      module ProviderSnapshotExtension
+        module_function
+
+        # rubocop:disable Metrics/MethodLength -- the extension envelope keeps all native evidence explicit
+        def call(source:, **)
+          normalized = Prism::Merge.parse_ruby_normalized(source)
+          nodes = normalized.fetch(:nodes)
+          {
+            schema: 'structuredmerge.extension/ruby-prism/v1',
+            namespace: 'ruby-prism',
+            capabilities: %w[comment-directives magic-comments native-node-kinds node-paths],
+            payload: {
+              parser_metadata: normalized.fetch(:metadata),
+              nodes: nodes.map { |node| native_node_evidence(node) },
+              native_tree_visibility: 'provider_internal'
+            }
+          }
+        end
+        # rubocop:enable Metrics/MethodLength
+
+        def native_node_evidence(node)
+          {
+            id: node.fetch(:id),
+            role: node.fetch(:role),
+            backend_kind: node.fetch(:backend_kind),
+            semantic_roles: node.fetch(:semantic_roles),
+            metadata: node.fetch(:metadata)
+          }
+        end
+        private_class_method :native_node_evidence
+      end
+    end
+  end
+end

data/lib/prism/merge/version.rb

@@ -5,7 +5,7 @@ module Prism
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.7'
+      VERSION = '7.1.8'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.7
+  version: 7.1.8
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: prism
   requirement: !ruby/object:Gem::Requirement
@@ -71,28 +71,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -260,7 +260,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -361,6 +361,7 @@ files:
 - lib/prism/merge/provider.rb
 - lib/prism/merge/recursive_merge_policy.rb
 - lib/prism/merge/recursive_node_body_merger.rb
+- lib/prism/merge/rspec/provider_snapshot_extension.rb
 - lib/prism/merge/ruby_doc_surface_analyzer.rb
 - lib/prism/merge/scaffold_chunk_remover.rb
 - lib/prism/merge/smart_merger.rb
@@ -375,10 +376,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.7
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.7/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.8
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.8/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/prism-merge/7.1.7
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/7.1.8
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/prism-merge