From 8b4d6c1a6faf46fe92abefed8ee92956e26a7587 Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Wed, 6 Jan 2016 19:46:08 +0500
Subject: [PATCH] lodash: signatures of _.isError have been changed

---
 lodash/lodash-tests.ts | 52 +++++++++++++++++++++++++++++++++---------
 lodash/lodash.d.ts     |  8 +++++++
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 77a20e2e2..cf7c65a0a 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -5906,17 +5906,47 @@ module TestIsEqual {
 }
 
 // _.isError
-result = <boolean>_.isError(any);
-result = <boolean>_(1).isError();
-result = <boolean>_<any>([]).isError();
-result = <boolean>_({}).isError();
-{
-  let value: Error|string = "error";
-  if (_.isError(value)) {
-    let message: string = value.message;
-  } else {
-    let message: string = value;
-  }
+module TestIsError {
+    {
+        let value: number|Error;
+
+        if (_.isError(value)) {
+            let result: Error = value;
+        }
+        else {
+            let result: number = value;
+        }
+    }
+
+    {
+        class CustomError extends Error {}
+
+        let value: number|CustomError;
+
+        if (_.isError(value)) {
+            let result: CustomError = value;
+        }
+        else {
+            let result: number = value;
+        }
+    }
+
+    {
+        let result: boolean;
+
+        result = _.isError(any);
+        result = _(1).isError();
+        result = _<any>([]).isError();
+        result = _({}).isError();
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().isError();
+        result = _<any>([]).chain().isError();
+        result = _({}).chain().isError();
+    }
 }
 
 // _.isFinite
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index c45ec90ee..aec233285 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -9911,6 +9911,7 @@ declare module _ {
         /**
          * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
          * object.
+         *
          * @param value The value to check.
          * @return Returns true if value is an error object, else false.
          */
@@ -9924,6 +9925,13 @@ declare module _ {
         isError(): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isError
+         */
+        isError(): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.isFinite
     interface LoDashStatic {
         /**