fix: add more tests for edit utils

Author: karthiknadig

src/features/terminal/shells/common/editUtils.ts

@@ -1,32 +1,77 @@
 export function hasStartupCode(content: string, start: string, end: string, keys: string[]): boolean {
-    const startIndex = content.indexOf(start);
-    const endIndex = content.indexOf(end);
+    // Normalize line endings to \n
+    const normalizedContent = content.replace(/\r\n/g, '\n');
+    const startIndex = normalizedContent.indexOf(start);
+    const endIndex = normalizedContent.indexOf(end);
     if (startIndex === -1 || endIndex === -1 || startIndex >= endIndex) {
         return false;
     }
-    const contentBetween = content.substring(startIndex + start.length, endIndex).trim();
+    const contentBetween = normalizedContent.substring(startIndex + start.length, endIndex).trim();
     return contentBetween.length > 0 && keys.every((key) => contentBetween.includes(key));
 }
 
 export function insertStartupCode(content: string, start: string, end: string, code: string): string {
-    const startIndex = content.indexOf(start);
-    const endIndex = content.indexOf(end);
+    // Detect line ending style from content (default to \n if cannot determine)
+    const lineEnding = content.includes('\r\n') ? '\r\n' : '\n';
 
+    // Normalize line endings to \n for processing
+    const normalizedContent = content.replace(/\r\n/g, '\n');
+    const startIndex = normalizedContent.indexOf(start);
+    const endIndex = normalizedContent.indexOf(end);
+
+    let result: string;
     if (startIndex !== -1 && endIndex !== -1 && startIndex < endIndex) {
-        return content.substring(0, startIndex + start.length) + '\n\n' + code + '\n\n' + content.substring(endIndex);
+        // Both markers exist in correct order
+        result =
+            normalizedContent.substring(0, startIndex + start.length) +
+            '\n' +
+            code +
+            '\n' +
+            normalizedContent.substring(endIndex);
+    } else if (startIndex !== -1) {
+        // Only start marker exists - truncate everything after the start marker
+        result = normalizedContent.substring(0, startIndex + start.length) + '\n' + code + '\n' + end + '\n';
     } else {
-        return content + '\n' + start + '\n\n' + code + '\n\n' + end + '\n';
+        // No markers or only end marker exists
+        result = normalizedContent + '\n' + start + '\n' + code + '\n' + end + '\n';
+    }
+
+    // Restore original line ending style
+    if (lineEnding === '\r\n') {
+        result = result.replace(/\n/g, '\r\n');
     }
+    return result;
 }
 
 export function removeStartupCode(content: string, start: string, end: string): string {
-    const startIndex = content.indexOf(start);
-    const endIndex = content.indexOf(end);
+    // Detect line ending style from content (default to \n if cannot determine)
+    const lineEnding = content.includes('\r\n') ? '\r\n' : '\n';
+
+    // Normalize line endings to \n for processing
+    const normalizedContent = content.replace(/\r\n/g, '\n');
+    const startIndex = normalizedContent.indexOf(start);
+    const endIndex = normalizedContent.indexOf(end);
 
     if (startIndex !== -1 && endIndex !== -1 && startIndex < endIndex) {
-        const before = content.substring(0, startIndex + start.length);
-        const after = content.substring(endIndex);
-        return before.trimEnd() + after;
+        const before = normalizedContent.substring(0, startIndex);
+        const after = normalizedContent.substring(endIndex + end.length);
+
+        let result: string;
+        if (before === '') {
+            result = after.startsWith('\n') ? after.substring(1) : after;
+        } else if (after === '' || after === '\n') {
+            result = before.endsWith('\n') ? before.substring(0, before.length - 1) : before;
+        } else if (after.startsWith('\n') && before.endsWith('\n')) {
+            result = before + after.substring(1);
+        } else {
+            result = before + after;
+        }
+
+        // Restore original line ending style
+        if (lineEnding === '\r\n') {
+            result = result.replace(/\n/g, '\r\n');
+        }
+        return result;
     }
     return content;
 }

src/test/features/terminal/shells/common/editUtils.unit.test.ts

@@ -60,6 +60,18 @@ suite('Shell Edit Utils', () => {
             const result = hasStartupCode(content, '# START', '# END', ['key1', 'key2']);
             assert.strictEqual(result, false);
         });
+
+        test('should handle Windows line endings (CRLF) correctly', () => {
+            const content = 'content\r\n# START\r\nsome key content\r\n# END\r\nmore content';
+            const result = hasStartupCode(content, '# START', '# END', ['key']);
+            assert.strictEqual(result, true);
+        });
+
+        test('should handle mixed line endings correctly', () => {
+            const content = 'content\n# START\r\nsome key content\n# END\r\nmore content';
+            const result = hasStartupCode(content, '# START', '# END', ['key']);
+            assert.strictEqual(result, true);
+        });
     });
 
     suite('insertStartupCode', () => {
@@ -122,6 +134,30 @@ suite('Shell Edit Utils', () => {
 
             assert.strictEqual(result, expected);
         });
+
+        test('should handle Windows line endings (CRLF) correctly', () => {
+            const content = 'before\r\n# START\r\nold code\r\n# END\r\nafter';
+            const start = '# START';
+            const end = '# END';
+            const code = 'new code';
+
+            const result = insertStartupCode(content, start, end, code);
+            const expected = 'before\r\n# START\r\nnew code\r\n# END\r\nafter';
+
+            assert.strictEqual(result, expected);
+        });
+
+        test('should preserve original line ending style when inserting', () => {
+            // Content with Windows line endings
+            const contentWindows = 'before\r\n# START\r\nold code\r\n# END\r\nafter';
+            const resultWindows = insertStartupCode(contentWindows, '# START', '# END', 'new code');
+            assert.ok(resultWindows.includes('\r\n'), 'Windows line endings should be preserved');
+
+            // Content with Unix line endings
+            const contentUnix = 'before\n# START\nold code\n# END\nafter';
+            const resultUnix = insertStartupCode(contentUnix, '# START', '# END', 'new code');
+            assert.ok(!resultUnix.includes('\r\n'), 'Unix line endings should be preserved');
+        });
     });
 
     suite('removeStartupCode', () => {
@@ -176,5 +212,24 @@ suite('Shell Edit Utils', () => {
             const expected = 'before content';
             assert.strictEqual(result, expected);
         });
+
+        test('should handle Windows line endings (CRLF) correctly', () => {
+            const content = 'before\r\n# START\r\ncode to remove\r\n# END\r\nafter';
+            const result = removeStartupCode(content, '# START', '# END');
+            const expected = 'before\r\nafter';
+            assert.strictEqual(result, expected);
+        });
+
+        test('should preserve original line ending style when removing', () => {
+            // Content with Windows line endings
+            const contentWindows = 'before\r\n# START\r\ncode to remove\r\n# END\r\nafter';
+            const resultWindows = removeStartupCode(contentWindows, '# START', '# END');
+            assert.ok(resultWindows.includes('\r\n'), 'Windows line endings should be preserved');
+
+            // Content with Unix line endings
+            const contentUnix = 'before\n# START\ncode to remove\n# END\nafter';
+            const resultUnix = removeStartupCode(contentUnix, '# START', '# END');
+            assert.ok(!resultUnix.includes('\r\n'), 'Unix line endings should be preserved');
+        });
     });
 });