Fix server hang when lr is disabled

Author: tmcw

src/infer/params.js

@@ -1,10 +1,10 @@
 /* @flow */
 
-const t = require('babel-types');
-const generate = require('babel-generator').default;
-const _ = require('lodash');
-const findTarget = require('./finders').findTarget;
-const flowDoctrine = require('../flow_doctrine');
+import * as t from 'babel-types';
+import generate from 'babel-generator';
+import _ from 'lodash';
+import finders from './finders';
+import flowDoctrine from '../flow_doctrine';
 
 /**
  * Infers param tags by reading function parameter names
@@ -13,7 +13,7 @@ const flowDoctrine = require('../flow_doctrine');
  * @returns {Object} comment with parameters
  */
 function inferParams(comment: Comment) {
-  var path = findTarget(comment.context.ast);
+  var path = finders.findTarget(comment.context.ast);
 
   // In case of `/** */ var x = function () {}` findTarget returns
   // the declarator.

src/serve/server.js

@@ -121,18 +121,13 @@ class Server extends EventEmitter {
      * Shut down the server's HTTP & LiveReload endpoints. This method
      * can be called multiple times.
      */
-    return new Promise(resolve => {
-      // idempotent
-      if (!this._lr) {
-        return resolve(this);
-      }
-
-      this._http.close(() => {
-        this._lr.close();
-        delete this._http;
-        delete this._lr;
-        resolve(this);
-      });
+    return Promise.all([
+      this._http && this._http.close(),
+      this._lr && this._lr.close()
+    ]).then(() => {
+      delete this._http;
+      delete this._lr;
+      return this;
     });
   }
 }