Skip to content

Commit 9222711

Browse files
committed
change name of the flag to emitBOM
1 parent f125ee2 commit 9222711

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

src/compiler/commandLineParser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module ts {
2424
type: "boolean",
2525
},
2626
{
27-
name: "generateBOM",
27+
name: "emitBOM",
2828
type: "boolean"
2929
},
3030
{

src/compiler/emitter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,7 +1854,7 @@ module ts {
18541854
}
18551855

18561856
writeLine();
1857-
writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.generateBOM);
1857+
writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM);
18581858
}
18591859

18601860
function emitDeclarations(jsFilePath: string, root?: SourceFile) {
@@ -2448,7 +2448,7 @@ module ts {
24482448
// TODO(shkamat): Should we not write any declaration file if any of them can produce error,
24492449
// or should we just not write this file like we are doing now
24502450
if (!reportedDeclarationError) {
2451-
writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", referencePathsOutput + writer.getText(), compilerOptions.generateBOM);
2451+
writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", referencePathsOutput + writer.getText(), compilerOptions.emitBOM);
24522452
}
24532453
}
24542454

src/compiler/sys.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ var sys: System = (function () {
9090
else {
9191
fileStream.Position = 3;
9292
}
93-
fileStream.Position = 3;
9493
fileStream.CopyTo(binaryStream);
9594
binaryStream.SaveToFile(fileName, 2 /*overwrite*/);
9695
}

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ module ts {
939939
codepage?: number;
940940
declaration?: boolean;
941941
diagnostics?: boolean;
942-
generateBOM?: boolean;
942+
emitBOM?: boolean;
943943
help?: boolean;
944944
locale?: string;
945945
mapRoot?: string;

src/harness/harness.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,8 @@ module Harness {
712712
// Not supported yet
713713
break;
714714

715-
case 'generatebom':
716-
options.generateBOM = !!setting.value;
715+
case 'emitbom':
716+
options.emitBOM = !!setting.value;
717717
break;
718718

719719
default:
@@ -897,7 +897,7 @@ module Harness {
897897
var optionRegex = /^[\/]{2}\s*@(\w+)\s*:\s*(\S*)/gm; // multiple matches on multiple lines
898898

899899
// List of allowed metadata names
900-
var fileMetadataNames = ["filename", "comments", "declaration", "module", "nolib", "sourcemap", "target", "out", "outDir", "noimplicitany", "noresolve", "newline", "newlines", "generatebom"];
900+
var fileMetadataNames = ["filename", "comments", "declaration", "module", "nolib", "sourcemap", "target", "out", "outDir", "noimplicitany", "noresolve", "newline", "newlines", "emitbom"];
901901

902902
function extractCompilerSettings(content: string): CompilerSetting[] {
903903

src/services/shims.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ module ts {
169169
useCaseSensitiveFileResolution?: boolean;
170170
gatherDiagnostics?: boolean;
171171
codepage?: number;
172-
generateBom?: boolean;
172+
emitBOM?: boolean;
173173
}
174174

175175
function languageVersionToScriptTarget(languageVersion: LanguageVersion): ScriptTarget {
@@ -232,7 +232,7 @@ module ts {
232232
options.declaration = settings.generateDeclarationFiles;
233233
//options.useCaseSensitiveFileResolution = settings.useCaseSensitiveFileResolution;
234234
options.codepage = settings.codepage;
235-
options.generateBOM = settings.generateBom;
235+
options.emitBOM = settings.emitBOM;
236236
return options;
237237
}
238238

@@ -253,7 +253,7 @@ module ts {
253253
settings.generateDeclarationFiles = options.declaration;
254254
// settings.useCaseSensitiveFileResolution = options.useCaseSensitiveFileResolution;
255255
settings.codepage = options.codepage;
256-
settings.generateBom = options.generateBOM;
256+
settings.emitBOM = options.emitBOM;
257257
return settings;
258258
}
259259

tests/cases/compiler/generateBOM.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@generateBOM: true
1+
//@emitBOM: true
22
//@declaration: true
33
//@sourcemap: true
44

0 commit comments

Comments
 (0)