Basilisk - the cmd line - help (the columns alignment, error improvements)

https://github.com/MoonchildProductions/moebius/pull/58

5 files changed, 38 insertions, 32 deletions

diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index e8fe0fe93..b366c3f81 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -454,16 +454,16 @@ nsBrowserContentHandler.prototype = {
 
   get helpInfo() {
     let info =
-              "  --browser          Open a browser window.\n" +
-              "  --new-window <url> Open <url> in a new window.\n" +
-              "  --new-tab <url>    Open <url> in a new tab.\n" +
-              "  --private-window <url> Open <url> in a new private window.\n";
+              "  --browser                                    Open a browser window.\n" +
+              "  --new-window <url>                           Open <url> in a new window.\n" +
+              "  --new-tab <url>                              Open <url> in a new tab.\n" +
+              "  --private-window <url>                       Open <url> in a new private window.\n";
     if (AppConstants.platform == "win") {
-      info += "  --preferences      Open Options dialog.\n";
+      info += "  --preferences                                Open Options dialog.\n";
     } else {
-      info += "  --preferences      Open Preferences dialog.\n";
+      info += "  --preferences                                Open Preferences dialog.\n";
     }
-    info += "  --search <term>    Search <term> with your default search engine.\n";
+    info += "  --search <term>                              Search <term> with your default search engine.\n";
     return info;
   },
 
diff --git a/browser/components/shell/nsSetDefaultBrowser.js b/browser/components/shell/nsSetDefaultBrowser.js
index bb09ab213..c7a78c538 100644
--- a/browser/components/shell/nsSetDefaultBrowser.js
+++ b/browser/components/shell/nsSetDefaultBrowser.js
@@ -21,7 +21,7 @@ nsSetDefaultBrowser.prototype = {
     }
   },
 
-  helpInfo: "  --setDefaultBrowser Set this app as the default browser.\n",
+  helpInfo: "  --setDefaultBrowser                          Set this app as the default browser.\n",
 
   classID: Components.ID("{F57899D0-4E2C-4ac6-9E29-50C736103B0C}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]),
diff --git a/devtools/client/devtools-startup.js b/devtools/client/devtools-startup.js
index 2271dd790..f07e4ff2b 100644
--- a/devtools/client/devtools-startup.js
+++ b/devtools/client/devtools-startup.js
@@ -190,7 +190,10 @@ DevToolsStartup.prototype = {
       listener.open();
       dump("Started debugger server on " + portOrPath + "\n");
     } catch (e) {
-      dump("Unable to start debugger server on " + portOrPath + ": " + e);
+      let _error = "Unable to start debugger server on " + portOrPath + ": "
+          + e;
+      Cu.reportError(_error);
+      dump(_error + "\n");
     }
 
     if (cmdLine.state == Ci.nsICommandLine.STATE_REMOTE_AUTO) {
@@ -199,12 +202,14 @@ DevToolsStartup.prototype = {
   },
 
   /* eslint-disable max-len */
-  helpInfo: "  --jsconsole        Open the Browser Console.\n" +
-            "  --jsdebugger       Open the Browser Toolbox.\n" +
-            "  --devtools         Open DevTools on initial load.\n" +
-            "  --start-debugger-server [ws:][ <port> | <path> ] Start the debugger server on\n" +
-            "                     a TCP port or Unix domain socket path. Defaults to TCP port\n" +
-            "                     6000. Use WebSocket protocol if ws: prefix is specified.\n",
+  helpInfo: "  --jsconsole                                  Open the Browser Console.\n" +
+            "  --jsdebugger                                 Open the Browser Toolbox.\n" +
+            "  --devtools                                   Open DevTools on initial load.\n" +
+            "  --start-debugger-server [ws:][<port>|<path>] Start the debugger server on\n" +
+            "                                               a TCP port or Unix domain socket path.\n" +
+            "                                               Defaults to TCP port 6000.\n" +
+            "                                               Use WebSocket protocol if ws: prefix\n" +
+            "                                               is specified.\n",
   /* eslint-disable max-len */
 
   classID: Components.ID("{9e9a9283-0ce9-4e4a-8f1c-ba129a032c32}"),
diff --git a/layout/tools/recording/recording-cmdline.js b/layout/tools/recording/recording-cmdline.js
index e043aa29c..0f127bbd5 100644
--- a/layout/tools/recording/recording-cmdline.js
+++ b/layout/tools/recording/recording-cmdline.js
@@ -67,8 +67,8 @@ RecordingCmdLineHandler.prototype =
         cmdLine.preventDefault = true;
     },
 
-    helpInfo : "  --recording <file> Record drawing for a given URL.\n" +
-               "  --recording-output <file> Specify destination file for a drawing recording.\n"
+    helpInfo : "  --recording <file>                           Record drawing for a given URL.\n" +
+               "  --recording-output <file>                    Specify destination file for a drawing recording.\n"
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([RecordingCmdLineHandler]);
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 4a1d3046f..1b5c2ed75 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1589,28 +1589,29 @@ DumpHelp()
 
 #ifdef MOZ_X11
   printf("X11 options\n"
-         "  --display=DISPLAY  X display to use\n"
-         "  --sync             Make X calls synchronous\n");
+         "  --display=DISPLAY                            X display to use.\n"
+         "  --sync                                       Make X calls synchronous.\n");
 #endif
 #ifdef XP_UNIX
-  printf("  --g-fatal-warnings Make all warnings fatal\n"
+  printf("  --g-fatal-warnings                           Make all warnings fatal.\n"
          "\n%s options\n", gAppData->name);
 #endif
 
-  printf("  -h or --help       Print this message.\n"
-         "  -v or --version    Print %s version.\n"
-         "  -P <profile>       Start with <profile>.\n"
-         "  --profile <path>   Start with profile at <path>.\n"
-         "  --migration        Start with migration wizard.\n"
-         "  --ProfileManager   Start with ProfileManager.\n"
-         "  --no-remote        Do not accept or send remote commands; implies\n"
-         "                     --new-instance.\n"
-         "  --new-instance     Open new instance, not a new window in running instance.\n"
-         "  --UILocale <locale> Start with <locale> resources as UI Locale.\n"
-         "  --safe-mode        Disables extensions and themes for this session.\n", gAppData->name);
+  printf("  -h or --help                                 Print this message.\n"
+         "  -v or --version                              Print %s version.\n"
+         "  -P <profile>                                 Start with <profile>.\n"
+         "  --profile <path>                             Start with profile at <path>.\n"
+         "  --migration                                  Start with migration wizard.\n"
+         "  --ProfileManager                             Start with ProfileManager.\n"
+         "  --no-remote                                  Do not accept or send remote commands;\n"
+         "                                               implies --new-instance.\n"
+         "  --new-instance                               Open new instance, not a new window\n"
+         "                                               in running instance.\n"
+         "  --UILocale <locale>                          Start with <locale> resources as UI Locale.\n"
+         "  --safe-mode                                  Disables extensions and themes for this session.\n", (const char*) gAppData->name);
 
 #if defined(XP_WIN)
-  printf("  --console          Start %s with a debugging console.\n", gAppData->name);
+  printf("  --console                                    Start %s with a debugging console.\n", (const char*) gAppData->name);
 #endif
 
   // this works, but only after the components have registered.  so if you drop in a new command line handler, --help