diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java index d390dfab..680bf724 100644 --- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java +++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java @@ -39,6 +39,8 @@ import com.intellij.psi.PsiModifier.ModifierConstant; import com.intellij.psi.impl.PsiClassImplUtil; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.javadoc.PsiDocComment; +import com.intellij.psi.scope.PsiScopeProcessor; +import com.intellij.psi.util.PsiUtil; import com.intellij.util.IncorrectOperationException; import com.sun.jdi.Location; import com.sun.jdi.Method; @@ -330,4 +332,11 @@ public class SmaliClass extends SmaliStubBasedPsiElement impleme } return null; } + + @Override + public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, + PsiElement lastParent, @NotNull PsiElement place) { + return PsiClassImplUtil.processDeclarationsInClass(this, processor, state, null, lastParent, place, + PsiUtil.getLanguageLevel(place), false); + } } \ No newline at end of file diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.java index 999f47d4..5c7d5419 100644 --- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.java +++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.java @@ -89,7 +89,7 @@ public class SmaliClassTypeElement extends SmaliTypeElement implements PsiJavaCo return new TextRange(0, getTextLength()); } - @Nullable @Override public PsiElement resolve() { + @Nullable @Override public PsiClass resolve() { JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject()); return facade.findClass(getCanonicalText(), getResolveScope()); } diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodReference.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodReference.java index 620552d8..7fe70db2 100644 --- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodReference.java +++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodReference.java @@ -31,17 +31,145 @@ package org.jf.smalidea.psi.impl; +import com.intellij.openapi.util.TextRange; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiReference; +import com.intellij.psi.PsiType; +import com.intellij.psi.impl.light.LightMethodBuilder; +import com.intellij.util.ArrayUtil; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jf.smalidea.SmaliLanguage; import org.jf.smalidea.psi.SmaliCompositeElementFactory; import org.jf.smalidea.psi.SmaliElementTypes; -public class SmaliMethodReference extends SmaliCompositeElement { +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +public class SmaliMethodReference extends SmaliCompositeElement implements PsiReference { public static final SmaliCompositeElementFactory FACTORY = new SmaliCompositeElementFactory() { @Override public SmaliCompositeElement createElement() { return new SmaliMethodReference(); } }; + @Override public String getName() { + PsiElement memberName = getMemberName(); + if (memberName == null) { + return null; + } + return memberName.getText(); + } + public SmaliMethodReference() { super(SmaliElementTypes.METHOD_REFERENCE); } + + @Override public PsiReference getReference() { + return this; + } + + @Override public PsiElement getElement() { + return this; + } + + @Override public TextRange getRangeInElement() { + return new TextRange(0, getTextLength()); + } + + @Nullable + public PsiClass getContainingClass() { + SmaliClassTypeElement containingClassReference = findChildByClass(SmaliClassTypeElement.class); + if (containingClassReference == null) { + return null; + } + PsiClass containingClass = containingClassReference.resolve(); + if (containingClass == null) { + return null; + } + + return containingClass; + } + + @Nullable + public SmaliMemberName getMemberName() { + return findChildByClass(SmaliMemberName.class); + } + + @Nonnull + public List getParameterTypes() { + SmaliMethodReferenceParamList paramList = findChildByClass(SmaliMethodReferenceParamList.class); + if (paramList == null) { + return null; + } + + SmaliTypeElement[] parameterElements = paramList.getParameterTypes(); + + List types = new ArrayList(parameterElements.length); + for (SmaliTypeElement parameterElement: parameterElements) { + types.add(parameterElement.getType()); + } + return types; + } + + @Nullable + public SmaliTypeElement getReturnType() { + SmaliTypeElement[] types = findChildrenByClass(SmaliTypeElement.class); + assert types.length == 2; + return types[1]; + } + + @Nullable @Override public PsiElement resolve() { + PsiClass containingClass = getContainingClass(); + if (containingClass == null) { + return null; + } + + SmaliMemberName memberName = getMemberName(); + if (memberName == null) { + return null; + } + + LightMethodBuilder pattern = new LightMethodBuilder(getManager(), SmaliLanguage.INSTANCE, memberName.getText()); + + for (PsiType type: getParameterTypes()) { + pattern.addParameter("", type); + } + + pattern.setMethodReturnType(getReturnType().getType()); + + // TODO: what about static constructor? + pattern.setConstructor(memberName.getText().equals("")); + + return containingClass.findMethodBySignature(pattern, true); + } + + @NotNull @Override public String getCanonicalText() { + return getText(); + } + + @Override public boolean isReferenceTo(PsiElement element) { + return resolve() == element; + } + + @NotNull @Override public Object[] getVariants() { + return ArrayUtil.EMPTY_OBJECT_ARRAY; + } + + @Override public boolean isSoft() { + return false; + } + + @Override public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException { + //TODO: implement this + throw new IncorrectOperationException(); + } + + @Override public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException { + //TODO: implement this + throw new IncorrectOperationException(); + } } diff --git a/smalidea/src/test/java/org/jf/smalidea/MethodReferenceTest.java b/smalidea/src/test/java/org/jf/smalidea/MethodReferenceTest.java new file mode 100644 index 00000000..adb7bed4 --- /dev/null +++ b/smalidea/src/test/java/org/jf/smalidea/MethodReferenceTest.java @@ -0,0 +1,136 @@ +/* + * Copyright 2014, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.jf.smalidea; + +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiReference; +import com.intellij.testFramework.ResolveTestCase; +import org.jf.smalidea.psi.impl.SmaliMethodReference; +import org.junit.Assert; + +public class MethodReferenceTest extends ResolveTestCase { + /** + * Test a reference to a java method from a smali class + */ + public void testJavaReferenceFromSmali() throws Exception { + String text = + ".class public Lmy/pkg/blah; .super Ljava/lang/Object;\n" + + ".method public blah()V\n" + + " .locals 1\n" + + + " invoke-static {}, Ljava/lang/System;->nanoTime()J\n" + + " return-void\n" + + ".end method"; + + SmaliMethodReference methodReference = (SmaliMethodReference)configureByFileText(text, "blah.smali"); + + Assert.assertNotNull(methodReference); + Assert.assertEquals("nanoTime", methodReference.getName()); + + PsiMethod resolvedMethod = (PsiMethod)methodReference.resolve(); + Assert.assertNotNull(resolvedMethod); + Assert.assertEquals("nanoTime", resolvedMethod.getName()); + Assert.assertNotNull(resolvedMethod.getContainingClass()); + Assert.assertEquals("java.lang.System", resolvedMethod.getContainingClass().getQualifiedName()); + Assert.assertEquals(0, resolvedMethod.getParameterList().getParametersCount()); + Assert.assertNotNull(resolvedMethod.getReturnType()); + Assert.assertEquals("long", resolvedMethod.getReturnType().getCanonicalText()); + } + + /** + * Test a reference to a smali method from a smali class + */ + public void testSmaliReferenceFromSmali() throws Exception { + createFile("blarg.smali", ".class public Lblarg; .super Ljava/lang/Object;" + + ".method public static blort(ILjava/lang/String;)V\n" + + " .locals 0\n" + + " return-void\n" + + ".end method\n"); + + String text = + ".class public Lmy/pkg/blah; .super Ljava/lang/Object;\n" + + ".method public blah2()V\n" + + " .locals 0\n" + + " invoke-static {}, Lblarg;->blort(ILjava/lang/String;)V\n" + + " return-void\n" + + ".end method"; + + SmaliMethodReference methodReference = (SmaliMethodReference)configureByFileText(text, "blah.smali"); + + Assert.assertNotNull(methodReference); + Assert.assertEquals("blort", methodReference.getName()); + + PsiMethod resolvedMethod = (PsiMethod)methodReference.resolve(); + Assert.assertNotNull(resolvedMethod); + Assert.assertEquals("blort", resolvedMethod.getName()); + Assert.assertNotNull(resolvedMethod.getContainingClass()); + Assert.assertEquals("blarg", resolvedMethod.getContainingClass().getQualifiedName()); + Assert.assertEquals(2, resolvedMethod.getParameterList().getParametersCount()); + Assert.assertEquals("int", resolvedMethod.getParameterList().getParameters()[0].getType().getCanonicalText()); + Assert.assertEquals("java.lang.String", + resolvedMethod.getParameterList().getParameters()[1].getType().getCanonicalText()); + Assert.assertNotNull(resolvedMethod.getReturnType()); + Assert.assertEquals("void", resolvedMethod.getReturnType().getCanonicalText()); + } + + /** + * Test a reference to a smali method from a java class + */ + public void testSmaliReferenceFromJava() throws Exception { + createFile("blarg.smali", ".class public Lblarg; .super Ljava/lang/Object;" + + ".method public static blort(ILjava/lang/String;)V\n" + + " .locals 0\n" + + " return-void\n" + + ".end method\n"); + + + String text = "public class blah { public static void something() {" + + "blarg.blort(10, \"bob\");" + + "}}"; + + PsiReference methodReference = configureByFileText(text, "blah.java"); + + Assert.assertNotNull(methodReference); + + PsiMethod resolvedMethod = (PsiMethod)methodReference.resolve(); + Assert.assertNotNull(resolvedMethod); + Assert.assertEquals("blort", resolvedMethod.getName()); + Assert.assertNotNull(resolvedMethod.getContainingClass()); + Assert.assertEquals("blarg", resolvedMethod.getContainingClass().getQualifiedName()); + Assert.assertEquals(2, resolvedMethod.getParameterList().getParametersCount()); + Assert.assertEquals("int", resolvedMethod.getParameterList().getParameters()[0].getType().getCanonicalText()); + Assert.assertEquals("java.lang.String", + resolvedMethod.getParameterList().getParameters()[1].getType().getCanonicalText()); + Assert.assertNotNull(resolvedMethod.getReturnType()); + Assert.assertEquals("void", resolvedMethod.getReturnType().getCanonicalText()); + } +}