fixup

nodejs · Aug 29, 2021 · 51c3ec4 · 51c3ec4
1 parent 638fb9b
commit 51c3ec4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/internal/repl/await.js b/lib/internal/repl/await.js
@@ -204,11 +204,11 @@ function processTopLevelAwait(src) {
       wrappedArray[from] = str;
     },
     prepend(node, str) {
-      wrappedArray[node.start] = str + wrappedArray[node.start];
+      const length = ArrayFrom(node.expression.value).length;
+      const idx = node.start - wrapped.length - wrappedArray.length - length;
+      wrappedArray[idx] = str + wrappedArray[idx];
     },
     append(node, str) {
-      // We need to calculate the difference between wrapped and wrappedArray
-      // in order to correctly handle surrogate characters.
       const offset = wrapped.length - wrappedArray.length;
       wrappedArray[node.end - 1 - offset] += str;
     },

diff --git a/test/parallel/test-repl-preprocess-top-level-await.js b/test/parallel/test-repl-preprocess-top-level-await.js
@@ -26,12 +26,16 @@ const testCases = [
     '(async () => { return (await "👨‍👨‍👧‍👧👨‍👨‍👧‍👧👨‍👨‍👧‍👧") })()' ],
   [ 'async function foo() { await 0; }',
     null ],
+  [ 'async function foo() { await "😀😀😀"; }',
+    null ],
   [ 'async () => await 0',
     null ],
   [ 'class A { async method() { await 0 } }',
     null ],
   [ 'await 0; return 0;',
     null ],
+  [ 'await "😀😀😀"; await "😀😀😀"; "😀😀😀";',
+    '(async () => { await "😀😀😀"; await "😀😀😀"; return ("😀😀😀"); })()' ],
   [ 'var a = await 1',
     'var a; (async () => { void (a = await 1) })()' ],
   [ 'let a = await 1',