Fix: Line endings when editing profiles

Author: karthiknadig

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

@@ -1,5 +1,6 @@
+import { isWindows } from '../../../../common/utils/platformUtils';
+
 export function hasStartupCode(content: string, start: string, end: string, keys: string[]): boolean {
-    // Normalize line endings to \n
     const normalizedContent = content.replace(/\r\n/g, '\n');
     const startIndex = normalizedContent.indexOf(start);
     const endIndex = normalizedContent.indexOf(end);
@@ -10,45 +11,46 @@ export function hasStartupCode(content: string, start: string, end: string, keys
     return contentBetween.length > 0 && keys.every((key) => contentBetween.includes(key));
 }
 
-export function insertStartupCode(content: string, start: string, end: string, code: string): string {
-    // Detect line ending style from content (default to \n if cannot determine)
-    const lineEnding = content.includes('\r\n') ? '\r\n' : '\n';
+function getLineEndings(content: string): string {
+    if (content.includes('\r\n')) {
+        return '\r\n';
+    } else if (content.includes('\n')) {
+        return '\n';
+    }
+    return isWindows() ? '\r\n' : '\n';
+}
 
-    // Normalize line endings to \n for processing
+export function insertStartupCode(content: string, start: string, end: string, code: string): string {
+    let lineEnding = getLineEndings(content);
     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) {
-        // 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 {
-        // 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 {
-    // 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
+    let lineEnding = getLineEndings(content);
     const normalizedContent = content.replace(/\r\n/g, '\n');
+
     const startIndex = normalizedContent.indexOf(start);
     const endIndex = normalizedContent.indexOf(end);
 
@@ -67,7 +69,6 @@ export function removeStartupCode(content: string, start: string, end: string):
             result = before + after;
         }
 
-        // Restore original line ending style
         if (lineEnding === '\r\n') {
             result = result.replace(/\n/g, '\r\n');
         }

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

@@ -1,4 +1,5 @@
 import * as assert from 'assert';
+import { isWindows } from '../../../../../common/utils/platformUtils';
 import {
     hasStartupCode,
     insertStartupCode,
@@ -80,9 +81,10 @@ suite('Shell Edit Utils', () => {
             const start = '# START';
             const end = '# END';
             const code = 'new code';
+            const lineEndings = isWindows() ? '\r\n' : '\n';
 
             const result = insertStartupCode(content, start, end, code);
-            const expected = 'existing content\n# START\nnew code\n# END\n';
+            const expected = `existing content${lineEndings}# START${lineEndings}new code${lineEndings}# END${lineEndings}`;
 
             assert.strictEqual(result, expected);
         });