fresh-editor 0.2.11

A lightweight, fast terminal-based text editor with LSP support and TypeScript plugins
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138

/**
 * Unit tests for merge conflict parser regex
 * Run with: node tests/merge_parser_test.js
 */

// The exact regex from the plugin
// Note: use \r?\n to handle both LF and CRLF line endings
const conflictRegex = /^<<<<<<<[^\r\n]*\r?\n([\s\S]*?)(?:^\|\|\|\|\|\|\|[^\r\n]*\r?\n([\s\S]*?))?^=======\r?\n([\s\S]*?)^>>>>>>>[^\r\n]*$/gm;

function parseConflicts(content) {
  const conflicts = [];

  // Reset regex state
  conflictRegex.lastIndex = 0;

  let match;
  while ((match = conflictRegex.exec(content)) !== null) {
    conflicts.push({
      startOffset: match.index,
      endOffset: match.index + match[0].length,
      ours: match[1] || "",
      base: match[2] || "",
      theirs: match[3] || "",
    });
  }

  return conflicts;
}

// Test cases
const tests = [
  {
    name: "Simple 2-way conflict",
    content: `<<<<<<< HEAD
ours
=======
theirs
>>>>>>> branch
`,
    expected: { count: 1, hasBase: false },
  },
  {
    name: "Diff3-style conflict with base section",
    content: `}

static int showdf(char *mntdir, struct obd_statfs *stat,
<<<<<<< HEAD
                  char *uuid, enum mntdf_flags flags,
                  char *type, int index, int rc)
||||||| parent of a3f05d81f6 (LU-18243 lfs: Add --output and --no-header options to lfs df command)
                  const char *uuid, enum mntdf_flags flags,
                  char *type, int index, int rc)
=======
                  const char *uuid, enum mntdf_flags flags,
                  char *type, int index, int rc, enum showdf_fields fields,
                  enum showdf_fields *field_order, int field_count)
>>>>>>> a3f05d81f6 (LU-18243 lfs: Add --output and --no-header options to lfs df command)
{
        int base = flags & MNTDF_DECIMAL ? 1000 : 1024;
        char *suffix = flags & MNTDF_DECIMAL ? "kMGTPEZY" : "KMGTPEZY";
        int shift = flags & MNTDF_COOKED ? 0 : 10;
`,
    expected: { count: 1, hasBase: true },
  },
  {
    name: "Multiple conflicts",
    content: `<<<<<<< HEAD
first ours
=======
first theirs
>>>>>>> branch

middle text

<<<<<<< HEAD
second ours
=======
second theirs
>>>>>>> branch
`,
    expected: { count: 2, hasBase: false },
  },
  {
    name: "Conflict with multiline content",
    content: `<<<<<<< HEAD
line 1
line 2
line 3
=======
other line 1
other line 2
>>>>>>> branch
`,
    expected: { count: 1, hasBase: false },
  },
];

// Run tests
let passed = 0;
let failed = 0;

for (const test of tests) {
  const result = parseConflicts(test.content);

  let success = true;
  let error = "";

  if (result.length !== test.expected.count) {
    success = false;
    error = `Expected ${test.expected.count} conflicts, got ${result.length}`;
  } else if (test.expected.hasBase !== undefined && result.length > 0) {
    const hasBase = result[0].base.trim().length > 0;
    if (hasBase !== test.expected.hasBase) {
      success = false;
      error = `Expected hasBase=${test.expected.hasBase}, got hasBase=${hasBase}`;
    }
  }

  if (success) {
    console.log(`✓ ${test.name}`);
    passed++;
  } else {
    console.log(`✗ ${test.name}: ${error}`);
    console.log("  Content preview:", test.content.substring(0, 100).replace(/\n/g, "\\n") + "...");
    if (result.length > 0) {
      console.log("  Parsed ours:", JSON.stringify(result[0].ours.substring(0, 50)));
      console.log("  Parsed base:", JSON.stringify(result[0].base.substring(0, 50)));
      console.log("  Parsed theirs:", JSON.stringify(result[0].theirs.substring(0, 50)));
    }
    failed++;
  }
}

console.log(`\n${passed} passed, ${failed} failed`);

if (failed > 0) {
  process.exit(1);
}