From 07c06f34a0227e8d78272f5a2bbee7904dc1458f Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Wed, 20 Jul 2016 17:58:37 -0700
Subject: [PATCH 1/8] Change the shape of the shim layer to support
 getAutomaticTypeDirectives

---
 src/compiler/program.ts |  6 +++---
 src/compiler/types.ts   |  1 +
 src/services/shims.ts   | 35 ++++++++++++++++++++++++++++++-----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index d70d1f8f60d9e..d5cc79d05cba0 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1071,14 +1071,14 @@ namespace ts {
     }
 
     /**
-      * Given a set of options and a set of root files, returns the set of type directive names
+      * Given a set of options, returns the set of type directive names
       *   that should be included for this program automatically.
       * This list could either come from the config file,
       *   or from enumerating the types root + initial secondary types lookup location.
       * More type directives might appear in the program later as a result of loading actual source files;
       *   this list is only the set of defaults that are implicitly included.
       */
-    export function getAutomaticTypeDirectiveNames(options: CompilerOptions, rootFiles: string[], host: CompilerHost): string[] {
+    export function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[] {
         // Use explicit type list from tsconfig.json
         if (options.types) {
             return options.types;
@@ -1166,7 +1166,7 @@ namespace ts {
             forEach(rootNames, name => processRootFile(name, /*isDefaultLib*/ false));
 
             // load type declarations specified via 'types' argument or implicitly from types/ and node_modules/@types folders
-            const typeReferences: string[] = getAutomaticTypeDirectiveNames(options, rootNames, host);
+            const typeReferences: string[] = getAutomaticTypeDirectiveNames(options, host);
 
             if (typeReferences) {
                 const inferredRoot = getInferredTypesRoot(options, rootNames, host);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 981c9db96f2bb..b1bbd24b0337c 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2872,6 +2872,7 @@ namespace ts {
         directoryExists?(directoryName: string): boolean;
         realpath?(path: string): string;
         getCurrentDirectory?(): string;
+        getDirectories?(path: string): string[];
     }
 
     export interface ResolvedModule {
diff --git a/src/services/shims.ts b/src/services/shims.ts
index e8b9b59b3cdad..2f6b958d37a92 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -72,8 +72,13 @@ namespace ts {
         directoryExists(directoryName: string): boolean;
     }
 
-    /** Public interface of the the of a config service shim instance.*/
-    export interface CoreServicesShimHost extends Logger, ModuleResolutionHost {
+    /** Public interface of the core-services host instance used in managed side */
+    export interface CoreServicesShimHost extends Logger {
+        directoryExists(directoryName: string): boolean;
+        fileExists(fileName: string): boolean;
+        getCurrentDirectory(): string;
+        getDirectories(path: string): string;
+
         /**
          * Returns a JSON-encoded value of the type: string[]
          *
@@ -81,9 +86,14 @@ namespace ts {
          *  when enumerating the directory.
          */
         readDirectory(rootDir: string, extension: string, basePaths?: string, excludeEx?: string, includeFileEx?: string, includeDirEx?: string, depth?: number): string;
-        useCaseSensitiveFileNames?(): boolean;
-        getCurrentDirectory(): string;
+
+        /**
+         * Read arbitary text files on disk, i.e. when resolution procedure needs the content of 'package.json' to determine location of bundled typings for node modules
+         */
+        readFile(fileName: string): string;
+        realpath?(path: string): string;
         trace(s: string): void;
+        useCaseSensitiveFileNames?(): boolean;
     }
 
     ///
@@ -240,6 +250,7 @@ namespace ts {
     }
 
     export interface CoreServicesShim extends Shim {
+        getAutomaticTypeDirectiveNames(compilerOptionsJson: string): string;
         getPreProcessedFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
         getTSConfigFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
         getDefaultCompilationSettings(): string;
@@ -492,6 +503,10 @@ namespace ts {
         private readDirectoryFallback(rootDir: string, extension: string, exclude: string[]) {
             return JSON.parse(this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude)));
         }
+
+        public getDirectories(path: string): string[] {
+            return JSON.parse(this.shimHost.getDirectories(path));
+        }
     }
 
     function simpleForwardCall(logger: Logger, actionDescription: string, action: () => any, logPerformance: boolean): any {
@@ -1003,7 +1018,7 @@ namespace ts {
 
         public getPreProcessedFileInfo(fileName: string, sourceTextSnapshot: IScriptSnapshot): string {
             return this.forwardJSONCall(
-                "getPreProcessedFileInfo('" + fileName + "')",
+                `getPreProcessedFileInfo('${fileName}')`,
                 () => {
                     // for now treat files as JavaScript
                     const result = preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
@@ -1017,6 +1032,16 @@ namespace ts {
                 });
         }
 
+        public getAutomaticTypeDirectiveNames(compilerOptionsJson: string): string {
+            return this.forwardJSONCall(
+                `getAutomaticTypeDirectiveNames('${compilerOptionsJson}')`,
+                () => {
+                    const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
+                    return getAutomaticTypeDirectiveNames(compilerOptions, this.host);
+                }
+            );
+        }
+
         private convertFileReferences(refs: FileReference[]): IFileReference[] {
             if (!refs) {
                 return undefined;

From c97a8ddd2a99802347b5f237a4900c5ceffa972c Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Wed, 20 Jul 2016 17:58:57 -0700
Subject: [PATCH 2/8] Change the key for looking up automatic type-directives

---
 src/compiler/program.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index d5cc79d05cba0..dcf29966ba0a6 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1169,8 +1169,8 @@ namespace ts {
             const typeReferences: string[] = getAutomaticTypeDirectiveNames(options, host);
 
             if (typeReferences) {
-                const inferredRoot = getInferredTypesRoot(options, rootNames, host);
-                const containingFilename = combinePaths(inferredRoot, "__inferred type names__.ts");
+                // This containgFilename needs to matched with the one used in managed-side
+                const containingFilename = "__inferred type names__.ts"
                 const resolutions = resolveTypeReferenceDirectiveNamesWorker(typeReferences, containingFilename);
                 for (let i = 0; i < typeReferences.length; i++) {
                     processTypeReferenceDirective(typeReferences[i], resolutions[i]);

From cc3a8cea8417a4552f8637d7d178f0feda552fe8 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Thu, 21 Jul 2016 08:06:50 -0700
Subject: [PATCH 3/8] Update baselines from change look-up name of
 type-directives

---
 tests/baselines/reference/library-reference-1.trace.json      | 2 +-
 tests/baselines/reference/library-reference-10.trace.json     | 2 +-
 tests/baselines/reference/library-reference-13.trace.json     | 2 +-
 tests/baselines/reference/library-reference-14.trace.json     | 2 +-
 tests/baselines/reference/library-reference-15.trace.json     | 2 +-
 tests/baselines/reference/library-reference-2.trace.json      | 2 +-
 tests/baselines/reference/library-reference-6.trace.json      | 2 +-
 tests/baselines/reference/library-reference-8.trace.json      | 4 ++--
 tests/baselines/reference/typeReferenceDirectives1.trace.json | 2 +-
 .../baselines/reference/typeReferenceDirectives10.trace.json  | 2 +-
 .../baselines/reference/typeReferenceDirectives11.trace.json  | 2 +-
 .../baselines/reference/typeReferenceDirectives12.trace.json  | 2 +-
 .../baselines/reference/typeReferenceDirectives13.trace.json  | 2 +-
 tests/baselines/reference/typeReferenceDirectives2.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives3.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives4.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives5.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives6.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives7.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives8.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives9.trace.json | 2 +-
 tests/baselines/reference/typingsLookup1.trace.json           | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/baselines/reference/library-reference-1.trace.json b/tests/baselines/reference/library-reference-1.trace.json
index 715572362407e..dd4931132aeaa 100644
--- a/tests/baselines/reference/library-reference-1.trace.json
+++ b/tests/baselines/reference/library-reference-1.trace.json
@@ -4,7 +4,7 @@
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '/src/__inferred type names__.ts', root directory 'types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-10.trace.json b/tests/baselines/reference/library-reference-10.trace.json
index f4df00fa52ded..bbcb0c1ec382e 100644
--- a/tests/baselines/reference/library-reference-10.trace.json
+++ b/tests/baselines/reference/library-reference-10.trace.json
@@ -5,7 +5,7 @@
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
     "File 'types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/jquery.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '/foo/__inferred type names__.ts', root directory './types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory './types'. ========",
     "Resolving with primary search path './types'",
     "Found 'package.json' at './types/jquery/package.json'.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
diff --git a/tests/baselines/reference/library-reference-13.trace.json b/tests/baselines/reference/library-reference-13.trace.json
index d8dfb57c2a66f..31538a19709c1 100644
--- a/tests/baselines/reference/library-reference-13.trace.json
+++ b/tests/baselines/reference/library-reference-13.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/a/b/__inferred type names__.ts', root directory '/a/types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/a/types'. ========",
     "Resolving with primary search path '/a/types'",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-14.trace.json b/tests/baselines/reference/library-reference-14.trace.json
index d8dfb57c2a66f..31538a19709c1 100644
--- a/tests/baselines/reference/library-reference-14.trace.json
+++ b/tests/baselines/reference/library-reference-14.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/a/b/__inferred type names__.ts', root directory '/a/types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/a/types'. ========",
     "Resolving with primary search path '/a/types'",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-15.trace.json b/tests/baselines/reference/library-reference-15.trace.json
index 3e9d7dba1d21d..df14e9e567579 100644
--- a/tests/baselines/reference/library-reference-15.trace.json
+++ b/tests/baselines/reference/library-reference-15.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/a/b/__inferred type names__.ts', root directory 'types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json
index c26f7d2763d7f..2e0604d17c554 100644
--- a/tests/baselines/reference/library-reference-2.trace.json
+++ b/tests/baselines/reference/library-reference-2.trace.json
@@ -5,7 +5,7 @@
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "Found 'package.json' at '/types/jquery/package.json'.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
diff --git a/tests/baselines/reference/library-reference-6.trace.json b/tests/baselines/reference/library-reference-6.trace.json
index 48fb49e6c7fb9..34bbe6280582c 100644
--- a/tests/baselines/reference/library-reference-6.trace.json
+++ b/tests/baselines/reference/library-reference-6.trace.json
@@ -4,7 +4,7 @@
     "File '/node_modules/@types/alpha/package.json' does not exist.",
     "File '/node_modules/@types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/@types/alpha/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'alpha', containing file '/src/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "======== Resolving type reference directive 'alpha', containing file '__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/alpha/package.json' does not exist.",
     "File '/node_modules/@types/alpha/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-8.trace.json b/tests/baselines/reference/library-reference-8.trace.json
index d34f206e5816b..f8c7f4d1b6de8 100644
--- a/tests/baselines/reference/library-reference-8.trace.json
+++ b/tests/baselines/reference/library-reference-8.trace.json
@@ -19,12 +19,12 @@
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'alpha', containing file '/test/__inferred type names__.ts', root directory '/test/types'. ========",
+    "======== Resolving type reference directive 'alpha', containing file '__inferred type names__.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'beta', containing file '/test/__inferred type names__.ts', root directory '/test/types'. ========",
+    "======== Resolving type reference directive 'beta', containing file '__inferred type names__.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/beta/package.json' does not exist.",
     "File '/test/types/beta/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives1.trace.json b/tests/baselines/reference/typeReferenceDirectives1.trace.json
index 58b23783b0b9d..b9d97adbe62a1 100644
--- a/tests/baselines/reference/typeReferenceDirectives1.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives1.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives10.trace.json b/tests/baselines/reference/typeReferenceDirectives10.trace.json
index 61341afdab3a3..190c3d2d9514d 100644
--- a/tests/baselines/reference/typeReferenceDirectives10.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives10.trace.json
@@ -12,7 +12,7 @@
     "File '/ref.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives11.trace.json b/tests/baselines/reference/typeReferenceDirectives11.trace.json
index 37fa7900a7c69..7ccbcff3567cf 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives11.trace.json
@@ -5,7 +5,7 @@
     "File '/mod1.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives12.trace.json b/tests/baselines/reference/typeReferenceDirectives12.trace.json
index 1024b0cdef3db..bd88025059479 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives12.trace.json
@@ -22,7 +22,7 @@
     "File '/main.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives13.trace.json b/tests/baselines/reference/typeReferenceDirectives13.trace.json
index 61341afdab3a3..190c3d2d9514d 100644
--- a/tests/baselines/reference/typeReferenceDirectives13.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives13.trace.json
@@ -12,7 +12,7 @@
     "File '/ref.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives2.trace.json b/tests/baselines/reference/typeReferenceDirectives2.trace.json
index 93d3658447dd3..17f5ee0609baa 100644
--- a/tests/baselines/reference/typeReferenceDirectives2.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives2.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives3.trace.json b/tests/baselines/reference/typeReferenceDirectives3.trace.json
index 58b23783b0b9d..b9d97adbe62a1 100644
--- a/tests/baselines/reference/typeReferenceDirectives3.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives3.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives4.trace.json b/tests/baselines/reference/typeReferenceDirectives4.trace.json
index 58b23783b0b9d..b9d97adbe62a1 100644
--- a/tests/baselines/reference/typeReferenceDirectives4.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives4.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives5.trace.json b/tests/baselines/reference/typeReferenceDirectives5.trace.json
index 61341afdab3a3..190c3d2d9514d 100644
--- a/tests/baselines/reference/typeReferenceDirectives5.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives5.trace.json
@@ -12,7 +12,7 @@
     "File '/ref.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives6.trace.json b/tests/baselines/reference/typeReferenceDirectives6.trace.json
index 58b23783b0b9d..b9d97adbe62a1 100644
--- a/tests/baselines/reference/typeReferenceDirectives6.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives6.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives7.trace.json b/tests/baselines/reference/typeReferenceDirectives7.trace.json
index 58b23783b0b9d..b9d97adbe62a1 100644
--- a/tests/baselines/reference/typeReferenceDirectives7.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives7.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives8.trace.json b/tests/baselines/reference/typeReferenceDirectives8.trace.json
index 37fa7900a7c69..7ccbcff3567cf 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives8.trace.json
@@ -5,7 +5,7 @@
     "File '/mod1.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives9.trace.json b/tests/baselines/reference/typeReferenceDirectives9.trace.json
index 1024b0cdef3db..bd88025059479 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives9.trace.json
@@ -22,7 +22,7 @@
     "File '/main.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typingsLookup1.trace.json b/tests/baselines/reference/typingsLookup1.trace.json
index 83b0e91d6c7c1..0c4d445c8fd18 100644
--- a/tests/baselines/reference/typingsLookup1.trace.json
+++ b/tests/baselines/reference/typingsLookup1.trace.json
@@ -4,7 +4,7 @@
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",

From 00ffd88713345d648cce60d6cbc47c7761bad9ab Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 25 Jul 2016 16:02:28 -0700
Subject: [PATCH 4/8] Add @currentDirectory into the test

---
 src/compiler/program.ts                                    | 4 ++--
 tests/cases/compiler/typeReferenceDirectives1.ts           | 2 +-
 tests/cases/compiler/typeReferenceDirectives10.ts          | 1 +
 tests/cases/compiler/typeReferenceDirectives11.ts          | 1 +
 tests/cases/compiler/typeReferenceDirectives12.ts          | 1 +
 tests/cases/compiler/typeReferenceDirectives13.ts          | 1 +
 tests/cases/compiler/typeReferenceDirectives2.ts           | 1 +
 tests/cases/compiler/typeReferenceDirectives3.ts           | 1 +
 tests/cases/compiler/typeReferenceDirectives4.ts           | 1 +
 tests/cases/compiler/typeReferenceDirectives5.ts           | 1 +
 tests/cases/compiler/typeReferenceDirectives6.ts           | 1 +
 tests/cases/compiler/typeReferenceDirectives7.ts           | 1 +
 tests/cases/compiler/typeReferenceDirectives8.ts           | 1 +
 tests/cases/compiler/typeReferenceDirectives9.ts           | 1 +
 tests/cases/conformance/references/library-reference-13.ts | 1 +
 tests/cases/conformance/typings/typingsLookup1.ts          | 1 +
 16 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index dcf29966ba0a6..3264e7f49447b 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1066,7 +1066,7 @@ namespace ts {
         return resolutions;
     }
 
-    function getInferredTypesRoot(options: CompilerOptions, rootFiles: string[], host: CompilerHost) {
+    function getInferredTypesRoot(options: CompilerOptions, rootFiles: string[], host: CompilerHost): string {
         return computeCommonSourceDirectoryOfFilenames(rootFiles, host.getCurrentDirectory(), f => host.getCanonicalFileName(f));
     }
 
@@ -1170,7 +1170,7 @@ namespace ts {
 
             if (typeReferences) {
                 // This containgFilename needs to matched with the one used in managed-side
-                const containingFilename = "__inferred type names__.ts"
+                const containingFilename = combinePaths(host.getCurrentDirectory(), "__inferred type names__.ts");
                 const resolutions = resolveTypeReferenceDirectiveNamesWorker(typeReferences, containingFilename);
                 for (let i = 0; i < typeReferences.length; i++) {
                     processTypeReferenceDirective(typeReferences[i], resolutions[i]);
diff --git a/tests/cases/compiler/typeReferenceDirectives1.ts b/tests/cases/compiler/typeReferenceDirectives1.ts
index e17e498b9784d..13c84c7ae5e9b 100644
--- a/tests/cases/compiler/typeReferenceDirectives1.ts
+++ b/tests/cases/compiler/typeReferenceDirectives1.ts
@@ -2,7 +2,7 @@
 // @traceResolution: true
 // @declaration: true
 // @typeRoots: /types
-
+// @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
 interface $ { x }
diff --git a/tests/cases/compiler/typeReferenceDirectives10.ts b/tests/cases/compiler/typeReferenceDirectives10.ts
index 61971ba44b2ad..1eb796d03fd25 100644
--- a/tests/cases/compiler/typeReferenceDirectives10.ts
+++ b/tests/cases/compiler/typeReferenceDirectives10.ts
@@ -2,6 +2,7 @@
 // @declaration: true
 // @typeRoots: /types
 // @traceResolution: true
+// @currentDirectory: /
 
 // @filename: /ref.d.ts
 export interface $ { x }
diff --git a/tests/cases/compiler/typeReferenceDirectives11.ts b/tests/cases/compiler/typeReferenceDirectives11.ts
index 2d93e22bdcf23..8b56459cd697f 100644
--- a/tests/cases/compiler/typeReferenceDirectives11.ts
+++ b/tests/cases/compiler/typeReferenceDirectives11.ts
@@ -4,6 +4,7 @@
 // @traceResolution: true
 // @types: lib
 // @out: output.js
+// @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
 
diff --git a/tests/cases/compiler/typeReferenceDirectives12.ts b/tests/cases/compiler/typeReferenceDirectives12.ts
index efdb1e8312b6f..f1abe27f05f36 100644
--- a/tests/cases/compiler/typeReferenceDirectives12.ts
+++ b/tests/cases/compiler/typeReferenceDirectives12.ts
@@ -3,6 +3,7 @@
 // @typeRoots: /types
 // @traceResolution: true
 // @out: output.js
+// @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
 
diff --git a/tests/cases/compiler/typeReferenceDirectives13.ts b/tests/cases/compiler/typeReferenceDirectives13.ts
index 124c31274ace4..f9dede73267bd 100644
--- a/tests/cases/compiler/typeReferenceDirectives13.ts
+++ b/tests/cases/compiler/typeReferenceDirectives13.ts
@@ -2,6 +2,7 @@
 // @declaration: true
 // @typeRoots: /types
 // @traceResolution: true
+// @currentDirectory: /
 
 // @filename: /ref.d.ts
 export interface $ { x }
diff --git a/tests/cases/compiler/typeReferenceDirectives2.ts b/tests/cases/compiler/typeReferenceDirectives2.ts
index 31a01a0b8e4bc..44218683a5a99 100644
--- a/tests/cases/compiler/typeReferenceDirectives2.ts
+++ b/tests/cases/compiler/typeReferenceDirectives2.ts
@@ -3,6 +3,7 @@
 // @declaration: true
 // @typeRoots: /types
 // @types: lib
+// @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
 interface $ { x }
diff --git a/tests/cases/compiler/typeReferenceDirectives3.ts b/tests/cases/compiler/typeReferenceDirectives3.ts
index 4c2729ab389b3..1baf0bdac9d28 100644
--- a/tests/cases/compiler/typeReferenceDirectives3.ts
+++ b/tests/cases/compiler/typeReferenceDirectives3.ts
@@ -2,6 +2,7 @@
 // @declaration: true
 // @typeRoots: /types
 // @traceResolution: true
+// @currentDirectory: /
 
 // $ comes from d.ts file - no need to add type reference directive
 
diff --git a/tests/cases/compiler/typeReferenceDirectives4.ts b/tests/cases/compiler/typeReferenceDirectives4.ts
index ac7346895ef7d..dfa87b651387b 100644
--- a/tests/cases/compiler/typeReferenceDirectives4.ts
+++ b/tests/cases/compiler/typeReferenceDirectives4.ts
@@ -2,6 +2,7 @@
 // @traceResolution: true
 // @declaration: true
 // @typeRoots: /types
+// @currentDirectory: /
 
 // $ comes from d.ts file - no need to add type reference directive
 
diff --git a/tests/cases/compiler/typeReferenceDirectives5.ts b/tests/cases/compiler/typeReferenceDirectives5.ts
index bb24b82b32466..e81ae663e24f6 100644
--- a/tests/cases/compiler/typeReferenceDirectives5.ts
+++ b/tests/cases/compiler/typeReferenceDirectives5.ts
@@ -2,6 +2,7 @@
 // @traceResolution: true
 // @declaration: true
 // @typeRoots: /types
+// @currentDirectory: /
 
 // @filename: /ref.d.ts
 export interface $ { x }
diff --git a/tests/cases/compiler/typeReferenceDirectives6.ts b/tests/cases/compiler/typeReferenceDirectives6.ts
index 7154963f1efa3..edf2ece7e06dc 100644
--- a/tests/cases/compiler/typeReferenceDirectives6.ts
+++ b/tests/cases/compiler/typeReferenceDirectives6.ts
@@ -2,6 +2,7 @@
 // @traceResolution: true
 // @declaration: true
 // @typeRoots: /types
+// @currentDirectory: /
 
 // $ comes from type declaration file - type reference directive should be added
 
diff --git a/tests/cases/compiler/typeReferenceDirectives7.ts b/tests/cases/compiler/typeReferenceDirectives7.ts
index 79d42fa701853..e9335b0708209 100644
--- a/tests/cases/compiler/typeReferenceDirectives7.ts
+++ b/tests/cases/compiler/typeReferenceDirectives7.ts
@@ -2,6 +2,7 @@
 // @traceResolution: true
 // @declaration: true
 // @typeRoots: /types
+// @currentDirectory: /
 
 // local value shadows global - no need to add type reference directive 
    
diff --git a/tests/cases/compiler/typeReferenceDirectives8.ts b/tests/cases/compiler/typeReferenceDirectives8.ts
index c7725a3aab1ab..bed69cbf35739 100644
--- a/tests/cases/compiler/typeReferenceDirectives8.ts
+++ b/tests/cases/compiler/typeReferenceDirectives8.ts
@@ -3,6 +3,7 @@
 // @typeRoots: /types
 // @traceResolution: true
 // @types: lib
+// @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
 
diff --git a/tests/cases/compiler/typeReferenceDirectives9.ts b/tests/cases/compiler/typeReferenceDirectives9.ts
index 610c7173c898b..1ad1aa522885b 100644
--- a/tests/cases/compiler/typeReferenceDirectives9.ts
+++ b/tests/cases/compiler/typeReferenceDirectives9.ts
@@ -2,6 +2,7 @@
 // @declaration: true
 // @typeRoots: /types
 // @traceResolution: true
+// @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
 
diff --git a/tests/cases/conformance/references/library-reference-13.ts b/tests/cases/conformance/references/library-reference-13.ts
index 92b4b259ba4a9..419643d9d0d90 100644
--- a/tests/cases/conformance/references/library-reference-13.ts
+++ b/tests/cases/conformance/references/library-reference-13.ts
@@ -1,5 +1,6 @@
 // @noImplicitReferences: true
 // @traceResolution: true
+// @currentDirectory: /
 
 // load type declarations from types section of tsconfig
 
diff --git a/tests/cases/conformance/typings/typingsLookup1.ts b/tests/cases/conformance/typings/typingsLookup1.ts
index 555d4569af34d..150deef992ac1 100644
--- a/tests/cases/conformance/typings/typingsLookup1.ts
+++ b/tests/cases/conformance/typings/typingsLookup1.ts
@@ -1,5 +1,6 @@
 // @traceResolution: true
 // @noImplicitReferences: true
+// @currentDirectory: /
 
 // @filename: /tsconfig.json
 { "files": "a.ts" }

From 520db2609162a9fcc6480c217f59787d3cf9bf15 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 25 Jul 2016 16:05:25 -0700
Subject: [PATCH 5/8] Update baselines

---
 tests/baselines/reference/library-reference-1.trace.json      | 2 +-
 tests/baselines/reference/library-reference-10.trace.json     | 2 +-
 tests/baselines/reference/library-reference-13.trace.json     | 2 +-
 tests/baselines/reference/library-reference-14.trace.json     | 2 +-
 tests/baselines/reference/library-reference-15.trace.json     | 2 +-
 tests/baselines/reference/library-reference-2.trace.json      | 2 +-
 tests/baselines/reference/library-reference-6.trace.json      | 2 +-
 tests/baselines/reference/library-reference-8.trace.json      | 4 ++--
 tests/baselines/reference/typeReferenceDirectives1.js         | 1 -
 tests/baselines/reference/typeReferenceDirectives1.symbols    | 3 +--
 tests/baselines/reference/typeReferenceDirectives1.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives1.types      | 1 -
 .../baselines/reference/typeReferenceDirectives10.trace.json  | 2 +-
 .../baselines/reference/typeReferenceDirectives11.trace.json  | 2 +-
 .../baselines/reference/typeReferenceDirectives12.trace.json  | 2 +-
 .../baselines/reference/typeReferenceDirectives13.trace.json  | 2 +-
 tests/baselines/reference/typeReferenceDirectives2.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives3.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives4.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives5.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives6.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives7.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives8.trace.json | 2 +-
 tests/baselines/reference/typeReferenceDirectives9.trace.json | 2 +-
 tests/baselines/reference/typingsLookup1.trace.json           | 2 +-
 25 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/tests/baselines/reference/library-reference-1.trace.json b/tests/baselines/reference/library-reference-1.trace.json
index dd4931132aeaa..715572362407e 100644
--- a/tests/baselines/reference/library-reference-1.trace.json
+++ b/tests/baselines/reference/library-reference-1.trace.json
@@ -4,7 +4,7 @@
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory 'types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/src/__inferred type names__.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-10.trace.json b/tests/baselines/reference/library-reference-10.trace.json
index bbcb0c1ec382e..f4df00fa52ded 100644
--- a/tests/baselines/reference/library-reference-10.trace.json
+++ b/tests/baselines/reference/library-reference-10.trace.json
@@ -5,7 +5,7 @@
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
     "File 'types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/jquery.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory './types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/foo/__inferred type names__.ts', root directory './types'. ========",
     "Resolving with primary search path './types'",
     "Found 'package.json' at './types/jquery/package.json'.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
diff --git a/tests/baselines/reference/library-reference-13.trace.json b/tests/baselines/reference/library-reference-13.trace.json
index 31538a19709c1..a23f0ef0ca56e 100644
--- a/tests/baselines/reference/library-reference-13.trace.json
+++ b/tests/baselines/reference/library-reference-13.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/a/types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/a/types'. ========",
     "Resolving with primary search path '/a/types'",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-14.trace.json b/tests/baselines/reference/library-reference-14.trace.json
index 31538a19709c1..fb3a2bb7da48d 100644
--- a/tests/baselines/reference/library-reference-14.trace.json
+++ b/tests/baselines/reference/library-reference-14.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/a/types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/a/__inferred type names__.ts', root directory '/a/types'. ========",
     "Resolving with primary search path '/a/types'",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-15.trace.json b/tests/baselines/reference/library-reference-15.trace.json
index df14e9e567579..e23517976b0e4 100644
--- a/tests/baselines/reference/library-reference-15.trace.json
+++ b/tests/baselines/reference/library-reference-15.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory 'types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/a/__inferred type names__.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json
index 2e0604d17c554..64cdd8091832f 100644
--- a/tests/baselines/reference/library-reference-2.trace.json
+++ b/tests/baselines/reference/library-reference-2.trace.json
@@ -5,7 +5,7 @@
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file 'test/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "Found 'package.json' at '/types/jquery/package.json'.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
diff --git a/tests/baselines/reference/library-reference-6.trace.json b/tests/baselines/reference/library-reference-6.trace.json
index 34bbe6280582c..fd83c1431b438 100644
--- a/tests/baselines/reference/library-reference-6.trace.json
+++ b/tests/baselines/reference/library-reference-6.trace.json
@@ -4,7 +4,7 @@
     "File '/node_modules/@types/alpha/package.json' does not exist.",
     "File '/node_modules/@types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/@types/alpha/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'alpha', containing file '__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "======== Resolving type reference directive 'alpha', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/alpha/package.json' does not exist.",
     "File '/node_modules/@types/alpha/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-8.trace.json b/tests/baselines/reference/library-reference-8.trace.json
index f8c7f4d1b6de8..d34f206e5816b 100644
--- a/tests/baselines/reference/library-reference-8.trace.json
+++ b/tests/baselines/reference/library-reference-8.trace.json
@@ -19,12 +19,12 @@
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'alpha', containing file '__inferred type names__.ts', root directory '/test/types'. ========",
+    "======== Resolving type reference directive 'alpha', containing file '/test/__inferred type names__.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'beta', containing file '__inferred type names__.ts', root directory '/test/types'. ========",
+    "======== Resolving type reference directive 'beta', containing file '/test/__inferred type names__.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/beta/package.json' does not exist.",
     "File '/test/types/beta/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives1.js b/tests/baselines/reference/typeReferenceDirectives1.js
index 775af9c5283f3..a621081993126 100644
--- a/tests/baselines/reference/typeReferenceDirectives1.js
+++ b/tests/baselines/reference/typeReferenceDirectives1.js
@@ -2,7 +2,6 @@
 
 //// [index.d.ts]
 
-
 interface $ { x }
 
 //// [app.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives1.symbols b/tests/baselines/reference/typeReferenceDirectives1.symbols
index 55c17b219ecaa..a33a2aba4082d 100644
--- a/tests/baselines/reference/typeReferenceDirectives1.symbols
+++ b/tests/baselines/reference/typeReferenceDirectives1.symbols
@@ -9,8 +9,7 @@ interface A {
 }
 === /types/lib/index.d.ts ===
 
-
 interface $ { x }
 >$ : Symbol($, Decl(index.d.ts, 0, 0))
->x : Symbol($.x, Decl(index.d.ts, 2, 13))
+>x : Symbol($.x, Decl(index.d.ts, 1, 13))
 
diff --git a/tests/baselines/reference/typeReferenceDirectives1.trace.json b/tests/baselines/reference/typeReferenceDirectives1.trace.json
index b9d97adbe62a1..58b23783b0b9d 100644
--- a/tests/baselines/reference/typeReferenceDirectives1.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives1.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives1.types b/tests/baselines/reference/typeReferenceDirectives1.types
index 05080e05651dd..be789a08ddc5c 100644
--- a/tests/baselines/reference/typeReferenceDirectives1.types
+++ b/tests/baselines/reference/typeReferenceDirectives1.types
@@ -9,7 +9,6 @@ interface A {
 }
 === /types/lib/index.d.ts ===
 
-
 interface $ { x }
 >$ : $
 >x : any
diff --git a/tests/baselines/reference/typeReferenceDirectives10.trace.json b/tests/baselines/reference/typeReferenceDirectives10.trace.json
index 190c3d2d9514d..61341afdab3a3 100644
--- a/tests/baselines/reference/typeReferenceDirectives10.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives10.trace.json
@@ -12,7 +12,7 @@
     "File '/ref.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives11.trace.json b/tests/baselines/reference/typeReferenceDirectives11.trace.json
index 7ccbcff3567cf..37fa7900a7c69 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives11.trace.json
@@ -5,7 +5,7 @@
     "File '/mod1.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives12.trace.json b/tests/baselines/reference/typeReferenceDirectives12.trace.json
index bd88025059479..1024b0cdef3db 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives12.trace.json
@@ -22,7 +22,7 @@
     "File '/main.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives13.trace.json b/tests/baselines/reference/typeReferenceDirectives13.trace.json
index 190c3d2d9514d..61341afdab3a3 100644
--- a/tests/baselines/reference/typeReferenceDirectives13.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives13.trace.json
@@ -12,7 +12,7 @@
     "File '/ref.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives2.trace.json b/tests/baselines/reference/typeReferenceDirectives2.trace.json
index 17f5ee0609baa..93d3658447dd3 100644
--- a/tests/baselines/reference/typeReferenceDirectives2.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives2.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives3.trace.json b/tests/baselines/reference/typeReferenceDirectives3.trace.json
index b9d97adbe62a1..58b23783b0b9d 100644
--- a/tests/baselines/reference/typeReferenceDirectives3.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives3.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives4.trace.json b/tests/baselines/reference/typeReferenceDirectives4.trace.json
index b9d97adbe62a1..58b23783b0b9d 100644
--- a/tests/baselines/reference/typeReferenceDirectives4.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives4.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives5.trace.json b/tests/baselines/reference/typeReferenceDirectives5.trace.json
index 190c3d2d9514d..61341afdab3a3 100644
--- a/tests/baselines/reference/typeReferenceDirectives5.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives5.trace.json
@@ -12,7 +12,7 @@
     "File '/ref.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives6.trace.json b/tests/baselines/reference/typeReferenceDirectives6.trace.json
index b9d97adbe62a1..58b23783b0b9d 100644
--- a/tests/baselines/reference/typeReferenceDirectives6.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives6.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives7.trace.json b/tests/baselines/reference/typeReferenceDirectives7.trace.json
index b9d97adbe62a1..58b23783b0b9d 100644
--- a/tests/baselines/reference/typeReferenceDirectives7.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives7.trace.json
@@ -4,7 +4,7 @@
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives8.trace.json b/tests/baselines/reference/typeReferenceDirectives8.trace.json
index 7ccbcff3567cf..37fa7900a7c69 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives8.trace.json
@@ -5,7 +5,7 @@
     "File '/mod1.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeReferenceDirectives9.trace.json b/tests/baselines/reference/typeReferenceDirectives9.trace.json
index bd88025059479..1024b0cdef3db 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives9.trace.json
@@ -22,7 +22,7 @@
     "File '/main.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
-    "======== Resolving type reference directive 'lib', containing file '__inferred type names__.ts', root directory '/types'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typingsLookup1.trace.json b/tests/baselines/reference/typingsLookup1.trace.json
index 0c4d445c8fd18..83b0e91d6c7c1 100644
--- a/tests/baselines/reference/typingsLookup1.trace.json
+++ b/tests/baselines/reference/typingsLookup1.trace.json
@@ -4,7 +4,7 @@
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'jquery', containing file '__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",

From acb08a463379a8e212643fb1663d58079c222315 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 25 Jul 2016 16:05:33 -0700
Subject: [PATCH 6/8] Fix linting error

---
 src/compiler/program.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 3264e7f49447b..ffd4262092742 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1066,10 +1066,6 @@ namespace ts {
         return resolutions;
     }
 
-    function getInferredTypesRoot(options: CompilerOptions, rootFiles: string[], host: CompilerHost): string {
-        return computeCommonSourceDirectoryOfFilenames(rootFiles, host.getCurrentDirectory(), f => host.getCanonicalFileName(f));
-    }
-
     /**
       * Given a set of options, returns the set of type directive names
       *   that should be included for this program automatically.

From a324bf05d07f457a2fd2229ae3bbddb5993fed71 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 25 Jul 2016 17:48:25 -0700
Subject: [PATCH 7/8] Address PR: fix spelling mistake

---
 src/compiler/program.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index ffd4262092742..4f0b26a7e803b 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1165,7 +1165,7 @@ namespace ts {
             const typeReferences: string[] = getAutomaticTypeDirectiveNames(options, host);
 
             if (typeReferences) {
-                // This containgFilename needs to matched with the one used in managed-side
+                // This containingFilename needs to match with the one used in managed-side
                 const containingFilename = combinePaths(host.getCurrentDirectory(), "__inferred type names__.ts");
                 const resolutions = resolveTypeReferenceDirectiveNamesWorker(typeReferences, containingFilename);
                 for (let i = 0; i < typeReferences.length; i++) {

From 103f7864331aeb1c0d039a49a852943be6e7d01e Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Wed, 27 Jul 2016 15:36:18 -0700
Subject: [PATCH 8/8] Instead of return path of the type directive names just
 return type directive names

---
 src/compiler/program.ts  | 5 ++++-
 src/services/services.ts | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 4f0b26a7e803b..a254b04d17410 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1087,7 +1087,10 @@ namespace ts {
             if (typeRoots) {
                 for (const root of typeRoots) {
                     if (host.directoryExists(root)) {
-                        result = result.concat(host.getDirectories(root));
+                        for (const typeDirectivePath of host.getDirectories(root)) {
+                            // Return just the type directive names
+                            result = result.concat(getBaseFileName(normalizePath(typeDirectivePath)));
+                        }
                     }
                 }
             }
diff --git a/src/services/services.ts b/src/services/services.ts
index b03cc932d2a9b..65c816eeae59e 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1794,7 +1794,7 @@ namespace ts {
         };
     }
 
-    // Cache host information about scrip Should be refreshed
+    // Cache host information about script should be refreshed
     // at each language service public entry point, since we don't know when
     // set of scripts handled by the host changes.
     class HostCache {