Revert adding named import binding list outlining spans

mhegazy · mhegazy · commit 12ed49bada77 · 2018-05-05T12:04:12.000-07:00
diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
@@ -20,28 +20,12 @@ namespace ts.OutliningElementsCollector {
             if (current === n) break;
             const firstImport = statements[current];
             while (current < n && isAnyImportSyntax(statements[current])) {
-                visitImportNode(statements[current] as AnyImportSyntax, sourceFile, cancellationToken, out);
+                addOutliningForLeadingCommentsForNode(statements[current], sourceFile, cancellationToken, out);
                 current++;
             }
             const lastImport = current < n ? statements[current - 1] : statements[n - 1];
             if (lastImport !== firstImport) {
-                out.push(createOutliningSpanFromBounds(findChildOfKind(firstImport, SyntaxKind.ImportKeyword, sourceFile)!.getStart(sourceFile), lastImport.getEnd(), OutliningSpanKind.Import));
-            }
-        }
-
-        function visitImportNode(node: AnyImportSyntax, sourceFile: SourceFile, cancellationToken: CancellationToken, out: Push<OutliningSpan>) {
-            // Add outlining spans for comments if they exist
-            addOutliningForLeadingCommentsForNode(node, sourceFile, cancellationToken, out);
-            // Add outlining spans for the import statement itself if applicable
-            if (isImportDeclaration(node) && node.importClause && node.importClause.namedBindings &&
-                node.importClause.namedBindings.kind !== SyntaxKind.NamespaceImport && node.importClause.namedBindings.elements.length) {
-                const openToken = findChildOfKind(node.importClause.namedBindings, SyntaxKind.OpenBraceToken, sourceFile);
-                const closeToken = findChildOfKind(node.importClause.namedBindings, SyntaxKind.CloseBraceToken, sourceFile);
-                if (openToken && closeToken) {
-                    out.push(createOutliningSpan(
-                        createTextSpanFromBounds(openToken.getStart(sourceFile), closeToken.getEnd()),
-                        OutliningSpanKind.Import, createTextSpanFromNode(node, sourceFile)));
-                }
+                out.push(createOutliningSpanFromBounds(findChildOfKind(firstImport, SyntaxKind.ImportKeyword, sourceFile)!.getStart(sourceFile), lastImport.getEnd(), OutliningSpanKind.Imports));
             }
         }
 
diff --git a/tests/cases/fourslash/getOutliningSpansForImports.ts b/tests/cases/fourslash/getOutliningSpansForImports.ts
@@ -4,7 +4,7 @@
 ////[|import * as ns from "mod";
 ////
 ////import d from "mod";
-////import [|{ a, b, c }|] from "mod";
+////import { a, b, c } from "mod";
 ////
 ////import r = require("mod");|]
 ////
@@ -14,7 +14,7 @@
 ////// another set of imports
 ////[|import * as ns from "mod";
 ////import d from "mod";
-////import [|{ a, b, c }|] from "mod";
+////import { a, b, c } from "mod";
 ////import r = require("mod");|]
 
 verify.outliningSpansInCurrentFile(test.ranges(), "import");
diff --git a/tests/cases/fourslash/getOutliningSpansForImportsWithNamedBindings.ts b/tests/cases/fourslash/getOutliningSpansForImportsWithNamedBindings.ts
