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

KotlinElementActionsFactory: fix for getting names from dead pointers (EA-116215)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-05-08 12:44:12 +03:00
parent 37a8844050
commit 732e25a3f0
3 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt
+13 -10
View File
@@ -288,9 +288,10 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
modifierList = modifierBuilder.modifierList, modifierList = modifierBuilder.modifierList,
withBody = true withBody = true
) )
val targetClassName = targetClass.name
val addConstructorAction = object : CreateCallableFromUsageFix<KtElement>(targetKtClass, listOf(constructorInfo)) { val addConstructorAction = object : CreateCallableFromUsageFix<KtElement>(targetKtClass, listOf(constructorInfo)) {
override fun getFamilyName() = "Add method" override fun getFamilyName() = "Add method"
override fun getText() = "Add ${if (needPrimary) "primary" else "secondary"} constructor to '${targetClass.name}'" override fun getText() = "Add ${if (needPrimary) "primary" else "secondary"} constructor to '$targetClassName'"
} }
val changePrimaryConstructorAction = run { val changePrimaryConstructorAction = run {
@@ -382,19 +383,21 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
val parameterInfos = parameters.map { (suggestedNames, expectedTypes) -> val parameterInfos = parameters.map { (suggestedNames, expectedTypes) ->
ParameterInfo(expectedTypes.toKotlinTypeInfo(resolutionFacade), suggestedNames.names.toList()) ParameterInfo(expectedTypes.toKotlinTypeInfo(resolutionFacade), suggestedNames.names.toList())
} }
val methodName = request.methodName
val functionInfo = FunctionInfo( val functionInfo = FunctionInfo(
request.methodName, methodName,
TypeInfo.Empty, TypeInfo.Empty,
returnTypeInfo, returnTypeInfo,
listOf(targetContainer), listOf(targetContainer),
parameterInfos, parameterInfos,
isForCompanion = JvmModifier.STATIC in request.modifiers, isForCompanion = JvmModifier.STATIC in request.modifiers,
modifierList = modifierBuilder.modifierList, modifierList = modifierBuilder.modifierList,
preferEmptyBody = true preferEmptyBody = true
) )
val targetClassName = targetClass.name
val action = object : CreateCallableFromUsageFix<KtElement>(targetContainer, listOf(functionInfo)) { val action = object : CreateCallableFromUsageFix<KtElement>(targetContainer, listOf(functionInfo)) {
override fun getFamilyName() = "Add method" override fun getFamilyName() = "Add method"
override fun getText() = "Add method '${request.methodName}' to '${targetClass.name}'" override fun getText() = "Add method '$methodName' to '$targetClassName'"
} }
return listOf(action) return listOf(action)
} }
idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.173
+13 -10
View File
@@ -279,9 +279,10 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
modifierList = modifierBuilder.modifierList, modifierList = modifierBuilder.modifierList,
withBody = true withBody = true
) )
val targetClassName = targetClass.name
val addConstructorAction = object : CreateCallableFromUsageFix<KtElement>(targetKtClass, listOf(constructorInfo)) { val addConstructorAction = object : CreateCallableFromUsageFix<KtElement>(targetKtClass, listOf(constructorInfo)) {
override fun getFamilyName() = "Add method" override fun getFamilyName() = "Add method"
override fun getText() = "Add ${if (needPrimary) "primary" else "secondary"} constructor to '${targetClass.name}'" override fun getText() = "Add ${if (needPrimary) "primary" else "secondary"} constructor to '$targetClassName'"
} }
val changePrimaryConstructorAction = run { val changePrimaryConstructorAction = run {
@@ -372,19 +373,21 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
val parameterInfos = request.parameters.map { (suggestedNames, expectedTypes) -> val parameterInfos = request.parameters.map { (suggestedNames, expectedTypes) ->
ParameterInfo(expectedTypes.toKotlinTypeInfo(resolutionFacade), suggestedNames.names.toList()) ParameterInfo(expectedTypes.toKotlinTypeInfo(resolutionFacade), suggestedNames.names.toList())
} }
val methodName = request.methodName
val functionInfo = FunctionInfo( val functionInfo = FunctionInfo(
request.methodName, methodName,
TypeInfo.Empty, TypeInfo.Empty,
returnTypeInfo, returnTypeInfo,
listOf(targetContainer), listOf(targetContainer),
parameterInfos, parameterInfos,
isForCompanion = JvmModifier.STATIC in request.modifiers, isForCompanion = JvmModifier.STATIC in request.modifiers,
modifierList = modifierBuilder.modifierList, modifierList = modifierBuilder.modifierList,
preferEmptyBody = true preferEmptyBody = true
) )
val targetClassName = targetClass.name
val action = object : CreateCallableFromUsageFix<KtElement>(targetContainer, listOf(functionInfo)) { val action = object : CreateCallableFromUsageFix<KtElement>(targetContainer, listOf(functionInfo)) {
override fun getFamilyName() = "Add method" override fun getFamilyName() = "Add method"
override fun getText() = "Add method '${request.methodName}' to '${targetClass.name}'" override fun getText() = "Add method '$methodName' to '$targetClassName'"
} }
return listOf(action) return listOf(action)
} }
idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182
+13 -10
View File
@@ -295,9 +295,10 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
modifierList = modifierBuilder.modifierList, modifierList = modifierBuilder.modifierList,
withBody = true withBody = true
) )
val targetClassName = targetClass.name
val addConstructorAction = object : CreateCallableFromUsageFix<KtElement>(targetKtClass, listOf(constructorInfo)) { val addConstructorAction = object : CreateCallableFromUsageFix<KtElement>(targetKtClass, listOf(constructorInfo)) {
override fun getFamilyName() = "Add method" override fun getFamilyName() = "Add method"
override fun getText() = "Add ${if (needPrimary) "primary" else "secondary"} constructor to '${targetClass.name}'" override fun getText() = "Add ${if (needPrimary) "primary" else "secondary"} constructor to '$targetClassName'"
} }
val changePrimaryConstructorAction = run { val changePrimaryConstructorAction = run {
@@ -394,19 +395,21 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
val parameterInfos = parameters.map { (suggestedNames, expectedTypes) -> val parameterInfos = parameters.map { (suggestedNames, expectedTypes) ->
ParameterInfo(expectedTypes.toKotlinTypeInfo(resolutionFacade), suggestedNames.names.toList()) ParameterInfo(expectedTypes.toKotlinTypeInfo(resolutionFacade), suggestedNames.names.toList())
} }
val methodName = request.methodName
val functionInfo = FunctionInfo( val functionInfo = FunctionInfo(
request.methodName, methodName,
TypeInfo.Empty, TypeInfo.Empty,
returnTypeInfo, returnTypeInfo,
listOf(targetContainer), listOf(targetContainer),
parameterInfos, parameterInfos,
isForCompanion = JvmModifier.STATIC in request.modifiers, isForCompanion = JvmModifier.STATIC in request.modifiers,
modifierList = modifierBuilder.modifierList, modifierList = modifierBuilder.modifierList,
preferEmptyBody = true preferEmptyBody = true
) )
val targetClassName = targetClass.name
val action = object : CreateCallableFromUsageFix<KtElement>(targetContainer, listOf(functionInfo)) { val action = object : CreateCallableFromUsageFix<KtElement>(targetContainer, listOf(functionInfo)) {
override fun getFamilyName() = "Add method" override fun getFamilyName() = "Add method"
override fun getText() = "Add method '${request.methodName}' to '${targetClass.name}'" override fun getText() = "Add method '$methodName' to '$targetClassName'"
} }
return listOf(action) return listOf(action)
} }