lib: use consistent indentation for ternaries

Trott · addaleax · commit 07642552cb78 · 2017-07-18T19:58:24.000+02:00
In anticipation of stricter linting for indentation issues, modify ternary operators in lib that do not conform with the expected ESLint settings. PR-URL: #14078 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -949,9 +949,7 @@ function fromListPartial(n, list, hasStrings) {
     ret = list.shift();
   } else {
     // result spans more than one buffer
-    ret = (hasStrings ?
-           copyFromBufferString(n, list) :
-           copyFromBuffer(n, list));
+    ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list);
   }
   return ret;
 }
diff --git a/lib/cluster.js b/lib/cluster.js
@@ -21,6 +21,5 @@
 
 'use strict';
 
-module.exports = ('NODE_UNIQUE_ID' in process.env) ?
-                  require('internal/cluster/child') :
-                  require('internal/cluster/master');
+const childOrMaster = 'NODE_UNIQUE_ID' in process.env ? 'child' : 'master';
+module.exports = require(`internal/cluster/${childOrMaster}`);
diff --git a/lib/fs.js b/lib/fs.js
@@ -1357,9 +1357,8 @@ function FSWatcher() {
     if (status < 0) {
       self._handle.close();
       const error = !filename ?
-          errnoException(status, 'Error watching file for changes:') :
-          errnoException(status,
-                         `Error watching file ${filename} for changes:`);
+        errnoException(status, 'Error watching file for changes:') :
+        errnoException(status, `Error watching file ${filename} for changes:`);
       error.filename = filename;
       self.emit('error', error);
     } else {
diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
@@ -275,9 +275,9 @@
       enumerable: true,
       get: function() {
         if (!console) {
-          console = originalConsole === undefined ?
-              NativeModule.require('console') :
-              installInspectorConsole(originalConsole);
+          console = (originalConsole === undefined) ?
+            NativeModule.require('console') :
+            installInspectorConsole(originalConsole);
         }
         return console;
       }
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
@@ -875,8 +875,8 @@ function _validateStdio(stdio, sync) {
     } else if (getHandleWrapType(stdio) || getHandleWrapType(stdio.handle) ||
                getHandleWrapType(stdio._handle)) {
       var handle = getHandleWrapType(stdio) ?
-          stdio :
-          getHandleWrapType(stdio.handle) ? stdio.handle : stdio._handle;
+        stdio :
+        getHandleWrapType(stdio.handle) ? stdio.handle : stdio._handle;
 
       acc.push({
         type: 'wrap',
diff --git a/lib/url.js b/lib/url.js
@@ -393,10 +393,9 @@ Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) {
     this.query = Object.create(null);
   }
 
-  var firstIdx = (questionIdx !== -1 &&
-                  (hashIdx === -1 || questionIdx < hashIdx) ?
-                  questionIdx :
-                  hashIdx);
+  const useQuestionIdx =
+    questionIdx !== -1 && (hashIdx === -1 || questionIdx < hashIdx);
+  const firstIdx = useQuestionIdx ? questionIdx : hashIdx;
   if (firstIdx === -1) {
     if (rest.length > 0)
       this.pathname = rest;
@@ -583,9 +582,11 @@ Url.prototype.format = function format() {
   if (this.host) {
     host = auth + this.host;
   } else if (this.hostname) {
-    host = auth + (this.hostname.indexOf(':') === -1 ?
+    host = auth + (
+      this.hostname.indexOf(':') === -1 ?
         this.hostname :
-        '[' + this.hostname + ']');
+        '[' + this.hostname + ']'
+    );
     if (this.port) {
       host += ':' + this.port;
     }

Original file line number	Diff line number	Diff line change
`@@ -949,9 +949,7 @@ function fromListPartial(n, list, hasStrings) {`
`949`	`949`	`ret = list.shift();`
`950`	`950`	`} else {`
`951`	`951`	`// result spans more than one buffer`
`952`		`- ret = (hasStrings ?`
`953`		`- copyFromBufferString(n, list) :`
`954`		`- copyFromBuffer(n, list));`
	`952`	`+ ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list);`
`955`	`953`	`}`
`956`	`954`	`return ret;`
`957`	`955`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,9 +275,9 @@`
`275`	`275`	`enumerable: true,`
`276`	`276`	`get: function() {`
`277`	`277`	`if (!console) {`
`278`		`- console = originalConsole === undefined ?`
`279`		`- NativeModule.require('console') :`
`280`		`- installInspectorConsole(originalConsole);`
	`278`	`+ console = (originalConsole === undefined) ?`
	`279`	`+ NativeModule.require('console') :`
	`280`	`+ installInspectorConsole(originalConsole);`
`281`	`281`	`}`
`282`	`282`	`return console;`
`283`	`283`	`}`