lib: use consistent indentation for ternaries #14078
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Trott
added
lib / src
nodejs-github-bot
added
the
lib / src
mscdex
reviewed
Jul 5, 2017
lib/cluster.js
Outdated
| module.exports = ('NODE_UNIQUE_ID' in process.env) ? | ||
| require('internal/cluster/child') : | ||
| require('internal/cluster/master'); | ||
| module.exports = require(`internal/cluster/${ |
There was a problem hiding this comment.
I'm not particularly a fan of this multi-line inline substitution stuff. Can't we just set it to a variable and use the variable name instead?
There was a problem hiding this comment.
I agree. Yes, I did it, but I did not feel good about it. Will fix.
refack
reviewed
Jul 5, 2017
lib/internal/bootstrap_node.js
Outdated
| @@ -276,8 +276,8 @@ | |||
| get: function() { | |||
| if (!console) { | |||
| console = originalConsole === undefined ? | |||
There was a problem hiding this comment.
Maybe parans around the conditional?
lib/url.js
Outdated
| questionIdx : | ||
| hashIdx); | ||
| var firstIdx = | ||
| questionIdx !== -1 && (hashIdx === -1 || questionIdx < hashIdx) ? |
There was a problem hiding this comment.
nit: assign the condition to a variable, and fit it in one line (useQuestionIdx)
lib/url.js
Outdated
| @@ -585,8 +585,8 @@ 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 : | |||
There was a problem hiding this comment.
I think I was once asked to explain this snippet in a job interview 😵
Maybe break after the open paran into an indented block:
host = auth + (
this.hostname.indexOf(':') === -1 ?
this.hostname :
'[' + this.hostname + ']'
);There was a problem hiding this comment.
This one is tricky to fix that way because the custom align-multiline-assignment rule seems to conflict with the newer indent stuff. I'd been thinking it might be good to remove that custom rule anyway, but I don't want to do it ahead of time.
There are some other ways to make this code clearer, but they will require benchmarks to confirm that they don't adversely affect performance. Stay tuned.
There was a problem hiding this comment.
Obviously my comment can be deffered, or replaced with a TODO
refack
approved these changes
Jul 5, 2017
|
This will not lint cleanly without first removing the custom align-multiline-assignment rule. Marking as blocked. |
lpinca
approved these changes
Jul 5, 2017
cjihrig
approved these changes
Jul 5, 2017
BridgeAR
approved these changes
Jul 5, 2017
In anticipation of stricter linting for indentation issues, modify ternary operators in lib that do not conform with the expected ESLint settings.
Trott
force-pushed
the
ternary-indentation
branch
from
306ea50 to
a1f4bfb
Compare
|
This is now unblocked. |
|
Landed in 85dacd6 |
Trott
added a commit
that referenced
this pull request
Jul 7, 2017
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 <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
addaleax
pushed a commit
that referenced
this pull request
Jul 11, 2017
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 <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
Merged
addaleax
pushed a commit
that referenced
this pull request
Jul 18, 2017
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 <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
Fishrock123
pushed a commit
that referenced
this pull request
Jul 19, 2017
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 <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
|
Can you backport trott? |
7 tasks
Trott
added a commit
to Trott/io.js
that referenced
this pull request
Aug 15, 2017
In anticipation of stricter linting for indentation issues, modify ternary operators in lib that do not conform with the expected ESLint settings. PR-URL: nodejs#14078 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
MylesBorins
pushed a commit
that referenced
this pull request
Aug 16, 2017
In anticipation of stricter linting for indentation issues, modify ternary operators in lib that do not conform with the expected ESLint settings. Backport-PR-URL: #14835 PR-URL: #14078 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
Merged
MylesBorins
pushed a commit
that referenced
this pull request
Sep 5, 2017
In anticipation of stricter linting for indentation issues, modify ternary operators in lib that do not conform with the expected ESLint settings. Backport-PR-URL: #14835 PR-URL: #14078 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
This was referenced Sep 5, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In anticipation of stricter linting for indentation issues, modify
ternary operators in lib that do not conform with the expected ESLint
settings.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
lib tools