Support navigation bar for new import/export syntax

mhegazy · mhegazy · commit 7b7d2b6006ec · 2015-02-24T11:54:10.000-08:00
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
@@ -50,6 +50,38 @@ module ts.NavigationBar {
                     case SyntaxKind.ArrayBindingPattern:
                         forEach((<BindingPattern>node).elements, visit);
                         break;
+
+                    case SyntaxKind.ExportDeclaration:
+                        // Handle named exports case e.g.:
+                        //    export {a, b as B} from "mod";
+                        if ((<ExportDeclaration>node).exportClause) {
+                            forEach((<ExportDeclaration>node).exportClause.elements, visit);
+                        }
+                        break;
+
+                    case SyntaxKind.ImportDeclaration:
+                        var importClause = (<ImportDeclaration>node).importClause;
+                        if (importClause) {
+                            // Handle default import case e.g.:
+                            //    import d from "mod";
+                            if (importClause.name) {
+                                childNodes.push(importClause);
+                            }
+
+                            // Handle named bindings in imports e.g.:
+                            //    import * as NS from "mod";
+                            //    import {a, b as B} from "mod";
+                            if (importClause.namedBindings) {
+                                if (importClause.namedBindings.kind === SyntaxKind.NamespaceImport) {
+                                    childNodes.push(importClause.namedBindings);
+                                }
+                                else {
+                                    forEach((<NamedImports>importClause.namedBindings).elements, visit);
+                                }
+                            }
+                        }
+                        break;
+
                     case SyntaxKind.BindingElement:
                     case SyntaxKind.VariableDeclaration:
                         if (isBindingPattern((<VariableDeclaration>node).name)) {
@@ -62,7 +94,11 @@ module ts.NavigationBar {
                     case SyntaxKind.InterfaceDeclaration:
                     case SyntaxKind.ModuleDeclaration:
                     case SyntaxKind.FunctionDeclaration:
+                    case SyntaxKind.ImportEqualsDeclaration:
+                    case SyntaxKind.ImportSpecifier:
+                    case SyntaxKind.ExportSpecifier:
                         childNodes.push(node);
+                        break;
                 }
             }
 
@@ -291,9 +327,16 @@ module ts.NavigationBar {
                     else {
                         return createItem(node, getTextOfNode(name), ts.ScriptElementKind.variableElement);
                     }
-                
+
                 case SyntaxKind.Constructor:
                     return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
+
+                case SyntaxKind.ExportSpecifier:
+                case SyntaxKind.ImportSpecifier:
+                case SyntaxKind.ImportEqualsDeclaration:
+                case SyntaxKind.ImportClause:
+                case SyntaxKind.NamespaceImport:
+                    return createItem(node, getTextOfNode((<Declaration>node).name), ts.ScriptElementKind.alias);
             }
 
             return undefined;
diff --git a/tests/cases/fourslash/scriptLexicalStructureExports.ts b/tests/cases/fourslash/scriptLexicalStructureExports.ts
@@ -0,0 +1,18 @@
+/// <reference path="fourslash.ts"/>
+
+
+////export { {| "itemName": "a", "kind": "alias", "parentName": "" |}a } from "a";
+////
+////export { {| "itemName": "B", "kind": "alias", "parentName": "" |}b as B } from "a" 
+////
+////{| "itemName": "e", "kind": "alias", "parentName": "" |} export import e = require("a");
+////
+////export * from "a"; // no bindings here
+
+test.markers().forEach((marker) => {
+    if (marker.data) {
+        verify.getScriptLexicalStructureListContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
+    }
+});
+
+verify.getScriptLexicalStructureListCount(4);
diff --git a/tests/cases/fourslash/scriptLexicalStructureImports.ts b/tests/cases/fourslash/scriptLexicalStructureImports.ts
@@ -0,0 +1,25 @@
+/// <reference path="fourslash.ts"/>
+
+
+////import {| "itemName": "d1", "kind": "alias", "parentName": "" |}d1 from "a";
+////
+////import { {| "itemName": "a", "kind": "alias", "parentName": "" |}a } from "a";
+////
+////import { {| "itemName": "B", "kind": "alias", "parentName": "" |}b as B } from "a" 
+////
+////import {| "itemName": "d2", "kind": "alias", "parentName": "" |}d2,
+////            { {| "itemName": "c", "kind": "alias", "parentName": "" |}c,
+////            {| "itemName": "D", "kind": "alias", "parentName": "" |} d as D } from "a" 
+////
+////{| "itemName": "e", "kind": "alias", "parentName": "" |}import e = require("a");
+////
+////import {| "itemName": "ns", "kind": "alias", "parentName": "" |}* as ns from "a";
+
+
+test.markers().forEach((marker) => {
+    if (marker.data) {
+        verify.getScriptLexicalStructureListContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
+    }
+});
+
+verify.getScriptLexicalStructureListCount(9);
