From 03225c5c160aa64a0178c48b793b7a784b3435a1 Mon Sep 17 00:00:00 2001
From: Hemanth HM <hemanth.hm@gmail.com>
Date: Tue, 11 Aug 2020 15:41:40 -0700
Subject: [PATCH] repl: unflag Top-Level Await unflags Top-Level await for the
 REPL. This is accomplished by getting rid of --experimental-repl-await flag
 and the checks related to the same.

---
 doc/api/cli.md                                            | 8 --------
 doc/api/repl.md                                           | 4 +---
 lib/repl.js                                               | 6 ++----
 src/node_options.cc                                       | 2 +-
 .../test-process-env-allowed-flags-are-documented.js      | 1 +
 test/parallel/test-repl-import-referrer.js                | 2 +-
 test/parallel/test-repl-top-level-await.js                | 2 +-
 7 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 899c28f6f76675..944bef506fd86f 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -230,13 +230,6 @@ added: v11.8.0
 
 Use the specified file as a security policy.
 
-### `--experimental-repl-await`
-<!-- YAML
-added: v10.0.0
--->
-
-Enable experimental top-level `await` keyword support in REPL.
-
 ### `--experimental-specifier-resolution=mode`
 <!-- YAML
 added:
@@ -1242,7 +1235,6 @@ Node.js options that are allowed are:
 * `--experimental-loader`
 * `--experimental-modules`
 * `--experimental-policy`
-* `--experimental-repl-await`
 * `--experimental-specifier-resolution`
 * `--experimental-top-level-await`
 * `--experimental-vm-modules`
diff --git a/doc/api/repl.md b/doc/api/repl.md
index 9c12d8e8c6782a..371176d6461ed6 100644
--- a/doc/api/repl.md
+++ b/doc/api/repl.md
@@ -224,8 +224,7 @@ Error: foo
 
 #### `await` keyword
 
-With the [`--experimental-repl-await`][] command line option specified,
-experimental support for the `await` keyword is enabled.
+Support for the `await` keyword is enabled at the top level.
 
 ```console
 > await Promise.resolve(123)
@@ -747,7 +746,6 @@ For an example of running a REPL instance over [curl(1)][], see:
 
 [ZSH]: https://en.wikipedia.org/wiki/Z_shell
 [`'uncaughtException'`]: process.html#process_event_uncaughtexception
-[`--experimental-repl-await`]: cli.html#cli_experimental_repl_await
 [`ERR_DOMAIN_CANNOT_SET_UNCAUGHT_EXCEPTION_CAPTURE`]: errors.html#errors_err_domain_cannot_set_uncaught_exception_capture
 [`ERR_INVALID_REPL_INPUT`]: errors.html#errors_err_invalid_repl_input
 [`domain`]: domain.html
diff --git a/lib/repl.js b/lib/repl.js
index aeef91e5e6d838..e136831f88bf6e 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -104,9 +104,7 @@ const {
 } = require('internal/errors');
 const { sendInspectorCommand } = require('internal/util/inspector');
 const { getOptionValue } = require('internal/options');
-const experimentalREPLAwait = getOptionValue(
-  '--experimental-repl-await'
-);
+
 const pendingDeprecation = getOptionValue('--pending-deprecation');
 const {
   REPL_MODE_SLOPPY,
@@ -369,7 +367,7 @@ function REPLServer(prompt,
       wrappedCmd = true;
     }
 
-    if (experimentalREPLAwait && code.includes('await')) {
+    if (code.includes('await')) {
       if (processTopLevelAwait === undefined) {
         ({ processTopLevelAwait } = require('internal/repl/await'));
       }
diff --git a/src/node_options.cc b/src/node_options.cc
index 737c4c147d3bcb..37073812a0f50e 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -329,7 +329,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
   Implies("--policy-integrity", "[has_policy_integrity_string]");
   AddOption("--experimental-repl-await",
             "experimental await keyword support in REPL",
-            &EnvironmentOptions::experimental_repl_await,
+            NoOp{},
             kAllowedInEnvironment);
   AddOption("--experimental-vm-modules",
             "experimental ES Module support in vm module",
diff --git a/test/parallel/test-process-env-allowed-flags-are-documented.js b/test/parallel/test-process-env-allowed-flags-are-documented.js
index 0e0af9471ce84e..2b0320dcd9ad9d 100644
--- a/test/parallel/test-process-env-allowed-flags-are-documented.js
+++ b/test/parallel/test-process-env-allowed-flags-are-documented.js
@@ -86,6 +86,7 @@ assert(undocumented.delete('--debug-arraybuffer-allocations'));
 assert(undocumented.delete('--es-module-specifier-resolution'));
 assert(undocumented.delete('--experimental-report'));
 assert(undocumented.delete('--experimental-worker'));
+assert(undocumented.delete('--experimental-repl-await'));
 assert(undocumented.delete('--no-node-snapshot'));
 assert(undocumented.delete('--loader'));
 
diff --git a/test/parallel/test-repl-import-referrer.js b/test/parallel/test-repl-import-referrer.js
index 33bc442e6f69c8..b226cbc752fee0 100644
--- a/test/parallel/test-repl-import-referrer.js
+++ b/test/parallel/test-repl-import-referrer.js
@@ -4,7 +4,7 @@ const assert = require('assert');
 const cp = require('child_process');
 const fixtures = require('../common/fixtures');
 
-const args = ['--interactive', '--experimental-repl-await'];
+const args = ['--interactive'];
 const opts = { cwd: fixtures.path('es-modules') };
 const child = cp.spawn(process.execPath, args, opts);
 
diff --git a/test/parallel/test-repl-top-level-await.js b/test/parallel/test-repl-top-level-await.js
index 018d8707009ad9..9415436493c2e1 100644
--- a/test/parallel/test-repl-top-level-await.js
+++ b/test/parallel/test-repl-top-level-await.js
@@ -8,7 +8,7 @@ const repl = require('repl');
 
 common.skipIfInspectorDisabled();
 
-// Flags: --expose-internals --experimental-repl-await
+// Flags: --expose-internals
 
 const PROMPT = 'await repl > ';