Merge pull request #200 from dart-lang/class-mixins

list the mixins for a class
dart-lang · Feb 16, 2015 · 056d47e · 056d47e
2 parents f7eef60 + b0dc35d
commit 056d47e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/lib/src/model.dart b/lib/src/model.dart
@@ -500,7 +500,7 @@ class Class extends ModelElement {
     _mixins = _cls.mixins.map((f) {
       var lib = new Library(f.element.library, p);
       return new ElementType(f, new ModelElement.from(f.element, lib));
-    }).toList();
+    }).toList(growable: false);
     if (hasSupertype) {
       var lib = new Library(_cls.supertype.element.library, p);
       _supertype = new ElementType(
@@ -509,7 +509,7 @@ class Class extends ModelElement {
     _interfaces = _cls.interfaces.map((f) {
       var lib = new Library(f.element.library, p);
       return new ElementType(f, new ModelElement.from(f.element, lib));
-    }).toList();
+    }).toList(growable: false);
   }
 
   bool get isAbstract => _cls.isAbstract;
@@ -521,9 +521,11 @@ class Class extends ModelElement {
 
   List<ElementType> get mixins => _mixins;
 
+  bool get hasMixins => mixins.isNotEmpty;
+
   List<ElementType> get interfaces => _interfaces;
 
-  bool get hasInterfaces => _interfaces.isNotEmpty;
+  bool get hasInterfaces => interfaces.isNotEmpty;
 
   List<Field> _getAllfields() {
     List<FieldElement> elements = _cls.fields.toList()
@@ -555,8 +557,6 @@ class Class extends ModelElement {
   List<Method> get methods {
     if (_methods != null) return _methods;
 
-    // Do not sort. We want source order.
-    // Also, check if this is lexically ordered
     _methods = _cls.methods
       .where(isPublic)
       .map((e) {

diff --git a/lib/src/new_html_generator.dart b/lib/src/new_html_generator.dart
@@ -119,7 +119,8 @@ class NewHtmlGenerator extends Generator {
   void _writeFile(String filename, String template, Map data) {
     File f = _createOutputFile(filename);
     String content = render(template, data, partial: _partials,
-        assumeNullNonExistingProperty: false);
+        assumeNullNonExistingProperty: false,
+        errorOnMissingProperty: true);
     f.writeAsStringSync(content);
   }
 
@@ -144,7 +145,8 @@ class NewHtmlGenerator extends Generator {
 /// and removes any script tags. Returns the HTML as a string.
 String renderMarkdown(String markdown, {nestedContext}) {
   String mustached = render(markdown.trim(), nestedContext,
-      assumeNullNonExistingProperty: false);
+      assumeNullNonExistingProperty: false,
+      errorOnMissingProperty: true);
   String html = md.markdownToHtml(mustached);
   Document doc = parse(html);
   doc.querySelectorAll('script').forEach((s) => s.remove());
@@ -153,7 +155,9 @@ String renderMarkdown(String markdown, {nestedContext}) {
 
 String oneLiner(String text, {nestedContext}) {
   String mustached = render(text.trim(), nestedContext,
-      assumeNullNonExistingProperty: false).trim();
+      assumeNullNonExistingProperty: false,
+      errorOnMissingProperty: true)
+      .trim();
   if (mustached == null || mustached.trim().isEmpty) return '';
 
   // Parse with Markdown, but only care about the first block or paragraph.

diff --git a/templates/new/class.html b/templates/new/class.html
@@ -26,7 +26,7 @@ <h1 class="title">
     <section class="desc markdown">
 
         {{#markdown}}
-          {{{ class.description }}}
+          {{{ class.documentation }}}
         {{/markdown}}
 
     </section>
@@ -42,6 +42,17 @@ <h4>Implements</h4>
     </section>
     {{/class.hasInterfaces}}
 
+    {{#class.hasMixins}}
+    <section id="mixes-in">
+        <h4>Mixes-in</h4>
+        <ul class="interfaces-implemented">
+            {{#class.mixins}}
+            <li>{{{linkedName}}}</li>
+            {{/class.mixins}}
+        </ul>
+    </section>
+    {{/class.hasMixins}}
+
     <section class="summary" id="constructors">
         <h2>Constructors</h2>
 

diff --git a/test/fake_package/lib/fake.dart b/test/fake_package/lib/fake.dart
@@ -47,6 +47,11 @@ class Cool {
 
 }
 
+/// Perfect for mix-ins.
+abstract class MixMeIn {
+
+}
+
 /// An interface that can be implemented.
 abstract class Interface {
 
@@ -61,7 +66,7 @@ abstract class AnotherInterface {
 /// across... wait for it... two physical lines.
 ///
 /// The rest of this is not in the first paragraph.
-class LongFirstLine implements Interface, AnotherInterface {
+class LongFirstLine extends Object with MixMeIn implements Interface, AnotherInterface {
 
   /// The default constructor.
   LongFirstLine();