diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt index 069f8c458b5..be166e48aa1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt @@ -10,7 +10,6 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass -import com.intellij.psi.PsiFile import com.intellij.psi.PsiNamedElement import com.intellij.refactoring.HelpID import com.intellij.refactoring.RefactoringBundle @@ -24,8 +23,6 @@ import org.jetbrains.kotlin.idea.refactoring.canRefactor import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfoStorage import org.jetbrains.kotlin.idea.refactoring.memberInfo.qualifiedClassNameForRendering -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtNamedDeclaration @@ -110,11 +107,6 @@ class KotlinPullUpHandler : AbstractPullPushMembersHandler( KotlinPullUpDialog(project, classOrObject, superClasses, memberInfoStorage).show() } } - - override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { - super.invoke(project, editor, file, dataContext) - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) - } } val PULL_MEMBERS_UP: String get() = RefactoringBundle.message("pull.members.up.title") \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt index 8a757098fc1..55d6707c936 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt @@ -9,7 +9,6 @@ import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project -import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager import com.intellij.refactoring.HelpID import com.intellij.refactoring.RefactoringBundle @@ -22,8 +21,6 @@ import org.jetbrains.kotlin.idea.refactoring.AbstractPullPushMembersHandler import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfoStorage import org.jetbrains.kotlin.idea.refactoring.pullUp.PULL_MEMBERS_UP -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtNamedDeclaration @@ -80,9 +77,4 @@ class KotlinPushDownHandler : AbstractPullPushMembersHandler( KotlinPushDownDialog(project, members, classOrObject).show() } } - - override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { - super.invoke(project, editor, file, dataContext) - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) - } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt index d6b51a2dcc2..07d2a3d2a1b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt @@ -5,10 +5,8 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.command.impl.StartMarkAction import com.intellij.openapi.editor.Editor -import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiMember @@ -18,8 +16,6 @@ import com.intellij.refactoring.rename.inplace.MemberInplaceRenamer import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.idea.references.SyntheticPropertyAccessorReference import org.jetbrains.kotlin.idea.references.mainReference -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.psi.KtPsiUtil import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType @@ -47,15 +43,4 @@ class JavaMemberByKotlinReferenceInplaceRenameHandler : MemberInplaceRenameHandl override fun createMemberRenamer(element: PsiElement, elementToRename: PsiNameIdentifierOwner, editor: Editor): MemberInplaceRenamer { return Renamer(elementToRename, element, editor) } - - override fun invoke(project: Project, elements: Array, dataContext: DataContext) { - super.invoke(project, elements, dataContext) - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) - } - - override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { - super.invoke(project, editor, file, dataContext) - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) - } - } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt index b20f4e0a511..e10c606e44f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt @@ -13,8 +13,6 @@ import com.intellij.psi.search.SearchScope import com.intellij.refactoring.rename.RenameJavaMethodProcessor import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.idea.references.SyntheticPropertyAccessorReference -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor @@ -35,7 +33,6 @@ class KotlinAwareJavaGetterRenameProcessor : RenameJavaMethodProcessor() { ?: return getterReferences val setterName = JvmAbi.setterName(propertyName.asString()) val containingClass = getter.containingClass ?: return getterReferences - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) val setterReferences = containingClass .findMethodsByName(setterName, true) .filter { it.parameters.size == 1 && it.returnType == PsiType.VOID } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt.191 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt.191 index 90c41594f96..1e72ab0c2a1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt.191 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt.191 @@ -28,7 +28,6 @@ class KotlinAwareJavaGetterRenameProcessor : RenameJavaMethodProcessor() { val propertyName = SyntheticJavaPropertyDescriptor.propertyNameByGetMethodName(Name.identifier(getter.name)) ?: return getterReferences val setterName = JvmAbi.setterName(propertyName.asString()) val containingClass = getter.containingClass ?: return getterReferences - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) val setterReferences = containingClass .findMethodsByName(setterName, true) .filter { it.parameters.size == 1 && it.returnType == PsiType.VOID } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt index e037a4d0c4d..399a80bde47 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt @@ -16,27 +16,11 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.openapi.actionSystem.DataContext -import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiFile import com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.psi.psiUtil.isIdentifier import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded class KotlinDirectoryAsPackageRenameHandler : DirectoryAsPackageRenameHandler() { override fun isIdentifier(name: String, project: Project): Boolean = name.quoteIfNeeded().isIdentifier() - override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { - super.invoke(project, elements, dataContext) - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) - } - - override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { - super.invoke(project, editor, file, dataContext) - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) - } - } \ No newline at end of file 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 68492e58073..1c623a1c7b6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt @@ -9,15 +9,12 @@ import com.intellij.openapi.fileTypes.FileTypeManager import com.intellij.openapi.module.ModuleUtilCore import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiElement -import com.intellij.psi.PsiReference import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.SearchScope import com.intellij.refactoring.rename.RenamePsiFileProcessor import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi.KtFile @@ -57,10 +54,4 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { } } } - - override fun findReferences(element: PsiElement): MutableCollection { - return super.findReferences(element).also { - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) - } - } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt index 452aab0bae7..d7a3b46ecec 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOpt import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters import org.jetbrains.kotlin.idea.search.or import org.jetbrains.kotlin.idea.search.projectScope -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.idea.util.actualsForExpected import org.jetbrains.kotlin.idea.util.liftToExpected import org.jetbrains.kotlin.name.Name @@ -58,8 +56,6 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement): Boolean = element is KtNamedDeclaration override fun findReferences(element: PsiElement): Collection { - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) - val searchParameters = KotlinReferencesSearchParameters( element, element.project.projectScope() or element.useScope, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt index 718c79e99d9..2ea27a26aba 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt @@ -16,8 +16,6 @@ import com.intellij.refactoring.rename.RenameHandler import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils -import org.jetbrains.kotlin.idea.statistics.FUSEventGroups -import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized @@ -39,7 +37,6 @@ class RenameSyntheticDeclarationByReferenceHandler : RenameHandler { RefactoringBundle.message("rename.title"), null ) - KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext?) {