microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-07 05:41:22 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Revert adding named import binding list outlining spans

Browse Source
This commit is contained in:
Mohamed Hegazy 2018-05-05 12:04:12 -07:00
parent 8072dae16b
commit 12ed49bada
3 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/outliningElementsCollector.ts
View File

@ -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));
}
}

4
tests/cases/fourslash/getOutliningSpansForImports.ts
View File

@ -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");

17
tests/cases/fourslash/getOutliningSpansForImportsWithNamedBindings.ts
View File

@ -1,17 +0,0 @@
/// <reference path="fourslash.ts"/>
////[|import [|{
//// a,
//// b as B,
//// c
////}|] from "mod";
////
////
////import { } from "mod";
////import * as ns from "mod";
////import d from "mod";|]
verify.outliningSpansInCurrentFile(test.ranges(), "import");