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

Add correct UL-method hasTypeParameters realization (#KT-30970 Fixed)

Browse Source 
Incorrect realization is breaking-down of IDEA generic-type inference algorithm that leads to SOE.
This commit is contained in:
Igor Yakovlev
2019-05-31 19:55:19 +03:00
parent f660faed97
commit f5190f195d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt
+2 -2
View File
@@ -137,6 +137,8 @@ open class KtLightMethodImpl protected constructor(
override fun getTypeParameters(): Array<PsiTypeParameter> = override fun getTypeParameters(): Array<PsiTypeParameter> =
typeParameterList?.typeParameters ?: PsiTypeParameter.EMPTY_ARRAY typeParameterList?.typeParameters ?: PsiTypeParameter.EMPTY_ARRAY
override fun hasTypeParameters() = typeParameters.isNotEmpty()
override fun getSignature(substitutor: PsiSubstitutor): MethodSignature { override fun getSignature(substitutor: PsiSubstitutor): MethodSignature {
if (substitutor == PsiSubstitutor.EMPTY) { if (substitutor == PsiSubstitutor.EMPTY) {
return clsDelegate.getSignature(substitutor) return clsDelegate.getSignature(substitutor)
@@ -218,8 +220,6 @@ open class KtLightMethodImpl protected constructor(
override fun getThrowsList() = clsDelegate.throwsList override fun getThrowsList() = clsDelegate.throwsList
override fun hasTypeParameters() = clsDelegate.hasTypeParameters()
override fun isVarArgs() = (dummyDelegate ?: clsDelegate).isVarArgs override fun isVarArgs() = (dummyDelegate ?: clsDelegate).isVarArgs
override fun isConstructor() = dummyDelegate?.isConstructor ?: clsDelegate.isConstructor override fun isConstructor() = dummyDelegate?.isConstructor ?: clsDelegate.isConstructor