Rework "analysis.updateContent" analysis server request.

pkg/analysis_server/test/integration/protocol_matchers.dart

Index: pkg/analysis_server/test/integration/protocol_matchers.dart
diff --git a/pkg/analysis_server/test/integration/protocol_matchers.dart b/pkg/analysis_server/test/integration/protocol_matchers.dart
index 393aae3f028ab0dd20e0fdb1065b6e8c5d4a52eb..2aac360c9c73857d44840ef642d9782e183b8922 100644
--- a/pkg/analysis_server/test/integration/protocol_matchers.dart
+++ b/pkg/analysis_server/test/integration/protocol_matchers.dart
@@ -210,12 +210,12 @@ final Matcher isAnalysisSetSubscriptionsResult = isNull;
  * analysis.updateContent params
  *
  * {
- *   "files": Map<FilePath, ContentChange>
+ *   "files": Map<FilePath, object>
  * }
  */
 final Matcher isAnalysisUpdateContentParams = new MatchesJsonObject(
   "analysis.updateContent params", {
-    "files": isMapOf(isFilePath, isContentChange)
+    "files": isMapOf(isFilePath, isObject)
   });
 
 /**
@@ -768,6 +768,20 @@ final Matcher isDebugLaunchDataParams = new MatchesJsonObject(
   });
 
 /**
+ * AddContentOverlay
+ *
+ * {
+ *   "type": "add"
+ *   "content": String
+ * }
+ */
+final Matcher isAddContentOverlay = new MatchesJsonObject(
+  "AddContentOverlay", {
+    "type": equals("add"),
+    "content": isString
+  });
+
+/**
  * AnalysisError
  *
  * {
@@ -849,6 +863,24 @@ final Matcher isAnalysisStatus = new MatchesJsonObject(
   });
 
 /**
+ * ChangeContentOverlay
+ *
+ * {
+ *   "type": "change"
+ *   "offset": int
+ *   "oldLength": int
+ *   "replacement": String
+ * }
+ */
+final Matcher isChangeContentOverlay = new MatchesJsonObject(
+  "ChangeContentOverlay", {
+    "type": equals("change"),
+    "offset": isInt,
+    "oldLength": isInt,
+    "replacement": isString
+  });
+
+/**
  * CompletionId
  *
  * String
@@ -963,25 +995,6 @@ final Matcher isCompletionSuggestionKind = isIn([
 ]);
 
 /**
- * ContentChange
- *
- * {
- *   "content": String
- *   "offset": optional int
- *   "oldLength": optional int
- *   "newLength": optional int
- * }
- */
-final Matcher isContentChange = new MatchesJsonObject(
-  "ContentChange", {
-    "content": isString
-  }, optionalFields: {
-    "offset": isInt,
-    "oldLength": isInt,
-    "newLength": isInt
-  });
-
-/**
  * DebugContextId
  *
  * String
@@ -1565,6 +1578,18 @@ final Matcher isRefactoringProblemSeverity = isIn([
 ]);
 
 /**
+ * RemoveContentOverlay
+ *
+ * {
+ *   "type": "remove"
+ * }
+ */
+final Matcher isRemoveContentOverlay = new MatchesJsonObject(
+  "RemoveContentOverlay", {
+    "type": equals("remove")
+  });
+
+/**
  * SearchId
  *
  * String