From 9aef83c000525a1dd02dfc552aacdf915e84c65e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 10 Apr 2018 14:41:49 -0700 Subject: [PATCH] Make sure js/ts blocks folds show ending bracket Fixes #47240 --- .../src/features/foldingProvider.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/typescript-language-features/src/features/foldingProvider.ts b/extensions/typescript-language-features/src/features/foldingProvider.ts index 6c11adb069b..b5ad3d23199 100644 --- a/extensions/typescript-language-features/src/features/foldingProvider.ts +++ b/extensions/typescript-language-features/src/features/foldingProvider.ts @@ -36,6 +36,10 @@ export default class TypeScriptFoldingProvider implements vscode.FoldingProvider return new vscode.FoldingRangeList(response.body.map(span => { const range = typeConverters.Range.fromTextSpan(span.textSpan); + // workaround for #47240 + if (range.end.character > 0 && document.getText(new vscode.Range(range.end.translate(0, -1), range.end)) === '}') { + return new vscode.FoldingRange(range.start.line, Math.max(range.end.line - 1, range.start.line)); + } return new vscode.FoldingRange(range.start.line, range.end.line); })); } -- GitLab