Merge branch 'master' of github.com:dart-lang/dartdoc into sl-version-in-comments

Author: sethladd

.travis.yml

@@ -1,8 +1,8 @@
 language: dart
 sudo: false
-dart: 
+dart:
   - dev
-  - stable
+#  - stable
 env:
   - GEN_SDK_DOCS=true
   - GEN_SDK_DOCS=false

lib/dartdoc.dart

@@ -159,7 +159,7 @@ class DartDoc {
         if (name.startsWith(Platform.pathSeparator)) name = name.substring(1);
       }
       print('parsing ${name}...');
-      Source source = new FileBasedSource.con1(new JavaFile(filePath));
+      Source source = new FileBasedSource(new JavaFile(filePath));
       sources.add(source);
       if (context.computeKindOf(source) == SourceKind.LIBRARY) {
         LibraryElement library = context.computeLibraryElement(source);

lib/resource_loader.dart

@@ -2,8 +2,6 @@
 // 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.
 
-// TODO: Consider making this a stand-alone package, if useful.
-
 /// Make it possible to load resources, independent of how the Dart app is run.
 ///
 ///     Future<String> getTemplateFile(String templatePath) {
@@ -24,20 +22,27 @@ import 'package:pub_cache/pub_cache.dart';
 String packageRootPath;
 
 /// Loads a `package:` resource as a String.
-Future<String> loadAsString(String path) async {
+Future<String> loadAsString(String path) {
   if (!path.startsWith('package:')) {
     throw new ArgumentError('path must begin with package:');
   }
-  Uint8List bytes = await _doLoad(path);
-  return new String.fromCharCodes(bytes);
+  return new Resource(path).readAsString().catchError((_) async {
+    // TODO: Remove once https://github.com/dart-lang/pub/issues/22 is fixed.
+    var bytes = await _doLoad(path);
+    return new String.fromCharCodes(bytes);
+  });
 }
 
-/// Loads a `package:` resource as an [Uint8List].
-Future<Uint8List> loadAsBytes(String path) {
+/// Loads a `package:` resource as an [List<int>].
+Future<List<int>> loadAsBytes(String path) {
   if (!path.startsWith('package:')) {
     throw new ArgumentError('path must begin with package:');
   }
-  return _doLoad(path);
+
+  return new Resource(path).readAsBytes().catchError((_) {
+    // TODO: Remove once https://github.com/dart-lang/pub/issues/22 is fixed.
+    return _doLoad(path);
+  });
 }
 
 /// Determine how to do the load. HTTP? Snapshotted? From source?

lib/resources/styles.css

@@ -324,7 +324,7 @@ footer .container-fluid {
 }
 
 .gt-separated li:before {
-  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'><path fill='#FFFFFF' d='M6.7,4L5.7,4.9L8.8,8l-3.1,3.1L6.7,12l4-4L6.7,4z'/></svg>");
+  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'><path fill='#DDDDDD' d='M6.7,4L5.7,4.9L8.8,8l-3.1,3.1L6.7,12l4-4L6.7,4z'/></svg>");
   background-position: center;
   content: "\00a0";
   margin: 0 6px 0 4px;
@@ -504,7 +504,8 @@ span.top-level-variable-type {
 }
 
 .sidebar ol li.section-title {
-  font-size: 12px;
+  font-size: 13px;
+  color: #B6B6B6;
   text-transform: uppercase;
   line-height: 20px;
   margin-top: 24px;

lib/src/model.dart

@@ -11,7 +11,6 @@ import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart' show ParameterKind;
 import 'package:quiver/core.dart';
 
-import 'debug.dart';
 import 'html_utils.dart';
 import 'model_utils.dart';
 import 'package_meta.dart';

lib/templates/_property.html

@@ -1,6 +1,6 @@
 <dt id="{{htmlId}}" class="property">
-    <span class="top-level-variable-type">{{{ linkedReturnType }}}</span>
     {{#isInherited}}{{>name_summary}}{{/isInherited}}{{^isInherited}}{{{linkedName}}}{{/isInherited}}
+    <span class="signature">&#8594; {{{ linkedReturnType }}}</span>
 </dt>
 <dd>
     {{>readable_writable}}

pubspec.yaml

@@ -5,9 +5,9 @@ author: Dart Team <[email protected]>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
 environment:
-  sdk: '>=1.9.0 <2.0.0' # when we go to 1.12, bump analyzer version
+  sdk: '>=1.12.0-dev.5.0 <2.0.0'
 dependencies:
-  analyzer: '>=0.25.0 <0.27.0'
+  analyzer: '>=0.26.0 <0.27.0'
   args: ^0.13.0
   cli_util: ^0.0.1
   html: ^0.12.1

test/test_utils.dart

@@ -65,7 +65,7 @@ class AnalyzerHelper {
   }
 
   Source addSource(String filePath) {
-    Source source = new FileBasedSource.con1(new JavaFile(filePath));
+    Source source = new FileBasedSource(new JavaFile(filePath));
     ChangeSet changeSet = new ChangeSet();
     changeSet.addedSource(source);
     context.applyChanges(changeSet);