fix stats reporters (dummies) Rename Handlers for 181 bunch files
fix bunch files again fix RenameBackingFieldReferenceHandler for 181 bunch fix RenameKotlinImplicitLambdaParameter for 181 bunch
This commit is contained in:
+2
-2
@@ -193,7 +193,7 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
|
|||||||
val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java)
|
val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java)
|
||||||
if (mppModel != null) {
|
if (mppModel != null) {
|
||||||
mppModel.targets.filterNot { it.name == "metadata" }.forEach { target ->
|
mppModel.targets.filterNot { it.name == "metadata" }.forEach { target ->
|
||||||
KotlinStatisticsTrigger.trigger(KotlinTargetTrigger::class.java, target.name)
|
KotlinStatisticsTrigger.trigger(KotlinTargetTrigger::class.java, "MPP.${target.name}")
|
||||||
}
|
}
|
||||||
return super.populateModuleDependencies(gradleModule, ideModule, ideProject)
|
return super.populateModuleDependencies(gradleModule, ideModule, ideProject)
|
||||||
}
|
}
|
||||||
@@ -216,7 +216,7 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
|
|||||||
|
|
||||||
KotlinStatisticsTrigger.trigger(
|
KotlinStatisticsTrigger.trigger(
|
||||||
KotlinTargetTrigger::class.java,
|
KotlinTargetTrigger::class.java,
|
||||||
gradleModel.platformPluginId ?: "none"
|
gradleModel.platformPluginId ?: "unknown"
|
||||||
)
|
)
|
||||||
|
|
||||||
addImplementedModuleNames(gradleModule, ideModule, ideProject, gradleModel)
|
addImplementedModuleNames(gradleModule, ideModule, ideProject, gradleModel)
|
||||||
|
|||||||
+9
-9
@@ -42,10 +42,10 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
|||||||
protected open class RenamerImpl : VariableInplaceRenamer {
|
protected open class RenamerImpl : VariableInplaceRenamer {
|
||||||
constructor(elementToRename: PsiNamedElement, editor: Editor): super(elementToRename, editor)
|
constructor(elementToRename: PsiNamedElement, editor: Editor): super(elementToRename, editor)
|
||||||
constructor(
|
constructor(
|
||||||
elementToRename: PsiNamedElement,
|
elementToRename: PsiNamedElement,
|
||||||
editor: Editor,
|
editor: Editor,
|
||||||
currentName: String,
|
currentName: String,
|
||||||
oldName: String
|
oldName: String
|
||||||
) : super(elementToRename, editor, editor.project!!, currentName, oldName)
|
) : super(elementToRename, editor, editor.project!!, currentName, oldName)
|
||||||
|
|
||||||
override fun acceptReference(reference: PsiReference): Boolean {
|
override fun acceptReference(reference: PsiReference): Boolean {
|
||||||
@@ -73,13 +73,13 @@ 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) {
|
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
||||||
super.invoke(project, elements, dataContext)
|
super.invoke(project, elements, dataContext)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+4
-4
@@ -74,12 +74,12 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() {
|
|||||||
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) {
|
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
||||||
getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext)
|
super.invoke(project, editor, file, dataContext)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
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)
|
super.invoke(project, elements, dataContext)
|
||||||
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-4
@@ -26,17 +26,16 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
|
|||||||
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
|
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
|
||||||
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
|
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
|
||||||
|
|
||||||
class RenameBackingFieldReferenceHandler : KotlinVariableInplaceRenameHandler() {
|
class RenameBackingFieldReferenceHandler: KotlinVariableInplaceRenameHandler() {
|
||||||
override fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile): Boolean {
|
override fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile): Boolean {
|
||||||
val refExpression = file.findElementForRename<KtSimpleNameExpression>(editor.caretModel.offset) ?: return false
|
val refExpression = file.findElementForRename<KtSimpleNameExpression>(editor.caretModel.offset) ?: return false
|
||||||
if (refExpression.text != "field") return false
|
if (refExpression.text != "field") return false
|
||||||
return refExpression.resolveToCall()?.resultingDescriptor is SyntheticFieldDescriptor
|
return refExpression.resolveToCall()?.resultingDescriptor is SyntheticFieldDescriptor
|
||||||
}
|
}
|
||||||
|
|
||||||
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, dataContext)
|
|
||||||
editor?.let {
|
editor?.let {
|
||||||
CodeInsightUtils.showErrorHint(project, it, "Rename is not applicable to backing field reference", "Rename", null)
|
CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to backing field reference", "Rename", null)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -33,9 +33,9 @@ class RenameBackingFieldReferenceHandler: KotlinVariableInplaceRenameHandler() {
|
|||||||
return refExpression.resolveToCall()?.resultingDescriptor is SyntheticFieldDescriptor
|
return refExpression.resolveToCall()?.resultingDescriptor is SyntheticFieldDescriptor
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) {
|
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
||||||
editor?.let {
|
editor?.let {
|
||||||
CodeInsightUtils.showErrorHint(project, it, "Rename is not applicable to backing field reference", "Rename", null)
|
CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to backing field reference", "Rename", null)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class RenameDynamicMemberHandler: KotlinVariableInplaceRenameHandler() {
|
|||||||
return calleeDescriptor.isDynamic()
|
return calleeDescriptor.isDynamic()
|
||||||
}
|
}
|
||||||
|
|
||||||
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, dataContext)
|
super.invoke(project, editor, file, dataContext)
|
||||||
editor?.let {
|
editor?.let {
|
||||||
CodeInsightUtils.showErrorHint(project, it, "Rename is not applicable to dynamically invoked members", "Rename", null)
|
CodeInsightUtils.showErrorHint(project, it, "Rename is not applicable to dynamically invoked members", "Rename", null)
|
||||||
|
|||||||
+2
-2
@@ -36,10 +36,10 @@ class RenameDynamicMemberHandler: KotlinVariableInplaceRenameHandler() {
|
|||||||
return calleeDescriptor.isDynamic()
|
return calleeDescriptor.isDynamic()
|
||||||
}
|
}
|
||||||
|
|
||||||
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, dataContext)
|
super.invoke(project, editor, file, dataContext)
|
||||||
editor?.let {
|
editor?.let {
|
||||||
CodeInsightUtils.showErrorHint(project, it, "Rename is not applicable to dynamically invoked members", "Rename", null)
|
CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to dynamically invoked members", "Rename", null)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ class RenameKotlinImplicitLambdaParameter : KotlinVariableInplaceRenameHandler()
|
|||||||
return nameExpression != null && isAutoCreatedItUsage(nameExpression)
|
return nameExpression != null && isAutoCreatedItUsage(nameExpression)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) {
|
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
||||||
val intention = ReplaceItWithExplicitFunctionLiteralParamIntention()
|
val intention = ReplaceItWithExplicitFunctionLiteralParamIntention()
|
||||||
project.executeWriteCommand("Convert 'it' to explicit lambda parameter") {
|
project.executeWriteCommand("Convert 'it' to explicit lambda parameter") {
|
||||||
if (file != null) intention.invoke(project, editor, file)
|
if (file != null) intention.invoke(project, editor, file)
|
||||||
|
|||||||
+5
-3
@@ -33,14 +33,16 @@ class RenameKotlinImplicitLambdaParameter : KotlinVariableInplaceRenameHandler()
|
|||||||
return nameExpression != null && isAutoCreatedItUsage(nameExpression)
|
return nameExpression != null && isAutoCreatedItUsage(nameExpression)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) {
|
override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) {
|
||||||
val intention = ReplaceItWithExplicitFunctionLiteralParamIntention()
|
val intention = ReplaceItWithExplicitFunctionLiteralParamIntention()
|
||||||
project.executeWriteCommand("Convert 'it' to explicit lambda parameter") {
|
project.executeWriteCommand("Convert 'it' to explicit lambda parameter") {
|
||||||
intention.invoke(project, editor, file)
|
file?.let {
|
||||||
|
intention.invoke(project, editor, file)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
|
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext) {
|
||||||
// Do nothing: this method is called not from editor
|
// Do nothing: this method is called not from editor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user