Preserve "fatal" in compiler errors

When transforming compiler errors (to make filenames more friendly), it
would match "fatal error" or "error" but then always reconstruct as
"error", modifying the compiler error in a way that is not intended.

This commit fixes that, as well as the previous hardcoding of the
"error: " prefix when rebuilding the error message, by capturing this
entire prefix and simply reproducing it in the resulting error message.

Author: matthijskooijman

arduino-core/src/cc/arduino/Compiler.java

@@ -134,7 +134,7 @@ enum BuilderAction {
     }
   }
 
-  private static final Pattern ERROR_FORMAT = Pattern.compile("(.+\\.\\w+):(\\d+)(:\\d+)*:\\s*(fatal)?\\s*error:\\s*(.*)\\s*", Pattern.MULTILINE | Pattern.DOTALL);
+  private static final Pattern ERROR_FORMAT = Pattern.compile("(.+\\.\\w+):(\\d+)(:\\d+)*:\\s*((fatal)?\\s*error:\\s*)(.*)\\s*", Pattern.MULTILINE | Pattern.DOTALL);
 
   private final File pathToSketch;
   private final Sketch sketch;
@@ -522,7 +522,8 @@ public void message(String s) {
       if (pieces[3] != null) {
         col = PApplet.parseInt(pieces[3].substring(1));
       }
-      String error = pieces[5];
+      String errorPrefix = pieces[4];
+      String error = pieces[6];
 
       if (error.trim().equals("SPI.h: No such file or directory")) {
         error = tr("Please import the SPI library from the Sketch > Import Library menu.");
@@ -583,7 +584,7 @@ public void message(String s) {
         int lineNum = ex.getCodeLine() + 1;
         int colNum = ex.getCodeColumn();
         String column = (colNum != -1) ? (":" + colNum) : "";
-        s = fileName + ":" + lineNum + column + ": error: " + error + msg;
+        s = fileName + ":" + lineNum + column + ": " + errorPrefix + error + msg;
       }
 
       if (ex != null) {