From 9222711ace7d15d6dc12c19b1a3c2a990b544a1f Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 6 Aug 2014 14:24:47 -0700
Subject: [PATCH] change name of the flag to emitBOM

---
 src/compiler/commandLineParser.ts   | 2 +-
 src/compiler/emitter.ts             | 4 ++--
 src/compiler/sys.ts                 | 1 -
 src/compiler/types.ts               | 2 +-
 src/harness/harness.ts              | 6 +++---
 src/services/shims.ts               | 6 +++---
 tests/cases/compiler/generateBOM.ts | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 326b67817a..da08aec616 100644
--- 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
index eaaca3e164..8c62617f7f 100644
--- 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
index 19902f821a..e215979d2d 100644
--- 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
index 44b9e21fc2..2c9284052d 100644
--- 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
index 497a4010b9..7abfbd4f19 100644
--- 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
index 2e9a834903..891b9e1d91 100644
--- 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
index 006a88dabe..f503cd4de7 100644
--- a/tests/cases/compiler/generateBOM.ts
+++ b/tests/cases/compiler/generateBOM.ts
@@ -1,4 +1,4 @@
-//@generateBOM: true
+//@emitBOM: true
 //@declaration: true
 //@sourcemap: true