harden 'get import declaration' logic

vladima · vladima · commit 5b38cb9a6975 · 2014-12-16T00:34:51.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4742,7 +4742,9 @@ module ts {
                 nodeLinks.importOnRightSide = undefined;
 
                 getSymbolLinks(rightSide).referenced = true;
-                nodeLinks = getNodeLinks(rightSide.declarations[0])
+                Debug.assert((rightSide.flags & SymbolFlags.Import) !== 0);
+
+                nodeLinks = getNodeLinks(getDeclarationOfKind(rightSide, SyntaxKind.ImportDeclaration))
             }
         }
 
@@ -4773,7 +4775,7 @@ module ts {
                 }
                 
                 if (symbolLinks.referenced) {
-                    markLinkedImportsAsReferenced(<ImportDeclaration>symbol.declarations[0]);
+                    markLinkedImportsAsReferenced(<ImportDeclaration>getDeclarationOfKind(symbol, SyntaxKind.ImportDeclaration));
                 }
             }
 
@@ -8906,7 +8908,7 @@ module ts {
                         // Mark the import as referenced so that we emit it in the final .js file.
                         getSymbolLinks(symbol).referenced = true;
                         // mark any import declarations that depend upon this import as referenced
-                        markLinkedImportsAsReferenced(<ImportDeclaration>symbol.declarations[0])
+                        markLinkedImportsAsReferenced(<ImportDeclaration>getDeclarationOfKind(symbol, SyntaxKind.ImportDeclaration))
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -4742,7 +4742,9 @@ module ts {`
`4742`	`4742`	`nodeLinks.importOnRightSide = undefined;`
`4743`	`4743`
`4744`	`4744`	`getSymbolLinks(rightSide).referenced = true;`
`4745`		`- nodeLinks = getNodeLinks(rightSide.declarations[0])`
	`4745`	`+ Debug.assert((rightSide.flags & SymbolFlags.Import) !== 0);`
	`4746`	`+`
	`4747`	`+ nodeLinks = getNodeLinks(getDeclarationOfKind(rightSide, SyntaxKind.ImportDeclaration))`
`4746`	`4748`	`}`
`4747`	`4749`	`}`
`4748`	`4750`
`@@ -4773,7 +4775,7 @@ module ts {`
`4773`	`4775`	`}`
`4774`	`4776`
`4775`	`4777`	`if (symbolLinks.referenced) {`
`4776`		`- markLinkedImportsAsReferenced(<ImportDeclaration>symbol.declarations[0]);`
	`4778`	`+ markLinkedImportsAsReferenced(<ImportDeclaration>getDeclarationOfKind(symbol, SyntaxKind.ImportDeclaration));`
`4777`	`4779`	`}`
`4778`	`4780`	`}`
`4779`	`4781`
`@@ -8906,7 +8908,7 @@ module ts {`
`8906`	`8908`	`// Mark the import as referenced so that we emit it in the final .js file.`
`8907`	`8909`	`getSymbolLinks(symbol).referenced = true;`
`8908`	`8910`	`// mark any import declarations that depend upon this import as referenced`
`8909`		`- markLinkedImportsAsReferenced(<ImportDeclaration>symbol.declarations[0])`
	`8911`	`+ markLinkedImportsAsReferenced(<ImportDeclaration>getDeclarationOfKind(symbol, SyntaxKind.ImportDeclaration))`
`8910`	`8912`	`}`
`8911`	`8913`	`}`
`8912`	`8914`