Merge SourceLocation and Source

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 1436 matching lines @@
     }
   }
 
   DocComment createDocComment(String text, [ClassMirror inheritedFrom]) =>
       new DocComment(text, inheritedFrom);
 
 
   /** Get the doc comment associated with the given library. */
   DocComment getLibraryComment(LibraryMirror library) {
     // Look for a comment for the entire library.
-    final comment = _comments.findLibrary(library.location.source);
+    final comment = _comments.findLibrary(library.location);
     if (comment == null) return null;
     return createDocComment(comment);
   }
 
   /** Get the doc comment associated with the given type. */
   DocComment getTypeComment(TypeMirror type) {
     String comment = _comments.find(type.location);
     if (comment == null) return null;
     return createDocComment(comment);
   }
@@ skipping 214 matching lines @@
     }
 
     // Regular type.
     return type.simpleName;
   }
 
   /**
    * Remove leading indentation to line up with first line.
    */
   unindentCode(SourceLocation span) {
-    final column = getLocationColumn(span);
+    final column = span.column;
     final lines = span.text.split('\n');
     // TODO(rnystrom): Dirty hack.
     for (var i = 1; i < lines.length; i++) {
       lines[i] = unindent(lines[i], column);
     }
 
     final code = Strings.join(lines, '\n');
     return code;
   }
 
@@ skipping 154 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;
 }