Merge pull request #268 from dart-lang/operator-page

page for operator
dart-lang · Mar 14, 2015 · 71aa629 · 71aa629
2 parents 557d21d + ac5e3e6
commit 71aa629
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 26 deletions.
diff --git a/lib/src/html_generator.dart b/lib/src/html_generator.dart
@@ -57,15 +57,19 @@ class HtmlGenerator extends Generator {
     package.libraries.forEach((lib) {
       generateLibrary(package, lib);
 
-      lib.getClasses().forEach((clazz) {
+      lib.getClasses().forEach((Class clazz) {
         generateClass(package, lib, clazz);
 
-        clazz.instanceMethods.forEach((m) {
-          generateMethod(package, lib, clazz, m);
+        clazz.instanceMethods.forEach((method) {
+          generateMethod(package, lib, clazz, method);
         });
 
-        clazz.staticMethods.forEach((m) {
-          generateMethod(package, lib, clazz, m);
+        clazz.operators.forEach((operator) {
+          generateMethod(package, lib, clazz, operator);
+        });
+
+        clazz.staticMethods.forEach((method) {
+          generateMethod(package, lib, clazz, method);
         });
       });
 

diff --git a/lib/src/model.dart b/lib/src/model.dart
@@ -73,7 +73,10 @@ abstract class ModelElement {
     if (e is ConstructorElement) {
       return new Constructor(e, library);
     }
-    if (e is MethodElement) {
+    if (e is MethodElement && e.isOperator) {
+      return new Operator(e, library);
+    }
+    if (e is MethodElement && !e.isOperator) {
       return new Method(e, library);
     }
     if (e is PropertyAccessorElement) {
@@ -560,7 +563,7 @@ class Class extends ModelElement {
   List<ElementType> _interfaces;
   List<Constructor> _constructors;
   List<Method> _allMethods;
-  List<Method> _operators;
+  List<Operator> _operators;
   List<Method> _inheritedMethods;
   List<Method> _staticMethods;
   List<Method> _instanceMethods;
@@ -686,13 +689,17 @@ class Class extends ModelElement {
     _allMethods = _cls.methods.where(isPublic).map((e) {
       var mSource =
           source != null ? source.substring(e.node.offset, e.node.end) : null;
-      return new Method(e, library, mSource);
+      if (!e.isOperator) {
+        return new Method(e, library, mSource);
+      } else {
+        return new Operator(e, library, mSource);
+      }
     }).toList(growable: false);
 
     return _allMethods;
   }
 
-  List<Method> get operators {
+  List<Operator> get operators {
     if (_operators != null) return _operators;
 
     _operators = _methods.where((m) => m.isOperator).toList(growable: false);
@@ -928,7 +935,9 @@ class Method extends ModelElement {
   @override
   bool get isStatic => _method.isStatic;
 
-  bool get isOperator => _method.isOperator;
+  bool get isOperator => false;
+
+  String get typeName => 'method';
 
   String get linkedReturnType => type.createLinkedReturnTypeName();
 
@@ -937,6 +946,15 @@ class Method extends ModelElement {
       '${library.name}/${_method.enclosingElement.name}/$name.html';
 }
 
+class Operator extends Method {
+  Operator(MethodElement element, Library library, [String source])
+    : super(element, library, source);
+
+  bool get isOperator => true;
+
+  String get typeName => 'operator';
+}
+
 /// Getters and setters.
 class Accessor extends ModelElement {
   PropertyAccessorElement get _accessor => (element as PropertyAccessorElement);

diff --git a/templates/class.html b/templates/class.html
@@ -262,7 +262,7 @@ <h2>Operators</h2>
                 <code>
                     <span class="returntype">{{{ linkedReturnType }}}</span>
                     <span class="name-and-params">
-                        <span class="name">{{ name }}</span>({{{ linkedParams }})
+                        <span class="name"><a href="{{href}}">{{ name }}</a></span>({{{ linkedParams }})
                     </span>
                 </code>
             </dt>

diff --git a/templates/method.html b/templates/method.html
@@ -1,5 +1,5 @@
 {{>head}}
-<title>{{method.name}} method - {{class.name}} class - {{ library.name }} library - Dart API</title>
+<title>{{method.name}} {{method.typeName}} - {{class.name}} class - {{ library.name }} library - Dart API</title>
 
 <!-- required because all the links are pseudo-absolute -->
 <base href="../..">
@@ -23,7 +23,8 @@
         <h1 class="title">
             {{ method.name }}
             <span class="type">
-                {{#method.isStatic}}static {{/method.isStatic}}method
+                {{#method.isStatic}}static {{/method.isStatic}}{{method.typeName}}
+                on <span class="classname"><a href="{{class.href}}">{{class.name}}</a></span>
             </span>
         </h1>
     </div>
@@ -45,18 +46,6 @@ <h1 class="title">
         </code>
     </section>
 
-    <section id="declared-in">
-        Declared in <a href="{{class.href}}">{{class.name}}</a>.
-        {{#class.hasImplementors}}
-        Also accessible from
-        <ul class="comma-separated end-with-period">
-        {{#class.implementors}}
-        <li><a href="{{href}}">{{name}}</a></li>
-        {{/class.implementors}}
-        </ul>
-        {{/class.hasImplementors}}
-    </section>
-
     <section class="desc markdown">
 
         {{#markdown}}

diff --git a/templates/styles.css b/templates/styles.css
@@ -22,7 +22,7 @@ pre.prettyprint {
   border: 1px solid #CCC;
 }
 
-.title .type, .classname {
+.title .type, .classname, .classname a {
   color: #BBB;
 }