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

To avoid obtaining stub-based types with no underlying AST node, create class types from reference elements manually

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-12-08 18:43:53 +03:00
parent 502e99e918
commit 66f58c08b2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
+7 -4
View File
@@ -171,8 +171,8 @@ class Converter private constructor(
val annotations = convertAnnotations(psiClass) val annotations = convertAnnotations(psiClass)
var modifiers = convertModifiers(psiClass, false) var modifiers = convertModifiers(psiClass, false)
val typeParameters = convertTypeParameterList(psiClass.typeParameterList) val typeParameters = convertTypeParameterList(psiClass.typeParameterList)
val extendsTypes = convertToNotNullableTypes(psiClass.extendsListTypes) val extendsTypes = convertToNotNullableTypes(psiClass.extendsList)
val implementsTypes = convertToNotNullableTypes(psiClass.implementsListTypes) val implementsTypes = convertToNotNullableTypes(psiClass.implementsList)
val name = psiClass.declarationIdentifier() val name = psiClass.declarationIdentifier()
val converted = when { val converted = when {
@@ -703,8 +703,11 @@ class Converter private constructor(
fun convertTypeElement(element: PsiTypeElement?, nullability: Nullability): Type fun convertTypeElement(element: PsiTypeElement?, nullability: Nullability): Type
= (if (element == null) ErrorType() else typeConverter.convertType(element.type, nullability)).assignPrototype(element) = (if (element == null) ErrorType() else typeConverter.convertType(element.type, nullability)).assignPrototype(element)
private fun convertToNotNullableTypes(types: Array<out PsiType?>): List<Type> private fun convertToNotNullableTypes(refs: PsiReferenceList?): List<Type> {
= types.map { typeConverter.convertType(it, Nullability.NotNull) } if (refs == null) return emptyList()
val factory = JavaPsiFacade.getInstance(project).elementFactory
return refs.referenceElements.map { ref -> typeConverter.convertType(factory.createType(ref), Nullability.NotNull) }
}
fun convertParameter( fun convertParameter(
parameter: PsiParameter, parameter: PsiParameter,