Revert element hierarchy to its original form

pkg/analyzer/lib/dart/element/element.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 analyzer.dart.element.element;
 
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/constant.dart' show DartObject;
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
@@ skipping 540 matching lines @@
    * Return the display name of this element, or `null` if this element does not
    * have a name.
    *
    * In most cases the name and the display name are the same. Differences
    * though are cases such as setters where the name of some setter `set f(x)`
    * is `f=`, instead of `f`.
    */
   String get displayName;
 
   /**
-   * Return the content of the documentation comment (including delimiters) for
-   * this element, or `null` if this element does not or cannot have
-   * documentation.
-   */
-  String get documentationComment;
-
-  /**
    * Return the source range of the documentation comment for this element,
    * or `null` if this element does not or cannot have a documentation.
    *
    * Deprecated.  Use [documentationComment] instead.
    */
   @deprecated
   SourceRange get docRange;
 
   /**
+   * Return the content of the documentation comment (including delimiters) for
+   * this element, or `null` if this element does not or cannot have
+   * documentation.
+   */
+  String get documentationComment;
+
+  /**
    * Return the element that either physically or logically encloses this
    * element. This will be `null` if this element is a library because libraries
    * are the top-level elements in the model.
    */
   Element get enclosingElement;
 
   /**
    * The unique integer identifier of this element.
    */
   int get id;
@@ skipping 559 matching lines @@
 
   @override
   FunctionDeclaration computeNode();
 }
 
 /**
  * A function type alias (`typedef`).
  *
  * Clients may not extend, implement or mix-in this class.
  */
-abstract class FunctionTypeAliasElement implements FunctionTypedElement {
+abstract class FunctionTypeAliasElement
+    implements FunctionTypedElement, TypeDefiningElement {
   /**
    * An empty array of type alias elements.
    */
   static List<FunctionTypeAliasElement> EMPTY_LIST =
       new List<FunctionTypeAliasElement>(0);
 
   /**
    * Return the compilation unit in which this type alias is defined.
    */
   @override
   CompilationUnitElement get enclosingElement;
 
   @override
   FunctionTypeAlias computeNode();
 }
 
 /**
  * An element that has a [FunctionType] as its [type].
  *
  * This also provides convenient access to the parameters and return type.
  *
  * Clients may not extend, implement or mix-in this class.
  */
-abstract class FunctionTypedElement
-    implements TypeDefiningElement, TypeParameterizedElement {
+abstract class FunctionTypedElement implements TypeParameterizedElement {
   /**
    * Return a list containing all of the parameters defined by this executable
    * element.
    */
   List<ParameterElement> get parameters;
 
   /**
    * Return the return type defined by this element. If the element model is
    * fully populated, then the [returnType] will not be `null`, even if no
    * return type was explicitly specified.
@@ skipping 850 matching lines @@
    */
   bool get isStatic;
 
   /**
    * Return the declared type of this variable, or `null` if the variable did
    * not have a declared type (such as if it was declared using the keyword
    * 'var').
    */
   DartType get type;
 }