Class: N2B::MergeConflictParser

Inherits:
Object
  • Object
show all
Defined in:
lib/n2b/merge_conflict_parser.rb

Overview

Parses files containing Git or Mercurial merge conflict markers. Returns an array of ConflictBlock objects with context information.

Defined Under Namespace

Classes: ConflictBlock

Constant Summary collapse

DEFAULT_CONTEXT_LINES = 
10

Instance Method Summary collapse

Constructor Details

#initialize(context_lines: DEFAULT_CONTEXT_LINES) ⇒ MergeConflictParser

Returns a new instance of MergeConflictParser.



15
16
17
 
# File 'lib/n2b/merge_conflict_parser.rb', line 15

def initialize(context_lines: DEFAULT_CONTEXT_LINES)
  @context_lines = context_lines
end

Instance Method Details

#parse(file_path) ⇒ Object

Raises:

  • (ArgumentError) 


19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
 
# File 'lib/n2b/merge_conflict_parser.rb', line 19

def parse(file_path)
  raise ArgumentError, "File not found: #{file_path}" unless File.exist?(file_path)

  lines = File.readlines(file_path, chomp: true)
  blocks = []
  i = 0
  while i < lines.length
    line = lines[i]
    unless line.start_with?('<<<<<<<')
      i += 1
      next
    end

    start_line = i + 1
    base_label = line.sub('<<<<<<<', '').strip
    i += 1
    base_lines = []
    while i < lines.length && !lines[i].start_with?('=======')
      base_lines << lines[i]
      i += 1
    end
    i += 1 # skip ======= line
    incoming_lines = []
    while i < lines.length && !lines[i].start_with?('>>>>>>>')
      incoming_lines << lines[i]
      i += 1
    end
    incoming_label = lines[i].sub('>>>>>>>', '').strip if i < lines.length
    end_line = i + 1

    context_before_start = [start_line - @context_lines - 1, 0].max
    context_before = lines[context_before_start...(start_line - 1)].join("\n")
    context_after_end = [end_line + @context_lines - 1, lines.length - 1].min
    context_after = lines[(end_line)..context_after_end].join("\n")

    blocks << ConflictBlock.new(
      start_line: start_line,
      end_line: end_line,
      base_content: base_lines.join("\n"),
      incoming_content: incoming_lines.join("\n"),
      context_before: context_before,
      context_after: context_after,
      base_label: base_label,
      incoming_label: incoming_label
    )
    i += 1
  end

  blocks
end