Fix crash when using format

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/ide/editor/CppIdeActivity.java

@@ -149,7 +149,8 @@ public ArrayList<SuggestItem> getSuggestions(Editor editor) {
                 ArrayList<SuggestItem> items = new ArrayList<>();
                 int size = (int) (Math.random() * 10);
                 for (int i = 0; i <= size; i++) {
-                    items.add(new DefaultSuggestItem("toString", "", "int", "s", 0));
+                    items.add(new DefaultSuggestItem("toString", "",
+                            "int", "s", 0));
                 }
                 return items;
             }

lib-n-ide/build.gradle

@@ -118,7 +118,7 @@ task copyReleaseToJavaNIDE << {
     File settingsFile = new File(javaIdeDir, "settings.gradle");
     String content = fileToString(settingsFile);
     //comment it
-    content = content.replaceAll("include\\s+':${Pattern.quote(oldModuleName)}'", "//include ':${newModuleName}'");
+    content = content.replaceAll("include\\s+':${Pattern.quote(oldModuleName)}'", "include ':${newModuleName}'");
     FileOutputStream output = new FileOutputStream(settingsFile);
     output.write(content.getBytes());
     output.close();

lib-n-ide/src/main/java/com/duy/ide/editor/task/FormatSourceTask.java

@@ -75,7 +75,7 @@ protected void onPostExecute(CharSequence formatted) {
         mProgressDialog.dismiss();
         if (formatted != null) {
             mEditText.setText(formatted);
-            if (mEditText.length() <= mOldSelection) {
+            if (mOldSelection <= mEditText.length()) {
                 mEditText.setSelection(mOldSelection);
             }
             Toast.makeText(mContext, R.string.formated_source, Toast.LENGTH_SHORT).show();

lib-n-ide/src/main/java/com/duy/ide/editor/view/SuggestionEditor.java

@@ -226,7 +226,6 @@ private void showDropDownImpl() {
         mPopup.show();
         ListView list = mPopup.getListView();
         list.setOverScrollMode(View.OVER_SCROLL_ALWAYS);
-        list.setSelection(-1);
     }
 
 
@@ -253,6 +252,10 @@ public void setSuggestData(@NonNull List<SuggestItem> data) {
 
         if (data.size() > 0) {
             showDropDown();
+        } else {
+            if (isPopupShowing()) {
+                dismissDropDown();
+            }
         }
     }
 
@@ -428,18 +431,17 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (isPopupShowing()) {
             //editor support press tab to insert tab character
             if (keyCode != KeyEvent.KEYCODE_TAB) {
-                if (getSelectedItemPosition() >= 0) {
-                    switch (keyCode) {
-                        // if the list accepts the key events and the key event
-                        // was a click, the text view gets the selected item
-                        // from the drop down as its content
-                        case KeyEvent.KEYCODE_ENTER:
-                        case KeyEvent.KEYCODE_DPAD_CENTER:
-                            if (event.hasNoModifiers()) {
-                                performCompletion();
-                            }
-                            return true;
-                    }
+                mPopup.onKeyUp(keyCode, event);
+                switch (keyCode) {
+                    // if the list accepts the key events and the key event
+                    // was a click, the text view gets the selected item
+                    // from the drop down as its content
+                    case KeyEvent.KEYCODE_ENTER:
+                    case KeyEvent.KEYCODE_DPAD_CENTER:
+                        if (event.hasNoModifiers()) {
+                            performCompletion();
+                        }
+                        return true;
                 }
             }
         }
@@ -461,7 +463,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
             }
 
             //editor support press tab to insert tab character
-            if (keyCode != KeyEvent.KEYCODE_TAB && mPopup.isShowing()) {
+            if (keyCode != KeyEvent.KEYCODE_TAB) {
                 if (mPopup.onKeyDown(keyCode, event)) {
                     return true;
                 }