Refactored accessors in mirrors from methods to properties.

utils/apidoc/apidoc.dart

 // Copyright (c) 2012, 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.
 
 /**
  * This generates the reference documentation for the core libraries that come
  * with dart. It is built on top of dartdoc, which is a general-purpose library
  * for generating docs from any Dart code. This library extends that to include
  * additional information and styling specific to our standard library.
  *
@@ skipping 139 matching lines @@
   }
 
   // Suppress any actual writing to file.  This is only for analysis.
   void endFile() {
   }
 
   void write(String s) {
   }
 
   String getRecordedLibraryComment(LibraryMirror library) {
-    if (library.simpleName() == HTML_LIBRARY_NAME) {
+    if (library.simpleName == HTML_LIBRARY_NAME) {
       return libraryComment;
     }
     return null;
   }
 
   String getRecordedTypeComment(TypeMirror type) {
-    if (typeComments.containsKey(type.qualifiedName())) {
-      return typeComments[type.qualifiedName()];
+    if (typeComments.containsKey(type.qualifiedName)) {
+      return typeComments[type.qualifiedName];
     }
     return null;
   }
 
   String getRecordedMemberComment(MemberMirror member) {
-    if (memberComments.containsKey(member.qualifiedName())) {
-      return memberComments[member.qualifiedName()];
+    if (memberComments.containsKey(member.qualifiedName)) {
+      return memberComments[member.qualifiedName];
     }
     return null;
   }
 
   // These methods are subclassed and used for internal processing.
   // Do not invoke outside of this class.
   String getLibraryComment(LibraryMirror library) {
     String comment = super.getLibraryComment(library);
     libraryComment = comment;
     return comment;
@@ skipping 15 matching lines @@
     String comment = super.getFieldComment(field);
     recordMemberComment(field, comment);
     return comment;
   }
 
   void recordTypeComment(TypeMirror type, String comment) {
     if (comment != null && comment.contains('@domName')) {
       // This is not a handwritten comment.
       return;
     }
-    typeComments[type.qualifiedName()] = comment;
+    typeComments[type.qualifiedName] = comment;
   }
 
   void recordMemberComment(MemberMirror member, String comment) {
     if (comment != null && comment.contains('@domName')) {
       // This is not a handwritten comment.
       return;
     }
-    memberComments[member.qualifiedName()] = comment;
+    memberComments[member.qualifiedName] = comment;
   }
 }
 
 class Apidoc extends doc.Dartdoc {
   /** Big ball of JSON containing the scraped MDN documentation. */
   final Map mdn;
 
   final Htmldoc htmldoc;
 
   static final disqusShortname = 'dartapidocs';
@@ skipping 87 matching lines @@
             var s = document.getElementsByTagName("script")[0];
             s.parentNode.insertBefore(ga, s);
           })();
         </script>
         ''');
   }
 
   void docIndexLibrary(LibraryMirror library) {
     // TODO(rnystrom): Hackish. The IO libraries reference this but we don't
     // want it in the docs.
-    if (library.simpleName() == 'dart:nativewrappers') return;
+    if (library.simpleName == 'dart:nativewrappers') return;
     super.docIndexLibrary(library);
   }
 
   void docLibraryNavigationJson(LibraryMirror library, Map libraryMap) {
     // TODO(rnystrom): Hackish. The IO libraries reference this but we don't
     // want it in the docs.
-    if (library.simpleName() == 'dart:nativewrappers') return;
+    if (library.simpleName == 'dart:nativewrappers') return;
     super.docLibraryNavigationJson(library, libraryMap);
   }
 
   void docLibrary(LibraryMirror library) {
     // TODO(rnystrom): Hackish. The IO libraries reference this but we don't
     // want it in the docs.
-    if (library.simpleName() == 'dart:nativewrappers') return;
+    if (library.simpleName == 'dart:nativewrappers') return;
     super.docLibrary(library);
   }
 
   /** Override definition from parent class to strip out annotation tags. */
   String commentToHtml(String comment) {
     return super.commentToHtml(
         comment.replaceAll(const RegExp("@([a-zA-Z]+) ([^;]+)(?:;|\$)"), ''));
   }
 
   String getLibraryComment(LibraryMirror library) {
-    if (library.simpleName() == HTML_LIBRARY_NAME) {
+    if (library.simpleName == HTML_LIBRARY_NAME) {
       return htmldoc.libraryComment;
     }
     return super.getLibraryComment(library);
   }
 
   String getTypeComment(TypeMirror type) {
     return _mergeDocs(
         includeMdnTypeComment(type), super.getTypeComment(type),
         htmldoc.getRecordedTypeComment(type));
   }
@@ skipping 67 matching lines @@
           </p>
           ''');
     }
   }
 
   /**
    * Gets the MDN-scraped docs for [type], or `null` if this type isn't
    * scraped from MDN.
    */
   includeMdnTypeComment(TypeMirror type) {
-    if (type.library().simpleName() == HTML_LIBRARY_NAME) {
+    if (type.library.simpleName == HTML_LIBRARY_NAME) {
       // If it's an HTML type, try to map it to a base DOM type so we can find
       // the MDN docs.
-      final domTypes = _diff.htmlTypesToDom[type.qualifiedName()];
+      final domTypes = _diff.htmlTypesToDom[type.qualifiedName];
 
       // Couldn't find a DOM type.
       if ((domTypes == null) || (domTypes.length != 1)) return null;
 
       // Use the corresponding DOM type when searching MDN.
       // TODO(rnystrom): Shame there isn't a simpler way to get the one item
       // out of a singleton Set.
       type = domTypes.iterator().next();
-    } else if (type.library().simpleName() != DOM_LIBRARY_NAME) {
+    } else if (type.library.simpleName != DOM_LIBRARY_NAME) {
       // Not a DOM type.
       return null;
     }
 
-    final mdnType = mdn[type.simpleName()];
+    final mdnType = mdn[type.simpleName];
     if (mdnType == null) return null;
     if (mdnType['skipped'] != null) return null;
 
     // Remember which MDN page we're using so we can attribute it.
     mdnUrl = mdnType['srcUrl'];
     return mdnType['summary'];
   }
 
   /**
    * Gets the MDN-scraped docs for [member], or `null` if this type isn't
    * scraped from MDN.
    */
   includeMdnMemberComment(MemberMirror member) {
     var library = findLibrary(member);
-    if (library.simpleName() == HTML_LIBRARY_NAME) {
+    if (library.simpleName == HTML_LIBRARY_NAME) {
       // If it's an HTML type, try to map it to a base DOM type so we can find
       // the MDN docs.
-      final domMembers = _diff.htmlToDom[member.qualifiedName()];
+      final domMembers = _diff.htmlToDom[member.qualifiedName];
 
       // Couldn't find a DOM type.
       if ((domMembers == null) || (domMembers.length != 1)) return null;
 
       // Use the corresponding DOM member when searching MDN.
       // TODO(rnystrom): Shame there isn't a simpler way to get the one item
       // out of a singleton Set.
       member = domMembers.iterator().next();
-    } else if (library.simpleName() != DOM_LIBRARY_NAME) {
+    } else if (library.simpleName != DOM_LIBRARY_NAME) {
       // Not a DOM type.
       return null;
     }
 
     // Ignore top-level functions.
     if (member.isTopLevel) return null;
 
-    final mdnType = mdn[member.surroundingDeclaration().simpleName()];
+    final mdnType = mdn[member.surroundingDeclaration.simpleName];
     if (mdnType == null) return null;
-    var nameToFind = member.simpleName();
+    var nameToFind = member.simpleName;
     var mdnMember = null;
     for (final candidateMember in mdnType['members']) {
       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(MemberMirror member) {
-    final typeName = member.surroundingDeclaration().simpleName();
-    var memberName = '$typeName.${member.simpleName()}';
+    final typeName = member.surroundingDeclaration.simpleName;
+    var memberName = '$typeName.${member.simpleName}';
     if (member is MethodMirror && (member.isConstructor || member.isFactory)) {
       final separator = member.constructorName == '' ? '' : '.';
       memberName = 'new $typeName$separator${member.constructorName}';
     }
 
     return a(memberUrl(member), memberName);
   }
 }