From 47c4c125fe63b6499d22b571a727840fbb225db2 Mon Sep 17 00:00:00 2001 From: kmashint Date: Sat, 2 May 2015 17:48:14 -0400 Subject: [PATCH] Compiler flag to specify line ending #1693 unit test adjustments --- src/harness/harness.ts | 16 ++++++++-------- tests/cases/compiler/newLineFlagWithCR.ts | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 tests/cases/compiler/newLineFlagWithCR.ts diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 75e8d1e4590..8c3c29beca2 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -826,7 +826,7 @@ module Harness { useCaseSensitiveFileNames: boolean, // the currentDirectory is needed for rwcRunner to passed in specified current directory to compiler host currentDirectory?: string, - newLineKind?: ts.NewLineKind): ts.CompilerHost { + newLineKind?: ts.NewLineKind): ts.CompilerHost { // Local get canonical file name function, that depends on passed in parameter for useCaseSensitiveFileNames function getCanonicalFileName(fileName: string): string { @@ -1050,15 +1050,15 @@ module Harness { break; case 'newline': - case 'newlines': if (setting.value.toLowerCase() === 'crlf') { options.newLine = ts.NewLineKind.CarriageReturnLineFeed; - } else if (setting.value.toLowerCase() === 'lf') { - options.newLine = ts.NewLineKind.LineFeed; - } else if (setting.value === '\\n') { - // Handle old usage, e.g. contextualTyping.ts:// @newline: \n newLine = setting.value; - } else { + } + else if (setting.value.toLowerCase() === 'lf') { + options.newLine = ts.NewLineKind.LineFeed; + newLine = setting.value; + } + else { throw new Error('Unknown option for newLine: ' + setting.value); } break; @@ -1762,4 +1762,4 @@ module Harness { } // TODO: not sure why Utils.evalFile isn't working with this, eventually will concat it like old compiler instead of eval -eval(Harness.tcServicesFile); \ No newline at end of file +eval(Harness.tcServicesFile); diff --git a/tests/cases/compiler/newLineFlagWithCR.ts b/tests/cases/compiler/newLineFlagWithCR.ts deleted file mode 100644 index 4a1fbbfe3d3..00000000000 --- a/tests/cases/compiler/newLineFlagWithCR.ts +++ /dev/null @@ -1,4 +0,0 @@ -// @newline: CR -var x=1; -x=2; -