Make more use of generated code in analysis server.

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

Index: pkg/analysis_server/lib/src/computer/element.dart
diff --git a/pkg/analysis_server/lib/src/computer/element.dart b/pkg/analysis_server/lib/src/computer/element.dart
index 1bd69b9c73b0fe6ab5bce73a6d4b4b241e85e1e6..da7ebdce70238f3e640789ea4802d5572fe49c23 100644
--- a/pkg/analysis_server/lib/src/computer/element.dart
+++ b/pkg/analysis_server/lib/src/computer/element.dart
@@ -4,10 +4,8 @@
 
 library computer.element;
 
-import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol2.dart';
 import 'package:analyzer/src/generated/element.dart' as engine;
-import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart' as engine;
 
 
@@ -19,288 +17,100 @@ Map<String, Object> engineElementToJson(engine.Element element) {
 }
 
 
-/**
- * Information about an element.
- */
-class Element {
-  static const List<Element> EMPTY_ARRAY = const <Element>[];
-
-  static const int FLAG_ABSTRACT = 0x01;
-  static const int FLAG_CONST = 0x02;
-  static const int FLAG_FINAL = 0x04;
-  static const int FLAG_STATIC = 0x08;
-  static const int FLAG_PRIVATE = 0x10;
-  static const int FLAG_DEPRECATED = 0x20;
-
-  /**
-   * The kind of the element.
-   */
-  final ElementKind kind;
-
-  /**
-   * The name of the element. This is typically used as the label in the outline.
-   */
-  final String name;
-
-  /**
-   * The location of the element.
-   */
-  final Location location;
-
-  /**
-   * The parameter list for the element.
-   * If the element is not a method or function then `null`.
-   * If the element has zero parameters, then `()`.
-   */
-  final String parameters;
-
-  /**
-   * The return type of the element.
-   * If the element is not a method or function then `null`.
-   * If the element does not have a declared return type, then an empty string.
-   */
-  final String returnType;
-
-  final bool isAbstract;
-  final bool isConst;
-  final bool isFinal;
-  final bool isStatic;
-  final bool isPrivate;
-  final bool isDeprecated;
-
-  Element(this.kind, this.name, this.location, this.isPrivate,
-      this.isDeprecated, {this.parameters, this.returnType, this.isAbstract: false,
-      this.isConst: false, this.isFinal: false, this.isStatic: false});
-
-  factory Element.fromEngine(engine.Element element) {
-    String name = element.displayName;
-    String elementParameters = _getParametersString(element);
-    String elementReturnType = _getReturnTypeString(element);
-    return new Element(
-        new ElementKind.fromEngine(element.kind),
-        name,
-        new Location.fromElement(element),
-        element.isPrivate,
-        element.isDeprecated,
-        parameters: elementParameters,
-        returnType: elementReturnType,
+Element elementFromEngine(engine.Element element) {
+  String name = element.displayName;
+  String elementParameters = _getParametersString(element);
+  String elementReturnType = _getReturnTypeString(element);
+  return new Element(
+    new ElementKind.fromEngine(element.kind),
+    name,
+    Element.makeFlags(isPrivate: element.isPrivate,
+        isDeprecated: element.isDeprecated,
         isAbstract: _isAbstract(element),
         isConst: _isConst(element),
         isFinal: _isFinal(element),
-        isStatic: _isStatic(element));
-  }
-
-  factory Element.fromJson(Map<String, Object> map) {
-    ElementKind kind = new ElementKind(map[KIND]);
-    int flags = map[FLAGS];
-    return new Element(
-        kind,
-        map[NAME],
-        new Location.fromJson(map[LOCATION]),
-        _hasFlag(flags, FLAG_PRIVATE),
-        _hasFlag(flags, FLAG_DEPRECATED),
-        parameters: map[PARAMETERS],
-        returnType: map[RETURN_TYPE],
-        isAbstract: _hasFlag(flags, FLAG_ABSTRACT),
-        isConst: _hasFlag(flags, FLAG_CONST),
-        isFinal: _hasFlag(flags, FLAG_FINAL),
-        isStatic: _hasFlag(flags, FLAG_STATIC));
-  }
-
-  int get flags {
-    int flags = 0;
-    if (isAbstract) flags |= FLAG_ABSTRACT;
-    if (isConst) flags |= FLAG_CONST;
-    if (isFinal) flags |= FLAG_FINAL;
-    if (isStatic) flags |= FLAG_STATIC;
-    if (isPrivate) flags |= FLAG_PRIVATE;
-    if (isDeprecated) flags |= FLAG_DEPRECATED;
-    return flags;
-  }
-
-  Map<String, Object> toJson() {
-    Map<String, Object> json = {
-      KIND: kind.name,
-      NAME: name,
-      LOCATION: location.toJson(),
-      FLAGS: flags
-    };
-    if (parameters != null) {
-      json[PARAMETERS] = parameters;
-    }
-    if (returnType != null) {
-      json[RETURN_TYPE] = returnType;
-    }
-    return json;
-  }
-
-  @override
-  String toString() => toJson().toString();
-
-  static Map<String, Object> asJson(Element element) {
-    return element.toJson();
-  }
+        isStatic: _isStatic(element)),
+    location: new Location.fromElement(element),
+    parameters: elementParameters,
+    returnType: elementReturnType);
+}
 
-  static String _getParametersString(engine.Element element) {
-    // TODO(scheglov) expose the corresponding feature from ExecutableElement
-    if (element is engine.ExecutableElement) {
-      var sb = new StringBuffer();
-      String closeOptionalString = '';
-      for (var parameter in element.parameters) {
-        if (sb.isNotEmpty) {
-          sb.write(', ');
+String _getParametersString(engine.Element element) {
+  // TODO(scheglov) expose the corresponding feature from ExecutableElement
+  if (element is engine.ExecutableElement) {
+    var sb = new StringBuffer();
+    String closeOptionalString = '';
+    for (var parameter in element.parameters) {
+      if (sb.isNotEmpty) {
+        sb.write(', ');
+      }
+      if (closeOptionalString.isEmpty) {
+        if (parameter.kind == engine.ParameterKind.NAMED) {
+          sb.write('{');
+          closeOptionalString = '}';
         }
-        if (closeOptionalString.isEmpty) {
-          if (parameter.kind == engine.ParameterKind.NAMED) {
-            sb.write('{');
-            closeOptionalString = '}';
-          }
-          if (parameter.kind == engine.ParameterKind.POSITIONAL) {
-            sb.write('[');
-            closeOptionalString = ']';
-          }
+        if (parameter.kind == engine.ParameterKind.POSITIONAL) {
+          sb.write('[');
+          closeOptionalString = ']';
         }
-        sb.write(parameter.toString());
       }
-      sb.write(closeOptionalString);
-      return '(' + sb.toString() + ')';
-    } else {
-      return null;
+      sb.write(parameter.toString());
     }
+    sb.write(closeOptionalString);
+    return '(' + sb.toString() + ')';
+  } else {
+    return null;
   }
+}
 
-  static String _getReturnTypeString(engine.Element element) {
-    if ((element is engine.ExecutableElement)) {
-      return element.returnType.toString();
-    } else {
-      return null;
-    }
-  }
-
-  static bool _hasFlag(int flags, int flag) => (flags & flag) != 0;
-
-  static bool _isAbstract(engine.Element element) {
-    // TODO(scheglov) add isAbstract to Element API
-    if (element is engine.ClassElement) {
-      return element.isAbstract;
-    }
-    if (element is engine.MethodElement) {
-      return element.isAbstract;
-    }
-    if (element is engine.PropertyAccessorElement) {
-      return element.isAbstract;
-    }
-    return false;
+String _getReturnTypeString(engine.Element element) {
+  if ((element is engine.ExecutableElement)) {
+    return element.returnType.toString();
+  } else {
+    return null;
   }
+}
 
-  static bool _isConst(engine.Element element) {
-    // TODO(scheglov) add isConst to Element API
-    if (element is engine.ConstructorElement) {
-      return element.isConst;
-    }
-    if (element is engine.VariableElement) {
-      return element.isConst;
-    }
-    return false;
+bool _isAbstract(engine.Element element) {
+  // TODO(scheglov) add isAbstract to Element API
+  if (element is engine.ClassElement) {
+    return element.isAbstract;
   }
-
-  static bool _isFinal(engine.Element element) {
-    // TODO(scheglov) add isFinal to Element API
-    if (element is engine.VariableElement) {
-      return element.isFinal;
-    }
-    return false;
+  if (element is engine.MethodElement) {
+    return element.isAbstract;
   }
-
-  static bool _isStatic(engine.Element element) {
-    // TODO(scheglov) add isStatic to Element API
-    if (element is engine.ExecutableElement) {
-      return element.isStatic;
-    }
-    if (element is engine.PropertyInducingElement) {
-      return element.isStatic;
-    }
-    return false;
+  if (element is engine.PropertyAccessorElement) {
+    return element.isAbstract;
   }
+  return false;
 }
 
-
-/**
- * Information about a location.
- */
-class Location {
-  final String file;
-  final int offset;
-  final int length;
-  final int startLine;
-  final int startColumn;
-
-  Location(this.file, this.offset, this.length, this.startLine,
-      this.startColumn);
-
-  factory Location.fromElement(engine.Element element) {
-    Source source = element.source;
-    LineInfo lineInfo = element.context.getLineInfo(source);
-    String name = element.displayName;
-    // prepare location
-    int offset = element.nameOffset;
-    int length = name != null ? name.length : 0;
-    LineInfo_Location lineLocation = lineInfo.getLocation(offset);
-    int startLine = lineLocation.lineNumber;
-    int startColumn = lineLocation.columnNumber;
-    if (element is engine.CompilationUnitElement) {
-      offset = 0;
-      length = 0;
-      startLine = 1;
-      startColumn = 1;
-    }
-    // done
-    return new Location(
-        source.fullName,
-        offset,
-        length,
-        startLine,
-        startColumn);
+bool _isConst(engine.Element element) {
+  // TODO(scheglov) add isConst to Element API
+  if (element is engine.ConstructorElement) {
+    return element.isConst;
   }
-
-  factory Location.fromJson(Map<String, Object> map) {
-    return new Location(
-        map[FILE],
-        map[OFFSET],
-        map[LENGTH],
-        map[START_LINE],
-        map[START_COLUMN]);
+  if (element is engine.VariableElement) {
+    return element.isConst;
   }
+  return false;
+}
 
-  factory Location.fromOffset(engine.Element element, int offset, int length) {
-    Source source = element.source;
-    LineInfo lineInfo = element.context.getLineInfo(source);
-    // prepare location
-    LineInfo_Location lineLocation = lineInfo.getLocation(offset);
-    int startLine = lineLocation.lineNumber;
-    int startColumn = lineLocation.columnNumber;
-    // done
-    return new Location(
-        source.fullName,
-        offset,
-        length,
-        startLine,
-        startColumn);
+bool _isFinal(engine.Element element) {
+  // TODO(scheglov) add isFinal to Element API
+  if (element is engine.VariableElement) {
+    return element.isFinal;
   }
+  return false;
+}
 
-  Map<String, Object> toJson() {
-    return {
-      FILE: file,
-      OFFSET: offset,
-      LENGTH: length,
-      START_LINE: startLine,
-      START_COLUMN: startColumn
-    };
+bool _isStatic(engine.Element element) {
+  // TODO(scheglov) add isStatic to Element API
+  if (element is engine.ExecutableElement) {
+    return element.isStatic;
   }
-
-  @override
-  String toString() {
-    return 'Location(file=$file; offset=$offset; length=$length; '
-        'startLine=$startLine; startColumn=$startColumn)';
+  if (element is engine.PropertyInducingElement) {
+    return element.isStatic;
   }
+  return false;
 }