Merge branch 'master' into members

Author: munificent

.gitignore

@@ -10,6 +10,7 @@ packages
 .packages
 .settings/
 .DS_Store
+*.iml
 
 pub.dartlang.org/
 

.travis.yml

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

appveyor.yml

@@ -9,7 +9,12 @@ install:
   - set PATH=%PATH%;%APPDATA%\Pub\Cache\bin
   - pub get
 
+# this doesn't seem to be working
 build: off
 
+branches:
+  only:
+    - disable_builds_for_now
+
 test_script:
   - pub run grinder buildbot

lib/dartdoc.dart

@@ -19,7 +19,7 @@ import 'package:analyzer/src/generated/source_io.dart';
 
 import 'generator.dart';
 import 'resource_loader.dart' as loader;
-import 'src/html_generator.dart';
+import 'src/html_generator.dart' show dartdocVersion, HtmlGenerator;
 import 'src/io_utils.dart';
 import 'src/model.dart';
 import 'src/model_utils.dart';
@@ -37,6 +37,7 @@ final String defaultOutDir = 'doc${Platform.pathSeparator}api';
 /// Initialize and setup the generators.
 List<Generator> initGenerators(
     String url, String headerFilePath, String footerFilePath) {
+  dartdocVersion = version;
   return [
     new HtmlGenerator(url, header: headerFilePath, footer: footerFilePath)
   ];
@@ -57,8 +58,15 @@ class DartDoc {
 
   Stopwatch _stopwatch;
 
-  DartDoc(this.rootDir, this.excludes, this.sdkDir, this.generators,
-      this.outputDir, this.packageRootDir, this.packageMeta, this.urlMappings,
+  DartDoc(
+      this.rootDir,
+      this.excludes,
+      this.sdkDir,
+      this.generators,
+      this.outputDir,
+      this.packageRootDir,
+      this.packageMeta,
+      this.urlMappings,
       this.includes);
 
   /// Generate DartDoc documentation.
@@ -151,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);
@@ -178,8 +186,8 @@ class DartDoc {
     }).where((_Error error) => error.isError).toList()..sort();
 
     double seconds = _stopwatch.elapsedMilliseconds / 1000.0;
-    print(
-        "Parsed ${libraries.length} " "file${libraries.length == 1 ? '' : 's'} in "
+    print("Parsed ${libraries.length} "
+        "file${libraries.length == 1 ? '' : 's'} in "
         "${seconds.toStringAsFixed(1)} seconds.\n");
 
     if (errors.isNotEmpty) {

lib/markdown_processor.dart

@@ -69,7 +69,7 @@ class Documentation {
     String tempHtml = renderMarkdownToHtml(raw, element);
     _asHtmlDocument = parse(tempHtml);
     _asHtmlDocument.querySelectorAll('script').forEach((s) => s.remove());
-    _asHtmlDocument.querySelectorAll('code').forEach((e) {
+    _asHtmlDocument.querySelectorAll('pre').forEach((e) {
       e.classes.addAll(['prettyprint', 'lang-dart']);
     });
     _asHtml = _asHtmlDocument.body.innerHtml;
@@ -98,9 +98,6 @@ class _InlineCodeSyntax extends md.InlineSyntax {
   @override
   bool onMatch(md.InlineParser parser, Match match) {
     var element = new md.Element.text('code', htmlEscape(match[1]));
-    var c = element.attributes.putIfAbsent("class", () => "");
-    c = (c.isEmpty ? "" : " ") + "prettyprint";
-    element.attributes["class"] = c;
     parser.addNode(element);
     return true;
   }
@@ -124,7 +121,9 @@ NodeList<CommentReference> _getCommentRefs(ModelElement modelElement) {
   if (modelElement.element.node is AnnotatedNode) {
     if ((modelElement.element.node as AnnotatedNode).documentationComment !=
         null) {
-      return (modelElement.element.node as AnnotatedNode).documentationComment.references;
+      return (modelElement.element.node as AnnotatedNode)
+          .documentationComment
+          .references;
     }
   } else if (modelElement.element is LibraryElement) {
     // handle anonymous libraries

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) {
@@ -14,7 +12,7 @@ library dartdoc.resource_loader;
 
 import 'dart:async' show Future;
 import 'dart:io' show Platform, File, Directory;
-import 'dart:typed_data';
+import 'dart:typed_data' show Uint8List;
 
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as p;
@@ -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

@@ -122,7 +122,7 @@ a, a:hover {
   color: #1976D2;
 }
 
-pre {
+pre.prettyprint {
   font-family: 'Source Code Pro', monospace;
   color: black;
   border-radius: 4px;
@@ -146,11 +146,8 @@ pre code {
 code {
   font-family: 'Source Code Pro', monospace;
   /* overriding bootstrap */
-  font-size: 15px;
   color: inherit;
-  border-radius: 0;
-  padding: 0;
-  background-color: inherit;
+  background-color: #f7f7f7;
 }
 
 @media(max-width: 768px) {
@@ -337,7 +334,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;
@@ -516,7 +513,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;