Merge pull request #1207 from dart-lang/more_links

fix an issue w/ references in dartdoc not being hyperlinked

Author: devoncarew

lib/src/markdown_processor.dart

@@ -192,13 +192,10 @@ class Documentation {
       //   See https://github.com/dart-lang/markdown/commit/a7bf3dd
       e.classes.add('prettyprint');
 
-      // only "assume" the user intended dart if there are no other classes
-      // present
-      // TODO(kevmoo): This should be `language-dart`.
-      //   Waiting on pkg/markdown v0.10
-      //   See https://github.com/dart-lang/markdown/commit/a7bf3dd
+      // Only "assume" the user intended dart if there are no other classes
+      // present.
       if (e.classes.length == 1) {
-        e.classes.add('lang-dart');
+        e.classes.add('language-dart');
       }
     }
     var asHtml = asHtmlDocument.body.innerHtml;

lib/templates/_source_code.html

@@ -1,5 +1,5 @@
 {{#hasSourceCode}}
 <section class="summary source-code" id="source">
   <h2><span>Source</span> {{{crossdartHtmlTag}}}</h2>
-  <pre class="prettyprint lang-dart">{{{ sourceCode }}}</pre>
+  <pre class="prettyprint language-dart">{{{ sourceCode }}}</pre>
 </section>{{/hasSourceCode}}

pubspec.lock

@@ -120,7 +120,7 @@ packages:
       name: markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.0"
+    version: "0.10.1"
   matcher:
     description:
       name: matcher

pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   collection: ^1.2.0
   html: ^0.12.1
   logging: '>=0.9.0 <0.12.0'
-  markdown: ^0.8.0
+  markdown: ^0.10.1
   mustache4dart: ^1.0.9
   path: ^1.3.0
   quiver: '>=0.18.0 <0.23.0'

test/model_test.dart

@@ -401,7 +401,7 @@ void main() {
     test('no references', () {
       expect(
           Apple.documentationAsHtml,
-          '<p>Sample class <code>String</code></p><pre class="prettyprint lang-dart">  A\n'
+          '<p>Sample class <code>String</code></p><pre class="prettyprint language-dart">  A\n'
           '   B\n'
           '</pre>');
     });

testing/test_package/lib/example.dart

@@ -267,6 +267,12 @@ class PublicClassImplementsPrivateInterface implements _PrivateInterface {
   void test() {}
 }
 
+/// [Object] foo bar
+///
+/// 3. All references should be hyperlinks. [Object] [MyError] [ShapeType]
+///    [MyError] [MyException]
+///    [MyError] [MyException] [Object]
+///    [ShapeType] foo bar
 class ShapeType extends _RetainedEnum {
   static const ShapeType rect = const ShapeType._internal("Rect");
   static const ShapeType ellipse = const ShapeType._internal("Ellipse");

testing/test_package_docs/code_in_comments/code_in_comments-library.html

@@ -83,11 +83,11 @@ <h5><a href="index.html">test_package</a></h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="desc markdown">
-      <pre class="dart prettyprint"><code>void main() {
+      <pre class="prettyprint language-dart"><code class="language-dart">void main() {
   // in Dart!
 }
 </code></pre>
-<pre class="yaml prettyprint"><code>and_yaml:
+<pre class="prettyprint language-dart"><code class="language-yaml">and_yaml:
   - value
   - "value"
   - 3.14

testing/test_package_docs/ex/Apple-class.html

@@ -136,7 +136,7 @@ <h5><a href="ex/ex-library.html">ex</a></h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="desc markdown">
-      <p>Sample class <code>String</code></p><pre class="prettyprint lang-dart">  A
+      <p>Sample class <code>String</code></p><pre class="prettyprint language-dart">  A
    B
 </pre>
     </section>

testing/test_package_docs/ex/Apple/m1.html

@@ -115,7 +115,7 @@ <h5><a href="ex/Apple-class.html">Apple</a></h5>
     </section>
     <section class="desc markdown">
       <p>This is a method.</p>
-<pre class="prettyprint lang-dart"><code>new Apple().m1();
+<pre class="prettyprint language-dart"><code>new Apple().m1();
 </code></pre>
     </section>
 

testing/test_package_docs/ex/B-class.html

@@ -134,7 +134,7 @@ <h5><a href="ex/ex-library.html">ex</a></h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="desc markdown">
-      <p>Extends class <a href="ex/Apple-class.html">Apple</a>, use <a href="ex/Apple/Apple.html">new Apple</a> or <a href="ex/Apple/Apple.fromString.html">new Apple.fromString</a></p><pre class="prettyprint lang-dart"> B extends A
+      <p>Extends class <a href="ex/Apple-class.html">Apple</a>, use <a href="ex/Apple/Apple.html">new Apple</a> or <a href="ex/Apple/Apple.fromString.html">new Apple.fromString</a></p><pre class="prettyprint language-dart"> B extends A
  B implements C
  </pre>
     </section>