Revert "Update Analysis Server highlight API and implementation."

pkg/analysis_server/lib/src/computer/computer_highlights.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library computer.highlights;
 
 import 'package:analysis_server/src/protocol.dart' hide Element;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/scanner.dart';
@@ skipping 45 matching lines @@
   void _addIdentifierRegion(SimpleIdentifier node) {
     if (_addIdentifierRegion_keyword(node)) {
       return;
     }
     if (_addIdentifierRegion_class(node)) {
       return;
     }
     if (_addIdentifierRegion_constructor(node)) {
       return;
     }
-    if (_addIdentifierRegion_dynamicLocal(node)) {
+    if (_addIdentifierRegion_dynamicType(node)) {
       return;
     }
     if (_addIdentifierRegion_getterSetterDeclaration(node)) {
       return;
     }
     if (_addIdentifierRegion_field(node)) {
       return;
     }
     if (_addIdentifierRegion_function(node)) {
       return;
@@ skipping 51 matching lines @@
   }
 
   bool _addIdentifierRegion_constructor(SimpleIdentifier node) {
     Element element = node.staticElement;
     if (element is! ConstructorElement) {
       return false;
     }
     return _addRegion_node(node, HighlightRegionType.CONSTRUCTOR);
   }
 
-  bool _addIdentifierRegion_dynamicLocal(SimpleIdentifier node) {
-    // no propagated type
+  bool _addIdentifierRegion_dynamicType(SimpleIdentifier node) {
+    // should be variable
+    Element element = node.staticElement;
+    if (element is! VariableElement) {
+      return false;
+    }
+    // has propagated type
     if (node.propagatedType != null) {
       return false;
     }
     // has dynamic static type
     DartType staticType = node.staticType;
     if (staticType == null || !staticType.isDynamic) {
       return false;
     }
     // OK
-    Element element = node.staticElement;
-    if (element is LocalVariableElement) {
-      HighlightRegionType type = node.inDeclarationContext()
-          ? HighlightRegionType.DYNAMIC_LOCAL_VARIABLE_DECLARATION
-          : HighlightRegionType.DYNAMIC_LOCAL_VARIABLE_REFERENCE;
-      return _addRegion_node(node, type);
-    }
-    if (element is ParameterElement) {
-      HighlightRegionType type = node.inDeclarationContext()
-          ? HighlightRegionType.DYNAMIC_PARAMETER_DECLARATION
-          : HighlightRegionType.DYNAMIC_PARAMETER_REFERENCE;
-      return _addRegion_node(node, type);
-    }
-    return false;
+    return _addRegion_node(node, HighlightRegionType.DYNAMIC_TYPE);
   }
 
   bool _addIdentifierRegion_field(SimpleIdentifier node) {
     Element element = node.bestElement;
     if (element is FieldFormalParameterElement) {
       element = (element as FieldFormalParameterElement).field;
     }
+    if (element is PropertyAccessorElement) {
+      element = (element as PropertyAccessorElement).variable;
+    }
     // prepare type
     HighlightRegionType type;
     if (element is FieldElement) {
       Element enclosingElement = element.enclosingElement;
       if (enclosingElement is ClassElement && enclosingElement.isEnum) {
         type = HighlightRegionType.ENUM_CONSTANT;
       } else if (element.isStatic) {
-        type = HighlightRegionType.STATIC_FIELD_DECLARATION;
+        type = HighlightRegionType.FIELD_STATIC;
       } else {
-        type = node.inDeclarationContext()
-            ? HighlightRegionType.INSTANCE_FIELD_DECLARATION
-            : HighlightRegionType.INSTANCE_FIELD_REFERENCE;
+        type = HighlightRegionType.FIELD;
       }
     } else if (element is TopLevelVariableElement) {
-      type = HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION;
-    }
-    if (element is PropertyAccessorElement) {
-      PropertyAccessorElement accessor = element;
-      Element enclosingElement = element.enclosingElement;
-      if (accessor.variable is TopLevelVariableElement) {
-        type = accessor.isGetter
-            ? HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE
-            : HighlightRegionType.TOP_LEVEL_SETTER_REFERENCE;
-      } else if (enclosingElement is ClassElement && enclosingElement.isEnum) {
-        type = HighlightRegionType.ENUM_CONSTANT;
-      } else if (accessor.isStatic) {
-        type = accessor.isGetter
-            ? HighlightRegionType.STATIC_GETTER_REFERENCE
-            : HighlightRegionType.STATIC_SETTER_REFERENCE;
-      } else {
-        type = accessor.isGetter
-            ? HighlightRegionType.INSTANCE_GETTER_REFERENCE
-            : HighlightRegionType.INSTANCE_SETTER_REFERENCE;
-      }
+      type = HighlightRegionType.TOP_LEVEL_VARIABLE;
     }
     // add region
     if (type != null) {
       return _addRegion_node(node, type);
     }
     return false;
   }
 
   bool _addIdentifierRegion_function(SimpleIdentifier node) {
     Element element = node.staticElement;
     if (element is! FunctionElement) {
       return false;
     }
     HighlightRegionType type;
-    bool isTopLevel = element.enclosingElement is CompilationUnitElement;
     if (node.inDeclarationContext()) {
-      type = isTopLevel
-          ? HighlightRegionType.TOP_LEVEL_FUNCTION_DECLARATION
-          : HighlightRegionType.LOCAL_FUNCTION_DECLARATION;
+      type = HighlightRegionType.FUNCTION_DECLARATION;
     } else {
-      type = isTopLevel
-          ? HighlightRegionType.TOP_LEVEL_FUNCTION_REFERENCE
-          : HighlightRegionType.LOCAL_FUNCTION_REFERENCE;
+      type = HighlightRegionType.FUNCTION;
     }
     return _addRegion_node(node, type);
   }
 
   bool _addIdentifierRegion_functionTypeAlias(SimpleIdentifier node) {
     Element element = node.staticElement;
     if (element is! FunctionTypeAliasElement) {
       return false;
     }
     return _addRegion_node(node, HighlightRegionType.FUNCTION_TYPE_ALIAS);
   }
 
   bool _addIdentifierRegion_getterSetterDeclaration(SimpleIdentifier node) {
     // should be declaration
     AstNode parent = node.parent;
     if (!(parent is MethodDeclaration || parent is FunctionDeclaration)) {
       return false;
     }
     // should be property accessor
     Element element = node.staticElement;
     if (element is! PropertyAccessorElement) {
       return false;
     }
     // getter or setter
     PropertyAccessorElement propertyAccessorElement =
         element as PropertyAccessorElement;
-    bool isTopLevel = element.enclosingElement is CompilationUnitElement;
-    HighlightRegionType type;
     if (propertyAccessorElement.isGetter) {
-      if (isTopLevel) {
-        type = HighlightRegionType.TOP_LEVEL_GETTER_DECLARATION;
-      } else if (propertyAccessorElement.isStatic) {
-        type = HighlightRegionType.STATIC_GETTER_DECLARATION;
-      } else {
-        type = HighlightRegionType.INSTANCE_GETTER_DECLARATION;
-      }
+      return _addRegion_node(node, HighlightRegionType.GETTER_DECLARATION);
     } else {
-      if (isTopLevel) {
-        type = HighlightRegionType.TOP_LEVEL_SETTER_DECLARATION;
-      } else if (propertyAccessorElement.isStatic) {
-        type = HighlightRegionType.STATIC_SETTER_DECLARATION;
-      } else {
-        type = HighlightRegionType.INSTANCE_SETTER_DECLARATION;
-      }
+      return _addRegion_node(node, HighlightRegionType.SETTER_DECLARATION);
     }
-    return _addRegion_node(node, type);
   }
 
   bool _addIdentifierRegion_importPrefix(SimpleIdentifier node) {
     Element element = node.staticElement;
     if (element is! PrefixElement) {
       return false;
     }
     return _addRegion_node(node, HighlightRegionType.IMPORT_PREFIX);
   }
 
@@ skipping 12 matching lines @@
     }
     return _addRegion_node(node, HighlightRegionType.LABEL);
   }
 
   bool _addIdentifierRegion_localVariable(SimpleIdentifier node) {
     Element element = node.staticElement;
     if (element is! LocalVariableElement) {
       return false;
     }
     // OK
-    HighlightRegionType type = node.inDeclarationContext()
-        ? HighlightRegionType.LOCAL_VARIABLE_DECLARATION
-        : HighlightRegionType.LOCAL_VARIABLE_REFERENCE;
+    HighlightRegionType type;
+    if (node.inDeclarationContext()) {
+      type = HighlightRegionType.LOCAL_VARIABLE_DECLARATION;
+    } else {
+      type = HighlightRegionType.LOCAL_VARIABLE;
+    }
     return _addRegion_node(node, type);
   }
 
   bool _addIdentifierRegion_method(SimpleIdentifier node) {
     Element element = node.bestElement;
     if (element is! MethodElement) {
       return false;
     }
     MethodElement methodElement = element as MethodElement;
     bool isStatic = methodElement.isStatic;
     // OK
     HighlightRegionType type;
     if (node.inDeclarationContext()) {
       if (isStatic) {
-        type = HighlightRegionType.STATIC_METHOD_DECLARATION;
+        type = HighlightRegionType.METHOD_DECLARATION_STATIC;
       } else {
-        type = HighlightRegionType.INSTANCE_METHOD_DECLARATION;
+        type = HighlightRegionType.METHOD_DECLARATION;
       }
     } else {
       if (isStatic) {
-        type = HighlightRegionType.STATIC_METHOD_REFERENCE;
+        type = HighlightRegionType.METHOD_STATIC;
       } else {
-        type = HighlightRegionType.INSTANCE_METHOD_REFERENCE;
+        type = HighlightRegionType.METHOD;
       }
     }
     return _addRegion_node(node, type);
   }
 
   bool _addIdentifierRegion_parameter(SimpleIdentifier node) {
     Element element = node.staticElement;
     if (element is! ParameterElement) {
       return false;
     }
-    HighlightRegionType type = node.inDeclarationContext()
-        ? HighlightRegionType.PARAMETER_DECLARATION
-        : HighlightRegionType.PARAMETER_REFERENCE;
-    return _addRegion_node(node, type);
+    return _addRegion_node(node, HighlightRegionType.PARAMETER);
   }
 
   bool _addIdentifierRegion_typeParameter(SimpleIdentifier node) {
     Element element = node.staticElement;
     if (element is! TypeParameterElement) {
       return false;
     }
     return _addRegion_node(node, HighlightRegionType.TYPE_PARAMETER);
   }
 
@@ skipping 406 matching lines @@
   void _addRegions_functionBody(FunctionBody node) {
     Token keyword = node.keyword;
     if (keyword != null) {
       Token star = node.star;
       int offset = keyword.offset;
       int end = star != null ? star.end : keyword.end;
       computer._addRegion(offset, end - offset, HighlightRegionType.BUILT_IN);
     }
   }
 }