Change surroundingDeclaration to DeclarationMirror.owner

pkg/dartdoc/lib/dartdoc.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.
 
 /**
  * To generate docs for a library, run this script with the path to an
  * entrypoint .dart file, like:
  *
  *     $ dart dartdoc.dart foo.dart
  *
@@ skipping 1065 matching lines @@
       }
     }
 
     bool allMethodsInherited = true;
     bool allPropertiesInherited = true;
     bool allOperatorsInherited = true;
     memberMap.forEach((_, MemberMirror member) {
       if (member is MethodMirror) {
         if (member.isGetter) {
           instanceGetters[member.displayName] = member;
-          if (member.surroundingDeclaration == host) {
+          if (member.owner == host) {
             allPropertiesInherited = false;
           }
         } else if (member.isSetter) {
           instanceSetters[member.displayName] = member;
-          if (member.surroundingDeclaration == host) {
+          if (member.owner == host) {
             allPropertiesInherited = false;
           }
         } else if (member.isOperator) {
           instanceOperators.add(member);
-          if (member.surroundingDeclaration == host) {
+          if (member.owner == host) {
             allOperatorsInherited = false;
           }
         } else {
           instanceMethods.add(member);
-          if (member.surroundingDeclaration == host) {
+          if (member.owner == host) {
             allMethodsInherited = false;
           }
         }
       } else if (member is FieldMirror) {
         instanceGetters[member.displayName] = member;
-        if (member.surroundingDeclaration == host) {
+        if (member.owner == host) {
           allPropertiesInherited = false;
         }
       }
     });
 
     instanceOperators.sort((MethodMirror a, MethodMirror b) {
       return operatorOrderMap[a.simpleName].compareTo(
           operatorOrderMap[b.simpleName]);
     });
 
@@ skipping 44 matching lines @@
           assert(getter is MethodMirror);
           docProperty(host, getter, null);
         }
       } else if (getter == null) {
         // We only have a setter => Document as a method.
         assert(setter is MethodMirror);
         docMethod(host, setter);
       } else {
         DocComment getterComment = getMemberComment(getter);
         DocComment setterComment = getMemberComment(setter);
-        if (getter.surroundingDeclaration !== setter.surroundingDeclaration ||
+        if (getter.owner !== setter.owner ||
             getterComment != null && setterComment != null) {
           // Both have comments or are not declared in the same class
           // => Documents separately.
           if (getter is FieldMirror) {
             // Document field as a getter (setter is inherited).
             docField(host, getter, asGetter: true);
           } else {
             docMethod(host, getter);
           }
           if (setter is FieldMirror) {
@@ skipping 50 matching lines @@
       if (member.isGetter) {
         // Getter.
         name = 'get $name';
       } else if (member.isSetter) {
         // Setter.
         name = 'set $name';
       }
     }
 
     bool showCode = includeSource && !isAbstract;
-    bool inherited = host != member.surroundingDeclaration;
+    bool inherited = host != member.owner;
 
     writeln('<div class="method${inherited ? ' inherited': ''}">'
             '<h4 id="${memberAnchor(member)}">');
 
     if (showCode) {
       writeln('<button class="show-code">Code</button>');
     }
 
     if (member is MethodMirror) {
       if (member.isConstructor) {
@@ skipping 33 matching lines @@
       }
     }
 
     var prefix = host is LibraryMirror ? '' : '${typeName(host)}.';
     write(''' <a class="anchor-link" href="#${memberAnchor(member)}"
               title="Permalink to $prefix$name">#</a>''');
     writeln('</h4>');
 
     if (inherited) {
       write('<div class="inherited-from">inherited from ');
-      annotateType(host, member.surroundingDeclaration);
+      annotateType(host, member.owner);
       write('</div>');
     }
 
     writeln('<div class="doc">');
     docComment(host, getMemberComment(member));
     if (showCode) {
       docCode(member.location);
     }
     writeln('</div>');
 
@@ skipping 16 matching lines @@
    * [host]. If [getter] is a [FieldMirror], [setter] must be [:null:].
    * Otherwise, if [getter] is a [MethodMirror], the property is considered
    * final if [setter] is [:null:].
    */
   void docProperty(ObjectMirror host,
                    MemberMirror getter, MemberMirror setter) {
     assert(getter != null);
     _totalMembers++;
     _currentMember = getter;
 
-    bool inherited = host != getter.surroundingDeclaration;
+    bool inherited = host != getter.owner;
 
     writeln('<div class="field${inherited ? ' inherited' : ''}">'
             '<h4 id="${memberAnchor(getter)}">');
 
     if (includeSource) {
       writeln('<button class="show-code">Code</button>');
     }
 
     bool isConst = false;
     bool isFinal;
@@ skipping 22 matching lines @@
     write(
         '''
         <strong>${getter.simpleName}</strong> <a class="anchor-link"
             href="#${memberAnchor(getter)}"
             title="Permalink to $prefix${getter.simpleName}">#</a>
         </h4>
         ''');
 
     if (inherited) {
       write('<div class="inherited-from">inherited from ');
-      annotateType(host, getter.surroundingDeclaration);
+      annotateType(host, getter.owner);
       write('</div>');
     }
 
     DocComment comment = getMemberComment(getter);
     if (comment == null && setter != null) {
       comment = getMemberComment(setter);
     }
     writeln('<div class="doc">');
     docComment(host, comment);
     docCode(getter.location);
@@ skipping 82 matching lines @@
    * Get the doc comment associated with the given member.
    *
    * If no comment was found on the member, the hierarchy is traversed to find
    * an inherited comment, favouring comments inherited from classes over
    * comments inherited from interfaces.
    */
   DocComment getMemberComment(MemberMirror member) {
     String comment = _comments.find(member.location);
     ClassMirror inheritedFrom = null;
     if (comment == null) {
-      if (member.surroundingDeclaration is ClassMirror) {
+      if (member.owner is ClassMirror) {
         var iterable =
-            new HierarchyIterable(member.surroundingDeclaration,
+            new HierarchyIterable(member.owner,
                                   includeType: false);
         for (ClassMirror type in iterable) {
           var inheritedMember = type.declaredMembers[member.simpleName];
           if (inheritedMember is MemberMirror) {
             comment = _comments.find(inheritedMember.location);
             if (comment != null) {
               inheritedFrom = type;
               break;
             }
           }
@@ skipping 39 matching lines @@
     assert (type is TypeMirror);
     // Always get the generic type to strip off any type parameters or
     // arguments. If the type isn't generic, genericType returns `this`, so it
     // works for non-generic types too.
     return '${sanitize(displayName(type.library))}/'
            '${type.declaration.simpleName}.html';
   }
 
   /** Gets the URL for the documentation for [member]. */
   String memberUrl(MemberMirror member) {
-    String url = typeUrl(member.surroundingDeclaration);
+    String url = typeUrl(member.owner);
     return '$url#${memberAnchor(member)}';
   }
 
   /** Gets the anchor id for the document for [member]. */
   String memberAnchor(MemberMirror member) {
     return member.simpleName;
   }
 
   /**
    * Creates a hyperlink. Handles turning the [href] into an appropriate
@@ skipping 304 matching lines @@
   final ClassMirror inheritedFrom;
 
   DocComment(this.text, [this.inheritedFrom = null]) {
     assert(text != null && !text.trim().isEmpty);
   }
 
   String get html => md.markdownToHtml(text);
 
   String toString() => text;
 }