From e49f2982f06c276e08ec8444edd2f3bec1784aca Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Mon, 15 Feb 2016 20:12:57 +0500
Subject: [PATCH] lodash: changed _.noConflict

---
 lodash/lodash-3.10-tests.ts | 23 +++++++++++++++++------
 lodash/lodash-3.10.d.ts     |  7 +++++++
 lodash/lodash-tests.ts      | 23 +++++++++++++++++------
 lodash/lodash.d.ts          |  7 +++++++
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/lodash/lodash-3.10-tests.ts b/lodash/lodash-3.10-tests.ts
index 8d19f394a..e780cf088 100644
--- a/lodash/lodash-3.10-tests.ts
+++ b/lodash/lodash-3.10-tests.ts
@@ -10270,12 +10270,23 @@ namespace TestMixin {
 }
 
 // _.noConflict
-{
-    let result: typeof _;
-    result = _.noConflict();
-    result = _(42).noConflict();
-    result = _<any>([]).noConflict();
-    result = _({}).noConflict();
+namespace TestNoConflict {
+    {
+        let result: typeof _;
+
+        result = _.noConflict();
+        result = _(42).noConflict();
+        result = _<any>([]).noConflict();
+        result = _({}).noConflict();
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<typeof _>;
+
+        result = _(42).chain().noConflict();
+        result = _<any>([]).chain().noConflict();
+        result = _({}).chain().noConflict();
+    }
 }
 
 // _.noop
diff --git a/lodash/lodash-3.10.d.ts b/lodash/lodash-3.10.d.ts
index c2fb9f726..47bc4e0c9 100644
--- a/lodash/lodash-3.10.d.ts
+++ b/lodash/lodash-3.10.d.ts
@@ -15430,6 +15430,13 @@ declare module _ {
         noConflict(): typeof _;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.noConflict
+         */
+        noConflict(): LoDashExplicitObjectWrapper<typeof _>;
+    }
+
     //_.noop
     interface LoDashStatic {
         /**
diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index c8c824bd7..8435ff8e9 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -11506,12 +11506,23 @@ namespace TestMixin {
 }
 
 // _.noConflict
-{
-    let result: typeof _;
-    result = _.noConflict();
-    result = _(42).noConflict();
-    result = _<any>([]).noConflict();
-    result = _({}).noConflict();
+namespace TestNoConflict {
+    {
+        let result: typeof _;
+
+        result = _.noConflict();
+        result = _(42).noConflict();
+        result = _<any>([]).noConflict();
+        result = _({}).noConflict();
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<typeof _>;
+
+        result = _(42).chain().noConflict();
+        result = _<any>([]).chain().noConflict();
+        result = _({}).chain().noConflict();
+    }
 }
 
 // _.noop
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 790107369..d0544bc4c 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -18614,6 +18614,13 @@ declare module _ {
         noConflict(): typeof _;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.noConflict
+         */
+        noConflict(): LoDashExplicitObjectWrapper<typeof _>;
+    }
+
     //_.noop
     interface LoDashStatic {
         /**