Clarify type names in analysis server API.

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 e69335284b35e86a52619935d7d357743e25356a..1788fe2e1adc3bd5f4179a5128c06b2b1504b0d4 100644
--- a/pkg/analysis_server/test/integration/protocol_matchers.dart
+++ b/pkg/analysis_server/test/integration/protocol_matchers.dart
@@ -615,12 +615,12 @@ final Matcher isEditGetFixesParams = new LazyMatcher(() => new MatchesJsonObject
  * edit.getFixes result
  *
  * {
- *   "fixes": List<ErrorFixes>
+ *   "fixes": List<AnalysisErrorFixes>
  * }
  */
 final Matcher isEditGetFixesResult = new LazyMatcher(() => new MatchesJsonObject(
   "edit.getFixes result", {
-    "fixes": isListOf(isErrorFixes)
+    "fixes": isListOf(isAnalysisErrorFixes)
   }));
 
 /**
@@ -788,8 +788,8 @@ final Matcher isAddContentOverlay = new LazyMatcher(() => new MatchesJsonObject(
  * AnalysisError
  *
  * {
- *   "severity": ErrorSeverity
- *   "type": ErrorType
+ *   "severity": AnalysisErrorSeverity
+ *   "type": AnalysisErrorType
  *   "location": Location
  *   "message": String
  *   "correction": optional String
@@ -797,8 +797,8 @@ final Matcher isAddContentOverlay = new LazyMatcher(() => new MatchesJsonObject(
  */
 final Matcher isAnalysisError = new LazyMatcher(() => new MatchesJsonObject(
   "AnalysisError", {
-    "severity": isErrorSeverity,
-    "type": isErrorType,
+    "severity": isAnalysisErrorSeverity,
+    "type": isAnalysisErrorType,
     "location": isLocation,
     "message": isString
   }, optionalFields: {
@@ -806,6 +806,56 @@ final Matcher isAnalysisError = new LazyMatcher(() => new MatchesJsonObject(
   }));
 
 /**
+ * AnalysisErrorFixes
+ *
+ * {
+ *   "error": AnalysisError
+ *   "fixes": List<SourceChange>
+ * }
+ */
+final Matcher isAnalysisErrorFixes = new LazyMatcher(() => new MatchesJsonObject(
+  "AnalysisErrorFixes", {
+    "error": isAnalysisError,
+    "fixes": isListOf(isSourceChange)
+  }));
+
+/**
+ * AnalysisErrorSeverity
+ *
+ * enum {
+ *   INFO
+ *   WARNING
+ *   ERROR
+ * }
+ */
+final Matcher isAnalysisErrorSeverity = new MatchesEnum("AnalysisErrorSeverity", [
+  "INFO",
+  "WARNING",
+  "ERROR"
+]);
+
+/**
+ * AnalysisErrorType
+ *
+ * enum {
+ *   COMPILE_TIME_ERROR
+ *   HINT
+ *   STATIC_TYPE_WARNING
+ *   STATIC_WARNING
+ *   SYNTACTIC_ERROR
+ *   TODO
+ * }
+ */
+final Matcher isAnalysisErrorType = new MatchesEnum("AnalysisErrorType", [
+  "COMPILE_TIME_ERROR",
+  "HINT",
+  "STATIC_TYPE_WARNING",
+  "STATIC_WARNING",
+  "SYNTACTIC_ERROR",
+  "TODO"
+]);
+
+/**
  * AnalysisOptions
  *
  * {
@@ -1078,56 +1128,6 @@ final Matcher isElementKind = new MatchesEnum("ElementKind", [
 ]);
 
 /**
- * ErrorFixes
- *
- * {
- *   "error": AnalysisError
- *   "fixes": List<SourceChange>
- * }
- */
-final Matcher isErrorFixes = new LazyMatcher(() => new MatchesJsonObject(
-  "ErrorFixes", {
-    "error": isAnalysisError,
-    "fixes": isListOf(isSourceChange)
-  }));
-
-/**
- * ErrorSeverity
- *
- * enum {
- *   INFO
- *   WARNING
- *   ERROR
- * }
- */
-final Matcher isErrorSeverity = new MatchesEnum("ErrorSeverity", [
-  "INFO",
-  "WARNING",
-  "ERROR"
-]);
-
-/**
- * ErrorType
- *
- * enum {
- *   COMPILE_TIME_ERROR
- *   HINT
- *   STATIC_TYPE_WARNING
- *   STATIC_WARNING
- *   SYNTACTIC_ERROR
- *   TODO
- * }
- */
-final Matcher isErrorType = new MatchesEnum("ErrorType", [
-  "COMPILE_TIME_ERROR",
-  "HINT",
-  "STATIC_TYPE_WARNING",
-  "STATIC_WARNING",
-  "SYNTACTIC_ERROR",
-  "TODO"
-]);
-
-/**
  * ExecutableFile
  *
  * {