removed trigger() calls when refactoring is performed automatically or recursively
This commit is contained in:
-6
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.actionSystem.CommonDataKeys
|
import com.intellij.openapi.actionSystem.CommonDataKeys
|
||||||
import com.intellij.openapi.actionSystem.DataContext
|
import com.intellij.openapi.actionSystem.DataContext
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
@@ -34,7 +33,6 @@ import org.jetbrains.kotlin.psi.KtFile
|
|||||||
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
|
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.endOffset
|
import org.jetbrains.kotlin.psi.psiUtil.endOffset
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
|
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
abstract class AbstractReferenceSubstitutionRenameHandler(
|
abstract class AbstractReferenceSubstitutionRenameHandler(
|
||||||
private val delegateHandler: RenameHandler = MemberInplaceRenameHandler()
|
private val delegateHandler: RenameHandler = MemberInplaceRenameHandler()
|
||||||
@@ -65,9 +63,6 @@ abstract class AbstractReferenceSubstitutionRenameHandler(
|
|||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
||||||
val elementToRename = getElementToRename(dataContext) ?: return
|
val elementToRename = getElementToRename(dataContext) ?: return
|
||||||
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
|
|
||||||
val wrappingContext = DataContext { id ->
|
val wrappingContext = DataContext { id ->
|
||||||
if (CommonDataKeys.PSI_ELEMENT.`is`(id)) return@DataContext elementToRename
|
if (CommonDataKeys.PSI_ELEMENT.`is`(id)) return@DataContext elementToRename
|
||||||
dataContext.getData(id)
|
dataContext.getData(id)
|
||||||
@@ -82,6 +77,5 @@ abstract class AbstractReferenceSubstitutionRenameHandler(
|
|||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
||||||
// Can't be invoked outside of a text editor
|
// Can't be invoked outside of a text editor
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,20 +16,17 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.psi.PsiNamedElement
|
import com.intellij.psi.PsiNamedElement
|
||||||
import com.intellij.psi.search.searches.ClassInheritorsSearch
|
import com.intellij.psi.search.searches.ClassInheritorsSearch
|
||||||
import com.intellij.refactoring.JavaRefactoringSettings
|
import com.intellij.refactoring.JavaRefactoringSettings
|
||||||
import com.intellij.refactoring.RefactoringBundle
|
import com.intellij.refactoring.RefactoringBundle
|
||||||
import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo
|
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
||||||
import com.intellij.usageView.UsageInfo
|
import com.intellij.usageView.UsageInfo
|
||||||
import org.jetbrains.kotlin.asJava.toLightClass
|
import org.jetbrains.kotlin.asJava.toLightClass
|
||||||
import org.jetbrains.kotlin.asJava.unwrapped
|
import org.jetbrains.kotlin.asJava.unwrapped
|
||||||
import org.jetbrains.kotlin.psi.KtClass
|
import org.jetbrains.kotlin.psi.KtClass
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
class AutomaticInheritorRenamer(klass: KtClass, newName: String): AutomaticRenamer() {
|
class AutomaticInheritorRenamer(klass: KtClass, newName: String): AutomaticRenamer() {
|
||||||
init {
|
init {
|
||||||
@@ -47,23 +44,7 @@ class AutomaticInheritorRenamer(klass: KtClass, newName: String): AutomaticRenam
|
|||||||
|
|
||||||
override fun getDialogTitle() = RefactoringBundle.message("rename.inheritors.title")
|
override fun getDialogTitle() = RefactoringBundle.message("rename.inheritors.title")
|
||||||
override fun getDialogDescription() = RefactoringBundle.message("rename.inheritors.with.the.following.names.to")
|
override fun getDialogDescription() = RefactoringBundle.message("rename.inheritors.with.the.following.names.to")
|
||||||
override fun entityName() = RefactoringBundle.message("entity.name.inheritor")
|
override fun entityName() = RefactoringBundle.message("entity.name.inheritor")}
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?, allRenames: MutableMap<PsiElement, String>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class AutomaticInheritorRenamerFactory : AutomaticRenamerFactory {
|
class AutomaticInheritorRenamerFactory : AutomaticRenamerFactory {
|
||||||
override fun isApplicable(element: PsiElement) = element is KtClass
|
override fun isApplicable(element: PsiElement) = element is KtClass
|
||||||
|
|||||||
@@ -16,12 +16,10 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.refactoring.JavaRefactoringSettings
|
import com.intellij.refactoring.JavaRefactoringSettings
|
||||||
import com.intellij.refactoring.RefactoringBundle
|
import com.intellij.refactoring.RefactoringBundle
|
||||||
import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo
|
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
||||||
import com.intellij.usageView.UsageInfo
|
import com.intellij.usageView.UsageInfo
|
||||||
@@ -38,7 +36,6 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
|
|||||||
import org.jetbrains.kotlin.psi.UserDataProperty
|
import org.jetbrains.kotlin.psi.UserDataProperty
|
||||||
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
|
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
|
||||||
import org.jetbrains.kotlin.resolve.source.getPsi
|
import org.jetbrains.kotlin.resolve.source.getPsi
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
class AutomaticOverloadsRenamer(function: KtNamedFunction, newName: String) : AutomaticRenamer() {
|
class AutomaticOverloadsRenamer(function: KtNamedFunction, newName: String) : AutomaticRenamer() {
|
||||||
companion object {
|
companion object {
|
||||||
@@ -61,21 +58,6 @@ class AutomaticOverloadsRenamer(function: KtNamedFunction, newName: String) : Au
|
|||||||
override fun getDialogDescription() = "Rename overloads to:"
|
override fun getDialogDescription() = "Rename overloads to:"
|
||||||
override fun entityName() = "Overload"
|
override fun entityName() = "Overload"
|
||||||
override fun isSelectedByDefault(): Boolean = true
|
override fun isSelectedByDefault(): Boolean = true
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?, allRenames: MutableMap<PsiElement, String>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun KtNamedFunction.getOverloads(): Collection<FunctionDescriptor> {
|
private fun KtNamedFunction.getOverloads(): Collection<FunctionDescriptor> {
|
||||||
|
|||||||
@@ -16,13 +16,11 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.psi.PsiMethod
|
import com.intellij.psi.PsiMethod
|
||||||
import com.intellij.psi.PsiNamedElement
|
import com.intellij.psi.PsiNamedElement
|
||||||
import com.intellij.refactoring.JavaRefactoringSettings
|
import com.intellij.refactoring.JavaRefactoringSettings
|
||||||
import com.intellij.refactoring.RefactoringBundle
|
import com.intellij.refactoring.RefactoringBundle
|
||||||
import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo
|
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
||||||
import com.intellij.usageView.UsageInfo
|
import com.intellij.usageView.UsageInfo
|
||||||
@@ -34,7 +32,6 @@ import org.jetbrains.kotlin.psi.KtCallableDeclaration
|
|||||||
import org.jetbrains.kotlin.psi.KtNamedFunction
|
import org.jetbrains.kotlin.psi.KtNamedFunction
|
||||||
import org.jetbrains.kotlin.psi.KtParameter
|
import org.jetbrains.kotlin.psi.KtParameter
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded
|
import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
class AutomaticParameterRenamer(element: KtParameter, newName: String) : AutomaticRenamer() {
|
class AutomaticParameterRenamer(element: KtParameter, newName: String) : AutomaticRenamer() {
|
||||||
init {
|
init {
|
||||||
@@ -65,21 +62,6 @@ class AutomaticParameterRenamer(element: KtParameter, newName: String) : Automat
|
|||||||
override fun entityName() = "Parameter"
|
override fun entityName() = "Parameter"
|
||||||
|
|
||||||
override fun isSelectedByDefault() = true
|
override fun isSelectedByDefault() = true
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?, allRenames: MutableMap<PsiElement, String>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class AutomaticParameterRenamerFactory : AutomaticRenamerFactory {
|
class AutomaticParameterRenamerFactory : AutomaticRenamerFactory {
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
import com.intellij.openapi.diagnostic.Logger
|
||||||
import com.intellij.openapi.util.text.StringUtil
|
import com.intellij.openapi.util.text.StringUtil
|
||||||
import com.intellij.psi.PsiClass
|
import com.intellij.psi.PsiClass
|
||||||
@@ -27,7 +26,6 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager
|
|||||||
import com.intellij.psi.util.PsiTreeUtil
|
import com.intellij.psi.util.PsiTreeUtil
|
||||||
import com.intellij.refactoring.JavaRefactoringSettings
|
import com.intellij.refactoring.JavaRefactoringSettings
|
||||||
import com.intellij.refactoring.RefactoringBundle
|
import com.intellij.refactoring.RefactoringBundle
|
||||||
import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo
|
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
||||||
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
|
||||||
import com.intellij.usageView.UsageInfo
|
import com.intellij.usageView.UsageInfo
|
||||||
@@ -44,7 +42,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
|
|||||||
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
|
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
|
||||||
import org.jetbrains.kotlin.resolve.lazy.NoDescriptorForDeclarationException
|
import org.jetbrains.kotlin.resolve.lazy.NoDescriptorForDeclarationException
|
||||||
import org.jetbrains.kotlin.resolve.source.PsiSourceElement
|
import org.jetbrains.kotlin.resolve.source.PsiSourceElement
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
import org.jetbrains.kotlin.types.KotlinType
|
import org.jetbrains.kotlin.types.KotlinType
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
|
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
|
||||||
import java.util.*
|
import java.util.*
|
||||||
@@ -129,21 +126,6 @@ class AutomaticVariableRenamer(
|
|||||||
companion object {
|
companion object {
|
||||||
val LOG = Logger.getInstance(AutomaticVariableRenamer::class.java)
|
val LOG = Logger.getInstance(AutomaticVariableRenamer::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun findUsages(result: MutableList<UsageInfo>?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList<UnresolvableCollisionUsageInfo>?, allRenames: MutableMap<PsiElement, String>?) {
|
|
||||||
super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun KotlinType.isCollectionLikeOf(classPsiElement: PsiNamedElement): Boolean {
|
private fun KotlinType.isCollectionLikeOf(classPsiElement: PsiNamedElement): Boolean {
|
||||||
|
|||||||
-14
@@ -16,11 +16,8 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.lang.Language
|
import com.intellij.lang.Language
|
||||||
import com.intellij.openapi.actionSystem.DataContext
|
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.psi.*
|
import com.intellij.psi.*
|
||||||
import com.intellij.refactoring.RefactoringActionHandler
|
import com.intellij.refactoring.RefactoringActionHandler
|
||||||
import com.intellij.refactoring.rename.inplace.MemberInplaceRenameHandler
|
import com.intellij.refactoring.rename.inplace.MemberInplaceRenameHandler
|
||||||
@@ -30,7 +27,6 @@ import org.jetbrains.kotlin.idea.core.unquote
|
|||||||
import org.jetbrains.kotlin.psi.KtNamedDeclaration
|
import org.jetbrains.kotlin.psi.KtNamedDeclaration
|
||||||
import org.jetbrains.kotlin.psi.KtObjectDeclaration
|
import org.jetbrains.kotlin.psi.KtObjectDeclaration
|
||||||
import org.jetbrains.kotlin.psi.KtPrimaryConstructor
|
import org.jetbrains.kotlin.psi.KtPrimaryConstructor
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
class KotlinMemberInplaceRenameHandler : MemberInplaceRenameHandler() {
|
class KotlinMemberInplaceRenameHandler : MemberInplaceRenameHandler() {
|
||||||
private class RenamerImpl(
|
private class RenamerImpl(
|
||||||
@@ -90,14 +86,4 @@ class KotlinMemberInplaceRenameHandler : MemberInplaceRenameHandler() {
|
|||||||
val currentElement = element?.substitute() as? KtNamedDeclaration ?: return false
|
val currentElement = element?.substitute() as? KtNamedDeclaration ?: return false
|
||||||
return currentElement.nameIdentifier != null && !KotlinVariableInplaceRenameHandler.isInplaceRenameAvailable(currentElement)
|
return currentElement.nameIdentifier != null && !KotlinVariableInplaceRenameHandler.isInplaceRenameAvailable(currentElement)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
|
||||||
super.invoke(project, elements, dataContext)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) {
|
|
||||||
super.invoke(project, editor, file, dataContext)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.actionSystem.DataContext
|
import com.intellij.openapi.actionSystem.DataContext
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.extensions.ExtensionPointName
|
import com.intellij.openapi.extensions.ExtensionPointName
|
||||||
@@ -25,7 +24,6 @@ import com.intellij.openapi.project.Project
|
|||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import com.intellij.refactoring.rename.RenameHandler
|
import com.intellij.refactoring.rename.RenameHandler
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
|
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
@@ -49,11 +47,9 @@ class KotlinRenameDispatcherHandler : RenameHandler {
|
|||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
||||||
getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext)
|
getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
||||||
getRenameHandler(dataContext)?.invoke(project, elements, dataContext)
|
getRenameHandler(dataContext)?.invoke(project, elements, dataContext)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-4
@@ -26,8 +26,6 @@ import com.intellij.psi.PsiFile
|
|||||||
import com.intellij.refactoring.rename.RenameHandler
|
import com.intellij.refactoring.rename.RenameHandler
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
|
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
class KotlinRenameDispatcherHandler : RenameHandler {
|
class KotlinRenameDispatcherHandler : RenameHandler {
|
||||||
companion object {
|
companion object {
|
||||||
@@ -49,11 +47,9 @@ class KotlinRenameDispatcherHandler : RenameHandler {
|
|||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) {
|
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) {
|
||||||
getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext)
|
getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
|
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
|
||||||
getRenameHandler(dataContext)?.invoke(project, elements, dataContext)
|
getRenameHandler(dataContext)?.invoke(project, elements, dataContext)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-14
@@ -5,17 +5,13 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.actionSystem.DataContext
|
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.psi.*
|
import com.intellij.psi.*
|
||||||
import com.intellij.refactoring.RefactoringActionHandler
|
import com.intellij.refactoring.RefactoringActionHandler
|
||||||
import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
|
import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
|
||||||
import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer
|
import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer
|
||||||
import org.jetbrains.kotlin.idea.core.unquote
|
import org.jetbrains.kotlin.idea.core.unquote
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
||||||
companion object {
|
companion object {
|
||||||
@@ -72,14 +68,4 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
|||||||
|
|
||||||
override public fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile) =
|
override public fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile) =
|
||||||
editor.settings.isVariableInplaceRenameEnabled && element != null && isInplaceRenameAvailable(element)
|
editor.settings.isVariableInplaceRenameEnabled && element != null && isInplaceRenameAvailable(element)
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
|
||||||
super.invoke(project, editor, file, dataContext)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
|
||||||
super.invoke(project, elements, dataContext)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
-14
@@ -5,17 +5,13 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.actionSystem.DataContext
|
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.psi.*
|
import com.intellij.psi.*
|
||||||
import com.intellij.refactoring.RefactoringActionHandler
|
import com.intellij.refactoring.RefactoringActionHandler
|
||||||
import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
|
import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
|
||||||
import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer
|
import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer
|
||||||
import org.jetbrains.kotlin.idea.core.unquote
|
import org.jetbrains.kotlin.idea.core.unquote
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
||||||
companion object {
|
companion object {
|
||||||
@@ -72,14 +68,4 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
|||||||
|
|
||||||
override public fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile) =
|
override public fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile) =
|
||||||
editor.settings.isVariableInplaceRenameEnabled && element != null && isInplaceRenameAvailable(element)
|
editor.settings.isVariableInplaceRenameEnabled && element != null && isInplaceRenameAvailable(element)
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
|
||||||
super.invoke(project, editor, file, dataContext)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
|
||||||
super.invoke(project, elements, dataContext)
|
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.actionSystem.CommonDataKeys
|
import com.intellij.openapi.actionSystem.CommonDataKeys
|
||||||
import com.intellij.openapi.actionSystem.DataContext
|
import com.intellij.openapi.actionSystem.DataContext
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
@@ -37,7 +36,6 @@ import org.jetbrains.kotlin.psi.psiUtil.plainContent
|
|||||||
import org.jetbrains.kotlin.resolve.BindingContext
|
import org.jetbrains.kotlin.resolve.BindingContext
|
||||||
import org.jetbrains.kotlin.resolve.DescriptorUtils
|
import org.jetbrains.kotlin.resolve.DescriptorUtils
|
||||||
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
|
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
class RenameJvmNameHandler : PsiElementRenameHandler() {
|
class RenameJvmNameHandler : PsiElementRenameHandler() {
|
||||||
private fun getStringTemplate(dataContext: DataContext): KtStringTemplateExpression? {
|
private fun getStringTemplate(dataContext: DataContext): KtStringTemplateExpression? {
|
||||||
@@ -77,11 +75,9 @@ class RenameJvmNameHandler : PsiElementRenameHandler() {
|
|||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext) {
|
override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext) {
|
||||||
super.invoke(project, editor, file, wrapDataContext(dataContext) ?: return)
|
super.invoke(project, editor, file, wrapDataContext(dataContext) ?: return)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
||||||
super.invoke(project, elements, wrapDataContext(dataContext) ?: return)
|
super.invoke(project, elements, wrapDataContext(dataContext) ?: return)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-3
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||||
|
|
||||||
import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger
|
|
||||||
import com.intellij.openapi.actionSystem.CommonDataKeys
|
import com.intellij.openapi.actionSystem.CommonDataKeys
|
||||||
import com.intellij.openapi.actionSystem.DataContext
|
import com.intellij.openapi.actionSystem.DataContext
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
@@ -27,7 +26,6 @@ import com.intellij.psi.util.PsiTreeUtil
|
|||||||
import com.intellij.refactoring.rename.RenameHandler
|
import com.intellij.refactoring.rename.RenameHandler
|
||||||
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
|
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger
|
|
||||||
|
|
||||||
|
|
||||||
class RenameOnSecondaryConstructorHandler : RenameHandler {
|
class RenameOnSecondaryConstructorHandler : RenameHandler {
|
||||||
@@ -46,7 +44,6 @@ class RenameOnSecondaryConstructorHandler : RenameHandler {
|
|||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) {
|
override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) {
|
||||||
CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to secondary constructors", "Rename", null)
|
CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to secondary constructors", "Rename", null)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
|
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
|
||||||
|
|||||||
Reference in New Issue
Block a user