Added filtering on accessibility and "static". Issue #20

quarnster · quarnster · commit 492cf7ddad9b · 2012-05-13T12:32:21.000+02:00
diff --git a/SublimeJava.class b/SublimeJava.class
diff --git a/SublimeJava.java b/SublimeJava.java
@@ -100,7 +100,7 @@ private static String[] getCompletion(Method m, String filter, String[] template
         ins += ")";
         return new String[] {str, ins};
     }
-    private static <T extends Field> String[] getCompletion(T f, String filter, String[] templateArgs)
+    private static String[] getCompletion(Field f, String filter, String[] templateArgs)
     {
         String str = f.getName();
         if (!str.startsWith(filter))
@@ -144,6 +144,41 @@ else if (pack.length() != 0)
         return clazz;
     }
 
+    private static final int STATIC_BIT = 1 << 0;
+    private static final int PRIVATE_BIT = 1 << 1;
+    private static final int PROTECTED_BIT = 1 << 2;
+    private static final int PUBLIC_BIT = 1 << 3;
+
+    private static <T> int getModifiers(T t)
+    {
+        int modifiers = 0;
+        if (t instanceof Method)
+        {
+            Method m = (Method) t;
+            modifiers = m.getModifiers();
+        }
+        else if (t instanceof Field)
+        {
+            Field f = (Field) t;
+            modifiers = f.getModifiers();
+        }
+        else if (t instanceof Class)
+        {
+            Class c = (Class) t;
+            modifiers = c.getModifiers();
+        }
+        int returnvalue = 0;
+        if (Modifier.isStatic(modifiers))
+            returnvalue |= STATIC_BIT;
+        if (Modifier.isPrivate(modifiers))
+            returnvalue |= PRIVATE_BIT;
+        if (Modifier.isProtected(modifiers))
+            returnvalue |= PROTECTED_BIT;
+        if (Modifier.isPublic(modifiers))
+            returnvalue |= PUBLIC_BIT;
+        return returnvalue;
+    }
+
     private static <T> void dumpCompletions(T[] arr, String filter, String[] templateArgs)
     {
         for (T t : arr)
@@ -153,7 +188,7 @@ private static <T> void dumpCompletions(T[] arr, String filter, String[] templat
             {
                 continue;
             }
-            System.out.println(completion[0] + sep + completion[1]);
+            System.out.println(completion[0] + sep + completion[1] + sep + getModifiers(t));
         }
     }
 
diff --git a/sublimecompletioncommon b/sublimecompletioncommon
@@ -1 +1 @@
-Subproject commit 143d0a4b7380174e681193a6b2a60f655743c7b8
+Subproject commit 2f0c313ecead2e778b10703036a9fcd4e9ef51c7
diff --git a/sublimejava.py b/sublimejava.py
@@ -26,6 +26,7 @@
 import re
 try:
     from sublimecompletioncommon import completioncommon
+    reload(completioncommon)
 except:
     def hack(func):
         # If there's a sublime.error_message before a window is open
