FIR IDE: add reference info on reference resolve
This commit is contained in:
+2
-19
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
|
|||||||
import org.jetbrains.kotlin.idea.caches.project.LibrarySourceInfo
|
import org.jetbrains.kotlin.idea.caches.project.LibrarySourceInfo
|
||||||
import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
|
import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
|
||||||
import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
|
import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
|
||||||
|
import org.jetbrains.kotlin.idea.util.getElementTextInContext
|
||||||
import org.jetbrains.kotlin.psi.KtElement
|
import org.jetbrains.kotlin.psi.KtElement
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
import org.jetbrains.kotlin.psi.KtTypeReference
|
import org.jetbrains.kotlin.psi.KtTypeReference
|
||||||
@@ -166,28 +167,10 @@ class DuplicatedFirSourceElementsException(
|
|||||||
| ${newFir.render().trim()}
|
| ${newFir.render().trim()}
|
||||||
|
|
|
|
||||||
|PSI element is $psi with text in context:
|
|PSI element is $psi with text in context:
|
||||||
|${getElementInContext(psi)}""".trimMargin()
|
|${psi.getElementTextInContext()}""".trimMargin()
|
||||||
|
|
||||||
private fun getElementInContext(neededElement: KtElement): String {
|
|
||||||
val context = neededElement.containingDeclarationForPseudocode ?: neededElement.containingKtFile
|
|
||||||
val builder = StringBuilder()
|
|
||||||
context.accept(object : PsiElementVisitor() {
|
|
||||||
override fun visitElement(element: PsiElement) {
|
|
||||||
if (element === neededElement) builder.append("<$ELEMENT_TAG>")
|
|
||||||
if (element is LeafPsiElement) {
|
|
||||||
builder.append(element.text)
|
|
||||||
} else {
|
|
||||||
element.acceptChildren(this)
|
|
||||||
}
|
|
||||||
if (element === neededElement) builder.append("</$ELEMENT_TAG>")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return builder.toString().trimIndent().trim()
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val ELEMENT_TAG = "ELEMENT"
|
|
||||||
|
|
||||||
// The are some cases which are still generates FIR elements with duplicated source elements
|
// The are some cases which are still generates FIR elements with duplicated source elements
|
||||||
// Then such case is met, it's better to be fixed
|
// Then such case is met, it's better to be fixed
|
||||||
// but exception reporting can be easily disabled by setting this to false
|
// but exception reporting can be easily disabled by setting this to false
|
||||||
|
|||||||
+13
-3
@@ -6,14 +6,14 @@
|
|||||||
package org.jetbrains.kotlin.idea.references
|
package org.jetbrains.kotlin.idea.references
|
||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
|
import com.intellij.openapi.diagnostic.ControlFlowException
|
||||||
import com.intellij.openapi.progress.ProcessCanceledException
|
import com.intellij.openapi.progress.ProcessCanceledException
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.psi.PsiElementResolveResult
|
import com.intellij.psi.PsiElementResolveResult
|
||||||
import com.intellij.psi.ResolveResult
|
import com.intellij.psi.ResolveResult
|
||||||
import com.intellij.psi.impl.source.resolve.ResolveCache
|
import com.intellij.psi.impl.source.resolve.ResolveCache
|
||||||
import org.jetbrains.kotlin.idea.frontend.api.analyze
|
import org.jetbrains.kotlin.idea.frontend.api.analyze
|
||||||
import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
|
import org.jetbrains.kotlin.idea.util.getElementTextInContext
|
||||||
import org.jetbrains.kotlin.idea.frontend.api.getAnalysisSessionFor
|
|
||||||
|
|
||||||
object KtFirReferenceResolver : ResolveCache.PolyVariantResolver<KtReference> {
|
object KtFirReferenceResolver : ResolveCache.PolyVariantResolver<KtReference> {
|
||||||
class KotlinResolveResult(element: PsiElement) : PsiElementResolveResult(element)
|
class KotlinResolveResult(element: PsiElement) : PsiElementResolveResult(element)
|
||||||
@@ -24,7 +24,17 @@ object KtFirReferenceResolver : ResolveCache.PolyVariantResolver<KtReference> {
|
|||||||
if (ApplicationManager.getApplication().isDispatchThread) {
|
if (ApplicationManager.getApplication().isDispatchThread) {
|
||||||
throw ProcessCanceledException()
|
throw ProcessCanceledException()
|
||||||
}
|
}
|
||||||
val resolveToPsiElements = analyze(ref.expression) { ref.getResolvedToPsi(this) }
|
val resolveToPsiElements = try {
|
||||||
|
analyze(ref.expression) { ref.getResolvedToPsi(this) }
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
if (e is ControlFlowException) throw e
|
||||||
|
throw KtReferenceResolveException(ref, e)
|
||||||
|
}
|
||||||
return resolveToPsiElements.map { KotlinResolveResult(it) }.toTypedArray()
|
return resolveToPsiElements.map { KotlinResolveResult(it) }.toTypedArray()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class KtReferenceResolveException(
|
||||||
|
reference: KtReference,
|
||||||
|
cause: Throwable
|
||||||
|
) : RuntimeException("Reference is:\n${reference.element.getElementTextInContext()}", cause)
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.idea.util
|
||||||
|
|
||||||
|
import com.intellij.psi.PsiElement
|
||||||
|
import com.intellij.psi.PsiElementVisitor
|
||||||
|
import com.intellij.psi.impl.source.tree.LeafPsiElement
|
||||||
|
import com.intellij.psi.util.parentOfType
|
||||||
|
import org.jetbrains.kotlin.cfg.pseudocode.containingDeclarationForPseudocode
|
||||||
|
import org.jetbrains.kotlin.psi.KtElement
|
||||||
|
import org.jetbrains.kotlin.psi.KtImportDirective
|
||||||
|
import org.jetbrains.kotlin.psi.KtPackageDirective
|
||||||
|
|
||||||
|
fun KtElement.getElementTextInContext(): String {
|
||||||
|
val context = parentOfType<KtImportDirective>()
|
||||||
|
?: parentOfType<KtPackageDirective>()
|
||||||
|
?: containingDeclarationForPseudocode
|
||||||
|
?: containingKtFile
|
||||||
|
val builder = StringBuilder()
|
||||||
|
context.accept(object : PsiElementVisitor() {
|
||||||
|
override fun visitElement(element: PsiElement) {
|
||||||
|
if (element === this@getElementTextInContext) builder.append("<$ELEMENT_TAG>")
|
||||||
|
if (element is LeafPsiElement) {
|
||||||
|
builder.append(element.text)
|
||||||
|
} else {
|
||||||
|
element.acceptChildren(this)
|
||||||
|
}
|
||||||
|
if (element === this@getElementTextInContext) builder.append("</$ELEMENT_TAG>")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return builder.toString().trimIndent().trim()
|
||||||
|
}
|
||||||
|
private const val ELEMENT_TAG = "ELEMENT"
|
||||||
|
|
||||||
Reference in New Issue
Block a user