Skip to content

Commit 54ebd85

Browse files
committed
Compiler flag to specify line ending microsoft#1693 unit test adjustments
1 parent 20becef commit 54ebd85

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/harness/harness.ts

Lines changed: 7 additions & 7 deletions
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 {
@@ -1036,15 +1036,15 @@ module Harness {
10361036
break;
10371037

10381038
case 'newline':
1039-
case 'newlines':
10401039
if (setting.value.toLowerCase() === 'crlf') {
10411040
options.newLine = ts.NewLineKind.CarriageReturnLineFeed;
1042-
} else if (setting.value.toLowerCase() === 'lf') {
1041+
newLine = setting.value;
1042+
}
1043+
else if (setting.value.toLowerCase() === 'lf') {
10431044
options.newLine = ts.NewLineKind.LineFeed;
1044-
} else if (setting.value === '\\n') {
1045-
// Handle old usage, e.g. contextualTyping.ts:// @newline: \n
10461045
newLine = setting.value;
1047-
} else {
1046+
}
1047+
else {
10481048
throw new Error('Unknown option for newLine: ' + setting.value);
10491049
}
10501050
break;
@@ -1739,4 +1739,4 @@ module Harness {
17391739
}
17401740

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

tests/cases/compiler/newLineFlagWithCR.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)