Cleanup mdn scripts

utils/apidoc/apidoc.dart

 // Copyright (c) 2011, 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.
 
 /**
  * Generates the complete set of corelib reference documentation.
  */
 #library('apidoc');
 
 #import('dart:json');
 #import('html_diff.dart');
 #import('../../frog/lang.dart');
 #import('../../frog/file_system_node.dart');
 #import('../../frog/file_system.dart');
 #import('../dartdoc/dartdoc.dart', prefix: 'doc');
 
 HtmlDiff _diff;
 
+final GET_PREFIX = 'get:';
+
 void main() {
   var files = new NodeFileSystem();
   parseOptions('../../frog', [] /* args */, files);
   initializeWorld(files);
 
   print('Parsing MDN data...');
   final mdn = JSON.parse(files.readAll('mdn/database.json'));
 
   print('Cross-referencing dart:dom and dart:html...');
   HtmlDiff.initialize();
@@ skipping 125 matching lines @@
     return _mergeDocs(
         includeMdnMemberComment(field),
         super.getFieldComment(field),
         /* getMemberDoc(field) */ null);
   }
 
   bool isNonEmpty(String string) => (string != null) && (string.trim() != '');
 
   String _mergeDocs(String mdnComment, String dartComment, String diffComment) {
     // Prefer hand-written Dart comments over stuff from MDN.
-    if (isNonEmpty(dartComment)) {
+    if (0 == 1 && isNonEmpty(dartComment)) {

[Bob Nystrom, 2012/02/01 18:41:13]

Debug code? Remove?

[Jacob, 2012/02/01 21:12:02]

Done.

       // Also include the diff comment if provided.
       if (isNonEmpty(diffComment)) return dartComment + diffComment;
       return dartComment;
     } else if (isNonEmpty(mdnComment)) {
       // Wrap it so we can highlight it and so we handle MDN scraped content
       // that lacks a top-level block tag.
       mdnComment =
           '''
           <div class="mdn">
           $mdnComment
@@ skipping 96 matching lines @@
     } else if (member.library.name != 'dom') {
       // Not a DOM type.
       return null;
     }
 
     // Ignore top-level functions.
     if (member.declaringType.isTop) return null;
 
     final mdnType = mdn[member.declaringType.name];
     if (mdnType == null) return null;
-
+    String nameToFind = member.name;

[Bob Nystrom, 2012/02/01 18:41:13]

I think we're moving away from type annotating local variables. It's up to your
preference, but I would encourage you to be consistent with surrounding code
which here isn't annotating them.

[Jacob, 2012/02/01 21:12:02]

Done.

+    if (nameToFind.startsWith(GET_PREFIX)) {
+      nameToFind = nameToFind.substring(GET_PREFIX.length);
+    }
     var mdnMember = null;
-    for (final thisMember in mdnType['members']) {
-      if (thisMember['name'] == member.name) {
-        mdnMember = thisMember;
+    for (Map candidateMember in mdnType['members']) {

[Bob Nystrom, 2012/02/01 18:41:13]

Ditto.

[Jacob, 2012/02/01 21:12:02]

This type cannot possible be inferred and the word Map has the same number of
chars as the word var so I see little advantage in using var instead of Map. 
However switched back to final.

+      if (candidateMember['name'] == nameToFind) {
+        mdnMember = candidateMember;
         break;
       }
     }
 
     if (mdnMember == null) return null;
 
     // Remember which MDN page we're using so we can attribute it.
     mdnUrl = mdnType['srcUrl'];
     return mdnMember['help'];
   }
 
   /**
    * Returns a link to [member], relative to a type page that may be in a
    * different library than [member].
    */
   String _linkMember(Member member) {
-    final GET_PREFIX = 'get:';
-
     final typeName = member.declaringType.name;
     var memberName = '$typeName.${member.name}';
     if (member.isConstructor || member.isFactory) {
       final separator = member.constructorName == '' ? '' : '.';
       memberName = 'new $typeName$separator${member.constructorName}';
     } else if (member.name.startsWith(GET_PREFIX)) {
       memberName = '$typeName.${member.name.substring(GET_PREFIX.length)}';
     }
 
     return a(memberUrl(member), memberName);
@@ skipping 66 matching lines @@
       return
           '''
           <p class="correspond">This corresponds to $domTypesText in the
           ${a("dom.html", "dart:dom")} library.</p>
           ''';
     }
 
     return '';
   }
 }