From 99d0803eda92b842068aa2126fd0ba1a43de7539 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sat, 21 Mar 2015 13:39:58 -0700
Subject: [PATCH] Use createTypeFromText instead of createTypebyFQClassName

createTypeByFQClassName doesn't correctly handle primitive types
---
 .../org/jf/smalidea/psi/impl/SmaliField.java  |  2 +-
 .../psi/impl/SmaliMethodPrototype.java        |  2 +-
 .../java/org/jf/smalidea/SmaliMethodTest.java | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliField.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliField.java
index fd86f411..cada0a1d 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliField.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliField.java
@@ -101,7 +101,7 @@ public class SmaliField extends SmaliStubBasedPsiElement<SmaliFieldStub> impleme
         if (typeElement == null) {
             // If we don't have a type (i.e. syntax error), use Object as a safe-ish fallback
             PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
-            return factory.createTypeByFQClassName("java.lang.Object", getResolveScope());
+            return factory.createTypeFromText("java.lang.Object", this);
         }
         return getTypeElement().getType();
     }
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodPrototype.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodPrototype.java
index f7b493d6..89c7dace 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodPrototype.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodPrototype.java
@@ -59,7 +59,7 @@ public class SmaliMethodPrototype extends SmaliStubBasedPsiElement<SmaliMethodPr
                 return null;
             }
             PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
-            return factory.createTypeByFQClassName(returnType, getResolveScope());
+            return factory.createTypeFromText(returnType, this);
         }
 
         PsiTypeElement returnTypeElement = getReturnTypeElement();
diff --git a/smalidea/src/test/java/org/jf/smalidea/SmaliMethodTest.java b/smalidea/src/test/java/org/jf/smalidea/SmaliMethodTest.java
index 5526b439..6af96757 100644
--- a/smalidea/src/test/java/org/jf/smalidea/SmaliMethodTest.java
+++ b/smalidea/src/test/java/org/jf/smalidea/SmaliMethodTest.java
@@ -33,6 +33,7 @@ package org.jf.smalidea;
 
 import com.intellij.debugger.SourcePosition;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiPrimitiveType;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jf.dexlib2.Opcode;
 import org.jf.smalidea.psi.impl.*;
@@ -287,4 +288,22 @@ public class SmaliMethodTest extends LightCodeInsightFixtureTestCase {
         Assert.assertEquals(0, throwsList.getReferencedTypes().length);
         Assert.assertEquals(0, throwsList.getReferenceElements().length);
     }
+
+    public void testPrimitiveReturnType() {
+        String text = "" +
+                ".class public Lmy/pkg/blah; .super Ljava/lang/Object;\n" +
+                ".method blah()I\n" +
+                "    .registers 123\n" +
+                "    return-void\n" +
+                ".end method";
+
+        SmaliFile file = (SmaliFile)myFixture.addFileToProject("my/pkg/blah.smali", text);
+        SmaliClass smaliClass = file.getPsiClass();
+        Assert.assertNotNull(smaliClass);
+        SmaliMethod smaliMethod = smaliClass.getMethods()[0];
+
+        Assert.assertNotNull(smaliMethod.getReturnType());
+        Assert.assertTrue(smaliMethod.getReturnType().isConvertibleFrom(PsiPrimitiveType.INT));
+        Assert.assertTrue(smaliMethod.getReturnType().isAssignableFrom(PsiPrimitiveType.INT));
+    }
 }