Skip to content

fix(33286): Code folding fail for arrow function when param list has no parentheses #38631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/services/outliningElementsCollector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,7 @@ namespace ts.OutliningElementsCollector {
}

function functionSpan(node: FunctionLike, body: Block, sourceFile: SourceFile): OutliningSpan | undefined {
const openToken = isNodeArrayMultiLine(node.parameters, sourceFile)
? findChildOfKind(node, SyntaxKind.OpenParenToken, sourceFile)
: findChildOfKind(body, SyntaxKind.OpenBraceToken, sourceFile);
const openToken = tryGetFunctionOpenToken(node, body, sourceFile);
const closeToken = findChildOfKind(body, SyntaxKind.CloseBraceToken, sourceFile);
return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== SyntaxKind.ArrowFunction);
}
Expand All @@ -291,4 +289,14 @@ namespace ts.OutliningElementsCollector {
function createOutliningSpan(textSpan: TextSpan, kind: OutliningSpanKind, hintSpan: TextSpan = textSpan, autoCollapse = false, bannerText = "..."): OutliningSpan {
return { textSpan, kind, hintSpan, bannerText, autoCollapse };
}

function tryGetFunctionOpenToken(node: FunctionLike, body: Block, sourceFile: SourceFile): Node | undefined {
if (isNodeArrayMultiLine(node.parameters, sourceFile)) {
const openParenToken = findChildOfKind(node, SyntaxKind.OpenParenToken, sourceFile);
if (openParenToken) {
return openParenToken;
}
}
return findChildOfKind(body, SyntaxKind.OpenBraceToken, sourceFile);
}
}
84 changes: 77 additions & 7 deletions tests/cases/fourslash/outliningSpansForFunction.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,84 @@
/// <reference path="fourslash.ts"/>

////function f(x: number, y: number)[| {
//// return x + y;
////[|(
//// a: number,
//// b: number
////) => {
//// return a + b;
////}|]
/////
////(a: number, b: number) => [|{
//// return a + b;
////}|]
////
////const f1 = function[| (
//// a: number
//// b: number
////) {
//// return a + b;
////}|]
////
////const f2 = function (a: number, b: number)[| {
//// return a + b;
////}|]
////
////function g[|(
//// x: number,
//// y: number,
////): number {
//// return x + y;
////function f3[| (
//// a: number
//// b: number
////) {
//// return a + b;
////}|]
////
////function f4(a: number, b: number)[| {
//// return a + b;
////}|]
////
////class Foo[| {
//// constructor[|(
//// a: number,
//// b: number
//// ) {
//// this.a = a;
//// this.b = b;
//// }|]
////
//// m1[|(
//// a: number,
//// b: number
//// ) {
//// return a + b;
//// }|]
////
//// m1(a: number, b: number)[| {
//// return a + b;
//// }|]
////}|]
////
////declare function foo(props: any): void;
////foo(
//// a =>[| {
////
//// }|]
////)
////
////foo(
//// (a) =>[| {
////
//// }|]
////)
////
////foo(
//// (a, b, c) =>[| {
////
//// }|]
////)
////
////foo([|
//// (a,
//// b,
//// c) => {
////
//// }|]
////)

verify.outliningSpansInCurrentFile(test.ranges());