move to editor when select diagnostic

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/compiler/CompileManager.java

@@ -86,6 +86,7 @@ public void onCompileFailed(ShellResult shellResult) {
             mCompileDialog.dismiss();
         }
         if (DLog.DEBUG) DLog.w(TAG, "onCompileFailed: \n" + shellResult.getMessage());
+
         if (mDiagnosticPresenter != null) {
             DiagnosticsCollector diagnosticsCollector = new DiagnosticsCollector<>();
             OutputParser parser = new OutputParser(diagnosticsCollector);

app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticPresenter.java

@@ -17,6 +17,7 @@
 package com.duy.ccppcompiler.diagnostic;
 
 import android.support.annotation.MainThread;
+import android.support.v4.util.Pair;
 import android.view.View;
 
 import com.duy.ccppcompiler.compiler.diagnostic.Diagnostic;
@@ -58,8 +59,14 @@ public void onDiagnosticClick(View view, Diagnostic diagnostic) {
         Object source = diagnostic.getSource();
         if (source instanceof File) {
             File file = (File) source;
-            EditorDelegate editorDelegate = mTabManager.getEditorDelegate(file);
-            if (editorDelegate != null) {
+            Pair<Integer, EditorDelegate> pair = mTabManager.getEditorDelegate(file);
+            if (pair != null) {
+                int index = pair.first;
+                EditorDelegate editorDelegate = pair.second;
+
+                mTabManager.setCurrentTab(index);
+                editorDelegate.doCommand(new Command(Command.CommandEnum.REQUEST_FOCUS));
+
                 Command command = new Command(Command.CommandEnum.GOTO_LINE_COL);
                 command.args.putInt("line", (int) diagnostic.getLineNumber());
                 command.args.putInt("col", (int) diagnostic.getColumnNumber());

app/src/main/java/com/jecelyin/editor/v2/common/Command.java

@@ -60,6 +60,6 @@ public enum CommandEnum {
         INSERT_TEXT,
         RELOAD_WITH_ENCODING,
         FULL_SCREEN,
-        THEME,
+        THEME, REQUEST_FOCUS,
     }
 }

app/src/main/java/com/jecelyin/editor/v2/ui/editor/EditorDelegate.java

@@ -347,6 +347,9 @@ public boolean doCommand(Command command) {
             case BACK:
                 mEditText.backLocation();
                 break;
+            case REQUEST_FOCUS:
+                mEditText.requestFocus();
+                break;
         }
         return true;
     }

app/src/main/java/com/jecelyin/editor/v2/ui/manager/TabManager.java

@@ -20,6 +20,7 @@
 
 import android.database.DataSetObserver;
 import android.support.annotation.Nullable;
+import android.support.v4.util.Pair;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.view.ViewPager;
 import android.view.View;
@@ -239,12 +240,13 @@ public IEditorPagerAdapter getEditorPagerAdapter() {
      * @return null if not found
      */
     @Nullable
-    public EditorDelegate getEditorDelegate(File file) {
+    public Pair<Integer, EditorDelegate> getEditorDelegate(File file) {
         String path = file.getPath();
         ArrayList<EditorDelegate> allEditor = mEditorFragmentPagerAdapter.getAllEditor();
-        for (EditorDelegate editorDelegate : allEditor) {
+        for (int i = 0, allEditorSize = allEditor.size(); i < allEditorSize; i++) {
+            EditorDelegate editorDelegate = allEditor.get(i);
             if (editorDelegate.getPath().equals(path)) {
-                return editorDelegate;
+                return new Pair<>(i, editorDelegate);
             }
         }
         return null;