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

Probably fixed EA-69004

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-03 16:48:50 +03:00
parent f05789e224
commit 200c6446be
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
+3 -1
View File
@@ -64,7 +64,8 @@ public object SuperClassNotInitialized : JetIntentionActionsFactory() {
fixes.add(AddParenthesisFix(delegator, putCaretIntoParenthesis = constructors.singleOrNull()?.getValueParameters()?.isNotEmpty() ?: true)) fixes.add(AddParenthesisFix(delegator, putCaretIntoParenthesis = constructors.singleOrNull()?.getValueParameters()?.isNotEmpty() ?: true))
if (classOrObjectDeclaration is JetClass) { if (classOrObjectDeclaration is JetClass) {
val superType = classDescriptor.getTypeConstructor().getSupertypes().first { it.getConstructor().getDeclarationDescriptor() == superClass } val superType = classDescriptor.getTypeConstructor().getSupertypes().firstOrNull { it.getConstructor().getDeclarationDescriptor() == superClass }
if (superType != null) {
val typeArgsMap = superClass.getTypeConstructor().getParameters().zip(superType.getArguments()).toMap() val typeArgsMap = superClass.getTypeConstructor().getParameters().zip(superType.getArguments()).toMap()
val substitutor = TypeUtils.makeSubstitutorForTypeParametersMap(typeArgsMap) val substitutor = TypeUtils.makeSubstitutorForTypeParametersMap(typeArgsMap)
@@ -95,6 +96,7 @@ public object SuperClassNotInitialized : JetIntentionActionsFactory() {
} }
} }
} }
}
return fixes return fixes
} }