Clean-up and progress on analysis server

pkg/analysis_server/lib/src/domain_context.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.context;
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
  * Instances of the class [ContextDomainHandler] implement a [RequestHandler]
  * that handles requests in the context domain.
  */
 class ContextDomainHandler implements RequestHandler {
   /**
    * The name of the context.applyChanges request.
    */
   static const String APPLY_CHANGES_NAME = 'context.applyChanges';
 
   /**
+   * The name of the context.getFixes request.
+   */
+  static const String GET_FIXES_NAME = 'context.getFixes';
+
+  /**
    * The name of the context.setOptions request.
    */
   static const String SET_OPTIONS_NAME = 'context.setOptions';
 
   /**
    * The name of the context.setPrioritySources request.
    */
   static const String SET_PRIORITY_SOURCES_NAME = 'context.setPrioritySources';
 
   /**
+   * The name of the added parameter.
+   */
+  static const String ADDED_PARAM = "added";
+
+  /**
    * The name of the changes parameter.
    */
   static const String CHANGES_PARAM = 'changes';
 
   /**
    * The name of the contextId parameter.
    */
   static const String CONTEXT_ID_PARAM = 'contextId';
 
   /**
+   * The name of the modified parameter.
+   */
+  static const String MODIFIED_PARAM = "modified";
+
+  /**
    * The name of the options parameter.
    */
   static const String OPTIONS_PARAM = 'options';
 
   /**
+   * The name of the removed parameter.
+   */
+  static const String REMOVED_PARAM = "removed";
+
+  /**
    * The name of the sources parameter.
    */
   static const String SOURCES_PARAM = 'sources';
 
   /**
    * The name of the cacheSize option.
    */
   static const String CACHE_SIZE_OPTION = 'cacheSize';
 
   /**
@@ skipping 30 matching lines @@
    * Initialize a newly created handler to handle requests for the given [server].
    */
   ContextDomainHandler(this.server);
 
   @override
   Response handleRequest(Request request) {
     try {
       String requestName = request.method;
       if (requestName == APPLY_CHANGES_NAME) {
         return applyChanges(request);
+      } else if (requestName == GET_FIXES_NAME) {
+        return getFixes(request);
       } else if (requestName == SET_OPTIONS_NAME) {
         return setOptions(request);
       } else if (requestName == SET_PRIORITY_SOURCES_NAME) {
         return setPrioritySources(request);
       }
     } on RequestFailure catch (exception) {
       return exception.response;
     }
     return null;
   }
 
   /**
    * Inform the specified context that the changes encoded in the change set
    * have been made. Any invalidated analysis results will be flushed from the
    * context.
    */
   Response applyChanges(Request request) {
     AnalysisContext context = getAnalysisContext(request);
     Map<String, Object> changesData = request.getRequiredParameter(CHANGES_PARAM);
-    ChangeSet changeSet = createChangeSet(changesData);
+    ChangeSet changeSet = createChangeSet(
+        request,
+        context.sourceFactory,
+        changesData);
 
     context.applyChanges(changeSet);
     Response response = new Response(request.id);
     return response;
   }
 
   /**
-   * Convert the given JSON object into a [ChangeSet].
+   * Convert the given JSON object into a [ChangeSet], using the given
+   * [sourceFactory] to convert the embedded strings into sources.
    */
-  ChangeSet createChangeSet(Map<String, Object> jsonData) {
-    // TODO(brianwilkerson) Implement this.
-    return new ChangeSet();
+  ChangeSet createChangeSet(Request request, SourceFactory sourceFactory, Map<String, Object> jsonData) {
+    ChangeSet changeSet = new ChangeSet();
+    convertSources(request, sourceFactory, jsonData[ADDED_PARAM], (Source source) {
+      changeSet.addedSource(source);
+    });
+    convertSources(request, sourceFactory, jsonData[MODIFIED_PARAM], (Source source) {
+      changeSet.changedSource(source);
+    });
+    convertSources(request, sourceFactory, jsonData[REMOVED_PARAM], (Source source) {
+      changeSet.removedSource(source);
+    });
+    return changeSet;
   }
 
   /**
+   * If the given [sources] is a list of strings, use the given [sourceFactory]
+   * to convert each string into a source and pass the source to the given
+   * [handler]. Otherwise, throw an exception indicating that the data in the
+   * request was not valid.
+   */
+  void convertSources(Request request, SourceFactory sourceFactory, Object sources, void handler(Source source)) {
+    if (sources is! List<String>) {
+      throw new RequestFailure(new Response(request.id, new RequestError(1, 'Invalid sources')));
+    }
+    convertToSources(sourceFactory, sources).forEach(handler);
+  }
+
+  /**
+   * Return the list of fixes that are available for problems related to the
+   * given error in the specified context.
+   */
+  Response getFixes(Request request) {
+    // TODO(brianwilkerson) Implement this.
+    Response response = new Response(request.id);
+    return response;
+  }
+
+  /**
    * Set the options controlling analysis within a context to the given set of
    * options.
    */
   Response setOptions(Request request) {
     AnalysisContext context = getAnalysisContext(request);
 
     context.analysisOptions = createAnalysisOptions(request);
     Response response = new Response(request.id);
     return response;
   }
@@ skipping 58 matching lines @@
    */
   AnalysisContext getAnalysisContext(Request request) {
     String contextId = request.getRequiredParameter(CONTEXT_ID_PARAM);
     AnalysisContext context = server.contextMap[contextId];
     if (context == null) {
       throw new RequestFailure(new Response.contextDoesNotExist(request));
     }
     return context;
   }
 }