MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

CreatePropertyAction: prevent from NPE when calling getText() on non-available action (useful in test reporting)

Browse Source
This commit is contained in:
Tagir Valeev
2018-07-10 14:13:42 +07:00
parent 4f222266b8
commit b892f42553
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/lang/java/actions/CreateGetterWithFieldAction.kt
+1 -1
View File
@@ -26,7 +26,7 @@ internal class CreateGetterWithFieldAction(target: PsiClass, request: CreateMeth
}
override fun getText(): String {
return message("create.read.only.property.from.usage.full.text", propertyInfo.first, getNameForClass(target, false))
return message("create.read.only.property.from.usage.full.text", getPropertyName(), getNameForClass(target, false))
}
override fun createRenderer(project: Project) = object : PropertyRenderer(project, target, request, propertyInfo) {
java/java-impl/src/com/intellij/lang/java/actions/CreatePropertyAction.kt
+1 -1
View File
@@ -41,7 +41,7 @@ internal class CreatePropertyAction(target: PsiClass, request: CreateMethodReque
return target.findMethodsByName(getAccessorName(propertyName, counterPart), false).isEmpty()
}
override fun getText(): String = message("create.property.from.usage.full.text", propertyInfo.first, getNameForClass(target, false))
override fun getText(): String = message("create.property.from.usage.full.text", getPropertyName(), getNameForClass(target, false))
override fun createRenderer(project: Project): PropertyRenderer = object : PropertyRenderer(project, target, request, propertyInfo) {
java/java-impl/src/com/intellij/lang/java/actions/CreatePropertyActionBase.kt
+2
View File
@@ -45,6 +45,8 @@ internal abstract class CreatePropertyActionBase(
protected val propertyInfo: Pair<String, PropertyKind> get() = requireNotNull(doGetPropertyInfo()).toNotNull()
internal fun getPropertyName() : String? = doGetPropertyInfo()?.first
override fun getRenderData() = JvmActionGroup.RenderData { propertyInfo.first }
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
java/java-impl/src/com/intellij/lang/java/actions/CreateSetterWithFieldAction.kt
+1 -1
View File
@@ -26,7 +26,7 @@ internal class CreateSetterWithFieldAction(target: PsiClass, request: CreateMeth
}
override fun getText(): String {
return message("create.write.only.property.from.usage.full.text", propertyInfo.first, getNameForClass(target, false))
return message("create.write.only.property.from.usage.full.text", getPropertyName(), getNameForClass(target, false))
}
override fun createRenderer(project: Project) = object : PropertyRenderer(project, target, request, propertyInfo) {