From 5672e0fb6e96c789d13feee1c64b001ee95581c4 Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Thu, 27 Dec 2018 15:25:00 +0300 Subject: [PATCH 1/3] Removed second override as findReferences(element: PsiElement) is called anyway. It duplicates trigger(). --- .../idea/refactoring/rename/RenameKotlinFileProcessor.kt | 6 ------ .../refactoring/rename/RenameKotlinFileProcessor.kt.173 | 6 ------ 2 files changed, 12 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt index aeb3d751ae6..b9202f6fc7c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt @@ -72,10 +72,4 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } - - override fun findReferences(element: PsiElement, searchInCommentsAndStrings: Boolean): MutableCollection { - return super.findReferences(element, searchInCommentsAndStrings).also { - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 index 4f7246abf72..9a6c4237aa3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 @@ -71,10 +71,4 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } - - override fun findReferences(element: PsiElement, searchInCommentsAndStrings: Boolean): MutableCollection { - return super.findReferences(element, searchInCommentsAndStrings).also { - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - } } From 4b5c5d77bc235d015a536f11be9eb1a96ac41deb Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Fri, 11 Jan 2019 14:38:15 +0300 Subject: [PATCH 2/3] removed trigger() calls when refactoring is performed automatically or recursively --- ...tractReferenceSubstitutionRenameHandler.kt | 6 ------ .../rename/AutomaticInheritorRenamer.kt | 21 +------------------ .../rename/AutomaticOverloadsRenamer.kt | 18 ---------------- .../rename/AutomaticParameterRenamer.kt | 18 ---------------- .../rename/AutomaticVariableRenamer.kt | 18 ---------------- .../KotlinMemberInplaceRenameHandler.kt | 14 ------------- .../rename/KotlinRenameDispatcherHandler.kt | 4 ---- .../KotlinRenameDispatcherHandler.kt.181 | 4 ---- .../KotlinVariableInplaceRenameHandler.kt | 14 ------------- .../KotlinVariableInplaceRenameHandler.kt.181 | 14 ------------- .../rename/RenameJvmNameHandler.kt | 4 ---- .../RenameOnSecondaryConstructorHandler.kt | 3 --- 12 files changed, 1 insertion(+), 137 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt index 7426be958ba..f10d11785be 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext 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.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger abstract class AbstractReferenceSubstitutionRenameHandler( private val delegateHandler: RenameHandler = MemberInplaceRenameHandler() @@ -65,9 +63,6 @@ abstract class AbstractReferenceSubstitutionRenameHandler( override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) { val elementToRename = getElementToRename(dataContext) ?: return - - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - val wrappingContext = DataContext { id -> if (CommonDataKeys.PSI_ELEMENT.`is`(id)) return@DataContext elementToRename dataContext.getData(id) @@ -82,6 +77,5 @@ abstract class AbstractReferenceSubstitutionRenameHandler( override fun invoke(project: Project, elements: Array, dataContext: DataContext) { // Can't be invoked outside of a text editor - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt index 1771369bd1e..b11d0065ec9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt @@ -16,20 +16,17 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.psi.PsiElement import com.intellij.psi.PsiNamedElement import com.intellij.psi.search.searches.ClassInheritorsSearch import com.intellij.refactoring.JavaRefactoringSettings import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo import com.intellij.refactoring.rename.naming.AutomaticRenamer import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.psi.KtClass -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class AutomaticInheritorRenamer(klass: KtClass, newName: String): AutomaticRenamer() { init { @@ -47,23 +44,7 @@ class AutomaticInheritorRenamer(klass: KtClass, newName: String): AutomaticRenam override fun getDialogTitle() = RefactoringBundle.message("rename.inheritors.title") override fun getDialogDescription() = RefactoringBundle.message("rename.inheritors.with.the.following.names.to") - override fun entityName() = RefactoringBundle.message("entity.name.inheritor") - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } -} + override fun entityName() = RefactoringBundle.message("entity.name.inheritor")} class AutomaticInheritorRenamerFactory : AutomaticRenamerFactory { override fun isApplicable(element: PsiElement) = element is KtClass diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt index f1937154f2a..8f07afe957a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt @@ -16,12 +16,10 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.util.Key import com.intellij.psi.PsiElement import com.intellij.refactoring.JavaRefactoringSettings import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo import com.intellij.refactoring.rename.naming.AutomaticRenamer import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory 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.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.source.getPsi -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class AutomaticOverloadsRenamer(function: KtNamedFunction, newName: String) : AutomaticRenamer() { companion object { @@ -61,21 +58,6 @@ class AutomaticOverloadsRenamer(function: KtNamedFunction, newName: String) : Au override fun getDialogDescription() = "Rename overloads to:" override fun entityName() = "Overload" override fun isSelectedByDefault(): Boolean = true - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } } private fun KtNamedFunction.getOverloads(): Collection { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt index b0d8b922296..23a0bee5419 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt @@ -16,13 +16,11 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiNamedElement import com.intellij.refactoring.JavaRefactoringSettings import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo import com.intellij.refactoring.rename.naming.AutomaticRenamer import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory 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.KtParameter import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class AutomaticParameterRenamer(element: KtParameter, newName: String) : AutomaticRenamer() { init { @@ -65,21 +62,6 @@ class AutomaticParameterRenamer(element: KtParameter, newName: String) : Automat override fun entityName() = "Parameter" override fun isSelectedByDefault() = true - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } } class AutomaticParameterRenamerFactory : AutomaticRenamerFactory { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt index d4e1dad5b72..f10a41ae330 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiClass @@ -27,7 +26,6 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager import com.intellij.psi.util.PsiTreeUtil import com.intellij.refactoring.JavaRefactoringSettings import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo import com.intellij.refactoring.rename.naming.AutomaticRenamer import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory 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.lazy.NoDescriptorForDeclarationException import org.jetbrains.kotlin.resolve.source.PsiSourceElement -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* @@ -129,21 +126,6 @@ class AutomaticVariableRenamer( companion object { val LOG = Logger.getInstance(AutomaticVariableRenamer::class.java) } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } - - override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { - super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } } private fun KotlinType.isCollectionLikeOf(classPsiElement: PsiNamedElement): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt index 497b8b20f9c..331b4dbd258 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt @@ -16,11 +16,8 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.lang.Language -import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor -import com.intellij.openapi.project.Project import com.intellij.psi.* import com.intellij.refactoring.RefactoringActionHandler 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.KtObjectDeclaration import org.jetbrains.kotlin.psi.KtPrimaryConstructor -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class KotlinMemberInplaceRenameHandler : MemberInplaceRenameHandler() { private class RenamerImpl( @@ -90,14 +86,4 @@ class KotlinMemberInplaceRenameHandler : MemberInplaceRenameHandler() { val currentElement = element?.substitute() as? KtNamedDeclaration ?: return false return currentElement.nameIdentifier != null && !KotlinVariableInplaceRenameHandler.isInplaceRenameAvailable(currentElement) } - - override fun invoke(project: Project, elements: Array, 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) - } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt index 0d6e76ef7ee..c13b27c8959 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt @@ -16,7 +16,6 @@ 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.extensions.ExtensionPointName @@ -25,7 +24,6 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.refactoring.rename.RenameHandler -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* @@ -49,11 +47,9 @@ class KotlinRenameDispatcherHandler : RenameHandler { override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 index f96c70c8068..7ef8e91c293 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 @@ -26,8 +26,6 @@ import com.intellij.psi.PsiFile import com.intellij.refactoring.rename.RenameHandler import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class KotlinRenameDispatcherHandler : RenameHandler { companion object { @@ -49,11 +47,9 @@ class KotlinRenameDispatcherHandler : RenameHandler { override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { getRenameHandler(dataContext)?.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt index 38131dc0f20..88da0855cc0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt @@ -5,17 +5,13 @@ 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.project.Project import com.intellij.psi.* import com.intellij.refactoring.RefactoringActionHandler import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer import org.jetbrains.kotlin.idea.core.unquote import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { companion object { @@ -72,14 +68,4 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { override public fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile) = 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, dataContext: DataContext) { - super.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 index 5297d7e8b9a..5344790704f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 @@ -5,17 +5,13 @@ 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.project.Project import com.intellij.psi.* import com.intellij.refactoring.RefactoringActionHandler import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer import org.jetbrains.kotlin.idea.core.unquote import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { companion object { @@ -72,14 +68,4 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { override public fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile) = 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, dataContext: DataContext) { - super.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) - } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt index 56d5e4d994c..05a8bd02ea0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext 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.DescriptorUtils import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class RenameJvmNameHandler : PsiElementRenameHandler() { private fun getStringTemplate(dataContext: DataContext): KtStringTemplateExpression? { @@ -77,11 +75,9 @@ class RenameJvmNameHandler : PsiElementRenameHandler() { override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext) { super.invoke(project, editor, file, wrapDataContext(dataContext) ?: return) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext) { super.invoke(project, elements, wrapDataContext(dataContext) ?: return) - KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt index 6b794a2e1dc..21e7d4bb786 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor @@ -27,7 +26,6 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.refactoring.rename.RenameHandler import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class RenameOnSecondaryConstructorHandler : RenameHandler { @@ -46,7 +44,6 @@ class RenameOnSecondaryConstructorHandler : RenameHandler { override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { 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, dataContext: DataContext?) { From e49c35055069f6418bbc2c0f8e6a972e81abdc73 Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Fri, 11 Jan 2019 15:30:31 +0300 Subject: [PATCH 3/3] removed unused collectors --- .../kotlin/statistics/ProjectScopeStatsReporters.kt | 10 ---------- .../statistics/ProjectScopeStatsReporters.kt.181 | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt index 3893c5e3f7e..f8571a91d68 100644 --- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt +++ b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt @@ -30,16 +30,6 @@ class KotlinProjectLibraryUsageTrigger : KotlinGradlePluginStatisticsTrigger("li open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStatisticsTrigger("action" + (if (groupIdSufix != null) ".$groupIdSufix" else "")) -class KotlinIdeUndoTrigger : KotlinIdeActionTrigger("undo") - -class KotlinIdeQuickfixTrigger : KotlinIdeActionTrigger("quickfix") - class KotlinIdeRefactoringTrigger : KotlinIdeActionTrigger("refactoring") -class KotlinIdeIntentionTrigger : KotlinIdeActionTrigger("intention") - -class KotlinIdeInspectionTrigger : KotlinIdeActionTrigger("inspection") - -class KotlinIdeExceptionTrigger : KotlinIdeStatisticsTrigger("exception") - class KotlinIdeNewFileTemplateTrigger : KotlinIdeStatisticsTrigger("newFileTempl") \ No newline at end of file diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 index 9a3612c3e3f..c4a12529208 100644 --- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 +++ b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 @@ -25,16 +25,6 @@ class KotlinProjectLibraryUsageTrigger : KotlinGradlePluginStatisticsTrigger("li open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStatisticsTrigger("action" + (if (groupIdSufix != null) ".$groupIdSufix" else "")) -class KotlinIdeUndoTrigger : KotlinIdeActionTrigger("undo") - -class KotlinIdeQuickfixTrigger : KotlinIdeActionTrigger("quickfix") - class KotlinIdeRefactoringTrigger : KotlinIdeActionTrigger("refactoring") -class KotlinIdeIntentionTrigger : KotlinIdeActionTrigger("intention") - -class KotlinIdeInspectionTrigger : KotlinIdeActionTrigger("inspection") - -class KotlinIdeExceptionTrigger : KotlinIdeStatisticsTrigger("exception") - class KotlinIdeNewFileTemplateTrigger : KotlinIdeStatisticsTrigger("newFileTempl") \ No newline at end of file