Add vartype as an expression

Author: tranleduy2000

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/internal/CompleteExpression.java

@@ -357,6 +357,10 @@ private Expression getExpressionFromStatement(JCStatement statement) {
             if (isCursorInsideTree(initializer)) {
                 return new Expression(jcVariableDecl, initializer);
             }
+            JCExpression vartype = jcVariableDecl.vartype;
+            if (isCursorInsideTree(vartype)) {
+                return new Expression(jcVariableDecl, vartype);
+            }
         } else if (statement instanceof JCWhileLoop) {
             JCWhileLoop jcWhileLoop = (JCWhileLoop) statement;
             JCExpression condition = jcWhileLoop.getCondition();

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/internal/completed/CompleteNewKeyword.java

@@ -22,7 +22,7 @@
 import com.duy.ide.editor.internal.suggestion.Editor;
 import com.duy.ide.javaide.editor.autocomplete.parser.JavaDexClassLoader;
 import com.duy.ide.javaide.editor.autocomplete.internal.JavaCompleteMatcherImpl;
-import com.duy.ide.javaide.editor.autocomplete.model.ClassConstructorDescription;
+import com.duy.ide.javaide.editor.autocomplete.model.ConstructorDescription;
 import com.duy.ide.javaide.editor.autocomplete.model.ClassDescription;
 import com.duy.ide.javaide.editor.autocomplete.model.PrimitiveArrayConstructorDescription;
 
@@ -73,7 +73,7 @@ private boolean getSuggestionInternal(@NonNull Editor editor, @NonNull String in
         //try to find constructor
         ArrayList<ClassDescription> classes = mClassLoader.findAllWithPrefix(incomplete);
         for (ClassDescription clazz : classes) {
-            ArrayList<ClassConstructorDescription> constructors = clazz.getConstructors();
+            ArrayList<ConstructorDescription> constructors = clazz.getConstructors();
             setInfo(constructors, editor, incomplete);
             suggestItems.addAll(constructors);
             handled = true;

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/model/ClassDescription.java

@@ -20,6 +20,7 @@
 
 import android.text.Editable;
 
+import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.duy.common.DLog;
 import com.duy.ide.code.api.SuggestItem;
@@ -43,15 +44,16 @@
 
 public class ClassDescription extends JavaSuggestItemImpl implements IClass {
     private static final String TAG = "ClassDescription";
+    @NonNull
     private final String mClassName;
-    private final ArrayList<ClassConstructorDescription> mConstructors = new ArrayList<>();
+    private final ArrayList<ConstructorDescription> mConstructors = new ArrayList<>();
     private final ArrayList<FieldDescription> mFields = new ArrayList<>();
     private final ArrayList<MethodDescription> mMethods = new ArrayList<>();
     private final ArrayList<ClassDescription> mImplements = new ArrayList<>();
     @Nullable
     private final ClassDescription mSuperClass;
     private final int mModifiers;
-    private boolean mPrimitive;
+    private final boolean mPrimitive;
 
     public ClassDescription(Class c) {
         mClassName = c.getName();
@@ -105,34 +107,34 @@ public void onSelectThis(IEditAreaView editorView) {
         }
     }
 
-
+    @Override
     public String getSimpleName() {
         return JavaUtil.getSimpleName(mClassName);
     }
 
-
+    @Override
     public String getFullClassName() {
         return mClassName;
     }
 
     @Nullable
-    public final ClassDescription getSuperclass() {
+    public ClassDescription getSuperclass() {
         return mSuperClass;
     }
 
-    public final String getPackageName() {
+    public String getPackageName() {
         return JavaUtil.getPackageName(mClassName);
     }
 
-    public ArrayList<ClassConstructorDescription> getConstructors() {
+    public ArrayList<ConstructorDescription> getConstructors() {
         return mConstructors;
     }
 
     public ArrayList<FieldDescription> getFields() {
         return mFields;
     }
 
-    public void addConstructor(ClassConstructorDescription constructorDescription) {
+    public void addConstructor(ConstructorDescription constructorDescription) {
         this.mConstructors.add(constructorDescription);
     }
 
@@ -156,7 +158,7 @@ public String toString() {
     @SuppressWarnings("ConstantConditions")
     public ArrayList<SuggestItem> getMember(String prefix) {
         ArrayList<SuggestItem> result = new ArrayList<>();
-        for (ClassConstructorDescription constructor : mConstructors) {
+        for (ConstructorDescription constructor : mConstructors) {
             if (!prefix.isEmpty()) {
                 if (constructor.getName().startsWith(prefix)) {
                     result.add(constructor);
@@ -238,7 +240,7 @@ public IField getField(String name) {
     public void initMembers(Class c) {
         for (Constructor constructor : c.getConstructors()) {
             if (Modifier.isPublic(constructor.getModifiers())) {
-                addConstructor(new ClassConstructorDescription(constructor));
+                addConstructor(new ConstructorDescription(constructor));
             }
         }
 

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/model/ClassConstructorDescription.java renamed to app/src/main/java/com/duy/ide/javaide/editor/autocomplete/model/ConstructorDescription.java

@@ -31,12 +31,12 @@
  * Created by Duy on 20-Jul-17.
  */
 
-public class ClassConstructorDescription extends JavaSuggestItemImpl {
+public class ConstructorDescription extends JavaSuggestItemImpl {
     private Constructor constructor;
     private String simpleName;
     private String packageName;
 
-    public ClassConstructorDescription(Constructor constructor) {
+    public ConstructorDescription(Constructor constructor) {
         this.constructor = constructor;
         this.simpleName = JavaUtil.getSimpleName(constructor.getName());
         this.packageName = JavaUtil.getPackageName(constructor.getName());

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/model/FieldDescription.java

@@ -19,6 +19,7 @@
 
 import android.support.annotation.NonNull;
 
+import com.android.annotations.Nullable;
 import com.duy.ide.editor.view.IEditAreaView;
 import com.duy.ide.javaide.editor.autocomplete.parser.IClass;
 import com.duy.ide.javaide.editor.autocomplete.parser.IField;
@@ -32,18 +33,21 @@
  */
 
 public class FieldDescription extends JavaSuggestItemImpl implements Member, IField {
-    private String name;
+    @NonNull
+    private String mName;
+    @NonNull
     private IClass mType;
     private int mModifiers;
+    @Nullable
     private String value;
 
-    public FieldDescription(String name, IClass type, int modifiers) {
-        this.name = name;
+    public FieldDescription(@NonNull String name, IClass type, int modifiers) {
+        this.mName = name;
         this.mModifiers = modifiers;
     }
 
     public FieldDescription(Field field) {
-        this.name = field.getName();
+        this.mName = field.getName();
         this.mType = JavaClassReader.getInstance().getClassWrapper(field.getType());
         this.mModifiers = field.getModifiers();
 
@@ -63,7 +67,7 @@ public FieldDescription(Field field) {
 
     @Override
     public void onSelectThis(@NonNull IEditAreaView editorView) {
-        insertImpl(editorView, name);
+        insertImpl(editorView, mName);
     }
 
 
@@ -75,9 +79,9 @@ public char getTypeHeader() {
     @Override
     public String getName() {
         if (value == null) {
-            return name;
+            return mName;
         } else {
-            return name + "(" + value + ")";
+            return mName + "(" + value + ")";
         }
     }
 
@@ -88,6 +92,9 @@ public String getDescription() {
 
     @Override
     public String getReturnType() {
+        if (mType == null) {
+            return "";
+        }
         return mType.getSimpleName();
     }
 
@@ -98,7 +105,7 @@ public int getSuggestionPriority() {
 
     @Override
     public String toString() {
-        return name;
+        return mName;
     }
 
 
@@ -109,7 +116,7 @@ public int getModifiers() {
 
     @Override
     public String getFieldName() {
-        return name;
+        return mName;
     }
 
     @Override

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/model/MethodDescription.java

@@ -22,6 +22,7 @@
 
 import com.android.annotations.Nullable;
 import com.duy.ide.code.api.SuggestItem;
+import com.duy.ide.editor.internal.suggestion.Editor;
 import com.duy.ide.editor.view.IEditAreaView;
 import com.duy.ide.javaide.editor.autocomplete.parser.IClass;
 import com.duy.ide.javaide.editor.autocomplete.parser.IMethod;
@@ -68,20 +69,38 @@ public void onSelectThis(@NonNull IEditAreaView editorView) {
 
             Editable editable = editorView.getEditableText();
             editable.delete(start, editorView.getSelectionStart());
-            String text = JavaUtil.getSimpleName(mName) + "();";
+            String simpleName = JavaUtil.getSimpleName(mName);
+            String text = simpleName + "()" + (shouldAddSemicolon(getEditor()) ? ";" : "");
             if (getParameterTypes().size() > 0) {
                 //Should end method?
                 editable.insert(start, text);
-                editorView.setSelection(start + text.length() - 2 /*(*/);
+                editorView.setSelection(start + simpleName.length() + 1/*(*/);
             } else {
                 editable.insert(start, text);
                 editorView.setSelection(start + text.length());
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+    }
 
-
+    private boolean shouldAddSemicolon(Editor editor) {
+        int cursor = editor.getCursor();
+        String text = editor.getText();
+        while (cursor < editor.length()) {
+            char c = text.charAt(cursor);
+            if (c == ' ' || c == '\n') {
+                cursor++;
+                continue;
+            }
+            if (c == ';') {
+                return false;
+            }
+        }
+        if (getMethodReturnType().getFullClassName().equals(void.class.getName())) {
+            return true;
+        }
+        return false;
     }
 
     public ArrayList<String> getParameterTypes() {

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/parser/JavaClassReader.java

@@ -220,7 +220,7 @@ public ClassDescription readClassByName(String fullClassName,
         return null;
     }
 
-    @Nullable
+    @NonNull
     public ClassDescription getClassWrapper(@NonNull Class clazz) {
         ClassDescription cache = mLoaded.get(clazz.getName());
         if (cache != null) {