Make completion call pattern robust against trailing placeholder

fwcd · fwcd · commit 786aac485da4 · 2019-08-16T00:53:29.000+02:00
diff --git a/server/src/main/kotlin/org/javacs/kt/completion/Completions.kt b/server/src/main/kotlin/org/javacs/kt/completion/Completions.kt
@@ -79,7 +79,7 @@ private fun elementCompletionItems(file: CompiledFile, cursor: Int, config: Comp
     return visible.map { completionItem(it, surroundingElement, file, config) }
 }
 
-private val callPattern = Regex("(.*)\\((\\$\\d+)?\\)")
+private val callPattern = Regex("(.*)\\((?:\\$\\d+)?\\)(?:\\$0)?")
 private val methodSignature = Regex("""(?:fun|constructor) (?:<(?:[a-zA-Z\?\!\: ]+)(?:, [A-Z])*> )?([a-zA-Z]+\(.*\))""")
 
 private fun completionItem(d: DeclarationDescriptor, surroundingElement: KtElement, file: CompiledFile, config: CompletionConfiguration): CompletionItem {

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ private fun elementCompletionItems(file: CompiledFile, cursor: Int, config: Comp`
`79`	`79`	`return visible.map { completionItem(it, surroundingElement, file, config) }`
`80`	`80`	`}`
`81`	`81`
`82`		`-private val callPattern = Regex("(.*)\\((\\$\\d+)?\\)")`
	`82`	`+private val callPattern = Regex("(.*)\\((?:\\$\\d+)?\\)(?:\\$0)?")`
`83`	`83`	`private val methodSignature = Regex("""(?:fun\|constructor) (?:<(?:[a-zA-Z\?\!\: ]+)(?:, [A-Z])> )?([a-zA-Z]+\(.\))""")`
`84`	`84`
`85`	`85`	`private fun completionItem(d: DeclarationDescriptor, surroundingElement: KtElement, file: CompiledFile, config: CompletionConfiguration): CompletionItem {`