Revert "try again to not auto start editor port"

sdk/lib/_internal/pub/lib/src/command/serve.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library pub.command.serve;
 
 import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:barback/barback.dart';
@@ skipping 28 matching lines @@
   ///
   /// This will print a usage error and exit if the specified port is invalid.
   int get adminPort {
     var adminPort = commandOptions['admin-port'];
     return adminPort == null ? null : parseInt(adminPort, 'admin port');
   }
 
   /// `true` if Dart entrypoints should be compiled to JavaScript.
   bool get useDart2JS => commandOptions['dart2js'];
 
+  /// `true` if the admin server URL should be displayed on startup.
+  bool get logAdminUrl => commandOptions['log-admin-url'];
+
   BarbackMode get defaultMode => BarbackMode.DEBUG;
 
   List<String> get defaultSourceDirectories => ["web", "test"];
 
   /// This completer is used to keep pub running (by not completing) and to
   /// pipe fatal errors to pub's top-level error-handling machinery.
   final _completer = new Completer();
 
   ServeCommand() {
     commandParser.addOption('hostname', defaultsTo: 'localhost',
         help: 'The hostname to listen on.');
     commandParser.addOption('port', defaultsTo: '8080',
         help: 'The base port to listen on.');
 
-    // TODO(nweiz): Remove once editor also removes this. This is now a NOOP.
-    // Check on http://dartbug.com/20960
+    // TODO(rnystrom): A hidden option to print the URL that the admin server
+    // is bound to on startup. Since this is currently only used for the Web
+    // Socket interface, we don't want to show it to users, but the tests and
+    // Editor need this logged to know what port to bind to.
+    // Remove this (and always log) when #16954 is fixed.
     commandParser.addFlag('log-admin-url', defaultsTo: false, hide: true);
 
     // TODO(nweiz): Make this public when issue 16954 is fixed.
     commandParser.addOption('admin-port', hide: true);
 
     commandParser.addFlag('dart2js', defaultsTo: true,
         help: 'Compile Dart to JavaScript.');
     commandParser.addFlag('force-poll', defaultsTo: false,
         help: 'Force the use of a polling filesystem watcher.');
   }
 
   Future onRunTransformerCommand() async {
     var port = parseInt(commandOptions['port'], 'port');
     var adminPort = commandOptions['admin-port'] == null ? null :
         parseInt(commandOptions['admin-port'], 'admin port');
 
     var watcherType = commandOptions['force-poll'] ?
         WatcherType.POLLING : WatcherType.AUTO;
 
     var environment = await AssetEnvironment.create(entrypoint, mode,
         watcherType: watcherType, hostname: hostname, basePort: port,
         useDart2JS: useDart2JS);
     var directoryLength = sourceDirectories.map((dir) => dir.length)
         .reduce(math.max);
 
-    if (adminPort != null) {
-      var server = await environment.startAdminServer(adminPort);
-      server.results.listen((_) {
-        // The admin server produces no result values.
-        assert(false);
-      }, onError: _fatalError);
+    var server = await environment.startAdminServer(adminPort);
+    server.results.listen((_) {
+      // The admin server produces no result values.
+      assert(false);
+    }, onError: _fatalError);
 
+    if (logAdminUrl) {
       log.message("Running admin server on "
           "${log.bold('http://$hostname:${server.port}')}");
     }
 
     // Start up the servers. We pause updates while this is happening so
     // that we don't log spurious build results in the middle of listing
     // out the bound servers.
     environment.pauseUpdates();
     for (var directory in sourceDirectories) {
       await _startServer(environment, directory, directoryLength);
@@ skipping 56 matching lines @@
         "${padRight(server.rootDirectory, directoryLength)} "
         "on ${log.bold('http://$hostname:${server.port}')}");
   }
 
   /// Reports [error] and exits the server.
   void _fatalError(error, [stackTrace]) {
     if (_completer.isCompleted) return;
     _completer.completeError(error, stackTrace);
   }
 }