move normalizeLF(), normalizeCRLF() into util.ts

Author: malsyned

src/ctest.ts

@@ -134,7 +134,7 @@ interface ProjectCoverageConfig {
 }
 
 export function searchOutputForFailures(patterns: FailurePatternsConfig, output: string): vscode.TestMessage[] {
-    output = normalizeLF(output);
+    output = util.normalizeLF(output);
     const messages = [];
     patterns = Array.isArray(patterns) ? patterns : [patterns];
     for (let pattern of patterns) {
@@ -163,7 +163,7 @@ function matchToTestMessage(pat: FailurePattern, match: RegExpMatchArray): vscod
     const actual = pat.actual ? match[pat.actual] : undefined;
     const expected = pat.expected ? match[pat.expected] : undefined;
 
-    const testMessage = new vscode.TestMessage(normalizeCRLF(message));
+    const testMessage = new vscode.TestMessage(util.normalizeCRLF(message));
     testMessage.location = new vscode.Location(
         vscode.Uri.file(file), new vscode.Position(line, 0)
     );
@@ -172,14 +172,6 @@ function matchToTestMessage(pat: FailurePattern, match: RegExpMatchArray): vscod
     return testMessage;
 }
 
-function normalizeLF(s: string) {
-    return s.replace(/\r\n?/g, '\n');
-}
-
-function normalizeCRLF(s: string) {
-    return s = s.replace(/\r?\n/g, '\r\n');
-}
-
 function parseLineMatch(line: string | null) {
     const i = parseInt(line || '');
     if (i) {
@@ -661,7 +653,7 @@ export class CTestDriver implements vscode.Disposable {
 
         let output = testResult.output;
         // https://code.visualstudio.com/api/extension-guides/testing#test-output
-        output = output.replace(/\r?\n/g, '\r\n');
+        output = util.normalizeCRLF(output);
         if (test.uri && test.range) {
             run.appendOutput(output, new vscode.Location(test.uri, test.range.end), test);
         } else {

src/util.ts

@@ -1378,3 +1378,21 @@ function globWrapper(globPattern: string, cwd: string): Promise<boolean> {
         });
     });
 }
+
+/**
+ * Convert all line endings in a string to '\n'
+ * @param s the string to normalize
+ * @returns @c s with all line endings converted to '\n'
+ */
+export function normalizeLF(s: string) {
+    return s.replace(/\r\n?/g, '\n');
+}
+
+/**
+ * Convert all line endings in a string to '\r\n'
+ * @param s the string to normalize
+ * @returns @c s with all line endings converted to '\r\n'
+ */
+export function normalizeCRLF(s: string) {
+    return s = s.replace(/\r?\n/g, '\r\n');
+}