Simplify then() core

i20 · Apr 3, 2020 · 9c90987 · 9c90987
1 parent 4848033
commit 9c90987
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/Promise.es6.js b/Promise.es6.js
@@ -139,24 +139,16 @@ function Promise (_executor) {
 
         const promise = new Promise((nextResolve, nextReject, nextNotify) => {
 
-            let result;
-            let success;
+            // /!\ If run() is called manually on the new promise whereas parent promise has not
+            // solved yet then new promise will be rejected with an undefined value
 
-            try {
-                result = (_state === STATE_RESOLVED ? resolve || noopResolve : reject || noopReject)(_value);
-                success = true;
-            }
-
-            catch (error) {
-                result = error;
-                success = false;
-            }
+            const result = (_state === STATE_RESOLVED ? resolve || noopResolve : reject || noopReject)(_value);
 
-            // If handler's result is a promise then, whether it was thrown or returned, it "replaces" the current promise
+            // If handler returns a promise then, it "replaces" the current promise
             if (result instanceof Promise)
                 result.then(nextResolve, nextReject, nextNotify);
 
-            else (success ? nextResolve : nextReject)(result);
+            else nextResolve(result);
         });
 
         // Parent promise is not solved yet

diff --git a/Promise.js b/Promise.js
@@ -139,24 +139,16 @@ function Promise (_executor) {
 
         var promise = new Promise(function (nextResolve, nextReject, nextNotify) {
 
-            var result;
-            var success;
+            // /!\ If run() is called manually on the new promise whereas parent promise has not
+            // solved yet then new promise will be rejected with an undefined value
 
-            try {
-                result = (_state === STATE_RESOLVED ? resolve || noopResolve : reject || noopReject)(_value);
-                success = true;
-            }
-
-            catch (error) {
-                result = error;
-                success = false;
-            }
+            var result = (_state === STATE_RESOLVED ? resolve || noopResolve : reject || noopReject)(_value);
 
-            // If handler's result is a promise then, whether it was thrown or returned, it "replaces" the current promise
+            // If handler returns a promise then, it "replaces" the current promise
             if (result instanceof Promise)
                 result.then(nextResolve, nextReject, nextNotify);
 
-            else (success ? nextResolve : nextReject)(result);
+            else nextResolve(result);
         });
 
         // Parent promise is not solved yet