Tweak for AnalysisDomainHandler.

pkg/analysis_server/lib/src/domain_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 domain.analysis;
 
 import 'dart:collection';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_hover.dart';
 import 'package:analysis_server/src/computer/error.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_services/constants.dart';
-import 'package:analysis_services/search/search_engine.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 
 
 /**
  * Instances of the class [AnalysisDomainHandler] implement a [RequestHandler]
  * that handles requests in the `analysis` domain.
  */
 class AnalysisDomainHandler implements RequestHandler {
   /**
    * The analysis server that is using this handler to process requests.
    */
   final AnalysisServer server;
 
   /**
-   * The [SearchEngine] for this server.
-   */
-  SearchEngine searchEngine;
-
-  /**
    * Initialize a newly created handler to handle requests for the given [server].
    */
-  AnalysisDomainHandler(this.server) {
-    searchEngine = server.searchEngine;
-  }
+  AnalysisDomainHandler(this.server);
 
   /**
    * Implement the `analysis.getErrors` request.
    */
   Response getErrors(Request request) {
     String file = request.getRequiredParameter(FILE).asString();
     server.onFileAnalysisComplete(file).then((_) {
       Response response = new Response(request.id);
       AnalysisErrorInfo errorInfo = server.getErrors(file);
       if (errorInfo == null) {
@@ skipping 113 matching lines @@
     server.setAnalysisSubscriptions(subMap);
     return new Response(request.id);
   }
 
   /**
    * Implement the 'analysis.updateContent' request.
    */
   Response updateContent(Request request) {
     var changes = new HashMap<String, ContentChange>();
     RequestDatum filesDatum = request.getRequiredParameter(FILES);
-    Response errorResponse;
     for (String file in filesDatum.keys) {
       RequestDatum changeDatum = filesDatum[file];
       ContentChange change = new ContentChange();
       switch (changeDatum[TYPE].asString()) {
-        case 'add':
+        case ANALYSIS_OVERLAY_ADD:
           change.contentOrReplacement = changeDatum[CONTENT].asString();
           break;
-        case 'change':
+        case ANALYSIS_OVERLAY_CHANGE:
           change.offset = changeDatum[OFFSET].asInt();
           change.length = changeDatum[LENGTH].asInt();
           change.contentOrReplacement = changeDatum[REPLACEMENT].asString();
           break;
-        case 'remove':
+        case ANALYSIS_OVERLAY_REMOVE:
           break;
         default:
-          return new Response.invalidParameter(request,
-              changeDatum[TYPE].path, 'be one of "add", "change", or "remove"');
+          return new Response.invalidParameter(
+              request,
+              changeDatum[TYPE].path,
+              'be one of "add", "change", or "remove"');
       }
       changes[file] = change;
     }
-    if (errorResponse != null) {
-      return errorResponse;
-    }
     server.updateContent(changes);
     return new Response(request.id);
   }
 
   /**
    * Implement the 'analysis.updateOptions' request.
    */
   Response updateOptions(Request request) {
     // options
     RequestDatum optionsDatum = request.getRequiredParameter(OPTIONS);
@@ skipping 56 matching lines @@
    * if the file should be read from the filesystem).
    *
    * If [offset] and [length] are non-null, the replacement text which should
    * take the place of the [length] characters of the file starting at [offset].
    */
   String contentOrReplacement;
 
   int offset;
   int length;
 }