archived/coc-tsserver
1
0
Fork 0
Code Issues Pull requests Activity

fix(folding): don't join folding range (#380)

Browse source
This commit is contained in:
kevinhwang91 2022-06-11 16:42:25 +08:00 committed by GitHub
parent 68e60a6924
commit ab3f48019d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/server/features/folding.ts
View file

@ -45,16 +45,22 @@ export default class TypeScriptFoldingProvider implements FoldingRangeProvider {
): FoldingRange | undefined { ): FoldingRange | undefined {
const range = typeConverters.Range.fromTextSpan(span.textSpan) const range = typeConverters.Range.fromTextSpan(span.textSpan)
const kind = TypeScriptFoldingProvider.getFoldingRangeKind(span) const kind = TypeScriptFoldingProvider.getFoldingRangeKind(span)
let { start, end } = range
// Workaround for #49904 // Workaround for #49904
if (span.kind === 'comment') { if (span.kind === 'comment') {
let doc = workspace.getDocument(document.uri) let doc = workspace.getDocument(document.uri)
const line = doc.getline(range.start.line) const line = doc.getline(start.line)
if (line.match(/\/\/\s*#endregion/gi)) { if (line.match(/\/\/\s*#endregion/gi)) {
return undefined return undefined
} }
} else if (span.kind === 'code') {
let doc = workspace.getDocument(document.uri)
if (end.line > start.line && /^\s*}/.test(doc.getline(end.line))) {
end.line -= 1
end.character = doc.getline(end.line).length
}
} }
let { start, end } = range
return FoldingRange.create(start.line, end.line, start.character, end.character, kind) return FoldingRange.create(start.line, end.line, start.character, end.character, kind)
} }