Fix not add recent files when create new files

Author: tranleduy2000

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

@@ -135,6 +135,9 @@ public void onEditorViewCreated(@NonNull IEditorDelegate editorDelegate) {
             }
         }
 
+        if (false) {
+            return;
+        }
         editorDelegate.setSuggestionProvider(new SuggestionProvider() {
             @Override
             public ArrayList<SuggestItem> getSuggestions(Editor editor) {

lib-n-ide/src/main/java/com/duy/ide/core/api/IdeActivity.java

@@ -56,6 +56,7 @@
 import com.duy.file.explorer.FileExplorerActivity;
 import com.duy.ide.code.api.CodeFormatProvider;
 import com.duy.ide.code.format.CodeFormatProviderImpl;
+import com.duy.ide.database.ITabDatabase;
 import com.duy.ide.database.SQLHelper;
 import com.duy.ide.diagnostic.DiagnosticContract;
 import com.duy.ide.diagnostic.DiagnosticPresenter;
@@ -699,8 +700,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 EditorDelegate delegate = getCurrentEditorDelegate();
                 if (delegate != null) {
                     delegate.saveInBackground(new File(file), encoding);
-                    SQLHelper.getInstance(this).addRecentFile(file, encoding);
-                    SQLHelper.getInstance(this).updateRecentFile(file, false);
+                    ITabDatabase database = SQLHelper.getInstance(this);
+                    database.addRecentFile(file, encoding);
+                    database.updateRecentFile(file, false);
                 }
                 break;
             case RC_SETTINGS:

lib-n-ide/src/main/java/com/duy/ide/database/JsonDatabase.java

@@ -89,6 +89,8 @@ public void updateRecentFile(String path, String encoding, int offset) {
                 recentFile.setOffset(offset);
                 mHelper.write(jsonItem, recentFile);
                 saveRecentFileDatabase(database);
+            } else {
+                addRecentFile(path, encoding);
             }
         } catch (JSONException e) {
             e.printStackTrace();

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

@@ -29,6 +29,7 @@
 import android.text.style.ForegroundColorSpan;
 
 import com.duy.ide.editor.editor.R;
+import com.duy.ide.editor.task.SaveTask;
 import com.duy.ide.editor.theme.model.EditorTheme;
 import com.duy.ide.editor.view.IEditAreaView;
 import com.duy.ide.file.ReadFileListener;
@@ -37,7 +38,6 @@
 import com.jecelyin.common.utils.StringUtils;
 import com.jecelyin.common.utils.UIUtils;
 import com.jecelyin.editor.v2.Preferences;
-import com.duy.ide.editor.task.SaveTask;
 import com.jecelyin.editor.v2.highlight.Buffer;
 import com.jecelyin.editor.v2.io.FileReader;
 import com.jecelyin.editor.v2.io.LocalFileWriter;

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

@@ -37,6 +37,7 @@ public void highlightError(Buffer buffer, EditorTheme editorTheme,
                                HashMap<Integer, ArrayList<? extends CharacterStyle>> colorsMap,
                                Editable spannable,
                                int startLine, int endLine, boolean includeWhitespace) {
+
         Segment segment = new Segment();
         for (int line = startLine; line <= endLine; line++) {
             ArrayList<? extends CharacterStyle> oldSpans = colorsMap.remove(line);

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

@@ -69,4 +69,6 @@ public interface IEditAreaView extends IEditActionSupport, IdeEditor {
     Context getContext();
 
     void clearFocus();
+
+    boolean hasFocus();
 }

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

@@ -371,16 +371,10 @@ public void onWindowFocusChanged(boolean hasWindowFocus) {
     @Override
     protected void onDisplayHint(int hint) {
         super.onDisplayHint(hint);
-        switch (hint) {
-            case INVISIBLE:
-                if (!mPopup.isDropDownAlwaysVisible()) {
-                    dismissDropDown();
-                }
-                break;
-            case View.GONE:
-                break;
-            case View.VISIBLE:
-                break;
+        if (hint == INVISIBLE) {
+            if (!mPopup.isDropDownAlwaysVisible()) {
+                dismissDropDown();
+            }
         }
     }
 

lib-n-ide/src/main/java/com/jecelyin/editor/v2/dialog/FindHistoryDialog.java

@@ -21,6 +21,7 @@
 import android.support.v7.app.AlertDialog;
 import android.widget.EditText;
 
+import com.duy.ide.database.ITabDatabase;
 import com.duy.ide.database.SQLHelper;
 import com.duy.ide.editor.editor.R;
 
@@ -42,12 +43,13 @@ public FindHistoryDialog(Context context, EditText editText, boolean isReplace)
 
     @Override
     public void show() {
-        final List<String> items = SQLHelper.getInstance(context).getFindKeywords(isReplace);
+        final ITabDatabase database = SQLHelper.getInstance(context);
+        final List<String> items = database.getFindKeywords(isReplace);
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
         builder.setNegativeButton(R.string.clear_history, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                SQLHelper.getInstance(context).clearFindKeywords(isReplace);
+                database.clearFindKeywords(isReplace);
                 dialog.cancel();
             }
         });

lib-n-ide/src/main/java/com/jecelyin/editor/v2/dialog/FinderDialog.java

@@ -31,6 +31,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.duy.ide.database.ITabDatabase;
 import com.duy.ide.database.SQLHelper;
 import com.duy.ide.editor.editor.R;
 import com.jecelyin.common.task.TaskListener;
@@ -164,8 +165,9 @@ private boolean onFindButtonClick(ViewHolder holder) {
 
         ExtGrep grep = builder.build();
 
-        SQLHelper.getInstance(context).addFindKeyword(findText, false);
-        SQLHelper.getInstance(context).addFindKeyword(replaceText, true);
+        ITabDatabase database = SQLHelper.getInstance(context);
+        database.addFindKeyword(findText, false);
+        database.addFindKeyword(replaceText, true);
 
         findNext(grep, replaceText);
         return true;

lib-n-ide/src/main/java/com/jecelyin/editor/v2/manager/TabManager.java

@@ -31,6 +31,7 @@
 
 import com.duy.file.explorer.util.FileUtils;
 import com.duy.ide.core.api.IdeActivity;
+import com.duy.ide.database.ITabDatabase;
 import com.duy.ide.database.RecentFileItem;
 import com.duy.ide.database.SQLHelper;
 import com.duy.ide.editor.editor.R;
@@ -74,13 +75,14 @@ public void createEditor() {
         mViewPager.setAdapter(mPagerAdapter);
 
         if (Preferences.getInstance(mActivity).isOpenLastFiles()) {
-            ArrayList<RecentFileItem> recentFiles = SQLHelper.getInstance(mActivity).getRecentFiles(true);
+            ITabDatabase database = SQLHelper.getInstance(mActivity);
+            ArrayList<RecentFileItem> recentFiles = database.getRecentFiles(true);
             ArrayList<EditorPageDescriptor> descriptors = new ArrayList<>();
             File file;
             for (RecentFileItem item : recentFiles) {
                 file = new File(item.path);
                 if (!(file.isFile() && file.canRead() && file.canWrite())) {
-                    SQLHelper.getInstance(mActivity).updateRecentFile(item.path, false);
+                    database.updateRecentFile(item.path, false);
                     continue;
                 }
                 descriptors.add(new EditorPageDescriptor(file, item.offset, item.encoding));
@@ -222,6 +224,7 @@ public boolean onDestroy() {
             Preferences.getInstance(mActivity).setLastTab(getCurrentTab());
         }
         ArrayList<File> needSaveFiles = new ArrayList<>();
+        ITabDatabase database = SQLHelper.getInstance(mActivity);
         ArrayList<IEditorDelegate> allEditor = mPagerAdapter.getAllEditor();
         for (IEditorDelegate editorDelegate : allEditor) {
             String path = editorDelegate.getPath();
@@ -230,7 +233,7 @@ public boolean onDestroy() {
             if (editorDelegate.isChanged()) {
                 needSaveFiles.add(editorDelegate.getDocument().getFile());
             }
-            SQLHelper.getInstance(mActivity).updateRecentFile(path, encoding, offset);
+            database.updateRecentFile(path, encoding, offset);
         }
 
         if (needSaveFiles.isEmpty()) {