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

Disable default search in comments and strings when renaming

Browse Source
This commit is contained in:
Vadim Brilyantov
2019-05-22 17:16:01 +03:00
committed by Igor Yakovlev
parent 145a4b24ca
commit 895b49c0b9
17 changed files with 90 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSettings.kt
+31
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.components.PersistentStateComponent
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.components.State
import com.intellij.openapi.components.Storage
import com.intellij.refactoring.JavaRefactoringSettings
import com.intellij.util.xmlb.XmlSerializerUtil
@State(name = "KotlinRefactoringSettings", storages = arrayOf(Storage("kotlinRefactoring.xml")))
@@ -27,6 +28,36 @@ class KotlinRefactoringSettings : PersistentStateComponent<KotlinRefactoringSett
@JvmField var MOVE_TO_UPPER_LEVEL_SEARCH_IN_COMMENTS = false
@JvmField var MOVE_TO_UPPER_LEVEL_SEARCH_FOR_TEXT = false
@JvmField var RENAME_SEARCH_IN_COMMENTS_FOR_PACKAGE = false
@JvmField var RENAME_SEARCH_IN_COMMENTS_FOR_CLASS = false
@JvmField var RENAME_SEARCH_IN_COMMENTS_FOR_METHOD = false
@JvmField var RENAME_SEARCH_IN_COMMENTS_FOR_FIELD = false
@JvmField var RENAME_SEARCH_IN_COMMENTS_FOR_VARIABLE = false
@JvmField var RENAME_SEARCH_FOR_TEXT_FOR_PACKAGE = false
@JvmField var RENAME_SEARCH_FOR_TEXT_FOR_CLASS = false
@JvmField var RENAME_SEARCH_FOR_TEXT_FOR_METHOD = false
@JvmField var RENAME_SEARCH_FOR_TEXT_FOR_FIELD = false
@JvmField var RENAME_SEARCH_FOR_TEXT_FOR_VARIABLE = false
@JvmField var MOVE_PREVIEW_USAGES = true
@JvmField var MOVE_SEARCH_IN_COMMENTS = true
@JvmField var MOVE_SEARCH_FOR_TEXT = true
@JvmField var EXTRACT_INTERFACE_JAVADOC: Int = 0
@JvmField var EXTRACT_SUPERCLASS_JAVADOC: Int = 0
@JvmField var PULL_UP_MEMBERS_JAVADOC: Int = 0
@JvmField var PUSH_DOWN_PREVIEW_USAGES: Boolean = false
@JvmField var INLINE_METHOD_THIS: Boolean = false
@JvmField var INLINE_LOCAL_THIS: Boolean = false
var renameInheritors = true
var renameParameterInHierarchy = true
var renameVariables = true
var renameTests = true
var renameOverloads = true
override fun getState() = this
override fun loadState(state: KotlinRefactoringSettings) = XmlSerializerUtil.copyBean(state, this)
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionDialog.kt
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.inline
import com.intellij.openapi.help.HelpManager
import com.intellij.openapi.project.Project
import com.intellij.refactoring.HelpID
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
import org.jetbrains.kotlin.psi.KtConstructor
@@ -37,7 +37,7 @@ class KotlinInlineFunctionDialog(
init()
}
override fun isInlineThis() = JavaRefactoringSettings.getInstance().INLINE_METHOD_THIS
override fun isInlineThis() = KotlinRefactoringSettings.instance.INLINE_METHOD_THIS
public override fun doAction() {
invokeRefactoring(
@@ -46,7 +46,7 @@ class KotlinInlineFunctionDialog(
deleteAfter = !isInlineThisOnly && !isKeepTheDeclaration && !allowInlineThisOnly)
)
val settings = JavaRefactoringSettings.getInstance()
val settings = KotlinRefactoringSettings.instance
if (myRbInlineThisOnly.isEnabled && myRbInlineAll.isEnabled) {
settings.INLINE_METHOD_THIS = isInlineThisOnly
}
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt
+3 -3
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.idea.refactoring.inline
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
import org.jetbrains.kotlin.psi.KtBinaryExpression
@@ -57,7 +57,7 @@ class KotlinInlineValDialog(
fun shouldBeShown() = !simpleLocal || EditorSettingsExternalizable.getInstance().isShowInlineLocalDialog
override fun isInlineThis() = JavaRefactoringSettings.getInstance().INLINE_LOCAL_THIS
override fun isInlineThis() = KotlinRefactoringSettings.instance.INLINE_LOCAL_THIS
public override fun doAction() {
invokeRefactoring(
@@ -69,7 +69,7 @@ class KotlinInlineValDialog(
)
)
val settings = JavaRefactoringSettings.getInstance()
val settings = KotlinRefactoringSettings.instance
if (myRbInlineThisOnly.isEnabled && myRbInlineAll.isEnabled) {
settings.INLINE_LOCAL_THIS = isInlineThisOnly
}
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractInterfaceDialog.kt
+3 -3
View File
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod
import com.intellij.refactoring.HelpID
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.classMembers.MemberInfoModel
import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ExtractSuperInfo
@@ -120,10 +120,10 @@ class KotlinExtractInterfaceDialog(
override fun getTopLabelText() = RefactoringBundle.message("extract.interface.from")!!
override fun getDocCommentPolicySetting() = JavaRefactoringSettings.getInstance().EXTRACT_INTERFACE_JAVADOC
override fun getDocCommentPolicySetting() = KotlinRefactoringSettings.instance.EXTRACT_INTERFACE_JAVADOC
override fun setDocCommentPolicySetting(policy: Int) {
JavaRefactoringSettings.getInstance().EXTRACT_INTERFACE_JAVADOC = policy
KotlinRefactoringSettings.instance.EXTRACT_INTERFACE_JAVADOC = policy
}
override fun getExtractedSuperNameNotSpecifiedMessage() = RefactoringBundle.message("no.interface.name.specified")!!
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperclassDialog.kt
+3 -3
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ui
import com.intellij.psi.PsiElement
import com.intellij.refactoring.HelpID
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ExtractSuperInfo
import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.KotlinExtractSuperclassHandler
@@ -75,10 +75,10 @@ class KotlinExtractSuperclassDialog(
override fun getTopLabelText() = RefactoringBundle.message("extract.superclass.from")!!
override fun getDocCommentPolicySetting() = JavaRefactoringSettings.getInstance().EXTRACT_SUPERCLASS_JAVADOC
override fun getDocCommentPolicySetting() = KotlinRefactoringSettings.instance.EXTRACT_SUPERCLASS_JAVADOC
override fun setDocCommentPolicySetting(policy: Int) {
JavaRefactoringSettings.getInstance().EXTRACT_SUPERCLASS_JAVADOC = policy
KotlinRefactoringSettings.instance.EXTRACT_SUPERCLASS_JAVADOC = policy
}
override fun getExtractedSuperNameNotSpecifiedMessage() = RefactoringBundle.message("no.superclass.name.specified")!!
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt
+3 -3
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.actionSystem.LangDataKeys
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.*
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.move.MoveCallback
import com.intellij.refactoring.move.MoveHandlerDelegate
@@ -128,8 +128,8 @@ class MoveKotlinDeclarationsHandler : MoveHandlerDelegate() {
val targetDirectory = if (targetContainer != null) {
MoveClassesOrPackagesImpl.getInitialTargetDirectory(targetContainer, elements)
} else null
val searchInComments = JavaRefactoringSettings.getInstance()!!.MOVE_SEARCH_IN_COMMENTS
val searchInText = JavaRefactoringSettings.getInstance()!!.MOVE_SEARCH_FOR_TEXT
val searchInComments = KotlinRefactoringSettings.instance!!.MOVE_SEARCH_IN_COMMENTS
val searchInText = KotlinRefactoringSettings.instance!!.MOVE_SEARCH_FOR_TEXT
val targetFile = targetContainer as? KtFile
val moveToPackage = targetContainer !is KtFile
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+2 -1
View File
@@ -46,6 +46,7 @@ import org.jetbrains.kotlin.idea.KotlinFileType;
import org.jetbrains.kotlin.idea.core.PackageUtilsKt;
import org.jetbrains.kotlin.idea.core.util.PhysicalFileSystemUtilsKt;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt;
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo;
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionPanel;
@@ -399,7 +400,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
}
private void saveRefactoringSettings() {
JavaRefactoringSettings refactoringSettings = JavaRefactoringSettings.getInstance();
KotlinRefactoringSettings refactoringSettings = KotlinRefactoringSettings.getInstance();
refactoringSettings.MOVE_SEARCH_IN_COMMENTS = isSearchInComments();
refactoringSettings.MOVE_SEARCH_FOR_TEXT = isSearchInNonJavaFiles();
refactoringSettings.MOVE_PREVIEW_USAGES = isPreviewUsages();
idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.ui.DialogWrapper
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiNamedElement
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.classMembers.MemberInfoChange
import com.intellij.refactoring.classMembers.MemberInfoModel
import com.intellij.refactoring.memberPullUp.PullUpProcessor
@@ -166,7 +166,7 @@ class KotlinPullUpDialog(
sourceClass.toLightClass() ?: error("can't build lightClass for $sourceClass"),
targetPsiClass,
memberInfos.mapNotNull { it.toJavaMemberInfo() }.toTypedArray(),
DocCommentPolicy<PsiComment>(JavaRefactoringSettings.getInstance().PULL_UP_MEMBERS_JAVADOC))
DocCommentPolicy<PsiComment>(KotlinRefactoringSettings.instance.PULL_UP_MEMBERS_JAVADOC))
}
}
}
idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownDialog.kt
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.pushDown
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiNamedElement
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.classMembers.*
import com.intellij.refactoring.ui.RefactoringDialog
@@ -106,7 +106,7 @@ class KotlinPushDownDialog(
override fun doAction() {
if (!isOKActionEnabled) return
JavaRefactoringSettings.getInstance().PUSH_DOWN_PREVIEW_USAGES = isPreviewUsages
KotlinRefactoringSettings.instance.PUSH_DOWN_PREVIEW_USAGES = isPreviewUsages
invokeRefactoring(KotlinPushDownProcessor(project, sourceClass, selectedMemberInfos))
}
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt
+5 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiNamedElement
import com.intellij.psi.search.searches.ClassInheritorsSearch
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.rename.naming.AutomaticRenamer
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
@@ -49,8 +49,10 @@ class AutomaticInheritorRenamer(klass: KtClass, newName: String): AutomaticRenam
class AutomaticInheritorRenamerFactory : AutomaticRenamerFactory {
override fun isApplicable(element: PsiElement) = element is KtClass
override fun getOptionName() = RefactoringBundle.message("rename.inheritors")
override fun isEnabled() = JavaRefactoringSettings.getInstance().isToRenameInheritors
override fun setEnabled(enabled: Boolean) = JavaRefactoringSettings.getInstance().setRenameInheritors(enabled)
override fun isEnabled() = KotlinRefactoringSettings.instance.renameInheritors
override fun setEnabled(enabled: Boolean) {
KotlinRefactoringSettings.instance.renameInheritors = enabled
}
override fun createRenamer(element: PsiElement, newName: String, usages: Collection<UsageInfo>): AutomaticRenamer {
return AutomaticInheritorRenamer(element as KtClass, newName)
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt
+3 -3
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename
import com.intellij.openapi.util.Key
import com.intellij.psi.PsiElement
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.rename.naming.AutomaticRenamer
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
@@ -88,10 +88,10 @@ class AutomaticOverloadsRenamerFactory : AutomaticRenamerFactory {
override fun getOptionName() = RefactoringBundle.message("rename.overloads")
override fun isEnabled() = JavaRefactoringSettings.getInstance().isRenameOverloads
override fun isEnabled() = KotlinRefactoringSettings.instance.renameOverloads
override fun setEnabled(enabled: Boolean) {
JavaRefactoringSettings.getInstance().isRenameOverloads = enabled
KotlinRefactoringSettings.instance.renameOverloads = enabled
}
override fun createRenamer(element: PsiElement, newName: String, usages: Collection<UsageInfo>)
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiNamedElement
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.rename.naming.AutomaticRenamer
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
@@ -69,10 +69,10 @@ class AutomaticParameterRenamerFactory : AutomaticRenamerFactory {
override fun getOptionName() = RefactoringBundle.message("rename.parameters.hierarchy")!!
override fun isEnabled() = JavaRefactoringSettings.getInstance().isRenameParameterInHierarchy
override fun isEnabled() = KotlinRefactoringSettings.instance.renameParameterInHierarchy
override fun setEnabled(enabled: Boolean) {
JavaRefactoringSettings.getInstance().isRenameParameterInHierarchy = enabled
KotlinRefactoringSettings.instance.renameParameterInHierarchy = enabled
}
override fun createRenamer(element: PsiElement, newName: String, usages: Collection<UsageInfo>): AutomaticRenamer {
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt
+9 -5
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiNamedElement
import com.intellij.psi.PsiVariable
import com.intellij.psi.codeStyle.JavaCodeStyleManager
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.rename.naming.AutomaticRenamer
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
@@ -145,8 +145,10 @@ open class AutomaticVariableRenamerFactory: AutomaticRenamerFactory {
override fun createRenamer(element: PsiElement, newName: String, usages: Collection<UsageInfo>) =
AutomaticVariableRenamer(element as PsiNamedElement, newName, usages)
override fun isEnabled() = JavaRefactoringSettings.getInstance().isToRenameVariables
override fun setEnabled(enabled: Boolean) = JavaRefactoringSettings.getInstance().setRenameVariables(enabled)
override fun isEnabled() = KotlinRefactoringSettings.instance.renameVariables
override fun setEnabled(enabled: Boolean) {
KotlinRefactoringSettings.instance.renameVariables = enabled
}
override fun getOptionName() = RefactoringBundle.message("rename.variables")
}
@@ -164,8 +166,10 @@ class AutomaticVariableInJavaRenamerFactory: AutomaticRenamerFactory {
// Using java variable renamer for java usages
com.intellij.refactoring.rename.naming.AutomaticVariableRenamer((element as KtClass).toLightClass()!!, newName, usages)
override fun isEnabled() = JavaRefactoringSettings.getInstance().isToRenameVariables
override fun setEnabled(enabled: Boolean) = JavaRefactoringSettings.getInstance().setRenameVariables(enabled)
override fun isEnabled() = KotlinRefactoringSettings.instance.renameVariables
override fun setEnabled(enabled: Boolean) {
KotlinRefactoringSettings.instance.renameVariables = enabled
}
override fun getOptionName() = null
}
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt
+5 -5
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.listeners.RefactoringElementListener
import com.intellij.usageView.UsageInfo
import org.jetbrains.kotlin.asJava.classes.KtLightClass
@@ -40,16 +40,16 @@ class RenameKotlinClassifierProcessor : RenameKotlinPsiProcessor() {
return element is KtClassOrObject || element is KtLightClass || element is KtConstructor<*> || element is KtTypeAlias
}
override fun isToSearchInComments(psiElement: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_CLASS
override fun isToSearchInComments(psiElement: PsiElement) = KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_CLASS
override fun setToSearchInComments(element: PsiElement, enabled: Boolean) {
JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_CLASS = enabled
KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_CLASS = enabled
}
override fun isToSearchForTextOccurrences(element: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_CLASS
override fun isToSearchForTextOccurrences(element: PsiElement) = KotlinRefactoringSettings.instance.RENAME_SEARCH_FOR_TEXT_FOR_CLASS
override fun setToSearchForTextOccurrences(element: PsiElement, enabled: Boolean) {
JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_CLASS = enabled
KotlinRefactoringSettings.instance.RENAME_SEARCH_FOR_TEXT_FOR_CLASS = enabled
}
override fun substituteElementToRename(element: PsiElement, editor: Editor?) = getClassOrObject(element)
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
+5 -5
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Pass
import com.intellij.psi.*
import com.intellij.psi.search.SearchScope
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.listeners.RefactoringElementListener
import com.intellij.refactoring.rename.RenameDialog
import com.intellij.refactoring.rename.RenameJavaMethodProcessor
@@ -61,16 +61,16 @@ class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() {
return element is KtNamedFunction || (element is KtLightMethod && element.kotlinOrigin is KtNamedFunction) || element is FunctionWithSupersWrapper
}
override fun isToSearchInComments(psiElement: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_METHOD
override fun isToSearchInComments(psiElement: PsiElement) = KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_METHOD
override fun setToSearchInComments(element: PsiElement, enabled: Boolean) {
JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_METHOD = enabled
KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_METHOD = enabled
}
override fun isToSearchForTextOccurrences(element: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_METHOD
override fun isToSearchForTextOccurrences(element: PsiElement) = KotlinRefactoringSettings.instance.RENAME_SEARCH_FOR_TEXT_FOR_METHOD
override fun setToSearchForTextOccurrences(element: PsiElement, enabled: Boolean) {
JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_METHOD = enabled
KotlinRefactoringSettings.instance.RENAME_SEARCH_FOR_TEXT_FOR_METHOD = enabled
}
private fun getJvmName(element: PsiElement): String? {
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt
+3 -3
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.idea.refactoring.rename
import com.intellij.psi.PsiElement
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.listeners.RefactoringElementListener
import com.intellij.usageView.UsageInfo
import org.jetbrains.kotlin.asJava.namedUnwrappedElement
@@ -29,10 +29,10 @@ import org.jetbrains.kotlin.utils.SmartList
class RenameKotlinParameterProcessor : RenameKotlinPsiProcessor() {
override fun canProcessElement(element: PsiElement) = element is KtParameter && element.ownerFunction is KtFunction
override fun isToSearchInComments(psiElement: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_VARIABLE
override fun isToSearchInComments(psiElement: PsiElement) = KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_VARIABLE
override fun setToSearchInComments(element: PsiElement, enabled: Boolean) {
JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_VARIABLE = enabled
KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_VARIABLE = enabled
}
override fun findCollisions(
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
+5 -5
View File
@@ -25,7 +25,7 @@ import com.intellij.psi.*
import com.intellij.psi.search.SearchScope
import com.intellij.psi.search.searches.DirectClassInheritorsSearch
import com.intellij.psi.search.searches.OverridingMethodsSearch
import com.intellij.refactoring.JavaRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
import com.intellij.refactoring.listeners.RefactoringElementListener
import com.intellij.refactoring.rename.RenameProcessor
import com.intellij.refactoring.util.MoveRenameUsageInfo
@@ -78,16 +78,16 @@ class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() {
return namedUnwrappedElement is KtProperty || (namedUnwrappedElement is KtParameter && namedUnwrappedElement.hasValOrVar())
}
override fun isToSearchInComments(psiElement: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_FIELD
override fun isToSearchInComments(psiElement: PsiElement) = KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_FIELD
override fun setToSearchInComments(element: PsiElement, enabled: Boolean) {
JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_FIELD = enabled
KotlinRefactoringSettings.instance.RENAME_SEARCH_IN_COMMENTS_FOR_FIELD = enabled
}
override fun isToSearchForTextOccurrences(element: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_FIELD
override fun isToSearchForTextOccurrences(element: PsiElement) = KotlinRefactoringSettings.instance.RENAME_SEARCH_FOR_TEXT_FOR_FIELD
override fun setToSearchForTextOccurrences(element: PsiElement, enabled: Boolean) {
JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_FIELD = enabled
KotlinRefactoringSettings.instance.RENAME_SEARCH_FOR_TEXT_FOR_FIELD = enabled
}
private fun getJvmNames(element: PsiElement): Pair<String?, String?> {