Workaround for extra ts folding range

Fixes #49904
microsoft · May 22, 2018 · 86adb52 · 86adb52
1 parent ab6290f
commit 86adb52
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -17,7 +17,7 @@
 			"request": "attach",
 			"name": "Attach to Extension Host",
 			"protocol": "inspector",
-			"port": 5870,
+			"port": 5871,
 			// "restart": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"

diff --git a/extensions/typescript-language-features/src/features/foldingProvider.ts b/extensions/typescript-language-features/src/features/foldingProvider.ts
@@ -34,13 +34,26 @@ export default class TypeScriptFoldingProvider implements vscode.FoldingRangePro
 			return;
 		}
 
-		return response.body.map(span => this.convertOutliningSpan(span, document));
+		return response.body
+			.map(span => this.convertOutliningSpan(span, document))
+			.filter(foldingRange => !!foldingRange) as vscode.FoldingRange[];
 	}
 
-	private convertOutliningSpan(span: Proto.OutliningSpan, document: vscode.TextDocument): vscode.FoldingRange {
+	private convertOutliningSpan(
+		span: Proto.OutliningSpan,
+		document: vscode.TextDocument
+	): vscode.FoldingRange | undefined {
 		const range = typeConverters.Range.fromTextSpan(span.textSpan);
 		const kind = TypeScriptFoldingProvider.getFoldingRangeKind(span);
 
+		// Workaround for #49904
+		if (span.kind === 'comment') {
+			const line = document.lineAt(range.start.line).text;
+			if (line.match(/\/\/\s*#endregion/gi)) {
+				return undefined;
+			}
+		}
+
 		const start = range.start.line;
 		// workaround for #47240
 		const end = (range.end.character > 0 && document.getText(new vscode.Range(range.end.translate(0, -1), range.end)) === '}')