microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-12 11:08:26 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixed outlining spans for chained method calls. (#35860)

Browse Source
This commit is contained in:
Titian Cernicova-Dragomir
2020-01-03 01:44:22 +02:00
committed by Daniel Rosenwasser
parent 4942fd2b84
commit 82b0547281
2 changed files with 124 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/outliningElementsCollector.ts
View File

@@ -45,7 +45,14 @@ namespace ts.OutliningElementsCollector {
if (span) out.push(span);
depthRemaining--;
if (isIfStatement(n) && n.elseStatement && isIfStatement(n.elseStatement)) {
if (isCallExpression(n)) {
depthRemaining++;
visitNonImportNode(n.expression);
depthRemaining--;
n.arguments.forEach(visitNonImportNode);
n.typeArguments?.forEach(visitNonImportNode);
}
else if (isIfStatement(n) && n.elseStatement && isIfStatement(n.elseStatement)) {
// Consider an 'else if' to be on the same depth as the 'if'.
visitNonImportNode(n.expression);
visitNonImportNode(n.thenStatement);

116
tests/cases/fourslash/getOutliningSpansDepthChainedCalls.ts Normal file
View File

@@ -0,0 +1,116 @@
/// <reference path="fourslash.ts"/>
// Tests that each 'else if' does not count towards a higher nesting depth.
////declare var router: any;
////router
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
//// .get("/", async(ctx) =>[|{
//// ctx.body = "base";
//// }|])
//// .post("/a", async(ctx) =>[|{
//// //a
//// }|])
verify.outliningSpansInCurrentFile(test.ranges());