Merge pull request #722 from dart-lang/devoncarew_readme3

devoncarew · devoncarew · commit 759720182a4e · 2015-07-23T10:34:55.000-07:00
fix an NPE when generating docs
diff --git a/.analysis_options b/.analysis_options
@@ -3,6 +3,7 @@
 analyzer:
   exclude:
     - test_package/doc/api
+    - test_package_small/doc/api
     - test_package_bad/
     - doc/api/
     - pub.dartlang.org/
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 build/
 doc/api/
 test_package/doc
+test_package_small/doc
 packages
 .buildlog
 .pub
diff --git a/lib/templates/_documentation.html b/lib/templates/_documentation.html
@@ -1,9 +1,10 @@
 <section class="desc markdown">
 
     {{^hasDocumentation}}
-    <p class="no-docs">Not documented.</p>
+      <p class="no-docs">Not documented.</p>
+    {{/hasDocumentation}}
+    {{#hasDocumentation}}
+      {{{ documentationAsHtml }}}
     {{/hasDocumentation}}
-
-    {{{ documentationAsHtml }}}
 
 </section>
diff --git a/test_package_small/lib/main.dart b/test_package_small/lib/main.dart
@@ -0,0 +1,4 @@
+
+main(List<String> args) {
+  print('Hello world!');
+}
diff --git a/test_package_small/pubspec.yaml b/test_package_small/pubspec.yaml
@@ -0,0 +1,5 @@
+name: test_package_small
+version: 0.0.1
+description: A simple console application.
+#dependencies:
+#  foo_bar: '>=1.0.0 <2.0.0'
diff --git a/tool/travis.sh b/tool/travis.sh
@@ -29,11 +29,16 @@ else
   # Verify that the libraries are error free.
   grind analyze
 
-  # Another smoke test: Run dartdoc on test_package.
+  # Run dartdoc on test_package.
   cd test_package
   dart -c ../bin/dartdoc.dart
   cd ..
 
+  # And on test_package_small.
+  cd test_package_small
+  dart -c ../bin/dartdoc.dart
+  cd ..
+
   # Run the tests.
   grind test
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +main(List<String> args) {
 +  print('Hello world!');
 +}