Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract adjustFoldingEnd

Browse Source
This commit is contained in:
Matt Bierner
2020-11-04 13:19:14 -08:00
parent 97db458fa4
commit 8141dcf29a
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/typescript-language-features/src/languageFeatures/folding.ts
+15 -5
View File
@@ -54,14 +54,24 @@ class TypeScriptFoldingProvider implements vscode.FoldingRangeProvider {
}
const start = range.start.line;
// workaround for #47240
const end = (range.end.character > 0 && ['}', ']', ')'].includes(document.getText(new vscode.Range(range.end.translate(0, -1), range.end))))
? Math.max(range.end.line - 1, range.start.line)
: range.end.line;
const end = this.adjustFoldingEnd(range, document);
return new vscode.FoldingRange(start, end, kind);
}
private static readonly foldEndPairCharacters = ['}', ']', ')'];
private adjustFoldingEnd(range: vscode.Range, document: vscode.TextDocument) {
// workaround for #47240
if (range.end.character > 0) {
const foldEndCharacter = document.getText(new vscode.Range(range.end.translate(0, -1), range.end));
if (TypeScriptFoldingProvider.foldEndPairCharacters.includes(foldEndCharacter)) {
return Math.max(range.end.line - 1, range.start.line);
}
}
return range.end.line;
}
private static getFoldingRangeKind(span: Proto.OutliningSpan): vscode.FoldingRangeKind | undefined {
switch (span.kind) {
case 'comment': return vscode.FoldingRangeKind.Comment;