Fix it supported

Author: tranleduy2000

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

@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2018 Mr Duy
  *
@@ -31,6 +32,7 @@
 import com.jecelyin.editor.v2.ui.widget.menu.MenuDef;
 
 import java.io.File;
+import java.util.ArrayList;
 
 /**
  * Created by Duy on 25-Apr-18.
@@ -88,8 +90,17 @@ public void onCompileFailed(ShellResult shellResult) {
             DiagnosticsCollector diagnosticsCollector = new DiagnosticsCollector<>();
             OutputParser parser = new OutputParser(diagnosticsCollector);
             parser.parse(shellResult.getMessage());
-            mDiagnosticPresenter.setDiagnostics(diagnosticsCollector.getDiagnostics());
+            ArrayList diagnostics = diagnosticsCollector.getDiagnostics();
+            mDiagnosticPresenter.setDiagnostics(diagnostics);
             mDiagnosticPresenter.showView();
+
+            debug(diagnostics);
+        }
+    }
+
+    private void debug(ArrayList diagnostics) {
+        for (Object diagnostic : diagnostics) {
+            System.out.println(diagnostic);
         }
     }
 

app/src/main/java/com/duy/ccppcompiler/compiler/diagnostic/OutputParser.java

@@ -43,12 +43,11 @@ public class OutputParser {
                     "(.*)" /*Message*/);
 
     //fix-it:"/storage/emulated/0/examples/simple/bit_print.c":{6:7-6:11}:"printf"
-    public static final Pattern FIX_IT_PATTERN = Pattern.compile(Pattern.quote(
+    public static final Pattern FIX_IT_PATTERN = Pattern.compile(
             "(fix-it):" +/*prefix*/
                     "(.*):" +/*File path*/
-                    "\\{([0-9]+):([0-9]+)-([0-9]+):([0-9]+)}:" + /*Index (line:col)-(line:col)*/
-                    "\"(.*)\"" /*Message*/
-    ));
+                    "\\{([0-9]+):([0-9]+)-([0-9]+):([0-9]+)\\}:" + /*Index (line:col)-(line:col)*/
+                    Pattern.quote("\"") + "(.*)" + Pattern.quote("\"")/*Message*/);
 
     private DiagnosticsCollector diagnosticsCollector;
 
@@ -76,6 +75,7 @@ public void parse(String inputData) {
     @SuppressWarnings("unchecked")
     private void processLine(@NonNull String line, @Nullable String nextLine) {
         try {
+            line = line.trim();
             Matcher matcher = DIAGNOSTICS_PATTERN.matcher(line);
             Diagnostic diagnostic;
             if (matcher.find()) {
@@ -96,6 +96,7 @@ private void processLine(@NonNull String line, @Nullable String nextLine) {
             if (nextLine == null) {
                 return;
             }
+            nextLine = nextLine.trim();
 
             matcher = FIX_IT_PATTERN.matcher(nextLine);
             if (matcher.find()) {

app/src/main/java/com/duy/ccppcompiler/compiler/diagnostic/model/SimpleDiagnostic.java

@@ -104,17 +104,6 @@ public long getStartPosition() {
         return NOPOS;
     }
 
-    @Override
-    public String toString() {
-        return "SimpleDiagnostic{" +
-                "kind=" + kind +
-                ", filePath='" + filePath + '\'' +
-                ", line=" + line +
-                ", col=" + col +
-                ", message='" + message + '\'' +
-                '}';
-    }
-
     @Override
     public long getEndPosition() {
         return NOPOS;
@@ -143,14 +132,26 @@ public String getMessage(Context context) {
     @Nullable
     @Override
     public ISuggestion getSuggestion() {
-        return null;
+        return suggestion;
     }
 
     @Override
     public void setSuggestion(ISuggestion suggestion) {
         this.suggestion = suggestion;
     }
 
+    @Override
+    public String toString() {
+        return "SimpleDiagnostic{" +
+                "kind=" + kind +
+                ", filePath='" + filePath + '\'' +
+                ", line=" + line +
+                ", col=" + col +
+                ", message='" + message + '\'' +
+                ", suggestion=" + suggestion +
+                '}';
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -163,7 +164,8 @@ public boolean equals(Object o) {
         if (getKind() != that.getKind()) return false;
         if (filePath != null ? !filePath.equals(that.filePath) : that.filePath != null)
             return false;
-        return message != null ? message.equals(that.message) : that.message == null;
+        if (message != null ? !message.equals(that.message) : that.message != null) return false;
+        return getSuggestion() != null ? getSuggestion().equals(that.getSuggestion()) : that.getSuggestion() == null;
     }
 
     @Override
@@ -173,7 +175,7 @@ public int hashCode() {
         result = 31 * result + line;
         result = 31 * result + col;
         result = 31 * result + (message != null ? message.hashCode() : 0);
+        result = 31 * result + (getSuggestion() != null ? getSuggestion().hashCode() : 0);
         return result;
     }
-
 }

app/src/main/java/com/duy/ccppcompiler/compiler/diagnostic/suggestion/DiagnosticSuggestion.java

@@ -82,6 +82,45 @@ protected DiagnosticSuggestion(Parcel in) {
         suggestion = in.readString();
     }
 
+    @Override
+    public String toString() {
+        return "DiagnosticSuggestion{" +
+                "filePath='" + filePath + '\'' +
+                ", lineStart=" + lineStart +
+                ", colStart=" + colStart +
+                ", lineEnd=" + lineEnd +
+                ", colEnd=" + colEnd +
+                ", suggestion='" + suggestion + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DiagnosticSuggestion)) return false;
+
+        DiagnosticSuggestion that = (DiagnosticSuggestion) o;
+
+        if (getLineStart() != that.getLineStart()) return false;
+        if (getColStart() != that.getColStart()) return false;
+        if (getLineEnd() != that.getLineEnd()) return false;
+        if (getColEnd() != that.getColEnd()) return false;
+        if (getFilePath() != null ? !getFilePath().equals(that.getFilePath()) : that.getFilePath() != null)
+            return false;
+        return getSuggestion() != null ? getSuggestion().equals(that.getSuggestion()) : that.getSuggestion() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getFilePath() != null ? getFilePath().hashCode() : 0;
+        result = 31 * result + getLineStart();
+        result = 31 * result + getColStart();
+        result = 31 * result + getLineEnd();
+        result = 31 * result + getColEnd();
+        result = 31 * result + (getSuggestion() != null ? getSuggestion().hashCode() : 0);
+        return result;
+    }
+
     @Override
     public int describeContents() {
         return 0;

app/src/main/res/layout/list_item_diagnostic.xml

@@ -41,7 +41,6 @@
             android:id="@+id/txt_file"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-
             android:layout_alignParentTop="true"
             android:layout_toEndOf="@+id/txt_line_col"
             android:layout_toRightOf="@+id/txt_line_col"

app/src/test/java/com/duy/ccppcompiler/compiler/diagnostic/parser/OutputParserTest.java

@@ -23,6 +23,7 @@
 import junit.framework.TestCase;
 
 import java.util.ArrayList;
+import java.util.regex.Matcher;
 
 /**
  * Created by Duy on 28-Apr-18.
@@ -63,12 +64,17 @@ public void testParse2() throws Exception {
     public void testFixIt() {
         DiagnosticsCollector<Diagnostic> diagnosticsCollector = new DiagnosticsCollector<>();
         OutputParser outputParser = new OutputParser(diagnosticsCollector);
-        outputParser.parse("fix-it:\"/storage/emulated/0/examples/simple/bit_print.c\":{13:7-13:23}:\"temporaryVariable\"");
+        outputParser.parse("/storage/emulated/0/examples/simple/bit_print.c:6:7: warning: implicit declaration of function 'pinf'; did you mean 'printf'?\n" +
+                "                  fix-it:\"/storage/emulated/0/examples/simple/bit_print.c\":{6:7-6:11}:\"printf\"");
         ArrayList<Diagnostic<? extends Diagnostic>> diagnostics = diagnosticsCollector.getDiagnostics();
         for (Diagnostic<? extends Diagnostic> diagnostic : diagnostics) {
             System.out.println(diagnostic);
         }
         assertEquals(diagnostics.size(), 1);
     }
 
+    public void testFixIt2() {
+        Matcher matcher = OutputParser.FIX_IT_PATTERN.matcher("fix-it:\"/storage/emulated/0/examples/simple/bit_print.c\":{6:7-6:11}:\"printf\"");
+        assertTrue(matcher.find());
+    }
 }