From 63e136362365a6aebe83c5a966716e2b9782ca7a Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 28 Oct 2014 23:52:02 -0700
Subject: [PATCH] Load the es6 lib if target is es6

---
 src/compiler/parser.ts   | 2 +-
 src/compiler/tsc.ts      | 2 +-
 src/compiler/types.ts    | 2 +-
 src/harness/harness.ts   | 2 +-
 src/services/services.ts | 6 +++---
 src/services/shims.ts    | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 6c2207a08d2..03d8deefa57 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -4132,7 +4132,7 @@ module ts {
 
         forEach(rootNames, name => processRootFile(name, false));
         if (!seenNoDefaultLib) {
-            processRootFile(host.getDefaultLibFilename(), true);
+            processRootFile(host.getDefaultLibFilename(options), true);
         }
         verifyCompilerOptions();
         errors.sort(compareDiagnostics);
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 15f231bc74e..4e75cf21ea9 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -193,7 +193,7 @@ module ts {
 
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFilename: () => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), "lib.d.ts"),
+            getDefaultLibFilename: (options) => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), options.target === ScriptTarget.ES6 ? "lib.es6.d.ts" : "lib.d.ts"),
             writeFile: writeFile,
             getCurrentDirectory: () => currentDirectory || (currentDirectory = sys.getCurrentDirectory()),
             useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6a51691f1ab..2e9d22d9e7f 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1256,7 +1256,7 @@ module ts {
 
     export interface CompilerHost {
         getSourceFile(filename: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;
-        getDefaultLibFilename(): string;
+        getDefaultLibFilename(options: CompilerOptions): string;
         getCancellationToken? (): CancellationToken;
         writeFile(filename: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
         getCurrentDirectory(): string;
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 60c5da5a1a6..0276154c740 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -591,7 +591,7 @@ module Harness {
                         return null;
                     }
                 },
-                getDefaultLibFilename: () => defaultLibFileName,
+                getDefaultLibFilename: (options) => defaultLibFileName,
                 writeFile: writeFile,
                 getCanonicalFileName: getCanonicalFileName,
                 useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
diff --git a/src/services/services.ts b/src/services/services.ts
index d2e4360725d..d61c9288e50 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -785,7 +785,7 @@ module ts {
         getLocalizedDiagnosticMessages(): any;
         getCancellationToken(): CancellationToken;
         getCurrentDirectory(): string;
-        getDefaultLibFilename(): string;
+        getDefaultLibFilename(options: CompilerOptions): string;
     }
 
     //
@@ -2096,8 +2096,8 @@ module ts {
                 getCanonicalFileName: (filename) => useCaseSensitivefilenames ? filename : filename.toLowerCase(),
                 useCaseSensitiveFileNames: () => useCaseSensitivefilenames,
                 getNewLine: () => "\r\n",
-                getDefaultLibFilename: (): string => {
-                    return host.getDefaultLibFilename();
+                getDefaultLibFilename: (options): string => {
+                    return host.getDefaultLibFilename(options);
                 },
                 writeFile: (filename, data, writeByteOrderMark) => {
                     writer(filename, data, writeByteOrderMark);
diff --git a/src/services/shims.ts b/src/services/shims.ts
index a6bf421b095..19a593612fb 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -52,7 +52,7 @@ module ts {
         getLocalizedDiagnosticMessages(): string;
         getCancellationToken(): CancellationToken;
         getCurrentDirectory(): string;
-        getDefaultLibFilename(): string;
+        getDefaultLibFilename(options: string): string;
     }
 
     /** Public interface of a language service instance shim. */
@@ -389,8 +389,8 @@ module ts {
             return this.shimHost.getCancellationToken();
         }
 
-        public getDefaultLibFilename(): string {
-            return this.shimHost.getDefaultLibFilename();
+        public getDefaultLibFilename(options: CompilerOptions): string {
+            return this.shimHost.getDefaultLibFilename(JSON.stringify(options));
         }
 
         public getCurrentDirectory(): string {