runat-1128988: Use .catch(...) in place of .then(null, ...)

I thought that catch() died with end(), but apparently not. This has the
downside that Eclipse/JSDT mistakes the function 'catch' for the keyword
of the same name, so all parsing fails, but I don't think we should hold
back code for the sake of broken editors.

Signed-off-by: Joe Walker <[email protected]>

gcli.js

@@ -79,7 +79,7 @@ function logResults(output) {
 requisition.updateExec(command)
            .then(logResults)
            .then(extraActions)
-           .then(null, util.errorHandler);
+           .catch(util.errorHandler);
 
 /**
  * Start a NodeJS REPL to execute commands
@@ -96,10 +96,8 @@ function startRepl() {
     if (command.length !== 0) {
       requisition.updateExec(command)
                  .then(logResults)
-                 .then(
-                     function() { callback(); },
-                     function(ex) { util.errorHandler(ex); callback(); }
-                 );
+                 .then(function() { callback(); })
+                 .catch(function(ex) { util.errorHandler(ex); callback(); });
     }
   };
 

index.html

@@ -36,7 +36,7 @@
       gcli.createTerminal(system).then(function(terminal) {
         terminal.language.showIntro();    // Intro text
         test.run(terminal, false);        // Run the unit test at each startup
-      }).then(null, console.error.bind(console));
+      }).catch(console.error.bind(console));
     });
   </script>
 

lib/gcli/commands/server/server.js

@@ -192,7 +192,7 @@ var xhrsocket = {
           res.status(500).send(text);
         };
 
-        return Promise.resolve(reply).then(onResolve).then(null, onReject);
+        return Promise.resolve(reply).then(onResolve).catch(onReject);
       });
     });
   }

lib/gcli/fields/selection.js

@@ -75,7 +75,7 @@ SelectionField.prototype.setConversion = function(conversion) {
           prediction;
     }, this);
     this.menu.show(items, conversion.arg.text);
-  }.bind(this), util.errorHandler);
+  }.bind(this)).catch(util.errorHandler);
 };
 
 SelectionField.prototype.itemClicked = function(ev) {
@@ -85,7 +85,7 @@ SelectionField.prototype.itemClicked = function(ev) {
   this.type.parse(arg, context).then(function(conversion) {
     this.onFieldChange({ conversion: conversion });
     this.setMessage(conversion.message);
-  }.bind(this)).then(null, util.errorHandler);
+  }.bind(this)).catch(util.errorHandler);
 };
 
 SelectionField.prototype.getConversion = function() {

lib/gcli/languages/command.js

@@ -184,7 +184,7 @@ var commandLanguage = exports.commandLanguage = {
       var isNew = (this.assignment !== newAssignment);
 
       this.assignment = newAssignment;
-      this.terminal.updateCompletion().then(null, util.errorHandler);
+      this.terminal.updateCompletion().catch(util.errorHandler);
 
       if (isNew) {
         this.updateHints();
@@ -286,7 +286,7 @@ var commandLanguage = exports.commandLanguage = {
     }
 
     this.terminal.history.add(input);
-    this.terminal.unsetChoice().then(null, util.errorHandler);
+    this.terminal.unsetChoice().catch(util.errorHandler);
 
     this.terminal.inputElement.value = '';
     this.terminal_previousValue = this.terminal.inputElement.value;
@@ -499,7 +499,7 @@ var commandLanguage = exports.commandLanguage = {
         this.terminal.scrollToBottom();
         data.throbEle.style.display = ev.output.completed ? 'none' : 'block';
       }.bind(this));
-    }.bind(this)).then(null, console.error);
+    }.bind(this)).catch(console.error);
 
     this.terminal.addElement(data.rowinEle);
     this.terminal.addElement(data.rowoutEle);

lib/gcli/languages/languages.js

@@ -82,7 +82,7 @@ var baseLanguage = {
 
       this.focusManager.outputted();
 
-      this.terminal.unsetChoice().then(null, util.errorHandler);
+      this.terminal.unsetChoice().catch(util.errorHandler);
       this.terminal.inputElement.value = '';
     }.bind(this));
   },

lib/gcli/system.js

@@ -161,7 +161,7 @@ exports.createSystem = function(options) {
           pendingChanges = true;
         }
         else {
-          loadModule(name).then(null, console.error);
+          loadModule(name).catch(console.error);
         }
       });
     },
@@ -252,7 +252,7 @@ exports.createSystem = function(options) {
  */
 exports.connectFront = function(system, front, customProps) {
   front.on('commandsChanged', function(specs) {
-    syncItems(system, front, customProps).then(null, util.errorHandler);
+    syncItems(system, front, customProps).catch(util.errorHandler);
   });
 
   return syncItems(system, front, customProps);

lib/gcli/test/index.js

@@ -110,7 +110,7 @@ exports.run = function(terminal, isRemote) {
       console.log(helpers.timingSummary);
       document.testStatus = examiner.status.name;
 
-      setMocks(options, false).then(closeIfPhantomJs).then(null, function(ex) {
+      setMocks(options, false).then(closeIfPhantomJs).catch(function(ex) {
         console.error(ex);
         closeIfPhantomJs();
       });

lib/gcli/ui/terminal.js

@@ -266,7 +266,7 @@ Terminal.prototype._updateLanguage = function(language) {
   }
 
   this.language.updateHints();
-  this.updateCompletion().then(null, util.errorHandler);
+  this.updateCompletion().catch(util.errorHandler);
   this.promptElement.innerHTML = this.language.prompt;
 };
 
@@ -393,7 +393,7 @@ Terminal.prototype.onKeyDown = function(ev) {
  * if something went wrong.
  */
 Terminal.prototype.onKeyUp = function(ev) {
-  this.handleKeyUp(ev).then(null, util.errorHandler);
+  this.handleKeyUp(ev).catch(util.errorHandler);
 };
 
 /**
@@ -590,7 +590,7 @@ Terminal.prototype.updateCompletion = function() {
  * event handlers that can't react to rejected promises.
  */
 Terminal.prototype._updateCompletionWithErrorHandler = function() {
-  this.updateCompletion().then(null, util.errorHandler);
+  this.updateCompletion().catch(util.errorHandler);
 };
 
 /**

lib/gcli/util/util.js

@@ -275,7 +275,7 @@ exports.promiseEach = function(array, action, scope) {
       };
 
       var reply = action.call(scope, array[index], index, array);
-      Promise.resolve(reply).then(onSuccess).then(null, onFailure);
+      Promise.resolve(reply).then(onSuccess).catch(onFailure);
     };
 
     callNext(0);

remote.html

@@ -31,7 +31,7 @@
         gcli.createTerminal(system).then(function(terminal) {
           test.run(terminal, true);
         });
-      }).then(null, console.error.bind(console));
+      }).catch(console.error.bind(console));
     });
   </script>
 

web/gcli/types/fileparser.js

@@ -52,7 +52,7 @@ exports.parse = function(context, typed, options) {
           return Promise.resolve(reply.predictions);
         };
       }
-      front.connection.disconnect().then(null, util.errorHandler);
+      front.connection.disconnect().catch(util.errorHandler);
       return reply;
     });
   });

web/gcli/util/host.js

@@ -84,7 +84,7 @@ exports.spawn = function(context, spawnSpec) {
   var connector = context.system.connectors.get();
   return GcliFront.create(connector).then(function(front) {
     return front.system(cmd, cleanArgs, cwd, cleanEnv).then(function(reply) {
-      front.connection.disconnect().then(null, util.errorHandler);
+      front.connection.disconnect().catch(util.errorHandler);
       return reply;
     });
   });