Implementation for 'analysis.updateContent' API.

[email protected]
BUG=

Review URL: https://codereview.chromium.org//300553014

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@36766 260f80e4-7a28-3924-810f-c04153c831b5

Author: scheglov

pkg/analysis_server/lib/src/analysis_server.dart

@@ -274,7 +274,7 @@ class AnalysisServer {
   }
 
   /**
-   * Implementation for `server.setAnalysisRoots`.
+   * Implementation for `analysis.setAnalysisRoots`.
    *
    * TODO(scheglov) implement complete projects/contexts semantics.
    *
@@ -329,11 +329,30 @@ class AnalysisServer {
     }
   }
 
+  /**
+   * Implementation for `analysis.updateContent`.
+   */
+  void updateContent(Map<String, ContentChange> changes) {
+    changes.forEach((file, change) {
+      AnalysisContext analysisContext = _getAnalysisContext(file);
+      if (analysisContext != null) {
+        Source source = _getSource(file);
+        if (change.offset == null) {
+          analysisContext.setContents(source, change.content);
+        } else {
+          analysisContext.setChangedContents(source, change.content,
+              change.offset, change.oldLength, change.newLength);
+        }
+        addContextToWorkQueue(analysisContext);
+      }
+    });
+  }
+
   /**
    * Return the [AnalysisContext] that is used to analyze the given [path].
    * Return `null` if there is no such context.
    */
-  AnalysisContext test_getAnalysisContext(String path) {
+  AnalysisContext _getAnalysisContext(String path) {
     for (Folder folder in folderMap.keys) {
       if (path.startsWith(folder.fullName)) {
         return folderMap[folder].context;
@@ -342,19 +361,26 @@ class AnalysisServer {
     return null;
   }
 
+  /**
+   * Return the [Source] of the Dart file with the given [path].
+   */
+  Source _getSource(String path) {
+    File file = resourceProvider.getResource(path);
+    return file.createSource(UriKind.FILE_URI);
+  }
+
   /**
    * Return the [CompilationUnit] of the Dart file with the given [path].
    * Return `null` if the file is not a part of any context.
    */
   CompilationUnit test_getResolvedCompilationUnit(String path) {
     // prepare AnalysisContext
-    AnalysisContext context = test_getAnalysisContext(path);
+    AnalysisContext context = _getAnalysisContext(path);
     if (context == null) {
       return null;
     }
     // prepare sources
-    File file = resourceProvider.getResource(path);
-    Source unitSource = file.createSource(UriKind.FILE_URI);
+    Source unitSource = _getSource(path);
     List<Source> librarySources = context.getLibrariesContaining(unitSource);
     if (librarySources.isEmpty) {
       return null;

pkg/analysis_server/lib/src/domain_analysis.dart

@@ -77,6 +77,11 @@ class AnalysisDomainHandler implements RequestHandler {
    */
   static const String ADDED_PARAM = 'added';
 
+  /**
+   * The name of the `content` parameter.
+   */
+  static const String CONTENT_PARAM = 'content';
+
   /**
    * The name of the `default` parameter.
    */
@@ -117,11 +122,21 @@ class AnalysisDomainHandler implements RequestHandler {
    */
   static const String LENGTH_PARAM = 'length';
 
+  /**
+   * The name of the `newLength` parameter.
+   */
+  static const String NEW_LENGTH_PARAM = 'newLength';
+
   /**
    * The name of the `offset` parameter.
    */
   static const String OFFSET_PARAM = 'offset';
 
+  /**
+   * The name of the `oldLength` parameter.
+   */
+  static const String OLD_LENGTH_PARAM = 'oldLength';
+
   /**
    * The name of the `options` parameter.
    */
@@ -222,8 +237,20 @@ class AnalysisDomainHandler implements RequestHandler {
   }
 
   Response updateContent(Request request) {
-    // TODO(scheglov) implement
-    return null;
+    var changes = new Map<String, ContentChange>();
+    RequestDatum filesDatum = request.getRequiredParameter(FILES_PARAM);
+    filesDatum.forEachMap((file, changeDatum) {
+      var change = new ContentChange();
+      change.content = changeDatum[CONTENT_PARAM].asString();
+      if (changeDatum.hasKey(OFFSET_PARAM)) {
+        change.offset = changeDatum[OFFSET_PARAM].asInt();
+        change.oldLength = changeDatum[OLD_LENGTH_PARAM].asInt();
+        change.newLength = changeDatum[NEW_LENGTH_PARAM].asInt();
+      }
+      changes[file] = change;
+    });
+    server.updateContent(changes);
+    return new Response(request.id);
   }
 
   Response updateOptions(Request request) {
@@ -236,3 +263,14 @@ class AnalysisDomainHandler implements RequestHandler {
     return null;
   }
 }
+
+
+/**
+ * A description of the change to the content of a file.
+ */
+class ContentChange {
+  String content;
+  int offset;
+  int oldLength;
+  int newLength;
+}

pkg/analysis_server/test/domain_analysis_test.dart

@@ -30,6 +30,7 @@ main() {
   });
 
   group('notification.errors', testNotificationErrors);
+  group('updateContent', testUpdateContent);
 
   group('AnalysisDomainHandler', () {
     test('getFixes', () {
@@ -110,16 +111,6 @@ main() {
       expect(response, isNull);
     });
 
-    test('updateContent', () {
-      var request = new Request('0', AnalysisDomainHandler.UPDATE_CONTENT_METHOD);
-//      request.setParameter(
-//          AnalysisDomainHandler.FILES_PARAM,
-//          {'project/test.dart' : null});
-      var response = handler.handleRequest(request);
-      // TODO(scheglov) implement
-      expect(response, isNull);
-    });
-
     test('updateOptions', () {
       var request = new Request('0', AnalysisDomainHandler.UPDATE_OPTIONS_METHOD);
       request.setParameter(
@@ -213,20 +204,38 @@ class AnalysisTestHelper {
    * Creates a project with a single Dart file `/project/bin/test.dart` with
    * the given [code].
    */
-  createSingleFileProject(code) {
-    if (code is List<String>) {
-      code = code.join('\n');
-    }
-    this.testCode = code;
+  void createSingleFileProject(code) {
+    this.testCode = _getCodeString(code);
     resourceProvider.newFolder('/project');
     resourceProvider.newFile('/project/pubspec.yaml', 'name: project');
     resourceProvider.newFile(testFile, testCode);
     Request request = new Request('0', AnalysisDomainHandler.SET_ANALYSIS_ROOTS_METHOD);
     request.setParameter(AnalysisDomainHandler.INCLUDED_PARAM, ['/project']);
     request.setParameter(AnalysisDomainHandler.EXCLUDED_PARAM, []);
+    handleSuccessfulRequest(request);
+  }
+
+  /**
+   * Validates that the given [request] is handled successfully.
+   */
+  void handleSuccessfulRequest(Request request) {
     Response response = handler.handleRequest(request);
     expect(response, isResponseSuccess('0'));
   }
+
+  /**
+   * Stops the associated server.
+   */
+  void stopServer() {
+    server.done();
+  }
+
+  static String _getCodeString(code) {
+    if (code is List<String>) {
+      code = code.join('\n');
+    }
+    return code as String;
+  }
 }
 
 
@@ -266,6 +275,64 @@ testNotificationErrors() {
 }
 
 
+testUpdateContent() {
+  test('full content', () {
+    AnalysisTestHelper helper = new AnalysisTestHelper();
+    helper.createSingleFileProject('// empty');
+    return helper.waitForTasksFinished().then((_) {
+      // no errors initially
+      List<AnalysisError> errors = helper.getTestErrors();
+      expect(errors, isEmpty);
+      // update code
+      {
+        Request request = new Request('0', AnalysisDomainHandler.UPDATE_CONTENT_METHOD);
+        request.setParameter('files',
+            {
+              helper.testFile : {
+                AnalysisDomainHandler.CONTENT_PARAM : 'library lib'
+              }
+            });
+        helper.handleSuccessfulRequest(request);
+      }
+      // wait, there is an error
+      helper.waitForTasksFinished().then((_) {
+        List<AnalysisError> errors = helper.getTestErrors();
+        expect(errors, hasLength(1));
+      });
+    });
+  });
+
+  test('incremental', () {
+    AnalysisTestHelper helper = new AnalysisTestHelper();
+    helper.createSingleFileProject('library A;');
+    return helper.waitForTasksFinished().then((_) {
+      // no errors initially
+      List<AnalysisError> errors = helper.getTestErrors();
+      expect(errors, isEmpty);
+      // update code
+      {
+        Request request = new Request('0', AnalysisDomainHandler.UPDATE_CONTENT_METHOD);
+        request.setParameter('files',
+            {
+              helper.testFile : {
+                AnalysisDomainHandler.CONTENT_PARAM : 'library lib',
+                AnalysisDomainHandler.OFFSET_PARAM : 'library '.length,
+                AnalysisDomainHandler.OLD_LENGTH_PARAM : 'A;'.length,
+                AnalysisDomainHandler.NEW_LENGTH_PARAM : 'lib'.length,
+              }
+            });
+        helper.handleSuccessfulRequest(request);
+      }
+      // wait, there is an error
+      helper.waitForTasksFinished().then((_) {
+        List<AnalysisError> errors = helper.getTestErrors();
+        expect(errors, hasLength(1));
+      });
+    });
+  });
+}
+
+
 class AnalysisError {
   final String file;
   final String errorCode;