change name of the flag to emitBOM

mhegazy · mhegazy · commit 9222711ace7d · 2014-08-06T14:24:47.000-07:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -24,7 +24,7 @@ module ts {
             type: "boolean",
         },
         {
-            name: "generateBOM", 
+            name: "emitBOM", 
             type: "boolean"
         },
         {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1854,7 +1854,7 @@ module ts {
             }
 
             writeLine();
-            writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.generateBOM);
+            writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM);
         }
 
         function emitDeclarations(jsFilePath: string, root?: SourceFile) {
@@ -2448,7 +2448,7 @@ module ts {
             // TODO(shkamat): Should we not write any declaration file if any of them can produce error, 
             // or should we just not write this file like we are doing now
             if (!reportedDeclarationError) {
-                writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", referencePathsOutput + writer.getText(), compilerOptions.generateBOM);
+                writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", referencePathsOutput + writer.getText(), compilerOptions.emitBOM);
             }
         }
 
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -90,7 +90,6 @@ var sys: System = (function () {
                 else {
                     fileStream.Position = 3;
                 }
-                fileStream.Position = 3;
                 fileStream.CopyTo(binaryStream);
                 binaryStream.SaveToFile(fileName, 2 /*overwrite*/);
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -939,7 +939,7 @@ module ts {
         codepage?: number;
         declaration?: boolean;
         diagnostics?: boolean;
-        generateBOM?: boolean;
+        emitBOM?: boolean;
         help?: boolean;
         locale?: string;
         mapRoot?: string;
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -712,8 +712,8 @@ module Harness {
                             // Not supported yet
                             break;
 
-                        case 'generatebom':
-                            options.generateBOM = !!setting.value;
+                        case 'emitbom':
+                            options.emitBOM = !!setting.value;
                             break;
 
                         default:
@@ -897,7 +897,7 @@ module Harness {
         var optionRegex = /^[\/]{2}\s*@(\w+)\s*:\s*(\S*)/gm;  // multiple matches on multiple lines
 
         // List of allowed metadata names
-        var fileMetadataNames = ["filename", "comments", "declaration", "module", "nolib", "sourcemap", "target", "out", "outDir", "noimplicitany", "noresolve", "newline", "newlines", "generatebom"];
+        var fileMetadataNames = ["filename", "comments", "declaration", "module", "nolib", "sourcemap", "target", "out", "outDir", "noimplicitany", "noresolve", "newline", "newlines", "emitbom"];
 
         function extractCompilerSettings(content: string): CompilerSetting[] {
 
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -169,7 +169,7 @@ module ts {
         useCaseSensitiveFileResolution?: boolean;
         gatherDiagnostics?: boolean;
         codepage?: number;
-        generateBom?: boolean;
+        emitBOM?: boolean;
     }
 
     function languageVersionToScriptTarget(languageVersion: LanguageVersion): ScriptTarget {
@@ -232,7 +232,7 @@ module ts {
         options.declaration = settings.generateDeclarationFiles;
         //options.useCaseSensitiveFileResolution = settings.useCaseSensitiveFileResolution;
         options.codepage = settings.codepage;
-        options.generateBOM = settings.generateBom;
+        options.emitBOM = settings.emitBOM;
         return options;
     }
 
@@ -253,7 +253,7 @@ module ts {
         settings.generateDeclarationFiles = options.declaration;
         // settings.useCaseSensitiveFileResolution = options.useCaseSensitiveFileResolution;
         settings.codepage = options.codepage;
-        settings.generateBom = options.generateBOM;
+        settings.emitBOM = options.emitBOM;
         return settings;
     }
 
diff --git a/tests/cases/compiler/generateBOM.ts b/tests/cases/compiler/generateBOM.ts
@@ -1,4 +1,4 @@
-//@generateBOM: true
+﻿//@emitBOM: true
 //@declaration: true
 //@sourcemap: true
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ module ts {`
`24`	`24`	`type: "boolean",`
`25`	`25`	`},`
`26`	`26`	`{`
`27`		`- name: "generateBOM",`
	`27`	`+ name: "emitBOM",`
`28`	`28`	`type: "boolean"`
`29`	`29`	`},`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1854,7 +1854,7 @@ module ts {`
`1854`	`1854`	`}`
`1855`	`1855`
`1856`	`1856`	`writeLine();`
`1857`		`- writeEmittedFiles(writer.getText(), /writeByteOrderMark/ compilerOptions.generateBOM);`
	`1857`	`+ writeEmittedFiles(writer.getText(), /writeByteOrderMark/ compilerOptions.emitBOM);`
`1858`	`1858`	`}`
`1859`	`1859`
`1860`	`1860`	`function emitDeclarations(jsFilePath: string, root?: SourceFile) {`
`@@ -2448,7 +2448,7 @@ module ts {`
`2448`	`2448`	`// TODO(shkamat): Should we not write any declaration file if any of them can produce error,`
`2449`	`2449`	`// or should we just not write this file like we are doing now`
`2450`	`2450`	`if (!reportedDeclarationError) {`
`2451`		`- writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", referencePathsOutput + writer.getText(), compilerOptions.generateBOM);`
	`2451`	`+ writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", referencePathsOutput + writer.getText(), compilerOptions.emitBOM);`
`2452`	`2452`	`}`
`2453`	`2453`	`}`
`2454`	`2454`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ var sys: System = (function () {`
`90`	`90`	`else {`
`91`	`91`	`fileStream.Position = 3;`
`92`	`92`	`}`
`93`		`- fileStream.Position = 3;`
`94`	`93`	`fileStream.CopyTo(binaryStream);`
`95`	`94`	`binaryStream.SaveToFile(fileName, 2 /overwrite/);`
`96`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//@generateBOM: true`
	`1`	`+//@emitBOM: true`
`2`	`2`	`//@declaration: true`
`3`	`3`	`//@sourcemap: true`
`4`	`4`