suggestion

Author: tranleduy2000

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

@@ -18,6 +18,9 @@
 
 import android.content.Context;
 import android.os.Parcelable;
+import android.support.annotation.Nullable;
+
+import com.duy.ccppcompiler.compiler.diagnostic.suggestion.ISuggestion;
 
 /**
  * Created by Duy on 28-Apr-18.
@@ -38,6 +41,7 @@ public interface Diagnostic<S> extends Parcelable {
      * {@code null} if no source object is associated with the
      * diagnostic.
      */
+    @Nullable
     S getSource();
 
     /**
@@ -98,8 +102,11 @@ public interface Diagnostic<S> extends Parcelable {
      *
      * @return a diagnostic code
      */
+    @Nullable
     String getCode();
 
     String getMessage(Context context);
 
+    @Nullable
+    ISuggestion getSuggestion();
 }

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

@@ -16,6 +16,9 @@
 
 package com.duy.ccppcompiler.compiler.diagnostic;
 
+import com.duy.ccppcompiler.compiler.diagnostic.model.SimpleDiagnostic;
+import com.duy.ccppcompiler.compiler.diagnostic.suggestion.DiagnosticSuggestion;
+
 /**
  * Created by Duy on 28-Apr-18.
  */
@@ -49,4 +52,7 @@ public static Kind createType(String type) {
         return Kind.OTHER;
     }
 
+    public static Diagnostic createFixIt(String filePath, int lineStart, int colStart, int lineEnd, int colEnd, String suggestion) {
+        return new DiagnosticSuggestion(filePath, lineStart, colStart, lineEnd, colEnd, suggestion);
+    }
 }

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

@@ -16,6 +16,11 @@
 
 package com.duy.ccppcompiler.compiler.diagnostic;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.io.LineNumberReader;
+import java.io.StringReader;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -28,13 +33,20 @@
  */
 
 public class OutputParser {
-    public static final Pattern PATTERN = Pattern.compile(
-            "(.*):" + /*File name*/
+    public static final Pattern DIAGNOSTICS_PATTERN = Pattern.compile(
+            "(.*):" + /*File path*/
                     "([0-9]+):" + /*Line*/
                     "([0-9]+):" + /*Col*/
                     "(\\s+.*:\\s+)" + /*Type*/
-                    "(.*)" /*Message*/
-            , Pattern.CASE_INSENSITIVE);
+                    "(.*)" /*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(
+            "(fix-it):" +/*prefix*/
+                    "(.*):" +/*File path*/
+                    "\\{([0-9]+):([0-9]+)-([0-9]+):([0-9]+)}" + /*Index (line:col)-(line:col)*/
+                    "\"(.*)\"" /*Message*/
+    );
 
     private DiagnosticsCollector diagnosticsCollector;
 
@@ -44,21 +56,56 @@ public OutputParser(DiagnosticsCollector diagnosticsCollector) {
 
     @SuppressWarnings("unchecked")
     public void parse(String inputData) {
-        Matcher matcher = PATTERN.matcher(inputData);
-        while (matcher.find()) {
-            try {
-                String file = matcher.group(1);
-                int line = Integer.parseInt(matcher.group(2));
-                int col = Integer.parseInt(matcher.group(3));
+        try {
+            StringReader stringReader = new StringReader(inputData);
+            LineNumberReader lineNumberReader = new LineNumberReader(stringReader);
+
+            String line;
+            while ((line = lineNumberReader.readLine()) != null) {
+                processLine(line, lineNumberReader.readLine());
+            }
+
+        } catch (Exception e) {
+            //should not happened
+            e.printStackTrace();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void processLine(@NonNull String line, @Nullable String nextLine) {
+        try {
+            Matcher matcher = DIAGNOSTICS_PATTERN.matcher(line);
+            if (matcher.find()) {
+                String filePath = matcher.group(1);
+                int lineNumber = Integer.parseInt(matcher.group(2));
+                int colNumber = Integer.parseInt(matcher.group(3));
                 Kind type = DiagnosticFactory.createType(matcher.group(4));
                 String message = matcher.group(5);
 
-                Diagnostic diagnostic = DiagnosticFactory.create(type, file, line, col, message);
+                Diagnostic diagnostic = DiagnosticFactory.create(type, filePath, lineNumber, colNumber, message);
+                diagnosticsCollector.report(diagnostic);
+                return;
+            }
+            if (nextLine == null) {
+                return;
+            }
+
+            matcher = FIX_IT_PATTERN.matcher(line);
+            if (matcher.find()) {
+                String filePath = matcher.group(2);
+                int lineStart = Integer.parseInt(matcher.group(3));
+                int colStart = Integer.parseInt(matcher.group(4));
+                int lineEnd = Integer.parseInt(matcher.group(5));
+                int colEnd = Integer.parseInt(matcher.group(6));
+                String suggestion = matcher.group(7);
+                Diagnostic diagnostic = DiagnosticFactory.createFixIt(filePath, lineStart, colStart, lineEnd, colEnd, suggestion);
                 diagnosticsCollector.report(diagnostic);
-            } catch (Exception e) {
-                //should not happened
-                e.printStackTrace();
+            } else {
+                processLine(nextLine, null);
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            //should not happend
         }
     }
 }