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

New J2K: Extract fqName resolution

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-05-31 19:47:32 +03:00
committed by Ilya Kirillov
parent 00c52df519
commit ad0721aae7
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
+1 -20
View File
@@ -5,18 +5,11 @@
package org.jetbrains.kotlin.j2k.conversions
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.j2k.ConversionContext
import org.jetbrains.kotlin.j2k.tree.JKJavaAssignmentExpression
import org.jetbrains.kotlin.j2k.tree.JKTreeElement
import org.jetbrains.kotlin.j2k.tree.impl.*
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.analysisContext
import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
import org.jetbrains.kotlin.resolve.ImportPath
class AssignmentAsExpressionToAlsoConversion(val context: ConversionContext) : RecursiveApplicableConversionBase() {
@@ -26,7 +19,7 @@ class AssignmentAsExpressionToAlsoConversion(val context: ConversionContext) : R
// TODO: Check if inside variable initializer
//if (element.parent)
val alsoElement = resolveFqName(ClassId.fromString("kotlin/also"), element) ?: return recurse(element)
val alsoElement = resolveFqName(ClassId.fromString("kotlin/also"), element, context) ?: return recurse(element)
val alsoSymbol = context.symbolProvider.provideSymbol(alsoElement) as? JKMethodSymbol ?: return recurse(element)
element.invalidate()
@@ -38,16 +31,4 @@ class AssignmentAsExpressionToAlsoConversion(val context: ConversionContext) : R
))
)
}
private fun resolveFqName(classId: ClassId, contextElement: JKTreeElement): PsiElement? {
val element = context.backAnnotator(contextElement) ?: return null
val importDirective = KtPsiFactory(element).createImportDirective(ImportPath(classId.asSingleFqName(), false))
importDirective.containingKtFile.analysisContext = element.containingFile
return importDirective.getChildOfType<KtDotQualifiedExpression>()
?.selectorExpression
?.let {
it.references.mapNotNull { it.resolve() }.first()
}
}
}
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
-10
View File
@@ -35,16 +35,6 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
} else applyRecursive(element, this::applyToElement)
}
private fun resolveFqName(classId: ClassId, element: PsiElement): PsiElement? {
val importDirective = KtPsiFactory(element).createImportDirective(ImportPath(classId.asSingleFqName(), false))
importDirective.containingKtFile.analysisContext = element.containingFile
return importDirective.getChildOfType<KtDotQualifiedExpression>()
?.selectorExpression
?.let {
it.references.mapNotNull { it.resolve() }.firstOrNull()
}
}
private fun classTypeByFqName(
contextElement: PsiElement?,
fqName: ClassId,
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/resolveUtil.kt
+32
View File
@@ -0,0 +1,32 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. 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.j2k.conversions
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.j2k.ConversionContext
import org.jetbrains.kotlin.j2k.tree.JKTreeElement
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.analysisContext
import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
import org.jetbrains.kotlin.resolve.ImportPath
internal fun resolveFqName(classId: ClassId, contextElement: JKTreeElement, context: ConversionContext): PsiElement? {
val element = context.backAnnotator(contextElement) ?: return null
return resolveFqName(classId, element)
}
internal fun resolveFqName(classId: ClassId, element: PsiElement): PsiElement? {
val importDirective = KtPsiFactory(element).createImportDirective(ImportPath(classId.asSingleFqName(), false))
importDirective.containingKtFile.analysisContext = element.containingFile
return importDirective.getChildOfType<KtDotQualifiedExpression>()
?.selectorExpression
?.let {
it.references.mapNotNull { it.resolve() }.firstOrNull()
}
}