lib: use Array#includes instead of Array#indexOf

PR-URL: #26732 Refs: #26568 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Mar 27, 2019 · cc76f3f · cc76f3f
1 parent 3ab438a
commit cc76f3f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -215,7 +215,7 @@ function ClientRequest(input, options, cb) {
       // https://tools.ietf.org/html/rfc3986#section-3.2.2
       var posColon = hostHeader.indexOf(':');
       if (posColon !== -1 &&
-          hostHeader.indexOf(':', posColon + 1) !== -1 &&
+          hostHeader.includes(':', posColon + 1) &&
           hostHeader.charCodeAt(0) !== 91/* '[' */) {
         hostHeader = `[${hostHeader}]`;
       }

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -709,7 +709,7 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
       // also returned false.
       // => Check whether `dest` is still a piping destination.
       if (((state.pipesCount === 1 && state.pipes === dest) ||
-           (state.pipesCount > 1 && state.pipes.indexOf(dest) !== -1)) &&
+           (state.pipesCount > 1 && state.pipes.includes(dest))) &&
           !cleanedUp) {
         debug('false write response, pause', state.awaitDrain);
         state.awaitDrain++;

diff --git a/lib/assert.js b/lib/assert.js
@@ -284,7 +284,7 @@ function getErrMessage(message, fn) {
     // Flush unfinished multi byte characters.
     decoder.end();
     // Always normalize indentation, otherwise the message could look weird.
-    if (message.indexOf('\n') !== -1) {
+    if (message.includes('\n')) {
       if (EOL === '\r\n') {
         message = message.replace(/\r\n/g, '\n');
       }

diff --git a/lib/child_process.js b/lib/child_process.js
@@ -103,7 +103,7 @@ exports.fork = function fork(modulePath /* , args, options */) {
     // and stderr from the parent if silent isn't set.
     options.stdio = options.silent ? stdioStringToArray('pipe') :
       stdioStringToArray('inherit');
-  } else if (options.stdio.indexOf('ipc') === -1) {
+  } else if (!options.stdio.includes('ipc')) {
     throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
   }
 

diff --git a/lib/internal/cluster/shared_handle.js b/lib/internal/cluster/shared_handle.js
@@ -24,7 +24,7 @@ function SharedHandle(key, address, port, addressType, fd, flags) {
 }
 
 SharedHandle.prototype.add = function(worker, send) {
-  assert(this.workers.indexOf(worker) === -1);
+  assert(!this.workers.includes(worker));
   this.workers.push(worker);
   send(this.errno, null, this.handle);
 };

diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
@@ -220,7 +220,7 @@ Console.prototype[kWriteToConsole] = function(streamSymbol, string) {
     this._stdoutErrorHandler : this._stderrErrorHandler;
 
   if (groupIndent.length !== 0) {
-    if (string.indexOf('\n') !== -1) {
+    if (string.includes('\n')) {
       string = string.replace(/\n/g, `\n${groupIndent}`);
     }
     string = groupIndent + string;

diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
@@ -191,8 +191,8 @@ function nullCheck(path, propName, throwError = true) {
 
   // We can only perform meaningful checks on strings and Uint8Arrays.
   if (!pathIsString && !pathIsUint8Array ||
-      pathIsString && path.indexOf('\u0000') === -1 ||
-      pathIsUint8Array && path.indexOf(0) === -1) {
+      pathIsString && !path.includes('\u0000') ||
+      pathIsUint8Array && !path.includes(0)) {
     return;
   }
 

diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -265,12 +265,12 @@ function strEscape(str) {
   // instead wrap the text in double quotes. If double quotes exist, check for
   // backticks. If they do not exist, use those as fallback instead of the
   // double quotes.
-  if (str.indexOf("'") !== -1) {
+  if (str.includes("'")) {
     // This invalidates the charCode and therefore can not be matched for
     // anymore.
-    if (str.indexOf('"') === -1) {
+    if (!str.includes('"')) {
       singleQuote = -1;
-    } else if (str.indexOf('`') === -1 && str.indexOf('${') === -1) {
+    } else if (!str.includes('`') && !str.includes('${')) {
       singleQuote = -2;
     }
     if (singleQuote !== 39) {
@@ -534,7 +534,7 @@ function formatValue(ctx, value, recurseTimes, typedArray) {
 
   // Using an array here is actually better for the average case than using
   // a Set. `seen` will only check for the depth and will never grow too large.
-  if (ctx.seen.indexOf(value) !== -1)
+  if (ctx.seen.includes(value))
     return ctx.stylize('[Circular]', 'special');
 
   return formatRaw(ctx, value, recurseTimes, typedArray);

diff --git a/lib/url.js b/lib/url.js
@@ -581,9 +581,9 @@ Url.prototype.format = function format() {
     host = auth + this.host;
   } else if (this.hostname) {
     host = auth + (
-      this.hostname.indexOf(':') === -1 ?
-        this.hostname :
-        '[' + this.hostname + ']'
+      this.hostname.includes(':') ?
+        '[' + this.hostname + ']' :
+        this.hostname
     );
     if (this.port) {
       host += ':' + this.port;