From f4d9f33f489fd46b67cfa493e8ac135578800782 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 11 Aug 2016 20:33:21 +0300 Subject: [PATCH] Change Signature: Yield to other usage processor if target element is neither KtFunction, nor PsiMethod #KT-13277 Fixed --- ChangeLog.md | 1 + .../changeSignature/KotlinChangeSignatureUsageProcessor.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index ef33dcca904..2a1ceefa23c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -259,6 +259,7 @@ Using 'this' as function argument in constructor of non-final class - [`KT-13010`](https://youtrack.jetbrains.com/issue/KT-13010) Extract Function: Fix generation of destructuring declarations - [`KT-13128`](https://youtrack.jetbrains.com/issue/KT-13128) Introduce Variable: Retain entered name after changing "Specify type explicitly" option - [`KT-13054`](https://youtrack.jetbrains.com/issue/KT-13054) Introduce Variable: Skip leading/trailing comments inside selection +- [`KT-13277`](https://youtrack.jetbrains.com/issue/KT-13277) Change Signature: Fix usage processing to prevent interfering with Python support plugin ##### New features diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt index 1872c8e9e73..f928f370e07 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt @@ -843,7 +843,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } if (beforeMethodChange) { - if (method !is PsiMethod || initializedOriginalDescriptor) return true + if (method !is PsiMethod || initializedOriginalDescriptor) return false val descriptorWrapper = usages.firstIsInstanceOrNull() if (descriptorWrapper == null || descriptorWrapper.originalJavaMethodDescriptor != null) return true