Events are not a special scope

jfirebaugh · jfirebaugh · commit 9dcf92666971 · 2015-10-13T16:37:19.000-07:00
diff --git a/lib/hierarchy.js b/lib/hierarchy.js
@@ -22,9 +22,6 @@ function addPath(comment, prefix, namepath) {
   comment.members.static.forEach(function (member) {
     addPath(member, comment.path, namepath);
   });
-  comment.events.forEach(function (member) {
-    addPath(member, comment.path, namepath);
-  });
 }
 
 /**
@@ -45,7 +42,6 @@ function inferHierarchy(comments) {
   for (i = 0; i < comments.length; i++) {
     nameIndex[comments[i].name] = comments[i];
     comments[i].members = { instance: [], static: [] };
-    comments[i].events = [];
   }
 
   for (i = comments.length - 1; i >= 0; i--) {
@@ -70,16 +66,7 @@ function inferHierarchy(comments) {
       continue;
     }
 
-
-    switch (comment.kind) {
-    case 'event':
-      parent.events.push(comment);
-      break;
-
-    default:
-      parent.members[comment.scope || 'static'].push(comment);
-      break;
-    }
+    parent.members[comment.scope || 'static'].push(comment);
 
     // remove non-root nodes from the lowest level: these are reachable
     // as members of other docs.
diff --git a/test/fixture/_external-deps-included.json b/test/fixture/_external-deps-included.json
@@ -32,7 +32,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "foo"
     ]
@@ -91,7 +90,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "index"
     ]
@@ -150,7 +148,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "main"
     ]
diff --git a/test/fixture/_multi-file-input.json b/test/fixture/_multi-file-input.json
@@ -88,7 +88,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "returnTwo"
     ]
@@ -147,7 +146,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "simple.input"
     ]
diff --git a/test/fixture/class.output.json b/test/fixture/class.output.json
@@ -141,7 +141,6 @@
             "instance": [],
             "static": []
           },
-          "events": [],
           "path": [
             "MyClass",
             "getFoo"
@@ -201,7 +200,6 @@
             "instance": [],
             "static": []
           },
-          "events": [],
           "path": [
             "MyClass",
             "getUndefined"
@@ -210,7 +208,6 @@
       ],
       "static": []
     },
-    "events": [],
     "path": [
       "MyClass"
     ]
diff --git a/test/fixture/default-param.output.json b/test/fixture/default-param.output.json
@@ -39,7 +39,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "veryImportantTransform"
     ]
diff --git a/test/fixture/es6-import.output.json b/test/fixture/es6-import.output.json
@@ -65,7 +65,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "multiply"
     ]
@@ -131,7 +130,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "multiplyTwice"
     ]
diff --git a/test/fixture/es6.output.json b/test/fixture/es6.output.json
@@ -65,7 +65,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "multiply"
     ]
diff --git a/test/fixture/event.output.json b/test/fixture/event.output.json
@@ -89,7 +89,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "Map#mousemove"
     ]
diff --git a/test/fixture/external.output.json b/test/fixture/external.output.json
@@ -32,7 +32,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "foo"
     ]
diff --git a/test/fixture/factory.output.json b/test/fixture/factory.output.json
@@ -53,7 +53,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "area"
     ]
@@ -109,7 +108,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "area"
     ]
@@ -169,7 +167,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "data"
     ]
diff --git a/test/fixture/flow-default.output.json b/test/fixture/flow-default.output.json
@@ -72,7 +72,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "veryImportantTransform"
     ]
diff --git a/test/fixture/flow-types.output.json b/test/fixture/flow-types.output.json
@@ -108,7 +108,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "addThem"
     ]
diff --git a/test/fixture/html/nested.output.files b/test/fixture/html/nested.output.files
@@ -1757,6 +1757,11 @@ h4:hover .anchorjs-link {
                   class='regular block'>
                   .MAGIC_NUMBER
                 </a>
+                <a
+                  href='#klass/event'
+                  class='regular block'>
+                  .event
+                </a>
                 <a
                   href='#klass/isarrayofbuffers'
                   class='regular block'>
@@ -1787,11 +1792,6 @@ h4:hover .anchorjs-link {
                   class='regular block'>
                   #withOptions
                 </a>
-                <a
-                  href='#klass/event'
-                  class='regular block'>
-                  <code>ⓔ event</code>
-                </a>
               <a
                 href='#bar'
                 class='block bold'>
@@ -1843,6 +1843,26 @@ h4:hover .anchorjs-link {
             </section>
           </div>
         </div>
+        <div class='collapsible' id='klass/event'>
+          <a href='#klass/event'>
+            <code>
+              .event<span class='gray'></span>
+            </code>
+            <span class='force-inline'>
+              <p>Klass event</p>
+
+            </span>
+          </a>
+          <div class='collapser border px2 m2'>
+            <section class='py2 clearfix'>
+              <h2 id='klass/event' class='mt0'>
+                event<span class='gray'></span>
+              </h2>
+              <p>Klass event</p>
+            
+            </section>
+          </div>
+        </div>
         <div class='collapsible' id='klass/isarrayofbuffers'>
           <a href='#klass/isarrayofbuffers'>
             <code>
@@ -2073,15 +2093,6 @@ the referenced class type</p>
             </section>
           </div>
         </div>
-        <div>
-  <section class='py2 clearfix'>
-    <h2 id='klass/event' class='mt0'>
-      event<span class='gray'></span>
-    </h2>
-    <p>Klass event</p>
-  
-  </section>
-        </div>
 </section>
 </div><div class='py1'><section class='py2 clearfix'>
   <h2 id='bar' class='mt0'>
diff --git a/test/fixture/infer-params.output.json b/test/fixture/infer-params.output.json
@@ -65,7 +65,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "addThem"
     ]
diff --git a/test/fixture/inline-link.output.json b/test/fixture/inline-link.output.json
@@ -75,7 +75,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "addOne"
     ]
@@ -156,7 +155,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "inline-link.input"
     ]
diff --git a/test/fixture/internal.output.json b/test/fixture/internal.output.json
@@ -32,7 +32,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "foo"
     ]
diff --git a/test/fixture/jsx.output.json b/test/fixture/jsx.output.json
@@ -52,7 +52,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "jsx.input"
     ]
diff --git a/test/fixture/multiexample.output.json b/test/fixture/multiexample.output.json
@@ -135,7 +135,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "multiexample.input"
     ]
diff --git a/test/fixture/multisignature.output.json b/test/fixture/multisignature.output.json
@@ -60,7 +60,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "getTheTime"
     ]
@@ -139,7 +138,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "getTheTime"
     ]
diff --git a/test/fixture/nested_properties.output.json b/test/fixture/nested_properties.output.json
@@ -133,7 +133,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "foo"
     ]
diff --git a/test/fixture/newline-in-description.output.json b/test/fixture/newline-in-description.output.json
@@ -57,7 +57,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       null
     ]
diff --git a/test/fixture/no-name.output.json b/test/fixture/no-name.output.json
@@ -52,7 +52,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       null
     ]
diff --git a/test/fixture/optional.output.json b/test/fixture/optional.output.json
@@ -100,7 +100,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "Address6"
     ]
diff --git a/test/fixture/param_nest.output.json b/test/fixture/param_nest.output.json
@@ -252,7 +252,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "GeoJSONSource"
     ]
diff --git a/test/fixture/simple-hashbang.output.json b/test/fixture/simple-hashbang.output.json
@@ -53,7 +53,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "simple-hashbang.input"
     ]
diff --git a/test/fixture/simple-two.output.json b/test/fixture/simple-two.output.json
@@ -88,7 +88,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "returnTwo"
     ]
diff --git a/test/fixture/simple.output.github.json b/test/fixture/simple.output.github.json
@@ -55,7 +55,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "simple.input"
     ]
diff --git a/test/fixture/simple.output.json b/test/fixture/simple.output.json
@@ -53,7 +53,6 @@
       "instance": [],
       "static": []
     },
-    "events": [],
     "path": [
       "simple.input"
     ]
diff --git a/test/fixture/sorting/output.json b/test/fixture/sorting/output.json
diff --git a/test/fixture/throws.output.json b/test/fixture/throws.output.json
diff --git a/test/fixture/trailing-only.output.json b/test/fixture/trailing-only.output.json
diff --git a/test/fixture/trailing.output.json b/test/fixture/trailing.output.json
diff --git a/test/fixture/type_application.output.json b/test/fixture/type_application.output.json
diff --git a/test/fixture/typedef.output.json b/test/fixture/typedef.output.json
diff --git a/test/fixture/untyped-param.output.json b/test/fixture/untyped-param.output.json
diff --git a/test/lib/hierarchy.js b/test/lib/hierarchy.js

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@`
`39`	`39`	`"instance": [],`
`40`	`40`	`"static": []`
`41`	`41`	`},`
`42`		`- "events": [],`
`43`	`42`	`"path": [`
`44`	`43`	`"veryImportantTransform"`
`45`	`44`	`]`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@`
`65`	`65`	`"instance": [],`
`66`	`66`	`"static": []`
`67`	`67`	`},`
`68`		`- "events": [],`
`69`	`68`	`"path": [`
`70`	`69`	`"multiply"`
`71`	`70`	`]`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@`
`89`	`89`	`"instance": [],`
`90`	`90`	`"static": []`
`91`	`91`	`},`
`92`		`- "events": [],`
`93`	`92`	`"path": [`
`94`	`93`	`"Map#mousemove"`
`95`	`94`	`]`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`"instance": [],`
`33`	`33`	`"static": []`
`34`	`34`	`},`
`35`		`- "events": [],`
`36`	`35`	`"path": [`
`37`	`36`	`"foo"`
`38`	`37`	`]`