Revert "Update Analysis Server highlight API and implementation."

pkg/analysis_server/test/integration/analysis/highlights_test.dart

Index: pkg/analysis_server/test/integration/analysis/highlights_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/highlights_test.dart b/pkg/analysis_server/test/integration/analysis/highlights_test.dart
index c8fae2ecb2e5d3b4aa13da160773672272343edc..b466ff66660c3106fb92fe433fb439d7b24e2d9a 100644
--- a/pkg/analysis_server/test/integration/analysis/highlights_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/highlights_test.dart
@@ -49,7 +49,6 @@ class Class<TypeParameter> {
   }
 
   set setter(int parameter) {
-    print(parameter);
   }
 }
 
@@ -119,14 +118,13 @@ int topLevelVariable;
           HighlightRegionType.COMMENT_END_OF_LINE, ['// End of line comment']);
       check(HighlightRegionType.CONSTRUCTOR, ['constructor']);
       check(HighlightRegionType.DIRECTIVE, ["import 'dart:async' as async;"]);
-      check(HighlightRegionType.DYNAMIC_PARAMETER_DECLARATION, ['dynamicType']);
-      check(HighlightRegionType.INSTANCE_FIELD_DECLARATION, ['field']);
-      check(HighlightRegionType.INSTANCE_SETTER_REFERENCE, ['field']);
-      check(HighlightRegionType.STATIC_FIELD_DECLARATION, ['staticField']);
-      check(HighlightRegionType.TOP_LEVEL_FUNCTION_REFERENCE, ['print']);
-      check(HighlightRegionType.TOP_LEVEL_FUNCTION_DECLARATION, ['function']);
+      check(HighlightRegionType.DYNAMIC_TYPE, ['dynamicType']);
+      check(HighlightRegionType.FIELD, ['field']);
+      check(HighlightRegionType.FIELD_STATIC, ['staticField']);
+      check(HighlightRegionType.FUNCTION, ['print']);
+      check(HighlightRegionType.FUNCTION_DECLARATION, ['function']);
       check(HighlightRegionType.FUNCTION_TYPE_ALIAS, ['functionType']);
-      check(HighlightRegionType.INSTANCE_GETTER_DECLARATION, ['getter']);
+      check(HighlightRegionType.GETTER_DECLARATION, ['getter']);
       check(HighlightRegionType.IDENTIFIER_DEFAULT, ['unresolvedIdentifier']);
       check(HighlightRegionType.IMPORT_PREFIX, ['async']);
       check(HighlightRegionType.KEYWORD, ['class', 'true', 'return']);
@@ -139,18 +137,18 @@ int topLevelVariable;
         '{2: local}'
       ]);
       check(HighlightRegionType.LITERAL_STRING, ["'dart:async'", "'string'"]);
+      check(HighlightRegionType.LOCAL_VARIABLE, ['local']);
       check(HighlightRegionType.LOCAL_VARIABLE_DECLARATION, ['local']);
-      check(HighlightRegionType.LOCAL_VARIABLE_REFERENCE, ['local']);
-      check(HighlightRegionType.INSTANCE_METHOD_REFERENCE, ['toList']);
-      check(HighlightRegionType.INSTANCE_METHOD_DECLARATION, ['method']);
-      check(HighlightRegionType.STATIC_METHOD_DECLARATION, ['staticMethod']);
-      check(HighlightRegionType.STATIC_METHOD_REFERENCE, ['wait']);
-      check(HighlightRegionType.PARAMETER_DECLARATION, ['parameter']);
-      check(HighlightRegionType.PARAMETER_REFERENCE, ['parameter']);
-      check(HighlightRegionType.INSTANCE_SETTER_DECLARATION, ['setter']);
-      check(HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE, ['override']);
-      check(HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION,
-          ['topLevelVariable']);
+      check(HighlightRegionType.METHOD, ['toList']);
+      check(HighlightRegionType.METHOD_DECLARATION, ['method']);
+      check(HighlightRegionType.METHOD_DECLARATION_STATIC, ['staticMethod']);
+      check(HighlightRegionType.METHOD_STATIC, ['wait']);
+      check(HighlightRegionType.PARAMETER, ['parameter']);
+      check(HighlightRegionType.SETTER_DECLARATION, ['setter']);
+      check(HighlightRegionType.TOP_LEVEL_VARIABLE, [
+        'override',
+        'topLevelVariable'
+      ]);
       check(HighlightRegionType.TYPE_NAME_DYNAMIC, ['dynamic']);
       check(HighlightRegionType.TYPE_PARAMETER, ['TypeParameter']);
       expect(highlights, isEmpty);