Skip to content

Commit d196d45

Browse files
committed
repl: add auto‑completion for node:‑prefixed require(…) calls
Refs: #37178
1 parent 083a92d commit d196d45

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

lib/repl.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,7 @@ REPLServer.prototype.setPrompt = function setPrompt(prompt) {
11131113
};
11141114

11151115
const importRE = /\bimport\s*\(\s*['"`](([\w@./:-]+\/)?(?:[\w@./:-]*))(?![^'"`])$/;
1116-
const requireRE = /\brequire\s*\(\s*['"`](([\w@./-]+\/)?(?:[\w@./-]*))(?![^'"`])$/;
1116+
const requireRE = /\brequire\s*\(\s*['"`](([\w@./:-]+\/)?(?:[\w@./:-]*))(?![^'"`])$/;
11171117
const fsAutoCompleteRE = /fs(?:\.promises)?\.\s*[a-z][a-zA-Z]+\(\s*["'](.*)/;
11181118
const simpleExpressionRE =
11191119
/(?:[a-zA-Z_$](?:\w|\$)*\??\.)*[a-zA-Z_$](?:\w|\$)*\??\.?$/;
@@ -1275,7 +1275,7 @@ function complete(line, callback) {
12751275
}
12761276

12771277
if (!subdir) {
1278-
ArrayPrototypePush(completionGroups, _builtinLibs);
1278+
ArrayPrototypePush(completionGroups, _builtinLibs, nodeSchemeBuiltinLibs);
12791279
}
12801280
} else if (RegExpPrototypeTest(importRE, line) &&
12811281
this.allowBlockingCompletions) {

test/parallel/test-repl-tab-complete.js

+13-5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ const assert = require('assert');
3131
const path = require('path');
3232
const fixtures = require('../common/fixtures');
3333
const { builtinModules } = require('module');
34+
const publicModules = builtinModules.filter(
35+
(lib) => !lib.startsWith('_') && !lib.includes('/'),
36+
);
37+
3438
const hasInspector = process.features.inspector;
3539

3640
if (!common.isMainThread)
@@ -239,9 +243,9 @@ putIn.run(['.clear']);
239243

240244
testMe.complete('require(\'', common.mustCall(function(error, data) {
241245
assert.strictEqual(error, null);
242-
builtinModules.forEach((lib) => {
246+
publicModules.forEach((lib) => {
243247
assert(
244-
data[0].includes(lib) || lib.startsWith('_') || lib.includes('/'),
248+
data[0].includes(lib) && data[0].includes(`node:${lib}`),
245249
`${lib} not found`
246250
);
247251
});
@@ -258,11 +262,15 @@ testMe.complete("require\t( 'n", common.mustCall(function(error, data) {
258262
assert.strictEqual(error, null);
259263
assert.strictEqual(data.length, 2);
260264
assert.strictEqual(data[1], 'n');
265+
// require(...) completions include `node:`-prefixed modules:
266+
publicModules.forEach((lib, index) =>
267+
assert.strictEqual(data[0][index], `node:${lib}`));
268+
assert.strictEqual(data[0][publicModules.length], '');
261269
// There is only one Node.js module that starts with n:
262-
assert.strictEqual(data[0][0], 'net');
263-
assert.strictEqual(data[0][1], '');
270+
assert.strictEqual(data[0][publicModules.length + 1], 'net');
271+
assert.strictEqual(data[0][publicModules.length + 2], '');
264272
// It's possible to pick up non-core modules too
265-
data[0].slice(2).forEach((completion) => {
273+
data[0].slice(publicModules.length + 3).forEach((completion) => {
266274
assert.match(completion, /^n/);
267275
});
268276
}));

0 commit comments

Comments
 (0)