Can now find full class names for java.lang and import package.*;

quarnster · quarnster · commit b2aea4e26b6e · 2012-04-05T19:19:29.000+02:00
diff --git a/SublimeJava.class b/SublimeJava.class
diff --git a/SublimeJava.java b/SublimeJava.java
@@ -25,13 +25,40 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Member;
 import java.net.URL;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
 
 public class SublimeJava
 {
    public static void main(String... args)
     {
         try
         {
+            if (args[0].equals("-findclass"))
+            {
+                String line = null;
+                try
+                {
+                    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+                    while ((line = in.readLine()) != null)
+                    {
+                        try
+                        {
+                            Class<?> c = Class.forName(line + "." + args[1]);
+                            System.out.println("" + c.getName());
+                            return;
+                        }
+                        catch (Exception e)
+                        {
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                }
+                return;
+            }
             Class<?> c = Class.forName(args[1]);
             String filter = "";
             if (args.length >= 3)
diff --git a/sublimejava.py b/sublimejava.py
@@ -40,6 +40,9 @@ def find_type_of_variable(self, data, variable):
             # Variable not defined in this class...
             return None
 
+    def get_cmd(self):
+        return "java -classpath .:/Users/quarnster/android/android-sdk-mac_86/platforms/android-14/android.jar SublimeJava"
+
     def find_absolute_of_type(self, data, type):
         match = re.search("class %s" % type, data)
         if not match is None:
@@ -52,26 +55,35 @@ def find_absolute_of_type(self, data, type):
         match = re.search(regex, data)
         if not match is None:
             return "%s.%s" % (match.group(1), type)
-        return type
 
-    def run_java(self, cmd):
+        # Couldn't find the absolute name of this class so try to
+        # see if it's in one of the packages imported as
+        # "import package.*;", or in java.lang
+        #
+        packages = re.findall("[ \t]*import[ \t]+(.*)\.\*;", data)
+        packages.append("java.lang")
+        output = self.run_java("%s -findclass %s" % (self.get_cmd(), type), "\n".join(packages))
+        return output.strip()
+
+    def run_java(self, cmd, stdin=None):
         scriptdir = os.path.dirname(os.path.abspath(__file__))
         proc = subprocess.Popen(
             cmd,
             cwd=scriptdir,
             shell=True,
-            stdout=subprocess.PIPE
+            stdout=subprocess.PIPE,
+            stdin=subprocess.PIPE
             )
-        stdout, stderr = proc.communicate()
+        stdout, stderr = proc.communicate(stdin)
         return stdout
 
     def complete_class(self, absolute_classname, prefix):
-        stdout = self.run_java("java -classpath .:/Users/quarnster/android/android-sdk-mac_86/platforms/android-14/android.jar SublimeJava -complete %s %s" % (absolute_classname, prefix))
+        stdout = self.run_java("%s -complete %s %s" % (self.get_cmd(), absolute_classname, prefix))
         ret = [tuple(line.split(";")) for line in stdout.split("\n")[:-1]]
         return sorted(ret, key=lambda a: a[0])
 
     def get_return_type(self, absolute_classname, prefix):
-        stdout = self.run_java("java -classpath .:/Users/quarnster/android/android-sdk-mac_86/platforms/android-14/android.jar SublimeJava -returntype %s %s" % (absolute_classname, prefix))
+        stdout = self.run_java("%s -returntype %s %s" % (self.get_cmd(), absolute_classname, prefix))
         return stdout.strip()
 
     def on_query_completions(self, view, prefix, locations):
@@ -93,6 +105,7 @@ def on_query_completions(self, view, prefix, locations):
             t = self.find_type_of_variable(data, var)
             print "type is %s" % t
             t = self.find_absolute_of_type(data, t)
+
             print "absolute is %s" % (t)
 
             idx = before.find(".")
