Merge pull request #474 from nicolo-ribaudo/v2-fix-471

Backport #472 (Fix #471)
zloirock · Jan 9, 2019 · 93e0ffb · 93e0ffb
2 parents a5def74 + bc3feb1
commit 93e0ffb
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 14 deletions.
diff --git a/client/core.js b/client/core.js
@@ -2,7 +2,7 @@
  * core-js 2.6.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
- * © 2018 Denis Pushkarev
+ * © 2019 Denis Pushkarev
  */
 !function(__e, __g, undefined){
 'use strict';
@@ -6393,12 +6393,12 @@ __webpack_require__(62)('replace', 2, function (defined, REPLACE, $replace, mayb
           break;
         default: // \d\d?
           var n = +ch;
-          if (n === 0) return ch;
+          if (n === 0) return match;
           if (n > m) {
             var f = floor(n / 10);
-            if (f === 0) return ch;
+            if (f === 0) return match;
             if (f <= m) return captures[f - 1] === undefined ? ch.charAt(1) : captures[f - 1] + ch.charAt(1);
-            return ch;
+            return match;
           }
           capture = captures[n - 1];
       }

diff --git a/client/core.min.js b/client/core.min.js
diff --git a/client/core.min.js.map b/client/core.min.js.map
diff --git a/client/library.js b/client/library.js
@@ -2,7 +2,7 @@
  * core-js 2.6.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
- * © 2018 Denis Pushkarev
+ * © 2019 Denis Pushkarev
  */
 !function(__e, __g, undefined){
 'use strict';

diff --git a/client/library.min.js b/client/library.min.js
diff --git a/modules/es6.regexp.replace.js b/modules/es6.regexp.replace.js
@@ -103,12 +103,12 @@ require('./_fix-re-wks')('replace', 2, function (defined, REPLACE, $replace, may
           break;
         default: // \d\d?
           var n = +ch;
-          if (n === 0) return ch;
+          if (n === 0) return match;
           if (n > m) {
             var f = floor(n / 10);
-            if (f === 0) return ch;
+            if (f === 0) return match;
             if (f <= m) return captures[f - 1] === undefined ? ch.charAt(1) : captures[f - 1] + ch.charAt(1);
-            return ch;
+            return match;
           }
           capture = captures[n - 1];
       }

diff --git a/tests/es.js b/tests/es.js
diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es6.regexp.replace.ls b/tests/tests/es6.regexp.replace.ls
@@ -67,6 +67,9 @@ run = (assert)->
   assert.strictEqual 'uid=31'replace(/(uid=)(\d+)/, '$11A15'), 'uid=1A15', 'S15.5.4.11_A3_T3'
   assert.strictEqual 'abc12 def34'replace(/([a-z]+)([0-9]+)/, -> &.2 + &.1), '12abc def34', 'S15.5.4.11_A4_T1'
   assert.strictEqual 'aaaaaaaaaa,aaaaaaaaaaaaaaa'replace(/^(a+)\1*,\1+$/, '$1'), \aaaaa, 'S15.5.4.11_A5_T1'
+  # https://github.com/zloirock/core-js/issues/471
+  assert.strictEqual '{price} Retail'replace(/{price}/g, '$25.00'), '$25.00 Retail'
+  assert.strictEqual 'a'replace(/(.)/, '$0'), '$0'
 
 test 'String#replace regression' run