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

Use DescriptorToDeclarationUtil to get function declaration in JetChangeSignature

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-11-11 16:00:32 +04:00
parent 53acd2c837
commit f4c8655fa2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt
+2 -1
View File
@@ -32,6 +32,7 @@ import java.util.*
import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.* import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.*
import org.jetbrains.jet.lang.resolve.BindingContextUtils.* import org.jetbrains.jet.lang.resolve.BindingContextUtils.*
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil
public trait JetChangeSignatureConfiguration { public trait JetChangeSignatureConfiguration {
fun configure(changeSignatureData: JetChangeSignatureData, bindingContext: BindingContext) fun configure(changeSignatureData: JetChangeSignatureData, bindingContext: BindingContext)
@@ -135,7 +136,7 @@ public class JetChangeSignature(val project: Project,
fun createChangeSignatureDialog(descriptorsForSignatureChange: Collection<FunctionDescriptor>): JetChangeSignatureDialog? { fun createChangeSignatureDialog(descriptorsForSignatureChange: Collection<FunctionDescriptor>): JetChangeSignatureDialog? {
val baseDescriptor = preferContainedInClass(descriptorsForSignatureChange) val baseDescriptor = preferContainedInClass(descriptorsForSignatureChange)
val functionDeclaration = callableDescriptorToDeclaration(bindingContext, baseDescriptor) val functionDeclaration = DescriptorToDeclarationUtil.getDeclaration(project, baseDescriptor, bindingContext)
if (functionDeclaration == null) { if (functionDeclaration == null) {
LOG.error("Could not find declaration for $baseDescriptor") LOG.error("Could not find declaration for $baseDescriptor")
return null return null
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java
+2 -1
View File
@@ -34,6 +34,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.ArrayList; import java.util.ArrayList;
@@ -110,7 +111,7 @@ public final class JetChangeSignatureData implements JetMethodDescriptor {
@NotNull @NotNull
private Collection<PsiElement> computeHierarchyFrom(@NotNull FunctionDescriptor baseDescriptor) { private Collection<PsiElement> computeHierarchyFrom(@NotNull FunctionDescriptor baseDescriptor) {
PsiElement declaration = BindingContextUtils.callableDescriptorToDeclaration(bindingContext, baseDescriptor); PsiElement declaration = DescriptorToDeclarationUtil.getDeclaration(baseDeclaration.getProject(), baseDescriptor, bindingContext);
Set<PsiElement> result = Sets.newHashSet(); Set<PsiElement> result = Sets.newHashSet();
result.add(declaration); result.add(declaration);
if (!(declaration instanceof JetNamedFunction)) { if (!(declaration instanceof JetNamedFunction)) {