Unify the findDeclaration implementations to make it easier to use

Author: themkat

server/src/main/kotlin/org/javacs/kt/CompiledFile.kt

@@ -176,10 +176,15 @@ class CompiledFile(
     }
 
 
+    /**
+     * Find the declaration of the element at the cursor.
+     */
+    fun findDeclaration(cursor: Int): Pair<KtNamedDeclaration, Location>? = findDeclarationReference(cursor) ?: findDeclarationCursorSite(cursor)
+
     /**
      * Find the declaration of the element at the cursor. Only works if the element at the cursor is a reference.
      */
-    fun findDeclaration(cursor: Int): Pair<KtNamedDeclaration, Location>? {
+    private fun findDeclarationReference(cursor: Int): Pair<KtNamedDeclaration, Location>? {
         val (_, target) = referenceAtPoint(cursor) ?: return null
         val psi = target.findPsi()
 
@@ -198,7 +203,7 @@ class CompiledFile(
      * Find the declaration of the element at the cursor.
      * Works even in cases where the element at the cursor might not be a reference, so works for declaration sites.
      */
-    fun findDeclarationCursorSite(cursor: Int): Pair<KtNamedDeclaration, Location>? {
+    private fun findDeclarationCursorSite(cursor: Int): Pair<KtNamedDeclaration, Location>? {
         // current symbol might be a declaration. This function is used as a fallback when
         // findDeclaration fails
         val declaration = elementAtPoint(cursor)?.findParent<KtNamedDeclaration>()

server/src/main/kotlin/org/javacs/kt/highlight/DocumentHighlight.kt

@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.psi.KtNamedDeclaration
 
 fun documentHighlightsAt(file: CompiledFile, cursor: Int): List<DocumentHighlight> {
     val (declaration, declarationLocation) = file.findDeclaration(cursor)
-        ?: file.findDeclarationCursorSite(cursor)
         ?: return emptyList()
     val references = findReferencesToDeclarationInFile(declaration, file)
 

server/src/main/kotlin/org/javacs/kt/rename/Rename.kt

@@ -7,7 +7,7 @@ import org.javacs.kt.SourcePath
 import org.javacs.kt.references.findReferences
 
 fun renameSymbol(file: CompiledFile, cursor: Int, sp: SourcePath, newName: String): WorkspaceEdit? {
-    val (declaration, location) = file.findDeclaration(cursor) ?: file.findDeclarationCursorSite(cursor) ?: return null
+    val (declaration, location) = file.findDeclaration(cursor) ?: return null
     return declaration.let {
         val declarationEdit = Either.forLeft<TextDocumentEdit, ResourceOperation>(TextDocumentEdit(
             VersionedTextDocumentIdentifier().apply { uri = location.uri },