From f90f7cb4e08346934a9d4b2a9ce0ca959a948ef0 Mon Sep 17 00:00:00 2001
From: Eric Nicholson <eric.nicholson@inin.com>
Date: Wed, 11 Nov 2015 08:45:47 -0500
Subject: [PATCH] Promise.then definitions that allow void in the error handler

---
 bluebird/bluebird-tests.ts | 15 +++++++++++++++
 bluebird/bluebird.d.ts     | 10 +++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index e4f3ee62e2..bd4f46fc45 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -227,6 +227,21 @@ barProm = fooProm.then((value: Foo) => {
 }, (reason: any) => {
 	return bar;
 });
+barProm = fooProm.then((value: Foo) => {
+	return bar;
+}, (reason: any) => {
+	return barProm;
+});
+barProm = fooProm.then((value: Foo) => {
+	return bar;
+}, (reason: any) => {
+	return;
+});
+barProm = fooProm.then((value: Foo) => {
+	return bar;
+}, (reason: any) => {
+	return voidProm;
+});
 barProm = fooProm.then((value: Foo) => {
 	return bar;
 });
diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index 48f56b248f..9f36cf5bcf 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -25,9 +25,9 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	/**
 	 * Promises/A+ `.then()` with progress handler. Returns a new promise chained from this promise. The new promise will be rejected or resolved dedefer on the passed `fulfilledHandler`, `rejectedHandler` and the state of this promise.
 	 */
-	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject: (error: any) => Promise.Thenable<U>, onProgress?: (note: any) => any): Promise<U>;
-	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject?: (error: any) => U, onProgress?: (note: any) => any): Promise<U>;
-
+	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject?: (error: any) => U|Promise.Thenable<U>, onProgress?: (note: any) => any): Promise<U>;
+	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject?: (error: any) => void|Promise.Thenable<void>, onProgress?: (note: any) => any): Promise<U>;
+	
 	/**
 	 * This is a catch-all exception handler, shortcut for calling `.then(null, handler)` on this promise. Any exception happening in a `.then`-chain will propagate to nearest `.catch` handler.
 	 *
@@ -672,8 +672,8 @@ declare module Promise {
 	export function OperationalError(): OperationalError;
 
 	export interface Thenable<R> {
-		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>;
-		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected?: (error: any) => U|Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected?: (error: any) => void|Thenable<void>): Thenable<U>;
 	}
 
 	export interface Resolver<R> {