Fix ApiDoc to work with new dart:html code. Tweak dart:html generator to generate clearer @domName …

utils/apidoc/html_diff.dart

Index: utils/apidoc/html_diff.dart
diff --git a/utils/apidoc/html_diff.dart b/utils/apidoc/html_diff.dart
index ccedfdd181f417056a4b3719b4fb0ddff83f2571..37ac54563d7bd9eba61ec120e1d20070cfc6226b 100644
--- a/utils/apidoc/html_diff.dart
+++ b/utils/apidoc/html_diff.dart
@@ -9,6 +9,7 @@
 #library('html_diff');
 
 #import('dart:coreimpl');
+
 #import('../../frog/lang.dart');
 #import('../../frog/file_system_vm.dart');
 #import('../../frog/file_system.dart');
@@ -59,7 +60,8 @@ class HtmlDiff {
   static void initialize() {
     world.getOrAddLibrary('dart:dom');
     world.getOrAddLibrary('dart:html');
-    world.resolveAll();
+    world.process();
+
     dom = world.libraries['dart:dom'];
   }
 
@@ -78,60 +80,37 @@ class HtmlDiff {
    */
   void run() {
     final htmlLib = world.libraries['dart:html'];
-    for (var implType in htmlLib.types.getValues()) {
-      final domTypes = htmlToDomTypes(implType);
-      final htmlType = htmlImplToHtmlType(implType);
-      if (htmlType == null) continue;
+    for (Type htmlType in htmlLib.types.getValues()) {
+      final domTypes = htmlToDomTypes(htmlType);
+      if (domTypes.isEmpty()) continue;
 
-      htmlTypesToDom.putIfAbsent(htmlType, () => new Set()).addAll(domTypes);
+      htmlTypesToDom.putIfAbsent(htmlType,
+          () => new Set()).addAll(domTypes);
       domTypes.forEach((t) =>
           domTypesToHtml.putIfAbsent(t, () => new Set()).add(htmlType));
 
-      final members = new List.from(implType.members.getValues());
-      members.addAll(implType.constructors.getValues());
-      implType.factories.forEach((f) => members.add(f));
+      final members = new List.from(htmlType.members.getValues());
+      members.addAll(htmlType.constructors.getValues());
+      htmlType.factories.forEach((f) => members.add(f));
       members.forEach((m) => _addMemberDiff(m, domTypes));
     }
   }
 
   /**
-   * Returns whether or not [domMember] (from `dart:dom`) and [htmlMember] (from
-   * `dart:html`) have the same name from the user's perspective. The names are
-   * the same if the type names and the member names are the same, but allowance
-   * is made for `dart:dom` names that start with "HTML" or "WebKit", and for
-   * `dart:html` properties that have the same name as fields in `dart:dom`.
-   */
-  bool sameName(Member domMember, Member htmlMember) {
-    var domTypeName = domMember.declaringType.name;
-    if (domTypeName == 'DOMWindow') domTypeName = 'Window';
-    domTypeName = domTypeName.replaceFirst(new RegExp('^(HTML|WebKit)'), '');
-    var htmlTypeName = htmlMember.declaringType.name;
-
-    var domName = domMember.name;
-    var htmlName = htmlMember.name;
-    if (htmlName.startsWith('get:') || htmlName.startsWith('set:')) {
-      htmlName = htmlName.substring(4);
-    }
-
-    return domTypeName == htmlTypeName && domName == htmlName;
-  }
-
-  /**
    * Records the `dart:dom` to `dart:html` mapping for [implMember] (from
    * `dart:html`). [domTypes] are the `dart:dom` [Type]s that correspond to
    * [implMember]'s defining [Type].
    */
-  void _addMemberDiff(Member implMember, List<Type> domTypes) {
-    if (implMember.isProperty) {
-      if (implMember.canGet) _addMemberDiff(implMember.getter, domTypes);
-      if (implMember.canSet) _addMemberDiff(implMember.setter, domTypes);
+  void _addMemberDiff(Member htmlMember, List<Type> domTypes) {
+    if (htmlMember.isProperty) {
+      if (htmlMember.canGet) _addMemberDiff(htmlMember.getter, domTypes);
+      if (htmlMember.canSet) _addMemberDiff(htmlMember.setter, domTypes);
     }
 
-    var domMembers = htmlToDomMembers(implMember, domTypes);
-    var htmlMember = htmlImplToHtmlMember(implMember);
+    var domMembers = htmlToDomMembers(htmlMember, domTypes);
     if (htmlMember == null && !domMembers.isEmpty()) {
-      print('Warning: dart:html member ${implMember.declaringType.name}.' +
-          '${implMember.name} has no corresponding dart:html member.');
+      print('Warning: dart:html member ${htmlMember.declaringType.name}.' +
+          '${htmlMember.name} has no corresponding dart:html member.');
     }
 
     if (htmlMember == null) return;
@@ -141,55 +120,6 @@ class HtmlDiff {
   }
 
   /**
-   * Returns the `dart:html` [Type] that corresponds to [implType] from
-   * `dart:html`, or `null` if there is no such correspondence.
-   */
-  Type htmlImplToHtmlType(Type implType) {
-    if (implType == null || implType.isTop || implType.interfaces.isEmpty() ||
-        implType.interfaces[0].library.name != 'html') {
-      return null;
-    }
-
-    return implType.interfaces[0];
-  }
-
-  /**
-   * Returns the `dart:html` [Member] that corresponds to [implMember] from
-   * `dart:html`, or `null` if there is no such correspondence.
-   */
-  Member htmlImplToHtmlMember(Member implMember) {
-    var htmlType = htmlImplToHtmlType(implMember.declaringType);
-    if (htmlType == null) return null;
-
-    if (implMember.isConstructor || implMember.isFactory) {
-      var constructor = htmlType.constructors[implMember.name];
-      if (constructor != null) return constructor;
-
-      // Look for a factory constructor whose type and name matches the member.
-      return htmlType.factories.getFactoriesFor(implMember.name)[
-          implMember.constructorName];
-    }
-
-    final getter = implMember.name.startsWith('get:');
-    final setter = implMember.name.startsWith('set:');
-
-    if (getter || setter) {
-      // Use getMember to follow interface inheritance chains.
-      var htmlProperty = htmlType.getMember(implMember.name.substring(4));
-
-      if (htmlProperty == null) return null;
-
-      // If it's a straight field, use that directly.
-      if (htmlProperty.isField) return htmlProperty;
-
-      // Otherwise, it's a property, so use the appropriate getter or setter.
-      return getter ? htmlProperty.getter : htmlProperty.setter;
-    }
-
-    return htmlType.getMember(implMember.name);
-  }
-
-  /**
    * Returns the `dart:dom` [Type]s that correspond to [htmlType] from
    * `dart:html`. This can be the empty list if no correspondence is found.
    */
@@ -201,27 +131,12 @@ class HtmlDiff {
       var domNames = map(tags['domName'].split(','), (s) => s.trim());
       if (domNames.length == 1 && domNames[0] == 'none') return [];
       return map(domNames, (domName) {
-        // DOMWindow is Chrome-specific, so we don't use it in our annotations.
-        if (domName == 'Window') domName = 'DOMWindow';
         final domType = dom.types[domName];
         if (domType == null) print('Warning: no dart:dom type named $domName');
         return domType;
       });
-    } else {
-      if (!htmlType.name.endsWith('WrappingImplementation')) return [];
-      final domName = htmlType.name.replaceFirst('WrappingImplementation', '');
-      var domType = dom.types[domName];
-      if (domType == null && domName.endsWith('Element')) {
-        domType = dom.types['HTML$domName'];
-      }
-      if (domType == null) domType = dom.types['WebKit$domName'];
-      if (domType == null) {
-        print('Warning: no dart:dom type matches dart:html ' +
-            htmlType.name);
-        return [];
-      }
-      return [domType];
     }
+    return <Type>[];
   }
 
   /**
@@ -231,7 +146,7 @@ class HtmlDiff {
    * defining [Type].
    */
   Set<Member> htmlToDomMembers(Member htmlMember, List<Type> domTypes) {
-    if (htmlMember.isPrivate || htmlMember is! MethodMember) return new Set();
+    if (htmlMember.isPrivate) return new Set();
     final tags = _getTags(comments.find(htmlMember.span));
     if (tags.containsKey('domName')) {
       final domNames = map(tags['domName'].split(','), (s) => s.trim());
@@ -253,20 +168,7 @@ class HtmlDiff {
       return members;
     }
 
-    if (domTypes.isEmpty() || htmlMember.definition == null) return new Set();
-    if (htmlMember.name == 'get:on') {

[nweiz, 2012/04/12 19:40:51]

Why don't we need special logic for events anymore?

[Jacob, 2012/04/13 08:56:01]

The dart:html generator adds these annotations so this doesn't need to be hard
coded here.

-      final members = _membersFromName('addEventListener', domTypes);
-      members.addAll(_membersFromName('dispatchEvent', domTypes));
-      members.addAll(_membersFromName('removeEventListener', domTypes));
-      return members;
-    }
-
-    if (htmlMember.isFactory && htmlMember.name == '' &&
-        domTypes.length == 1 && domTypes[0].name.endsWith('Event')) {
-      return _membersFromName('init${domTypes[0].name}', domTypes);
-    }
-
-    return _getDomMembers(htmlMember.definition.body, domTypes);
+    return new Set();
   }
 
   /**
@@ -296,7 +198,6 @@ class HtmlDiff {
     }
 
     var typeName = splitName[0];
-    if (typeName == 'Window') typeName = 'DOMWindow';
 
     final type = dom.types[typeName];
     if (type == null) return new Set();
@@ -308,93 +209,6 @@ class HtmlDiff {
   }
 
   /**
-   * Returns the `dart:dom` [Member]s that are referred to in [stmt]. This only
-   * extracts references from relatively simple statements; methods containing
-   * more complex wrappers should be manually annotated with `@domName`.
-   *
-   * [domTypes] are the `dart:dom` [Type]s that correspond to the current
-   * [Member]'s defining [Type].
-   */
-  Set<Member> _getDomMembers(Statement stmt, List<Type> domTypes) {
-    if (stmt is BlockStatement) {
-      final body = stmt.body.filter((s) => !_ignorableStatement(s));
-      if (body.length != 1) return new Set();
-      return _getDomMembers(stmt.body[0], domTypes);
-    } else if (stmt is ReturnStatement) {
-      return _domMembersFromExpression(stmt.value, domTypes);
-    } else if (stmt is ExpressionStatement) {
-      return _domMembersFromExpression(stmt.body, domTypes);
-    } else if (stmt is TryStatement) {
-      return _getDomMembers(stmt.body, domTypes);
-    } else if (stmt is IfStatement) {
-      final members = _getDomMembers(stmt.trueBranch, domTypes);
-      members.addAll(_getDomMembers(stmt.falseBranch, domTypes));
-      return members;
-    } else {
-      return new Set();
-    }
-  }
-
-  /**
-   * Whether [stmt] can be ignored for the purpose of determining the DOM name
-   * of the enclosing method. The Webkit-to-Dart conversion process leaves
-   * behind various `throw`s and `return`s that we want to ignore.
-   */
-  bool _ignorableStatement(Statement stmt) {
-    if (stmt is BlockStatement) {
-      return Collections.every(stmt.body, (s) => _ignorableStatement(s));
-    } else if (stmt is TryStatement) {
-      return _ignorableStatement(stmt.body);
-    } else if (stmt is IfStatement) {
-      return _ignorableStatement(stmt.trueBranch) &&
-        _ignorableStatement(stmt.falseBranch);
-    } else if (stmt is ReturnStatement) {
-      return stmt.value == null || stmt.value is ThisExpression;
-    } else {
-      return stmt is ThrowStatement;
-    }
-  }
-
-  /**
-   * Returns the `dart:dom` [Member]s that are referred to in [expr]. This only
-   * extracts references from relatively simple expressions; methods containing
-   * more complex wrappers should be manually annotated with `@domName`.
-   *
-   * [domTypes] are the `dart:dom` [Type]s that correspond to the current
-   * [Member]'s defining [Type].
-   */
-  Set<Member> _domMembersFromExpression(Expression expr, List<Type> domTypes) {
-    if (expr is BinaryExpression && expr.op.kind == TokenKind.ASSIGN) {
-      return _domMembersFromExpression(expr.x, domTypes);
-    } else if (expr is CallExpression) {
-      if (expr.target is DotExpression && expr.target.self is VarExpression &&
-          expr.target.self.name.name == 'LevelDom' &&
-          (expr.target.name.name.startsWith('wrap') ||
-           expr.target.name.name == 'unwrap')) {
-        return _domMembersFromExpression(expr.arguments[0].value, domTypes);
-      }
-      return _domMembersFromExpression(expr.target, domTypes);
-    } else if (expr is DotExpression) {
-      if (expr.self is NewExpression && expr.name.name == '_wrap' &&
-          expr.self.arguments.length == 1) {
-        return _domMembersFromExpression(expr.self.arguments[0].value,
-            domTypes);
-      } else if (expr.self is VarExpression && expr.self.name.name == '_ptr') {
-        return _membersFromName(expr.name.name, domTypes);
-      }
-      final bases = _domMembersFromExpression(expr.self, domTypes);
-      return new Set.from(map(bases, (base) {
-          if (base == null || base.returnType == null) return null;
-          return base.returnType.members[expr.name.name];
-        }).filter((m) => m != null));
-    } else if (expr is NewExpression && expr.arguments.length == 1) {
-      return _domMembersFromExpression(expr.arguments[0].value, domTypes);
-    } else {
-      return new Set();
-    }
-  }
-
-  /**
    * Extracts a [Map] from tag names to values from [comment], which is parsed
    * from a Dart source file via dartdoc. Tags are of the form `@NAME VALUE`,
    * where `NAME` is alphabetic and `VALUE` can contain any character other than
@@ -404,7 +218,7 @@ class HtmlDiff {
    */
   Map<String, String> _getTags(String comment) {
     if (comment == null) return const <String>{};
-    final re = new RegExp("@([a-zA-Z]+) ([^;]+)(?:;|\$)");
+    final re = const RegExp("@([a-zA-Z]+) ([^;]+)(?:;|\$)");
     final tags = <String>{};
     for (var m in re.allMatches(comment.trim())) {
       tags[m[1]] = m[2];