Skip to content

Commit e278b2e

Browse files
committed
Compiler flag to specify line ending microsoft#1693 code review adjustments
1 parent afd96b5 commit e278b2e

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

Diff for: src/compiler/commandLineParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ module ts {
5959
},
6060
{
6161
name: "newLine",
62-
type: { "crlf": NewLineKind.CRLF, "lf": NewLineKind.LF },
62+
type: { "crlf": NewLineKind.CarriageReturnLineFeed, "lf": NewLineKind.LineFeed },
6363
description: Diagnostics.Emit_newline_Colon_CRLF_dos_or_LF_unix,
6464
paramType: Diagnostics.NEWLINE,
6565
error: Diagnostics.Argument_for_newLine_option_must_be_CRLF_or_LF

Diff for: src/compiler/diagnosticMessages.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@
19921992
"category": "Message",
19931993
"code": 6062
19941994
},
1995-
"Argument for --newLine option must be 'CRLF' or 'LF'.": {
1995+
"Argument for 'newLine' option must be 'CRLF' or 'LF'.": {
19961996
"category": "Error",
19971997
"code": 6063
19981998
},

Diff for: src/compiler/program.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,11 @@ module ts {
9191
}
9292
}
9393

94-
let newLine = [sys.newLine, "\r\n", "\n"][options.newLine ? Number(options.newLine) : 0];
95-
94+
let newLine =
95+
options.newLine === NewLineKind.CarriageReturnLineFeed ? "\r\n" :
96+
options.newLine === NewLineKind.LineFeed ? "\n" :
97+
sys.newLine;
98+
9699
return {
97100
getSourceFile,
98101
getDefaultLibFileName: options => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), getDefaultLibFileName(options)),

Diff for: src/compiler/types.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1683,9 +1683,8 @@ module ts {
16831683
}
16841684

16851685
export const enum NewLineKind {
1686-
DEFAULT = 0,
1687-
CRLF = 1,
1688-
LF = 2,
1686+
CarriageReturnLineFeed = 0,
1687+
LineFeed = 1,
16891688
}
16901689

16911690
export interface LineAndCharacter {

0 commit comments

Comments
 (0)