Drop 'errorToJson', use server's AnalysisError.

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_occurrences.dart';
 import 'package:analysis_server/src/computer/computer_outline.dart';
 import 'package:analysis_server/src/computer/computer_overrides.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:analysis_services/constants.dart';
 import 'package:analysis_services/index/index.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/source.dart';
-
-
-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 = {
-    // TODO(scheglov) add Enum.fullName ?
-    SEVERITY: errorCode.errorSeverity.name,
-    TYPE: errorCode.type.name,
-    LOCATION: location,
-    MESSAGE: analysisError.message
-  };
-  if (analysisError.correction != null) {
-    result[CORRECTION] = analysisError.correction;
-  }
-  return result;
-}
+import 'package:analysis_server/src/computer/error.dart' as server_prefix;
 
 
 void sendAnalysisNotificationErrors(AnalysisServer server, String file,
     LineInfo lineInfo, List<AnalysisError> errors) {
   Notification notification = new Notification(ANALYSIS_ERRORS);
   notification.setParameter(FILE, file);
-  notification.setParameter(ERRORS, errors.map((error) {
-    return errorToJson(lineInfo, error);
-  }).toList());
+  notification.setParameter(
+      ERRORS,
+      server_prefix.engineErrorsToJson(lineInfo, errors));
   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());
+  notification.setParameter(
+      REGIONS,
+      new DartUnitHighlightsComputer(dartUnit).compute());
   server.sendNotification(notification);
 }
 
 
 void sendAnalysisNotificationNavigation(AnalysisServer server, String file,
     CompilationUnit dartUnit) {
   Notification notification = new Notification(ANALYSIS_NAVIGATION);
   notification.setParameter(FILE, file);
-  notification.setParameter(REGIONS, new DartUnitNavigationComputer(
-      dartUnit).compute());
+  notification.setParameter(
+      REGIONS,
+      new DartUnitNavigationComputer(dartUnit).compute());
   server.sendNotification(notification);
 }
 
 
 void sendAnalysisNotificationOccurrences(AnalysisServer server, String file,
     CompilationUnit dartUnit) {
   Notification notification = new Notification(ANALYSIS_OCCURRENCES);
   notification.setParameter(FILE, file);
-  notification.setParameter(OCCURRENCES, new DartUnitOccurrencesComputer(
-      dartUnit).compute());
+  notification.setParameter(
+      OCCURRENCES,
+      new DartUnitOccurrencesComputer(dartUnit).compute());
   server.sendNotification(notification);
 }
 
 
 void sendAnalysisNotificationOutline(AnalysisServer server,
     AnalysisContext context, Source source, CompilationUnit dartUnit) {
   Notification notification = new Notification(ANALYSIS_OUTLINE);
   notification.setParameter(FILE, source.fullName);
-  notification.setParameter(OUTLINE, new DartUnitOutlineComputer(context,
-      source, dartUnit).compute());
+  notification.setParameter(
+      OUTLINE,
+      new DartUnitOutlineComputer(context, source, dartUnit).compute());
   server.sendNotification(notification);
 }
 
 
-void sendAnalysisNotificationOverrides(AnalysisServer server,
-    String file, CompilationUnit dartUnit) {
+void sendAnalysisNotificationOverrides(AnalysisServer server, String file,
+    CompilationUnit dartUnit) {
   Notification notification = new Notification(ANALYSIS_OVERRIDES);
   notification.setParameter(FILE, file);
-  notification.setParameter(OVERRIDES, new DartUnitOverridesComputer(
-      dartUnit).compute());
+  notification.setParameter(
+      OVERRIDES,
+      new DartUnitOverridesComputer(dartUnit).compute());
   server.sendNotification(notification);
 }
 
 
 /**
  * Instances of [PerformAnalysisOperation] perform a single analysis task.
  */
 class PerformAnalysisOperation extends ServerOperation {
   final AnalysisContext context;
   final bool isContinue;
@@ skipping 55 matching lines @@
         }
         if (server.hasAnalysisSubscription(AnalysisService.OUTLINE, file)) {
           sendAnalysisNotificationOutline(server, context, source, dartUnit);
         }
         if (server.hasAnalysisSubscription(AnalysisService.OVERRIDES, file)) {
           sendAnalysisNotificationOverrides(server, file, dartUnit);
         }
       }
       // TODO(scheglov) use default subscriptions
       if (!source.isInSystemLibrary) {
-        sendAnalysisNotificationErrors(server, file, notice.lineInfo,
+        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);
         }
       }
     }
   }
 }