Merge pull request #1179 from dart-lang/regen

regen test docs

Author: devoncarew

lib/src/model_utils.dart

@@ -4,15 +4,15 @@
 
 library dartdoc.model_utils;
 
-import 'dart:io';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';
-import 'package:path/path.dart' as p;
+
 import 'config.dart';
 
 final Map<String, String> _fileContents = <String, String>{};

test/model_test.dart

@@ -948,7 +948,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       new File(p.join(Directory.current.path, "crossdart.json"))
           .writeAsStringSync("""
               {"testing/test_package/lib/fake.dart":
-                {"references":[{"offset":5806,"end":5809,"remotePath":"http://www.example.com/fake.dart"}]}}
+                {"references":[{"offset":1069,"end":1072,"remotePath":"http://www.example.com/fake.dart"}]}}
       """);
 
       initializeConfig(addCrossdart: true, inputDir: Directory.current);

testing/test_package/lib/fake.dart

@@ -50,6 +50,19 @@ import 'css.dart' as css;
 
 import 'two_exports.dart' show BaseClass;
 
+class HasGenerics<X, Y, Z> {
+  HasGenerics(X x, Y y, Z z) {}
+
+  X returnX() => null;
+
+  Z returnZ() => null;
+
+  Z doStuff(String s, X x) => null;
+
+  /// Converts itself to a map.
+  Map<X, Y> convertToMap() => null;
+}
+
 Map<dynamic, String> mapWithDynamicKeys = {};
 
 /// Useful for annotations.
@@ -257,19 +270,6 @@ class Foo2 {
   static const Foo2 BAZ = const Foo2(1);
 }
 
-class HasGenerics<X, Y, Z> {
-  HasGenerics(X x, Y y, Z z) {}
-
-  X returnX() => null;
-
-  Z returnZ() => null;
-
-  Z doStuff(String s, X x) => null;
-
-  /// Converts itself to a map.
-  Map<X, Y> convertToMap() => null;
-}
-
 class OtherGenericsThing<A> {
   HasGenerics<A, Cool, String> convert() => null;
 }

testing/test_package_docs/ex/Dog-class.html

@@ -134,7 +134,8 @@ <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>implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a></p>
+      <p>implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a>
+{@example core/pipes/ts/slice_pipe/slice_pipe_example.ts region='SlicePipe_list'}</p>
     </section>
 
     <section>

testing/test_package_docs/ex/ex-library.html

@@ -335,7 +335,8 @@ <h2>Classes</h2>
           <span class="name "><a href="ex/Dog-class.html">Dog</a></span>
         </dt>
         <dd>
-          <p>implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a></p>
+          <p>implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a>
+{@example core/pipes/ts/slice_pipe/slice_pipe_example.ts region='SlicePipe_list'}</p>
         </dd>
         <dt id="E">
           <span class="name "><a href="ex/E-class.html">E</a></span>

testing/test_package_docs/fake/ExtraSpecialList-class.html

@@ -678,7 +678,7 @@ <h2>Methods</h2>
           </span>
         </dt>
         <dd class="inherited">
-          <p>Returns an Iterable that provides all but the first <code>count</code> elements.<a href="fake/ExtraSpecialList/skip.html">&hellip;</a>
+          <p>Returns an <code>Iterable</code> that provides all but the first <code>count</code> elements.<a href="fake/ExtraSpecialList/skip.html">&hellip;</a>
 </p>
           <div class="features">inherited</div>
         </dd>
@@ -688,7 +688,7 @@ <h2>Methods</h2>
           </span>
         </dt>
         <dd class="inherited">
-          <p>Returns an Iterable that skips leading elements while <code>test</code> is satisfied.<a href="fake/ExtraSpecialList/skipWhile.html">&hellip;</a>
+          <p>Returns an <code>Iterable</code> that skips leading elements while <code>test</code> is satisfied.<a href="fake/ExtraSpecialList/skipWhile.html">&hellip;</a>
 </p>
           <div class="features">inherited</div>
         </dd>

testing/test_package_docs/fake/ExtraSpecialList/firstWhere.html

@@ -154,7 +154,7 @@ <h5><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></h5>
     </section>
     <section class="desc markdown">
       <p>Returns the first element that satisfies the given predicate <code>test</code>.</p>
-<p>Iterates through elements and returns the first to satsify <code>test</code>.</p>
+<p>Iterates through elements and returns the first to satisfy <code>test</code>.</p>
 <p>If no element satisfies <code>test</code>, the result of invoking the <code>orElse</code>
 function is returned.
 If <code>orElse</code> is omitted, it defaults to throwing a <code>StateError</code>.</p>

testing/test_package_docs/fake/ExtraSpecialList/lastWhere.html

@@ -160,7 +160,7 @@ <h5><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></h5>
 The default implementation iterates elements in iteration order,
 checks <code>test(element)</code> for each,
 and finally returns that last one that matched.</p>
-<p>If no element satsfies <code>test</code>, the result of invoking the <code>orElse</code>
+<p>If no element satisfies <code>test</code>, the result of invoking the <code>orElse</code>
 function is returned.
 If <code>orElse</code> is omitted, it defaults to throwing a <code>StateError</code>.</p>
     </section>

testing/test_package_docs/fake/ExtraSpecialList/map.html

@@ -158,7 +158,7 @@ <h5><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></h5>
 <p>This method returns a view of the mapped elements. As long as the
 returned <code>Iterable</code> is not iterated over, the supplied function <code>f</code> will
 not be invoked. The transformed elements will not be cached. Iterating
-multiple times over the the returned <code>Iterable</code> will invoke the supplied
+multiple times over the returned <code>Iterable</code> will invoke the supplied
 function <code>f</code> multiple times on the same element.</p>
 <p>Methods on the returned iterable are allowed to omit calling <code>f</code>
 on any element where the result isn't needed.

testing/test_package_docs/fake/ExtraSpecialList/skip.html

@@ -153,13 +153,16 @@ <h5><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></h5>
       <span class="name ">skip</span>(<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
     </section>
     <section class="desc markdown">
-      <p>Returns an Iterable that provides all but the first <code>count</code> elements.</p>
+      <p>Returns an <code>Iterable</code> that provides all but the first <code>count</code> elements.</p>
 <p>When the returned iterable is iterated, it starts iterating over <code>this</code>,
 first skipping past the initial <code>count</code> elements.
 If <code>this</code> has fewer than <code>count</code> elements, then the resulting Iterable is
 empty.
 After that, the remaining elements are iterated in the same order as
 in this iterable.</p>
+<p>Some iterables may be able to find later elements without first iterating
+through earlier elements, for example when iterating a <code>List</code>.
+Such iterables are allowed to ignore the initial skipped elements.</p>
 <p>The <code>count</code> must not be negative.</p>
     </section>