Skip to content

Commit e876e24

Browse files
committed
Renamed signature help method to resolve a name conflict
1 parent d1a0b7f commit e876e24

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/kotlin/org/javacs/kt/KotlinTextDocumentService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.javacs.kt.diagnostic.convertDiagnostic
1010
import org.javacs.kt.hover.hoverAt
1111
import org.javacs.kt.position.offset
1212
import org.javacs.kt.references.findReferences
13-
import org.javacs.kt.signaturehelp.signatureHelpAt
13+
import org.javacs.kt.signaturehelp.fetchSignatureHelpAt
1414
import org.javacs.kt.symbols.documentSymbols
1515
import org.javacs.kt.util.noResult
1616
import org.javacs.kt.util.computeAsync
@@ -132,7 +132,7 @@ class KotlinTextDocumentService(private val sf: SourceFiles, private val sp: Sou
132132
LOG.info("Signature help at ${describePosition(position)}")
133133

134134
val (file, cursor) = recover(position, false)
135-
signatureHelpAt(file, cursor) ?: noResult("No function call around ${describePosition(position)}", null)
135+
fetchSignatureHelpAt(file, cursor) ?: noResult("No function call around ${describePosition(position)}", null)
136136
}
137137
}
138138

src/main/kotlin/org/javacs/kt/signatureHelp/signatureHelp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
1818
import org.jetbrains.kotlin.psi.KtNameReferenceExpression
1919
import org.jetbrains.kotlin.psi.psiUtil.startOffset
2020

21-
fun signatureHelpAt(file: CompiledFile, cursor: Int): SignatureHelp? {
21+
fun fetchSignatureHelpAt(file: CompiledFile, cursor: Int): SignatureHelp? {
2222
val call = file.parseAtPoint(cursor)?.findParent<KtCallExpression>() ?: return nullResult("No call around ${file.describePosition(cursor)}")
2323
val candidates = candidates(call, file)
2424
val activeDeclaration = activeDeclaration(call, candidates)

src/main/kotlin/org/javacs/kt/signaturehelp/signatureHelp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
1818
import org.jetbrains.kotlin.psi.KtNameReferenceExpression
1919
import org.jetbrains.kotlin.psi.psiUtil.startOffset
2020

21-
fun signatureHelpAt(file: CompiledFile, cursor: Int): SignatureHelp? {
21+
fun fetchSignatureHelpAt(file: CompiledFile, cursor: Int): SignatureHelp? {
2222
val call = file.parseAtPoint(cursor)?.findParent<KtCallExpression>() ?: return nullResult("No call around ${file.describePosition(cursor)}")
2323
val candidates = candidates(call, file)
2424
val activeDeclaration = activeDeclaration(call, candidates)

0 commit comments

Comments
 (0)