Revert "Update Analysis Server highlight API and implementation."

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 b2b727d90efb1e7306aba94c1c6d0be12ad906af..fbb40a8f7b9613cb2f962ab9ef49c70c93166a55 100644
--- a/pkg/analysis_server/test/integration/protocol_matchers.dart
+++ b/pkg/analysis_server/test/integration/protocol_matchers.dart
@@ -1372,24 +1372,17 @@ final Matcher isHighlightRegion = new LazyMatcher(() => new MatchesJsonObject(
  *   COMMENT_END_OF_LINE
  *   CONSTRUCTOR
  *   DIRECTIVE
- *   DYNAMIC_LOCAL_VARIABLE_DECLARATION
- *   DYNAMIC_LOCAL_VARIABLE_REFERENCE
- *   DYNAMIC_PARAMETER_DECLARATION
- *   DYNAMIC_PARAMETER_REFERENCE
+ *   DYNAMIC_TYPE
  *   ENUM
  *   ENUM_CONSTANT
+ *   FIELD
+ *   FIELD_STATIC
+ *   FUNCTION
+ *   FUNCTION_DECLARATION
  *   FUNCTION_TYPE_ALIAS
+ *   GETTER_DECLARATION
  *   IDENTIFIER_DEFAULT
  *   IMPORT_PREFIX
- *   INSTANCE_FIELD_DECLARATION
- *   INSTANCE_FIELD_REFERENCE
- *   INSTANCE_GETTER_DECLARATION
- *   INSTANCE_GETTER_REFERENCE
- *   INSTANCE_METHOD_DECLARATION
- *   INSTANCE_METHOD_REFERENCE
- *   INSTANCE_SETTER_DECLARATION
- *   INSTANCE_SETTER_REFERENCE
- *   INVALID_STRING_ESCAPE
  *   KEYWORD
  *   LABEL
  *   LITERAL_BOOLEAN
@@ -1398,30 +1391,17 @@ final Matcher isHighlightRegion = new LazyMatcher(() => new MatchesJsonObject(
  *   LITERAL_LIST
  *   LITERAL_MAP
  *   LITERAL_STRING
- *   LOCAL_FUNCTION_DECLARATION
- *   LOCAL_FUNCTION_REFERENCE
+ *   LOCAL_VARIABLE
  *   LOCAL_VARIABLE_DECLARATION
- *   LOCAL_VARIABLE_REFERENCE
- *   PARAMETER_DECLARATION
- *   PARAMETER_REFERENCE
- *   STATIC_FIELD_DECLARATION
- *   STATIC_GETTER_DECLARATION
- *   STATIC_GETTER_REFERENCE
- *   STATIC_METHOD_DECLARATION
- *   STATIC_METHOD_REFERENCE
- *   STATIC_SETTER_DECLARATION
- *   STATIC_SETTER_REFERENCE
- *   TOP_LEVEL_FUNCTION_DECLARATION
- *   TOP_LEVEL_FUNCTION_REFERENCE
- *   TOP_LEVEL_GETTER_DECLARATION
- *   TOP_LEVEL_GETTER_REFERENCE
- *   TOP_LEVEL_SETTER_DECLARATION
- *   TOP_LEVEL_SETTER_REFERENCE
- *   TOP_LEVEL_VARIABLE_DECLARATION
+ *   METHOD
+ *   METHOD_DECLARATION
+ *   METHOD_DECLARATION_STATIC
+ *   METHOD_STATIC
+ *   PARAMETER
+ *   SETTER_DECLARATION
+ *   TOP_LEVEL_VARIABLE
  *   TYPE_NAME_DYNAMIC
  *   TYPE_PARAMETER
- *   UNRESOLVED_INSTANCE_MEMBER_REFERENCE
- *   VALID_STRING_ESCAPE
  * }
  */
 final Matcher isHighlightRegionType = new MatchesEnum("HighlightRegionType", [
@@ -1433,24 +1413,17 @@ final Matcher isHighlightRegionType = new MatchesEnum("HighlightRegionType", [
   "COMMENT_END_OF_LINE",
   "CONSTRUCTOR",
   "DIRECTIVE",
-  "DYNAMIC_LOCAL_VARIABLE_DECLARATION",
-  "DYNAMIC_LOCAL_VARIABLE_REFERENCE",
-  "DYNAMIC_PARAMETER_DECLARATION",
-  "DYNAMIC_PARAMETER_REFERENCE",
+  "DYNAMIC_TYPE",
   "ENUM",
   "ENUM_CONSTANT",
+  "FIELD",
+  "FIELD_STATIC",
+  "FUNCTION",
+  "FUNCTION_DECLARATION",
   "FUNCTION_TYPE_ALIAS",
+  "GETTER_DECLARATION",
   "IDENTIFIER_DEFAULT",
   "IMPORT_PREFIX",
-  "INSTANCE_FIELD_DECLARATION",
-  "INSTANCE_FIELD_REFERENCE",
-  "INSTANCE_GETTER_DECLARATION",
-  "INSTANCE_GETTER_REFERENCE",
-  "INSTANCE_METHOD_DECLARATION",
-  "INSTANCE_METHOD_REFERENCE",
-  "INSTANCE_SETTER_DECLARATION",
-  "INSTANCE_SETTER_REFERENCE",
-  "INVALID_STRING_ESCAPE",
   "KEYWORD",
   "LABEL",
   "LITERAL_BOOLEAN",
@@ -1459,30 +1432,17 @@ final Matcher isHighlightRegionType = new MatchesEnum("HighlightRegionType", [
   "LITERAL_LIST",
   "LITERAL_MAP",
   "LITERAL_STRING",
-  "LOCAL_FUNCTION_DECLARATION",
-  "LOCAL_FUNCTION_REFERENCE",
+  "LOCAL_VARIABLE",
   "LOCAL_VARIABLE_DECLARATION",
-  "LOCAL_VARIABLE_REFERENCE",
-  "PARAMETER_DECLARATION",
-  "PARAMETER_REFERENCE",
-  "STATIC_FIELD_DECLARATION",
-  "STATIC_GETTER_DECLARATION",
-  "STATIC_GETTER_REFERENCE",
-  "STATIC_METHOD_DECLARATION",
-  "STATIC_METHOD_REFERENCE",
-  "STATIC_SETTER_DECLARATION",
-  "STATIC_SETTER_REFERENCE",
-  "TOP_LEVEL_FUNCTION_DECLARATION",
-  "TOP_LEVEL_FUNCTION_REFERENCE",
-  "TOP_LEVEL_GETTER_DECLARATION",
-  "TOP_LEVEL_GETTER_REFERENCE",
-  "TOP_LEVEL_SETTER_DECLARATION",
-  "TOP_LEVEL_SETTER_REFERENCE",
-  "TOP_LEVEL_VARIABLE_DECLARATION",
+  "METHOD",
+  "METHOD_DECLARATION",
+  "METHOD_DECLARATION_STATIC",
+  "METHOD_STATIC",
+  "PARAMETER",
+  "SETTER_DECLARATION",
+  "TOP_LEVEL_VARIABLE",
   "TYPE_NAME_DYNAMIC",
-  "TYPE_PARAMETER",
-  "UNRESOLVED_INSTANCE_MEMBER_REFERENCE",
-  "VALID_STRING_ESCAPE"
+  "TYPE_PARAMETER"
 ]);
 
 /**