Merge branch 'master' of github.com:dart-lang/dartdoc into sl-find-as-you-type

Author: sethladd

appveyor.yml

@@ -3,18 +3,16 @@
 # BSD-style license that can be found in the LICENSE file.
 
 install:
-  # Investigate scoop?
-  - choco install -y dart-sdk -version 1.11.1
+# TODO: Switch back to chocolatey once 1.12.0 is available.
+#  - choco install -y dart-sdk -version 1.11.1
+  - ps: wget https://gsdview.appspot.com/dart-archive/channels/dev/raw/latest/sdk/dartsdk-windows-x64-release.zip -OutFile dart-sdk.zip
+  - cmd: echo "Unzipping dart-sdk..."
+  - cmd: 7z x dart-sdk.zip -o"C:\tools" -y > nul
   - set PATH=%PATH%;C:\tools\dart-sdk\bin
   - 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

@@ -8,6 +8,12 @@ library dartdoc;
 import 'dart:async';
 import 'dart:io';
 
+import 'package:analyzer/file_system/file_system.dart' as fileSystem;
+import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:analyzer/source/package_map_provider.dart';
+import 'package:analyzer/source/package_map_resolver.dart';
+import 'package:analyzer/source/pub_package_map_provider.dart';
+import 'package:analyzer/source/sdk_ext.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
@@ -131,12 +137,20 @@ class DartDoc {
     ];
     if (urlMappings != null) resolvers.insert(
         0, new CustomUriResolver(urlMappings));
-    JavaFile packagesDir = packageRootDir == null
-        ? new JavaFile.relative(new JavaFile(rootDir.path), 'packages')
-        : new JavaFile(packageRootDir.path);
-    if (packagesDir.exists()) {
-      resolvers.add(new PackageUriResolver([packagesDir]));
+
+    fileSystem.Resource cwd =
+        PhysicalResourceProvider.INSTANCE.getResource('.');
+    PubPackageMapProvider pubPackageMapProvider =
+        new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
+    PackageMapInfo packageMapInfo =
+        pubPackageMapProvider.computePackageMap(cwd);
+    Map<String, List<fileSystem.Folder>> packageMap = packageMapInfo.packageMap;
+    if (packageMap != null) {
+      resolvers.add(new SdkExtUriResolver(packageMap));
+      resolvers.add(new PackageMapUriResolver(
+          PhysicalResourceProvider.INSTANCE, packageMap));
     }
+
     SourceFactory sourceFactory =
         new SourceFactory(/*contentCache,*/ resolvers);
 

lib/resources/styles.css

@@ -205,8 +205,15 @@ dt {
 }
 
 dd {
-  margin-bottom: 16px;
-  color: #727272;
+  color: #212121;
+}
+
+dd.callable, dd.constant, dd.property {
+  margin-bottom: 24px;
+}
+
+dd p {
+  margin-top: 4px;
 }
 
 section.summary h2 {
@@ -229,6 +236,7 @@ dl.dl-horizontal dt {
 
 dt .name {
   font-size: 17px;
+  font-weight: 500;
 }
 
 dl dt.callable .name {
@@ -240,8 +248,13 @@ dl dt.callable .name {
   white-space: nowrap;
 }
 
+.signature {
+  color: #727272;
+}
+
 .signature a {
-  color: rgb(51, 51, 51);
+  /* 50% mix of default-primary-color and primary-text-color. */
+  color: #4674a2;
 }
 
 .optional {
@@ -341,9 +354,12 @@ footer .container-fluid {
   margin: 0;
 }
 
-.is-inherited {
-  color: #727272;
+/* The little slug line under a declaration for things like "const",
+   "read-only", etc. */
+.features {
+  font-size: 14px;
   font-style: italic;
+  color: #727272;
 }
 
 .multi-line-signature {
@@ -423,10 +439,6 @@ nav .self-name {
   font-style: italic;
 }
 
-.readable-writable {
-  font-style: italic;
-}
-
 section.multi-line-signature div.parameters {
   margin-left: 24px;
 }

lib/templates/_callable.html

@@ -6,9 +6,7 @@
 </dt>
 <dd>
     {{#isInherited}}
-    <div>
-      <span class="is-inherited">inherited</span>
-    </div>
+    <div class="features">inherited</div>
     {{/isInherited}}
-    {{{ oneLineDoc }}}
+    <p>{{{ oneLineDoc }}}</p>
 </dd>

lib/templates/_constant.html

@@ -1,12 +1,9 @@
 <dt id="{{htmlId}}" class="constant">
     <span class="top-level-variable-type">{{{ linkedReturnType }}}</span>
     <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{ linkedName }}}</span>
-    =
-    <span class="constant-value">{{{ constantValue }}}</span>
+    <span class="signature">= {{{ constantValue }}}</span>
 </dt>
 <dd>
-    <div class="is-const">
-        const
-    </div>
-    {{{ oneLineDoc }}}
+    <div class="features">const</div>
+    <p>{{{ oneLineDoc }}}</p>
 </dd>

lib/templates/_property.html

@@ -1,8 +1,9 @@
 <dt id="{{htmlId}}" class="property">
-    {{#isInherited}}{{>name_summary}}{{/isInherited}}{{^isInherited}}{{{linkedName}}}{{/isInherited}}
+    {{#isInherited}}{{>name_summary}}{{/isInherited}}
+    {{^isInherited}}<span class="name">{{{linkedName}}}</span>{{/isInherited}}
     <span class="signature">&#8594; {{{ linkedReturnType }}}</span>
 </dt>
 <dd>
     {{>readable_writable}}
-    {{{ oneLineDoc }}}
+    <p>{{{ oneLineDoc }}}</p>
 </dd>

lib/templates/_readable_writable.html

@@ -1,3 +1,3 @@
-<div class="readable-writable">
-    {{#readOnly}}read-only{{/readOnly}}{{#writeOnly}}write-only{{/writeOnly}}{{#readWrite}}read / write{{/readWrite}}{{#isInherited}}, <span class="is-inherited">inherited</span>{{/isInherited}}
+<div class="features">
+    {{#readOnly}}read-only{{/readOnly}}{{#writeOnly}}write-only{{/writeOnly}}{{#readWrite}}read / write{{/readWrite}}{{#isInherited}}, inherited{{/isInherited}}
 </div>

lib/templates/class.html

@@ -131,7 +131,7 @@ <h2>Constructors</h2>
                     const
                 </div>
                 {{/isConst}}
-                {{{ oneLineDoc }}}
+                <p>{{{ oneLineDoc }}}</p>
             </dd>
             {{/clazz.constructors}}
         </dl>

lib/templates/index.html

@@ -15,7 +15,7 @@ <h2>Libraries</h2>
           </dt>
           <dd>
             {{#isNotDocumented}}<span class="undocumented">Library not documented.</span>{{/isNotDocumented}}
-            {{{ oneLineDoc }}}
+            <p>{{{ oneLineDoc }}}</p>
           </dd>
         {{/package.libraries}}
       </dl>

lib/templates/library.html

@@ -77,7 +77,7 @@ <h2>Enums</h2>
                 {{{linkedName}}}
             </dt>
             <dd>
-                {{{ oneLineDoc }}}
+                <p>{{{ oneLineDoc }}}</p>
             </dd>
             {{/library.enums}}
         </dl>
@@ -94,7 +94,7 @@ <h2>Classes</h2>
                 <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span>
             </dt>
             <dd>
-                {{{ oneLineDoc }}}
+                <p>{{{ oneLineDoc }}}</p>
             </dd>
             {{/library.classes}}
         </dl>
@@ -111,7 +111,7 @@ <h2>Exceptions / Errors</h2>
                 <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span>
             </dt>
             <dd>
-                {{{ oneLineDoc }}}
+                <p>{{{ oneLineDoc }}}</p>
             </dd>
             {{/library.exceptions}}
         </dl>