Refactor conflict marker handling to pre-parse segments and improve syntax support

- add missing test case
- [Pasted text]
- feel like we have circular dependencies
- structure in such way `apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/apply-conflict-markers-to-content/apply-conflict-markers-to-content.ts` is not dependent on `apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/parse-conflict-segments.ts`
- [Pasted text]

Author: robertpiosik

apps/editor/src/commands/apply-response-command/handlers/conflict-markers-handler.ts

@@ -12,7 +12,7 @@ import {
   get_rename_source_info
 } from '../utils/file-operations'
 import { apply_conflict_markers_to_content } from '../utils/edit-formats/conflict-markers/apply-conflict-markers-to-content'
-import { parse_conflict_segments } from '../utils/edit-formats/conflict-markers'
+import { parse_conflict_segments } from '../utils/edit-formats/conflict-markers/parse-conflict-segments'
 
 export const handle_conflict_markers = async (params: {
   files: FileItem[]
@@ -111,7 +111,7 @@ export const handle_conflict_markers = async (params: {
           if (has_markers) {
             new_content = apply_conflict_markers_to_content({
               original_content: rename_source_content,
-              markers_content: file.content
+              segments: parse_conflict_segments(file.content)
             })
           } else if (file.content != '') {
             new_content = file.content
@@ -149,7 +149,7 @@ export const handle_conflict_markers = async (params: {
           const original_content = document.getText()
           const current_content = apply_conflict_markers_to_content({
             original_content,
-            markers_content: file.content
+            segments: parse_conflict_segments(file.content)
           })
 
           if (current_content !== original_content) {

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/apply-conflict-markers-to-content/apply-conflict-markers-to-content.spec.ts

@@ -1,6 +1,7 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import { apply_conflict_markers_to_content } from './apply-conflict-markers-to-content'
+import { parse_conflict_segments } from '../parse-conflict-segments'
 
 describe('conflict-marker-parser', () => {
   const load_test_case_file = (test_case: string, filename: string): string => {
@@ -14,10 +15,11 @@ describe('conflict-marker-parser', () => {
     const original_content = load_test_case_file(test_case, 'original.txt')
     const markers_content = load_test_case_file(test_case, 'markers.txt')
     const expected_content = load_test_case_file(test_case, 'expected.txt')
+    const segments = parse_conflict_segments(markers_content)
 
     const result = apply_conflict_markers_to_content({
       original_content,
-      markers_content
+      segments
     })
 
     expect(result).toBe(expected_content)
@@ -39,17 +41,22 @@ describe('conflict-marker-parser', () => {
     it('throws an error when context cannot be found', () => {
       const original_content = 'Some random text'
       const markers_content = '<<<<<<<\nMissing\n=======\nFound\n>>>>>>>'
+      const segments = parse_conflict_segments(markers_content)
 
       expect(() =>
         apply_conflict_markers_to_content({
           original_content,
-          markers_content
+          segments
         })
       ).toThrow(/Could not find content to replace/)
     })
 
     it('handles whitespace issues in conflict markers', () => {
       run_test_case('whitespace-issues')
     })
+
+    it('handles rst syntax correctly', () => {
+      run_test_case('rst-syntax')
+    })
   })
 })

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/apply-conflict-markers-to-content/apply-conflict-markers-to-content.ts

@@ -1,16 +1,16 @@
-import { parse_conflict_segments } from '../parse-conflict-segments'
+import { Segment } from '../types'
 
 const escape_reg_exp = (string: string) => {
   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
 
 export const apply_conflict_markers_to_content = (params: {
   original_content: string
-  markers_content: string
+  segments: Segment[]
 }): string => {
   const line_ending = params.original_content.includes('\r\n') ? '\r\n' : '\n'
   let current_content = params.original_content
-  const segments = parse_conflict_segments(params.markers_content)
+  const segments = params.segments
   let cursor = 0
 
   const MAX_CONTEXT_LINES = 5

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/apply-conflict-markers-to-content/test-cases/rst-syntax/expected.txt

@@ -0,0 +1,17 @@
+=====================
+First Top-Level Title
+=====================
+
+Content under the first title.
+
+=======================
+Another Different Title
+=======================
+
+Content under the new title section.
+
+---------------------
+A Sub-Section Title
+---------------------
+
+Content under the sub-section.

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/apply-conflict-markers-to-content/test-cases/rst-syntax/markers.txt

@@ -0,0 +1,17 @@
+<<<<<<< SEARCH
+Content under the first title.
+
+======================
+Second Top-Level Title
+======================
+
+Content under the second title.
+=======
+Content under the first title.
+
+=======================
+Another Different Title
+=======================
+
+Content under the new title section.
+>>>>>>> REPLACE

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/apply-conflict-markers-to-content/test-cases/rst-syntax/original.txt

@@ -0,0 +1,17 @@
+=====================
+First Top-Level Title
+=====================
+
+Content under the first title.
+
+======================
+Second Top-Level Title
+======================
+
+Content under the second title.
+
+---------------------
+A Sub-Section Title
+---------------------
+
+Content under the sub-section.

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/index.ts

@@ -1 +1 @@
-export * from './parse-conflict-segments'
+export * from './types'

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/parse-conflict-segments.ts

@@ -14,7 +14,7 @@ export const parse_conflict_segments = (content: string): Segment[] => {
 
   for (const line of lines) {
     const trimmed = line.trim()
-    if (trimmed.startsWith('<<<<<<<')) {
+    if (trimmed == '<<<<<<<' || trimmed.startsWith('<<<<<<< ')) {
       if (state == 'NORMAL') {
         if (current_lines.length > 0) {
           segments.push({ type: 'common', lines: [...current_lines] })
@@ -30,7 +30,7 @@ export const parse_conflict_segments = (content: string): Segment[] => {
       continue
     }
 
-    if (trimmed.startsWith('=======')) {
+    if (trimmed == '=======' || trimmed.startsWith('======= ')) {
       if (state == 'ORIGINAL') {
         state = 'UPDATED'
       } else if (state == 'NORMAL') {
@@ -41,7 +41,7 @@ export const parse_conflict_segments = (content: string): Segment[] => {
       continue
     }
 
-    if (trimmed.startsWith('>>>>>>>')) {
+    if (trimmed == '>>>>>>>' || trimmed.startsWith('>>>>>>> ')) {
       if (state == 'UPDATED' || state == 'ORIGINAL') {
         segments.push({
           type: 'conflict',

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/types.ts

@@ -0,0 +1,3 @@
+export type Segment =
+  | { type: 'common'; lines: string[] }
+  | { type: 'conflict'; original_lines: string[]; updated_lines: string[] }