azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Signature: Allow running Kotlin change signature from Java usage/override

Browse Source
This commit is contained in:
Alexey Sedunov
2014-11-19 14:17:54 +03:00
parent 3d2cc129b5
commit b5f2ce743c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java
+3 -5
View File
@@ -32,10 +32,8 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly; import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.asJava.AsJavaPackage;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
@@ -157,7 +155,7 @@ public class JetChangeSignatureHandler implements ChangeSignatureHandler {
if (elements.length != 1) return; if (elements.length != 1) return;
Editor editor = dataContext != null ? PlatformDataKeys.EDITOR.getData(dataContext) : null; 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(); assert element instanceof JetElement : "This handler must be invoked for elements of JetLanguage : " + element.getText();
invokeChangeSignature((JetElement) element, element, project, editor); invokeChangeSignature((JetElement) element, element, project, editor);