From 10f59673d6b8f6a17d8f0ef620a97a64dfad153e Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Mon, 18 Sep 2017 14:45:03 +0200 Subject: [PATCH] [jvm-lang] rename CreateFieldActionBase.request to myRequest --- .../intellij/lang/java/actions/CreateEnumConstantAction.kt | 4 ++-- .../src/com/intellij/lang/java/actions/CreateFieldAction.kt | 4 ++-- .../com/intellij/lang/java/actions/CreateFieldActionBase.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/lang/java/actions/CreateEnumConstantAction.kt b/java/java-impl/src/com/intellij/lang/java/actions/CreateEnumConstantAction.kt index 4b992418ecc9..84bc94046361 100644 --- a/java/java-impl/src/com/intellij/lang/java/actions/CreateEnumConstantAction.kt +++ b/java/java-impl/src/com/intellij/lang/java/actions/CreateEnumConstantAction.kt @@ -36,8 +36,8 @@ class CreateEnumConstantAction(targetClass: PsiClass, request: CreateFieldReques private val myData: EnumConstantData? get() { val targetClass = myTargetClass.element - if (targetClass == null || !request.isValid) return null - return extractRenderData(targetClass, request) + if (targetClass == null || !myRequest.isValid) return null + return extractRenderData(targetClass, myRequest) } override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean { diff --git a/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldAction.kt b/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldAction.kt index 43802821604f..8ed6f690605a 100644 --- a/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldAction.kt +++ b/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldAction.kt @@ -43,8 +43,8 @@ internal class CreateFieldAction( private val myData: FieldData? get() { val targetClass = myTargetClass.element - if (targetClass == null || !request.isValid) return null - return extractRenderData(targetClass, request, constantField) + if (targetClass == null || !myRequest.isValid) return null + return extractRenderData(targetClass, myRequest, constantField) } override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean { diff --git a/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldActionBase.kt b/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldActionBase.kt index c7fb806393c4..f2268bf08dd6 100644 --- a/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldActionBase.kt +++ b/java/java-impl/src/com/intellij/lang/java/actions/CreateFieldActionBase.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.util.createSmartPointer -abstract class CreateFieldActionBase(targetClass: PsiClass, protected val request: CreateFieldRequest) : BaseIntentionAction() { +abstract class CreateFieldActionBase(targetClass: PsiClass, protected val myRequest: CreateFieldRequest) : BaseIntentionAction() { protected val myTargetClass = targetClass.createSmartPointer()