src: simplify DEP0062 logic

cjihrig · targos · commit c432ab13918c · 2019-07-20T11:05:24.000+02:00
This commit simplifies the DEP0062 error logic. Instead of looking for certain combinations of flags, just show an error for any usage of --debug or --debug-brk. PR-URL: #28589 Fixes: #28588 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/src/node_options.cc b/src/node_options.cc
@@ -34,17 +34,12 @@ void DebugOptions::CheckOptions(std::vector<std::string>* errors) {
   }
 #endif
 
-  if (deprecated_debug && !inspector_enabled) {
+  if (deprecated_debug) {
     errors->push_back("[DEP0062]: `node --debug` and `node --debug-brk` "
-                      "are invalid. Please use `node --inspect` or "
+                      "are invalid. Please use `node --inspect` and "
                       "`node --inspect-brk` instead.");
   }
 
-  if (deprecated_debug && inspector_enabled && break_first_line) {
-    errors->push_back("[DEP0062]: `node --inspect --debug-brk` is deprecated. "
-                      "Please use `node --inspect-brk` instead.");
-  }
-
   std::vector<std::string> destinations =
       SplitString(inspect_publish_uid_string, ',');
   inspect_publish_uid.console = false;
diff --git a/test/sequential/test-inspector-invalid-args.js b/test/sequential/test-inspector-invalid-args.js
@@ -10,7 +10,7 @@ const execFile = require('child_process').execFile;
 const mainScript = fixtures.path('loop.js');
 const expected =
   '`node --debug` and `node --debug-brk` are invalid. ' +
-  'Please use `node --inspect` or `node --inspect-brk` instead.';
+  'Please use `node --inspect` and `node --inspect-brk` instead.';
 for (const invalidArg of ['--debug-brk', '--debug']) {
   execFile(
     process.execPath,
