From 312921148d7d7b7d38fdd90c73f70b778605d5e7 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Tue, 31 Mar 2015 19:59:21 -0700
Subject: [PATCH] Add smali classes to the main shortname index

This ensures the classes are available for autocompletion, e.g. in
a java file or while adding a watch when debugging
---
 .../jf/smalidea/psi/stub/SmaliClassStatementStub.java | 11 +++++++++++
 .../psi/stub/element/SmaliClassElementType.java       |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStatementStub.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStatementStub.java
index f63236ce..41faccf2 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStatementStub.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStatementStub.java
@@ -48,4 +48,15 @@ public class SmaliClassStatementStub extends StubBase<SmaliClassStatement>  {
     @Nullable public String getQualifiedName() {
         return qualifiedName;
     }
+
+    @Nullable public String getName() {
+        if (qualifiedName == null) {
+            return null;
+        }
+        int lastDot = qualifiedName.lastIndexOf('.');
+        if (lastDot < 0) {
+            return qualifiedName;
+        }
+        return qualifiedName.substring(lastDot+1);
+    }
 }
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java
index db74e488..dcd7a2c7 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java
@@ -32,6 +32,7 @@
 package org.jf.smalidea.psi.stub.element;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.impl.java.stubs.index.JavaStubIndexKeys;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -86,6 +87,11 @@ public class SmaliClassElementType extends SmaliStubElementType<SmaliClassStub,
             if (qualifiedName != null) {
                 sink.occurrence(SmaliClassNameIndex.KEY, qualifiedName);
             }
+
+            final String shortName = smaliClassStatementStub.getName();
+            if (shortName != null) {
+                sink.occurrence(JavaStubIndexKeys.CLASS_SHORT_NAMES, shortName);
+            }
         }
     }
 }