improve cppcheck

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/compiler/analyze/CppCheckAnalyzer.java

@@ -31,15 +31,13 @@
 import com.duy.ccppcompiler.compiler.shell.Shell;
 import com.duy.common.DLog;
 import com.duy.ide.diagnostic.DiagnosticPresenter;
-import com.duy.ide.diagnostic.model.Message;
 import com.duy.ide.editor.view.IEditAreaView;
 import com.jecelyin.editor.v2.Preferences;
 import com.jecelyin.editor.v2.editor.IEditorDelegate;
 import com.jecelyin.editor.v2.io.LocalFileWriter;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 
 ;
 
@@ -126,7 +124,7 @@ public void afterTextChanged(Editable s) {
     }
 
     @SuppressLint("StaticFieldLeak")
-    private static class AnalyzeTask extends AsyncTask<Void, Void, ArrayList<Message>> {
+    private static class AnalyzeTask extends AsyncTask<Void, Void, String> {
 
         private final Context mContext;
         private final DiagnosticPresenter mDiagnosticPresenter;
@@ -139,7 +137,13 @@ public AnalyzeTask(Context mContext, IEditorDelegate delegate, DiagnosticPresent
         }
 
         @Override
-        protected ArrayList<Message> doInBackground(Void... voids) {
+        protected void onPreExecute() {
+            super.onPreExecute();
+            mDiagnosticPresenter.clear();
+        }
+
+        @Override
+        protected String doInBackground(Void... voids) {
             IEditAreaView editText = mEditorDelegate.getEditText();
 
             File originFile = mEditorDelegate.getDocument().getFile();
@@ -183,11 +187,7 @@ protected ArrayList<Message> doInBackground(Void... voids) {
             }
 
             if (DLog.DEBUG) DLog.d(TAG, "result = " + result);
-            String message = result.getMessage().replace(tmpFile.getAbsolutePath(), originFile.getAbsolutePath());
-            CppCheckOutputParser parser = new CppCheckOutputParser();
-            parser.parse(message);
-
-            return null;
+            return result.getMessage().replace(tmpFile.getAbsolutePath(), originFile.getAbsolutePath());
         }
 
         private File getCppCheckTmpDir() {
@@ -199,10 +199,10 @@ private File getCppCheckTmpDir() {
         }
 
         @Override
-        protected void onPostExecute(ArrayList<Message> messages) {
-            super.onPostExecute(messages);
-            if (messages != null && !isCancelled()) {
-                mDiagnosticPresenter.setMessages(messages);
+        protected void onPostExecute(String message) {
+            super.onPostExecute(message);
+            if (message != null && !isCancelled()) {
+                mDiagnosticPresenter.onNewMessage(message);
             }
         }
     }

app/src/main/java/com/duy/ccppcompiler/compiler/analyze/CppCheckOutputParser.java

@@ -20,11 +20,15 @@
 import android.support.annotation.NonNull;
 
 import com.duy.ide.diagnostic.model.Message;
+import com.duy.ide.diagnostic.model.SourceFilePosition;
+import com.duy.ide.diagnostic.model.SourcePosition;
 import com.duy.ide.diagnostic.parser.PatternAwareOutputParser;
 import com.duy.ide.diagnostic.util.OutputLineReader;
 import com.duy.ide.logging.ILogger;
 
+import java.io.File;
 import java.util.List;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -39,36 +43,31 @@
 
 public class CppCheckOutputParser implements PatternAwareOutputParser {
 
-    public static final String TEMPLATE = "--template=\"{file}:{line}:{severity}:{message}\"";
-    private static final Pattern TEMPLATE_PATTERN = Pattern.compile("^(\\S+):([0-9]+):([^:]+):(.*)");
+    public static final String TEMPLATE = "--template=\"analysis:{file}:{line}:{severity}:{message}\"";
+    private static final Pattern PATTERN = Pattern.compile("^analysis:(\\S+):([0-9]+):([^:]+):(.*)");
 
     public CppCheckOutputParser() {
     }
 
-    public void parse(String inputData) {
-//        try {
-//            StringReader stringReader = new StringReader(inputData);
-//            LineNumberReader lineReader = new LineNumberReader(stringReader);
-//            String line;
-//            while ((line = lineReader.readLine()) != null) {
-//                Matcher matcher = TEMPLATE_PATTERN.matcher(line);
-//                if (matcher.find()) {
-//                    String filePath = matcher.group(1);
-//                    int lineNumber = Integer.parseInt(matcher.group(2));
-//                    Kind type = DiagnosticFactory.createType(matcher.group(3));
-//                    String message = matcher.group(4);
-//                    Message diagnostic = DiagnosticFactory.create(type, filePath, lineNumber, Message.NOPOS, message);
-//                    diagnosticsCollector.report(diagnostic);
-//                }
-//            }
-//        } catch (Exception e) {
-//            //should not happened
-//            e.printStackTrace();
-//        }
-    }
-
     @Override
-    public boolean parse(@NonNull String line, @NonNull OutputLineReader reader, @NonNull List<Message> messages, @NonNull ILogger logger) {
+    public boolean parse(@NonNull String line, @NonNull OutputLineReader reader, @NonNull List<Message> messages,
+                         @NonNull ILogger logger) {
+        Matcher matcher = PATTERN.matcher(line);
+        try {
+
+            if (matcher.find()) {
+                File file = new File(matcher.group(1));
+                int lineNumber = Integer.parseInt(matcher.group(2));
+                Message.Kind kind = Message.Kind.ERROR;
+                String text = matcher.group(4);
+                Message message = new Message(kind, text,
+                        new SourceFilePosition(file, new SourcePosition(lineNumber - 1, -1, -1)));
+                messages.add(message);
+                return true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return false;
     }
 }

app/src/main/res/xml/preferences_cppcheck.xml

@@ -41,7 +41,8 @@
             android:title="--enable=performance" />
 
         <CheckBoxPreference
-            android:defaultValue="true"
+            android:defaultValue="false"
+            android:enabled="false"
             android:key="@string/pref_key_cpp_check_information"
             android:summary="enable information messages"
             android:title="--enable=information" />

lib-n-ide/src/main/java/com/nakama/arraypageradapter/ArrayFragmentStatePagerAdapter.java

@@ -356,7 +356,8 @@ private Fragment findFragmentByItem(Object item) {
     }
 
     private void setTags(List<IdentifiedItem<T>> items) {
-        for (int i = 0; i < mFragments.size(); i++) {
+        final int max = Math.max(items.size(), mFragments.size());
+        for (int i = 0; i < max; i++) {
             Fragment fragment = mFragments.get(i);
             if (fragment != null && fragment.getView() != null) {
                 fragment.getView().setTag(R.id.avpa_view_tag_key, items.get(i));