language-servers/texlab
1
0
Fork 0
mirror of https://github.com/latex-lsp/texlab.git synced 2025-12-23 09:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix deadlock in DocumentProvider

Browse source
This commit is contained in:
Eric Förster 2019-02-27 22:58:20 +01:00
parent 63907c5ec6
commit 0dc4b2b53c
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/kotlin/texlab/completion/latex/DocumentProvider.kt
View file

@ -1,7 +1,5 @@
package texlab.completion.latex
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.withLock
import org.eclipse.lsp4j.CompletionItem
import texlab.Document
import texlab.Workspace
@ -13,18 +11,16 @@ import java.nio.file.Paths
abstract class DocumentProvider<T>(private val workspace: Workspace,
private val documentClass: Class<T>,
private val includeExtension: Boolean) : LatexArgumentProvider() where T : Document {
private val includeExtension: Boolean)
: LatexArgumentProvider() where T : Document {
override val argumentIndex: Int = 0
override fun complete(request: CompletionRequest, command: LatexCommandSyntax)
: List<CompletionItem> = runBlocking {
workspace.withLock {
workspace.documents
.filterIsInstance(documentClass)
.filter { !request.relatedDocuments.contains(it) }
.map { relativize(request.uri, it.uri) }
.map { CompletionItemFactory.createFile(it) }
}
override fun complete(request: CompletionRequest, command: LatexCommandSyntax): List<CompletionItem> {
return workspace.documents
.filterIsInstance(documentClass)
.filter { !request.relatedDocuments.contains(it) }
.map { relativize(request.uri, it.uri) }
.map { CompletionItemFactory.createFile(it) }
}
private fun relativize(base: URI, relative: URI): String {