Fix negative activeSignature and activeParameter

jonas-w · jonas-w · commit 5f26451a79a8 · 2024-01-15T21:15:29.000+01:00
diff --git a/server/src/main/kotlin/org/javacs/kt/signaturehelp/SignatureHelp.kt b/server/src/main/kotlin/org/javacs/kt/signaturehelp/SignatureHelp.kt
@@ -23,7 +23,7 @@ import org.javacs.kt.LOG
 
 fun fetchSignatureHelpAt(file: CompiledFile, cursor: Int): SignatureHelp? {
     val (signatures, activeDeclaration, activeParameter) = getSignatureTriplet(file, cursor) ?: return nullResult("No call around ${file.describePosition(cursor)}")
-    return SignatureHelp(signatures, activeDeclaration, activeParameter)
+    return SignatureHelp(signatures, (if (activeDeclaration >= 0) activeDeclaration else null), (if (activeDeclaration >= 0) activeParameter else null))
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import org.javacs.kt.LOG`
`23`	`23`
`24`	`24`	`fun fetchSignatureHelpAt(file: CompiledFile, cursor: Int): SignatureHelp? {`
`25`	`25`	`val (signatures, activeDeclaration, activeParameter) = getSignatureTriplet(file, cursor) ?: return nullResult("No call around ${file.describePosition(cursor)}")`
`26`		`- return SignatureHelp(signatures, activeDeclaration, activeParameter)`
	`26`	`+ return SignatureHelp(signatures, (if (activeDeclaration >= 0) activeDeclaration else null), (if (activeDeclaration >= 0) activeParameter else null))`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`