Skip to content

Commit 47c4c12

Browse files
committed
Compiler flag to specify line ending microsoft#1693 unit test adjustments
1 parent 2e0a55c commit 47c4c12

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/harness/harness.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ module Harness {
826826
useCaseSensitiveFileNames: boolean,
827827
// the currentDirectory is needed for rwcRunner to passed in specified current directory to compiler host
828828
currentDirectory?: string,
829-
newLineKind?: ts.NewLineKind): ts.CompilerHost {
829+
newLineKind?: ts.NewLineKind): ts.CompilerHost {
830830

831831
// Local get canonical file name function, that depends on passed in parameter for useCaseSensitiveFileNames
832832
function getCanonicalFileName(fileName: string): string {
@@ -1050,15 +1050,15 @@ module Harness {
10501050
break;
10511051

10521052
case 'newline':
1053-
case 'newlines':
10541053
if (setting.value.toLowerCase() === 'crlf') {
10551054
options.newLine = ts.NewLineKind.CarriageReturnLineFeed;
1056-
} else if (setting.value.toLowerCase() === 'lf') {
1055+
newLine = setting.value;
1056+
}
1057+
else if (setting.value.toLowerCase() === 'lf') {
10571058
options.newLine = ts.NewLineKind.LineFeed;
1058-
} else if (setting.value === '\\n') {
1059-
// Handle old usage, e.g. contextualTyping.ts:// @newline: \n
10601059
newLine = setting.value;
1061-
} else {
1060+
}
1061+
else {
10621062
throw new Error('Unknown option for newLine: ' + setting.value);
10631063
}
10641064
break;
@@ -1762,4 +1762,4 @@ module Harness {
17621762
}
17631763

17641764
// TODO: not sure why Utils.evalFile isn't working with this, eventually will concat it like old compiler instead of eval
1765-
eval(Harness.tcServicesFile);
1765+
eval(Harness.tcServicesFile);

tests/cases/compiler/newLineFlagWithCR.ts

-4
This file was deleted.

0 commit comments

Comments
 (0)