azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delegate getContaingFile() for UAST declarations to Kotlin origin

Browse Source 
This is required to be able to report inspection problems on such
elements.
This commit is contained in:
Dmitry Jemerov
2017-04-12 18:58:27 +02:00
parent 2a9de93a82
commit dd4a5944f1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt
+3 -4
View File
@@ -16,10 +16,7 @@
package org.jetbrains.uast.kotlin package org.jetbrains.uast.kotlin
import com.intellij.psi.PsiAnonymousClass import com.intellij.psi.*
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod
import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.asJava.toLightMethods
@@ -43,6 +40,8 @@ class KotlinUClass private constructor(
return super.getOriginalElement() return super.getOriginalElement()
} }
override fun getContainingFile(): PsiFile? = ktClass?.containingFile ?: psi.containingFile
override val annotations: List<UAnnotation> override val annotations: List<UAnnotation>
get() = ktClass?.annotationEntries?.map { KotlinUAnnotation(it, this) } ?: emptyList() get() = ktClass?.annotationEntries?.map { KotlinUAnnotation(it, this) } ?: emptyList()
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
+3 -4
View File
@@ -16,10 +16,7 @@
package org.jetbrains.uast.kotlin.declarations package org.jetbrains.uast.kotlin.declarations
import com.intellij.psi.PsiCodeBlock import com.intellij.psi.*
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiNameIdentifierOwner
import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.asJava.elements.KtLightElement
import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.asJava.elements.isGetter import org.jetbrains.kotlin.asJava.elements.isGetter
@@ -44,6 +41,8 @@ open class KotlinUMethod(
private val kotlinOrigin = (psi.originalElement as KtLightElement<*, *>).kotlinOrigin private val kotlinOrigin = (psi.originalElement as KtLightElement<*, *>).kotlinOrigin
override fun getContainingFile(): PsiFile? = kotlinOrigin?.containingFile ?: psi.containingFile
override val annotations by lz { override val annotations by lz {
(kotlinOrigin as? KtDeclaration)?.annotationEntries?.map { KotlinUAnnotation(it, this) } ?: emptyList() (kotlinOrigin as? KtDeclaration)?.annotationEntries?.map { KotlinUAnnotation(it, this) } ?: emptyList()
} }
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
+2
View File
@@ -58,6 +58,8 @@ class KotlinUVariable(
override val annotations by lz { psi.annotations.map { JavaUAnnotation(it, this) } } override val annotations by lz { psi.annotations.map { JavaUAnnotation(it, this) } }
override val typeReference by lz { getLanguagePlugin().convertOpt<UTypeReferenceExpression>(psi.typeElement, this) } override val typeReference by lz { getLanguagePlugin().convertOpt<UTypeReferenceExpression>(psi.typeElement, this) }
override fun getContainingFile(): PsiFile? = (psi as? KtLightElement<*, *>)?.kotlinOrigin?.containingFile ?: psi.containingFile
override fun getInitializer(): PsiExpression? { override fun getInitializer(): PsiExpression? {
return super<AbstractKotlinUVariable>.getInitializer() return super<AbstractKotlinUVariable>.getInitializer()
} }