Perform circular resolution correctly

Author: RyanCavanaugh

src/compiler/program.ts

@@ -1565,8 +1565,8 @@ namespace ts {
                     const searchPath = combinePaths(primaryPath, ref.fileName);
                     const resolvedFile = findLibraryDefinition(searchPath);
                     if (resolvedFile) {
-                        processSourceFile(resolvedFile, /*isDefaultLib*/ false, /*isReference*/ true, file, ref.pos, ref.end);
                         resolvedLibraries[ref.fileName] = { primary: true, resolvedFileName: resolvedFile };
+                        processSourceFile(resolvedFile, /*isDefaultLib*/ false, /*isReference*/ true, file, ref.pos, ref.end);
                         foundIt = true;
                         break;
                     }
@@ -1591,8 +1591,8 @@ namespace ts {
                         }
                         else {
                             // First resolution of this library
-                            processSourceFile(secondaryResult, /*isDefaultLib*/ false, /*isReference*/ true, file, ref.pos, ref.end);
                             resolvedLibraries[ref.fileName] = { primary: false, resolvedFileName: secondaryResult };
+                            processSourceFile(secondaryResult, /*isDefaultLib*/ false, /*isReference*/ true, file, ref.pos, ref.end);
                         }
                     }
                 }

tests/baselines/reference/library-reference-8.js

@@ -0,0 +1,24 @@
+//// [tests/cases/conformance/references/library-reference-8.ts] ////
+
+//// [index.d.ts]
+
+// Don't crash in circular library reference situations
+
+/// <reference library="beta" />
+declare var alpha: { a: string };
+
+//// [index.d.ts]
+/// <reference library="alpha" />
+declare var beta: { b: string };
+
+//// [foo.ts]
+/// <reference library="alpha" />
+/// <reference library="beta" />
+var x: string = alpha.a + beta.b;
+
+
+
+//// [foo.js]
+/// <reference library="alpha" />
+/// <reference library="beta" />
+var x = alpha.a + beta.b;

tests/baselines/reference/library-reference-8.symbols

@@ -0,0 +1,28 @@
+=== tests/cases/conformance/references/foo.ts ===
+/// <reference library="alpha" />
+/// <reference library="beta" />
+var x: string = alpha.a + beta.b;
+>x : Symbol(x, Decl(foo.ts, 2, 3))
+>alpha.a : Symbol(a, Decl(index.d.ts, 4, 20))
+>alpha : Symbol(alpha, Decl(index.d.ts, 4, 11))
+>a : Symbol(a, Decl(index.d.ts, 4, 20))
+>beta.b : Symbol(b, Decl(index.d.ts, 1, 19))
+>beta : Symbol(beta, Decl(index.d.ts, 1, 11))
+>b : Symbol(b, Decl(index.d.ts, 1, 19))
+
+
+=== tests/cases/conformance/references/typings/alpha/index.d.ts ===
+
+// Don't crash in circular library reference situations
+
+/// <reference library="beta" />
+declare var alpha: { a: string };
+>alpha : Symbol(alpha, Decl(index.d.ts, 4, 11))
+>a : Symbol(a, Decl(index.d.ts, 4, 20))
+
+=== tests/cases/conformance/references/typings/beta/index.d.ts ===
+/// <reference library="alpha" />
+declare var beta: { b: string };
+>beta : Symbol(beta, Decl(index.d.ts, 1, 11))
+>b : Symbol(b, Decl(index.d.ts, 1, 19))
+

tests/baselines/reference/library-reference-8.types

@@ -0,0 +1,29 @@
+=== tests/cases/conformance/references/foo.ts ===
+/// <reference library="alpha" />
+/// <reference library="beta" />
+var x: string = alpha.a + beta.b;
+>x : string
+>alpha.a + beta.b : string
+>alpha.a : string
+>alpha : { a: string; }
+>a : string
+>beta.b : string
+>beta : { b: string; }
+>b : string
+
+
+=== tests/cases/conformance/references/typings/alpha/index.d.ts ===
+
+// Don't crash in circular library reference situations
+
+/// <reference library="beta" />
+declare var alpha: { a: string };
+>alpha : { a: string; }
+>a : string
+
+=== tests/cases/conformance/references/typings/beta/index.d.ts ===
+/// <reference library="alpha" />
+declare var beta: { b: string };
+>beta : { b: string; }
+>b : string
+

tests/cases/conformance/references/library-reference-8.ts

@@ -0,0 +1,17 @@
+// @noImplicitReferences: true
+
+// Don't crash in circular library reference situations
+
+// @filename: typings/alpha/index.d.ts
+/// <reference library="beta" />
+declare var alpha: { a: string };
+
+// @filename: typings/beta/index.d.ts
+/// <reference library="alpha" />
+declare var beta: { b: string };
+
+// @filename: foo.ts
+/// <reference library="alpha" />
+/// <reference library="beta" />
+var x: string = alpha.a + beta.b;
+