Move findDeclaration into a more logical place and minor restructuring

Author: themkat

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

@@ -4,18 +4,21 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.javacs.kt.compiler.CompilationKind
 import org.javacs.kt.position.changedRegion
+import org.javacs.kt.position.location
 import org.javacs.kt.position.position
 import org.javacs.kt.util.findParent
 import org.javacs.kt.util.nullResult
 import org.javacs.kt.util.toPath
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.types.KotlinType
+import org.eclipse.lsp4j.Location
 import java.nio.file.Paths
 
 class CompiledFile(
@@ -171,6 +174,25 @@ class CompiledFile(
         return psi.findParent<KtElement>()
     }
 
+
+    /**
+     * 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>? {
+        val (_, target) = referenceAtPoint(cursor) ?: return null
+        val psi = target.findPsi()
+
+        return if (psi is KtNamedDeclaration) {
+            psi.nameIdentifier?.let {
+                location(it)?.let { location ->
+                    Pair(psi, location)
+                }
+            }
+        } else {
+            null
+        }
+    }
+
     /**
      * Find the lexical-scope surrounding `cursor`.
      * This may be out-of-date if the user is typing quickly.

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

@@ -6,14 +6,13 @@ import org.eclipse.lsp4j.Location
 import org.javacs.kt.CompiledFile
 import org.javacs.kt.position.range
 import org.javacs.kt.references.findReferencesToDeclarationInFile
-import org.javacs.kt.rename.findDeclaration
 import org.javacs.kt.util.findParent
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 
 fun documentHighlightsAt(file: CompiledFile, cursor: Int): List<DocumentHighlight> {
-    val (declaration, declarationLocation) = findDeclaration(file, cursor)
-        ?: findDeclarationCursorSite(file, cursor)
+    val (declaration, declarationLocation) = file.findDeclaration(cursor)
+        ?: file.findDeclarationCursorSite(cursor)
         ?: return emptyList()
     val references = findReferencesToDeclarationInFile(declaration, file)
 
@@ -24,20 +23,17 @@ fun documentHighlightsAt(file: CompiledFile, cursor: Int): List<DocumentHighligh
     } + references.map { DocumentHighlight(it, DocumentHighlightKind.Text) }
 }
 
-private fun findDeclarationCursorSite(
-        file: CompiledFile,
-        cursor: Int
-): Pair<KtNamedDeclaration, Location>? {
+private fun CompiledFile.findDeclarationCursorSite(cursor: Int): Pair<KtNamedDeclaration, Location>? {
     // current symbol might be a declaration. This function is used as a fallback when
     // findDeclaration fails
-    val declaration = file.elementAtPoint(cursor)?.findParent<KtNamedDeclaration>()
+    val declaration = elementAtPoint(cursor)?.findParent<KtNamedDeclaration>()
 
     return declaration?.let {
         // in this scenario we know that the declaration will be at the cursor site, so uri is not
         // important
         Pair(it,
              Location("",
-                      range(file.content, it.nameIdentifier?.textRange ?: return null)))
+                      range(content, it.nameIdentifier?.textRange ?: return null)))
     }
 }
 

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

@@ -4,13 +4,10 @@ import org.eclipse.lsp4j.*
 import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.javacs.kt.CompiledFile
 import org.javacs.kt.SourcePath
-import org.javacs.kt.position.location
 import org.javacs.kt.references.findReferences
-import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi
-import org.jetbrains.kotlin.psi.KtNamedDeclaration
 
 fun renameSymbol(file: CompiledFile, cursor: Int, sp: SourcePath, newName: String): WorkspaceEdit? {
-    val (declaration, location) = findDeclaration(file, 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 },
@@ -27,18 +24,3 @@ fun renameSymbol(file: CompiledFile, cursor: Int, sp: SourcePath, newName: Strin
         WorkspaceEdit(listOf(declarationEdit) + referenceEdits)
     }
 }
-
-fun findDeclaration(file: CompiledFile, cursor: Int): Pair<KtNamedDeclaration, Location>? {
-    val (_, target) = file.referenceAtPoint(cursor) ?: return null
-    val psi = target.findPsi()
-
-    return if (psi is KtNamedDeclaration) {
-        psi.nameIdentifier?.let {
-            location(it)?.let { location ->
-                Pair(psi, location)
-            }
-        }
-    } else {
-        null
-    }
-}