Issue 250: Allow for GNU formatted errors

compiler/java/com/google/dart/compiler/PrettyErrorFormatter.java

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 package com.google.dart.compiler;
 
 import com.google.common.io.Closeables;
+import com.google.dart.compiler.CompilerConfiguration.ErrorFormat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Reader;
 
 /**
  * An error formatter that scans the source file and prints the error line and
  * some context around it. This formatter has two modes: with or without color.
  * When using colors, it prints the error message in red, and it highlights the
  * portion of the line containing the error in red. Without colors, it prints an
  * extra line underlying the portion of the line containing the error.
  */
 public class PrettyErrorFormatter extends DefaultErrorFormatter {
   private static String RED_BOLD_COLOR = "\033[31;1m";
   private static String RED_COLOR = "\033[31m";
   private static String NO_COLOR = "\033[0m";
 
   private final boolean useColor;
-  private final boolean printMachineProblems;
 
   public PrettyErrorFormatter(PrintStream outputStream,
       boolean useColor,
-      boolean printMachineProblems) {
-    super(outputStream);
+      ErrorFormat errorFormat) {
+    super(outputStream, errorFormat);
     this.useColor = useColor;
-    this.printMachineProblems = printMachineProblems;
   }
 
   @Override
   public void format(DartCompilationError event) {
     Source sourceFile = event.getSource();
 
     // if this is an unknown source type, default to the basic error formatter
     if (!(sourceFile instanceof DartSource) && !(sourceFile instanceof LibrarySource)) {
       super.format(event);
       return;
@@ skipping 27 matching lines @@
       int length = event.getLength();
       col = between(col, 0, lineText.length());
       length = between(length, 0, lineText.length() - col);
       length = length == 0 ? lineText.length() - col : length;
 
       // print the error message
       StringBuilder buf = new StringBuilder();
       if (useColor) {
         buf.append(RED_BOLD_COLOR);
       }
-      if (printMachineProblems) {
+      if (errorFormat == ErrorFormat.MACHINE) {
         buf.append(String.format(
             "%s:%s:%s:%s:%d:%d:%d: %s",
             event.getErrorCode().getErrorSeverity(),
             event.getErrorCode().getSubSystem(),
             event.getErrorCode(),
             sourceFile.getName(),
             event.getLineNumber(),
             1 + col,
             length,
             event.getMessage()));
       } else {
+        String sourceName = sourceFile.getUri().toString();
+        String includeFrom = getImportString(sourceFile);
         buf.append(String.format(
-            "%s:%d: %s",
-            sourceFile.getName(),
+            "%s:%d: %s%s",
+            sourceName,
             event.getLineNumber(),
-            event.getMessage()));
+            event.getMessage(),
+            includeFrom));
       }
       if (useColor) {
         buf.append(NO_COLOR);
       }
       buf.append("\n");
       // show the previous line for context
       if (lineBefore != null) {
         buf.append(String.format("%6d: %s\n", line - 1, lineBefore));
       }
 
@@ skipping 48 matching lines @@
   }
 
   /**
    * Returns the closest value in {@code [start,end]} to the given value. If
    * the given range is entirely empty, then {@code start} is returned.
    */
   private static int between(int val, int start, int end) {
     return Math.max(start, Math.min(val, end));
   }
 }