Class: Toml::Merge::ConflictResolver

Inherits:
Ast::Merge::ConflictResolverBase
  • Object
show all
Includes:
Ast::Merge::CommentLayoutEmissionSupport, Ast::Merge::StructuredEmitterProvenanceSupport, Ast::Merge::TrailingGroups::DestIterate
Defined in:
lib/toml/merge/conflict_resolver.rb

Overview

Resolves conflicts between template and destination TOML content using structural signatures and configurable preferences.

Examples:

Basic usage

resolver = ConflictResolver.new(template_analysis, dest_analysis)
resolver.resolve(result)

Defined Under Namespace

Classes: MissingSharedInlineRegionError

Instance Attribute Summary collapse

Instance Method Summary collapse

Constructor Details

#initialize(template_analysis, dest_analysis, preference: :destination, add_template_only_nodes: false, remove_template_missing_nodes: false, resolution_mode: :eager, corruption_handling: :heal, match_refiner: nil, **options) ⇒ ConflictResolver

Creates a new ConflictResolver

Parameters:

  • template_analysis (FileAnalysis) —

    Analyzed template file

  • dest_analysis (FileAnalysis) —

    Analyzed destination file

  • preference (Symbol) (defaults to: :destination) —

    Which version to prefer when nodes have matching signatures:

    • :destination (default) - Keep destination version (customizations)
    • :template - Use template version (updates)
  • add_template_only_nodes (Boolean) (defaults to: false) —

    Whether to add nodes only in template

  • match_refiner (#call, nil) (defaults to: nil) —

    Optional match refiner for fuzzy matching

  • options (Hash) —

    Additional options for forward compatibility



31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
 
# File 'lib/toml/merge/conflict_resolver.rb', line 31

def initialize(template_analysis, dest_analysis, preference: :destination, add_template_only_nodes: false,
               remove_template_missing_nodes: false, resolution_mode: :eager, corruption_handling: :heal, match_refiner: nil, **options)
  super(
    strategy: :batch,
    preference: preference,
    template_analysis: template_analysis,
    dest_analysis: dest_analysis,
    add_template_only_nodes: add_template_only_nodes,
    remove_template_missing_nodes: remove_template_missing_nodes,
    match_refiner: match_refiner,
    **options
  )
  @resolution_mode = resolution_mode
  @corruption_handling = ::Ast::Merge::Healer.normalize_mode(corruption_handling)
  @emitter = Emitter.new
end

Instance Attribute Details

#corruption_handling ⇒ Object (readonly)

Returns the value of attribute corruption_handling.



18
19
20
 
# File 'lib/toml/merge/conflict_resolver.rb', line 18

def corruption_handling
  @corruption_handling
end