Skip to content

Commit 91fedf4

Browse files
committed
Update description message and variable names
1 parent 07719e3 commit 91fedf4

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

src/compiler/commandLineParser.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,11 @@ module ts {
6868
},
6969
{
7070
name: "newLine",
71-
type: { "crlf": NewLineKind.CarriageReturnLineFeed, "lf": NewLineKind.LineFeed },
72-
description: Diagnostics.Emit_newline_Colon_CRLF_dos_or_LF_unix,
71+
type: {
72+
"crlf": NewLineKind.CarriageReturnLineFeed,
73+
"lf": NewLineKind.LineFeed
74+
},
75+
description: Diagnostics.Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
7376
paramType: Diagnostics.NEWLINE,
7477
error: Diagnostics.Argument_for_newLine_option_must_be_CRLF_or_LF
7578
},

src/compiler/diagnosticInformationMap.generated.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,9 @@ module ts {
502502
Preserve_new_lines_when_emitting_code: { code: 6057, category: DiagnosticCategory.Message, key: "Preserve new-lines when emitting code." },
503503
Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: DiagnosticCategory.Message, key: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
504504
File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: DiagnosticCategory.Error, key: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
505-
Emit_newline_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: DiagnosticCategory.Message, key: "Emit newline: 'CRLF' (dos) or 'LF' (unix)." },
505+
Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: DiagnosticCategory.Message, key: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
506506
NEWLINE: { code: 6061, category: DiagnosticCategory.Message, key: "NEWLINE" },
507-
Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: DiagnosticCategory.Error, key: "Argument for 'newLine' option must be 'CRLF' or 'LF'." },
507+
Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: DiagnosticCategory.Error, key: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
508508
Variable_0_implicitly_has_an_1_type: { code: 7005, category: DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." },
509509
Parameter_0_implicitly_has_an_1_type: { code: 7006, category: DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." },
510510
Member_0_implicitly_has_an_1_type: { code: 7008, category: DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." },

src/compiler/diagnosticMessages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,15 +1998,15 @@
19981998
"category": "Error",
19991999
"code": 6059
20002000
},
2001-
"Emit newline: 'CRLF' (dos) or 'LF' (unix).": {
2001+
"Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix).": {
20022002
"category": "Message",
20032003
"code": 6060
20042004
},
20052005
"NEWLINE": {
20062006
"category": "Message",
20072007
"code": 6061
20082008
},
2009-
"Argument for 'newLine' option must be 'CRLF' or 'LF'.": {
2009+
"Argument for '--newLine' option must be 'CRLF' or 'LF'.": {
20102010
"category": "Error",
20112011
"code": 6062
20122012
},

src/compiler/program.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ module ts {
99

1010
/** The version of the TypeScript compiler release */
1111
export const version = "1.5.0";
12-
13-
const NEWLINE_CRLF = "\r\n";
14-
const NEWLINE_LF = "\n";
12+
13+
const carriageReturnLineFeed = "\r\n";
14+
const lineFeed = "\n";
1515

1616
export function findConfigFile(searchPath: string): string {
1717
var fileName = "tsconfig.json";
@@ -95,8 +95,8 @@ module ts {
9595
}
9696

9797
let newLine =
98-
options.newLine === NewLineKind.CarriageReturnLineFeed ? NEWLINE_CRLF :
99-
options.newLine === NewLineKind.LineFeed ? NEWLINE_LF :
98+
options.newLine === NewLineKind.CarriageReturnLineFeed ? carriageReturnLineFeed :
99+
options.newLine === NewLineKind.LineFeed ? lineFeed :
100100
sys.newLine;
101101

102102
return {

src/harness/harness.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -805,8 +805,8 @@ module Harness {
805805
return result;
806806
}
807807

808-
const NEWLINE_CRLF = "\r\n";
809-
const NEWLINE_LF = "\n";
808+
const carriageReturnLineFeed = "\r\n";
809+
const lineFeed = "\n";
810810

811811
export var defaultLibFileName = 'lib.d.ts';
812812
export var defaultLibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + 'lib.core.d.ts'), /*languageVersion*/ ts.ScriptTarget.Latest);
@@ -846,9 +846,9 @@ module Harness {
846846
inputFiles.forEach(register);
847847

848848
let newLine =
849-
newLineKind === ts.NewLineKind.CarriageReturnLineFeed ? NEWLINE_CRLF :
850-
newLineKind === ts.NewLineKind.LineFeed ? NEWLINE_LF :
851-
ts.sys.newLine;
849+
newLineKind === ts.NewLineKind.CarriageReturnLineFeed ? carriageReturnLineFeed :
850+
newLineKind === ts.NewLineKind.LineFeed ? lineFeed :
851+
ts.sys.newLine;
852852

853853
return {
854854
getCurrentDirectory,

0 commit comments

Comments
 (0)