From b5f2ce743c3c1f8982958a1fa61b71f3b2ef3c93 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 19 Nov 2014 14:17:54 +0300 Subject: [PATCH] Change Signature: Allow running Kotlin change signature from Java usage/override --- .../changeSignature/JetChangeSignatureHandler.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java index 39c8c79b58e..cb0073ce632 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java @@ -32,10 +32,8 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.jet.asJava.AsJavaPackage; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; @@ -157,7 +155,7 @@ public class JetChangeSignatureHandler implements ChangeSignatureHandler { if (elements.length != 1) return; Editor editor = dataContext != null ? PlatformDataKeys.EDITOR.getData(dataContext) : null; - PsiElement element = elements[0]; + PsiElement element = AsJavaPackage.getUnwrapped(elements[0]); assert element instanceof JetElement : "This handler must be invoked for elements of JetLanguage : " + element.getText(); invokeChangeSignature((JetElement) element, element, project, editor);