Fix CreateTypeParameter quick fix tests

Partially reset 21429f0b94
This commit is contained in:
Ilya Kirillov
2019-09-29 20:40:27 +03:00
parent 04515eda3d
commit f70654d16b
2 changed files with 3 additions and 4 deletions
@@ -85,12 +85,12 @@ object CreateTypeParameterByUnresolvedRefActionFactory : KotlinIntentionActionFa
val name = ktUserType.referencedName ?: return emptyList()
return getPossibleTypeParameterContainers(ktUserType)
.asSequence()
.filter { it.typeParameters.all { it.name != name } }
.map {
.filter { declaration ->
declaration.isWritable && declaration.typeParameters.all { it.name != name }
}.map {
QuickFixWithDelegateFactory factory@{
val originalElement = originalElementPointer.element ?: return@factory null
val data = quickFixDataFactory()?.copy(declaration = it) ?: return@factory null
if (!data.declaration.isWritable) return@factory null
CreateTypeParameterFromUsageFix(originalElement, data, presentTypeParameterNames = true)
}
}
@@ -79,7 +79,6 @@ object CreateTypeParameterUnmatchedTypeArgumentActionFactory :
return QuickFixWithDelegateFactory factory@{
val originalElement = originalElementPointer.element ?: return@factory null
val data = quickFixDataFactory() ?: return@factory null
if (!data.declaration.isWritable) return@factory null
CreateTypeParameterFromUsageFix(originalElement, data, false)
}.let(::listOf)
}