From 3b1ab39bd4ff1f74cddb838d107ebbc24e81ac59 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 13 Jun 2021 05:00:09 -0700 Subject: [PATCH] debugger: use error codes in debugger REPL PR-URL: https://github.com/nodejs/node/pull/39024 Backport-PR-URL: https://github.com/nodejs/node/pull/39446 Reviewed-By: Antoine du Hamel Reviewed-By: Luigi Pinca Reviewed-By: Jan Krems --- lib/internal/inspector/inspect_repl.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/internal/inspector/inspect_repl.js b/lib/internal/inspector/inspect_repl.js index 3cb4d52f43aaf1..5393cb32718300 100644 --- a/lib/internal/inspector/inspect_repl.js +++ b/lib/internal/inspector/inspect_repl.js @@ -1,5 +1,5 @@ // TODO(trott): enable ESLint -/* eslint-disable getter-return, no-restricted-syntax */ +/* eslint-disable getter-return */ 'use strict'; @@ -18,7 +18,6 @@ const { ArrayPrototypeSome, ArrayPrototypeSplice, Date, - Error, FunctionPrototypeCall, JSONStringify, MathMax, @@ -47,9 +46,12 @@ const { StringPrototypeStartsWith, StringPrototypeToUpperCase, StringPrototypeTrim, - TypeError, } = primordials; +const { ERR_DEBUGGER_ERROR } = require('internal/errors').codes; + +const { validateString } = require('internal/validators'); + const FS = require('fs'); const Path = require('path'); const Repl = require('repl'); @@ -176,7 +178,7 @@ function extractErrorMessage(stack) { function convertResultToError(result) { const { className, description } = result; - const err = new Error(extractErrorMessage(description)); + const err = new ERR_DEBUGGER_ERROR(extractErrorMessage(description)); err.stack = description; ObjectDefineProperty(err, 'name', { value: className }); return err; @@ -357,7 +359,7 @@ function createRepl(inspector) { function getCurrentLocation() { if (!selectedFrame) { - throw new Error('Requires execution to be paused'); + throw new ERR_DEBUGGER_ERROR('Requires execution to be paused'); } return selectedFrame.location; } @@ -543,7 +545,7 @@ function createRepl(inspector) { // Repl asked for scope variables if (code === '.scope') { if (!selectedFrame) { - throw new Error('Requires execution to be paused'); + throw new ERR_DEBUGGER_ERROR('Requires execution to be paused'); } const scopes = await selectedFrame.loadScopes(); return ArrayPrototypeMap(scopes, (scope) => scope.completionGroup); @@ -706,9 +708,7 @@ function createRepl(inspector) { registerBreakpoint); } - if (typeof script !== 'string') { - throw new TypeError(`setBreakpoint() expects a string, got ${script}`); - } + validateString(script, 'script'); // setBreakpoint('fn()'): Break when a function is called if (StringPrototypeEndsWith(script, '()')) {