Repository: flex-falcon
Updated Branches:
  refs/heads/develop 1dc3e4851 -> 2ee9c04d0


FLEX-35133 update error output to match MXMLC.  I wonder if anything was 
expecting the other output format


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2ee9c04d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2ee9c04d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2ee9c04d

Branch: refs/heads/develop
Commit: 2ee9c04d08172d7cb1d4cec3e19f57a2523dcb07
Parents: 1dc3e48
Author: Alex Harui <aha...@apache.org>
Authored: Thu Sep 22 14:00:20 2016 -0700
Committer: Alex Harui <aha...@apache.org>
Committed: Thu Sep 22 14:00:20 2016 -0700

----------------------------------------------------------------------
 .../clients/problems/WorkspaceProblemFormatter.java      | 11 ++++++-----
 .../org/apache/flex/compiler/messages_en.properties      |  4 ++--
 .../org/apache/flex/compiler/messages_fr.properties      |  2 +-
 .../org/apache/flex/compiler/messages_ja.properties      |  2 +-
 .../org/apache/flex/compiler/messages_zh_CN.properties   |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2ee9c04d/compiler/src/main/java/org/apache/flex/compiler/clients/problems/WorkspaceProblemFormatter.java
----------------------------------------------------------------------
diff --git 
a/compiler/src/main/java/org/apache/flex/compiler/clients/problems/WorkspaceProblemFormatter.java
 
b/compiler/src/main/java/org/apache/flex/compiler/clients/problems/WorkspaceProblemFormatter.java
index a1a6df7..7279d06 100644
--- 
a/compiler/src/main/java/org/apache/flex/compiler/clients/problems/WorkspaceProblemFormatter.java
+++ 
b/compiler/src/main/java/org/apache/flex/compiler/clients/problems/WorkspaceProblemFormatter.java
@@ -58,7 +58,7 @@ public final class WorkspaceProblemFormatter extends 
ProblemFormatter
     private static String SYNTAXERROR_FORMAT_ID = "SyntaxErrorFormat";        
     private static String INTERNALERROR_FORMAT_ID = "InternalErrorFormat";     
  
     private static String LOCATION_FORMAT_ID = "LocationFormat";
-    private static String LOCATION_FORMAT_STRING = "%s:%d";    
+    private static String LOCATION_FORMAT_STRING = "%s(%d): col: %d";    
     
     private final Workspace workspace;
     private final LoadingCache<String, FileLineInfo> readers;
@@ -112,11 +112,11 @@ public final class WorkspaceProblemFormatter extends 
ProblemFormatter
     {   
         StringBuffer buffer = new StringBuffer();
         
-        final String locationString = 
getLocationString(problem.getSourcePath(), problem.getLine());
+        final String locationString = 
getLocationString(problem.getSourcePath(), problem.getLine(), 
problem.getColumn());
         if (!locationString.isEmpty()) 
         {
             buffer.append(locationString);
-            buffer.append(NEW_LINE);
+            buffer.append(" ");
         }
         
         String description = super.format(problem);
@@ -130,6 +130,7 @@ public final class WorkspaceProblemFormatter extends 
ProblemFormatter
         assert description != null;
         buffer.append(description);
         buffer.append(NEW_LINE);
+        buffer.append(NEW_LINE);
 
         final String lineText = getLineText(problem);
         if (lineText != null)
@@ -238,14 +239,14 @@ public final class WorkspaceProblemFormatter extends 
ProblemFormatter
      * <p>
      * Never returns null.
      */
-     private String getLocationString(String filePath, int line)
+     private String getLocationString(String filePath, int line, int col)
      {
          if (filePath == null)
              return "";
 
          String location = filePath;
          if (line != -1)
-             location = String.format(getLocationFormat(), location, (line + 
1));
+             location = String.format(getLocationFormat(), location, (line + 
1), (col + 1));
          assert location != null;
          return location;
      }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2ee9c04d/compiler/src/main/resources/org/apache/flex/compiler/messages_en.properties
----------------------------------------------------------------------
diff --git 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_en.properties 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_en.properties
index 59e87ae..e9b9b79 100644
--- 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_en.properties
+++ 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_en.properties
@@ -47,8 +47,8 @@ WarningFormat=Warning: %s
 SyntaxErrorFormat=Syntax error: %s
 InternalErrorFormat=Internal error: %s
 
-# Format the file name and line number of a problem, file name:line number.
-LocationFormat=%s:%d
+# Format the file name and line number of a problem, file name(line number): 
col: column.
+LocationFormat=%s(%d): col: %d
 
 # Format embed source locations searched.
 QuotedPath='${path}'

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2ee9c04d/compiler/src/main/resources/org/apache/flex/compiler/messages_fr.properties
----------------------------------------------------------------------
diff --git 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_fr.properties 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_fr.properties
index 07957aa..3e19057 100644
--- 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_fr.properties
+++ 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_fr.properties
@@ -48,7 +48,7 @@ SyntaxErrorFormat=Erreur de syntaxe\u00a0: %s
 InternalErrorFormat=Erreur interne\u00a0: %s
 
 # Format the file name and line number of a problem, file name:line number.
-LocationFormat=%s:%d
+LocationFormat=%s(%d): col: %d
 
 # Format embed source locations searched.
 QuotedPath=${path}

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2ee9c04d/compiler/src/main/resources/org/apache/flex/compiler/messages_ja.properties
----------------------------------------------------------------------
diff --git 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_ja.properties 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_ja.properties
index 0bfa119..3e801a2 100644
--- 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_ja.properties
+++ 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_ja.properties
@@ -48,7 +48,7 @@ SyntaxErrorFormat=\u69cb\u6587\u30a8\u30e9\u30fc : %s
 InternalErrorFormat=\u5185\u90e8\u30a8\u30e9\u30fc : %s
 
 # Format the file name and line number of a problem, file name:line number.
-LocationFormat=%s:%d
+LocationFormat=%s(%d): col: %d
 
 # Format embed source locations searched.
 QuotedPath=\u300c${path}\u300d

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2ee9c04d/compiler/src/main/resources/org/apache/flex/compiler/messages_zh_CN.properties
----------------------------------------------------------------------
diff --git 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_zh_CN.properties
 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_zh_CN.properties
index 7da7d5f..2ba9d6b 100644
--- 
a/compiler/src/main/resources/org/apache/flex/compiler/messages_zh_CN.properties
+++ 
b/compiler/src/main/resources/org/apache/flex/compiler/messages_zh_CN.properties
@@ -48,7 +48,7 @@ SyntaxErrorFormat=\u8bed\u6cd5\u9519\u8bef: %s
 InternalErrorFormat=\u5185\u90e8\u9519\u8bef: %s
 
 # Format the file name and line number of a problem, file name:line number.
-LocationFormat=%s:%d
+LocationFormat=%s(%d): col: %d
 
 # Format embed source locations searched.
 QuotedPath=\u201c${path}\u201d

Reply via email to