Update analysis.errors notification to the newest spec.

pkg/analysis_server/lib/src/operation/operation_analysis.dart

 // Copyright (c) 2014, 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.
 
 library operation.analysis;
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_highlights.dart';
 import 'package:analysis_server/src/computer/computer_navigation.dart';
 import 'package:analysis_server/src/computer/computer_outline.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/operation/operation.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/html.dart';
 import 'package:analyzer/src/generated/index.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 
-Map<String, Object> errorToJson(AnalysisError analysisError) {
-  // TODO(paulberry): move this function into the AnalysisError class.
+Map<String, Object> errorToJson(LineInfo lineInfo, AnalysisError analysisError)
+    {
   ErrorCode errorCode = analysisError.errorCode;
+  // prepare location
+  int offset = analysisError.offset;
+  Map<String, Object> location = {
+    FILE: analysisError.source.fullName,
+    OFFSET: offset,
+    LENGTH: analysisError.length
+  };
+  if (lineInfo != null) {
+    LineInfo_Location lineLocation = lineInfo.getLocation(offset);
+    if (lineLocation != null) {
+      location[START_LINE] = lineLocation.lineNumber;
+      location[START_COLUMN] = lineLocation.columnNumber;
+    }
+  }
+  // fill JSON
   Map<String, Object> result = {
-    FILE: analysisError.source.fullName,
     // TODO(scheglov) add Enum.fullName ?
     ERROR_CODE: '${errorCode.runtimeType}.${(errorCode as Enum).name}',
-    OFFSET: analysisError.offset,
-    LENGTH: analysisError.length,
+    SEVERITY: errorCode.errorSeverity.name,
+    TYPE: errorCode.type.name,
+    LOCATION: location,
     MESSAGE: analysisError.message
   };
   if (analysisError.correction != null) {
     result[CORRECTION] = analysisError.correction;
   }
   return result;
 }
 
 
 void sendAnalysisNotificationErrors(AnalysisServer server, String file,
-    List<AnalysisError> errors) {
+    LineInfo lineInfo, List<AnalysisError> errors) {
   Notification notification = new Notification(ANALYSIS_ERRORS);
   notification.setParameter(FILE, file);
-  notification.setParameter(ERRORS, errors.map(errorToJson).toList());
+  notification.setParameter(ERRORS, errors.map((error) {
+    return errorToJson(lineInfo, error);
+  }).toList());
   server.sendNotification(notification);
 }
 
 
 void sendAnalysisNotificationHighlights(AnalysisServer server, String file,
     CompilationUnit dartUnit) {
   Notification notification = new Notification(ANALYSIS_HIGHLIGHTS);
   notification.setParameter(FILE, file);
   notification.setParameter(REGIONS, new DartUnitHighlightsComputer(
       dartUnit).compute());
@@ skipping 62 matching lines @@
     server.addOperation(new PerformAnalysisOperation(context, true));
   }
 
   /**
    * Send the information in the given list of notices back to the client.
    */
   void sendNotices(AnalysisServer server, List<ChangeNotice> notices) {
     for (int i = 0; i < notices.length; i++) {
       ChangeNotice notice = notices[i];
       Source source = notice.source;
+      String file = source.fullName;
+      // Dart
       CompilationUnit dartUnit = notice.compilationUnit;
-      // TODO(scheglov) use default subscriptions
-      String file = source.fullName;
       if (dartUnit != null) {
         if (server.hasAnalysisSubscription(AnalysisService.HIGHLIGHTS, file)) {
           sendAnalysisNotificationHighlights(server, file, dartUnit);
         }
         if (server.hasAnalysisSubscription(AnalysisService.NAVIGATION, file)) {
           sendAnalysisNotificationNavigation(server, file, dartUnit);
         }
         if (server.hasAnalysisSubscription(AnalysisService.OUTLINE, file)) {
           sendAnalysisNotificationOutline(server, file, dartUnit);
         }
       }
+      // TODO(scheglov) use default subscriptions
       if (!source.isInSystemLibrary) {
-        sendAnalysisNotificationErrors(server, file, notice.errors);
+        sendAnalysisNotificationErrors(server, file, notice.lineInfo,
+            notice.errors);
       }
     }
   }
 
   void updateIndex(Index index, List<ChangeNotice> notices) {
     if (index == null) {
       return;
     }
     for (ChangeNotice notice in notices) {
       // Dart
       {
         CompilationUnit dartUnit = notice.compilationUnit;
         if (dartUnit != null) {
           index.indexUnit(context, dartUnit);
         }
       }
       // HTML
       {
         HtmlUnit htmlUnit = notice.htmlUnit;
         if (htmlUnit != null) {
           index.indexHtmlUnit(context, htmlUnit);
         }
       }
     }
   }
 }