Skip to content

[v6.x backport] multiple indentation/linting backports

Rodrigo Muino Tomonari requested to merge github/fork/Trott/mega-backport into v6.x-staging

Mega backport per https://github.com/nodejs/LTS/issues/239

commit dda0d72333ffbf82989550dab9dbfd63d83950d4 Author: Rich Trott rtrott@gmail.com Date: Fri Jun 23 20:14:33 2017 -0700

tools: update to ESLint 4.1.0

Update ESLint to 4.1.0. This fixes a bug that previously prevented us
from using the new and stricter indentation checking.

Refs: https://github.com/eslint/eslint/issues/8721
PR-URL: https://github.com/nodejs/node/pull/13895
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

commit 6c902cf0a013976f23258d0d463e7b3240218e41 Author: Rich Trott rtrott@gmail.com Date: Fri Jun 23 20:27:51 2017 -0700

tools: add script to update ESLint

Provide a bash script for updating ESLint in the project.

PR-URL: https://github.com/nodejs/node/pull/13895
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

commit 5f770d17ee436d196962e1c8a1e2f77141069f54 Author: Rich Trott rtrott@gmail.com Date: Tue Jul 4 20:44:40 2017 -0700

tools: remove align-multiline-assignment lint rule

In preparation for stricter indentation linting, remove the
align-multiline-assignment custom rule, as it may conflict with the
ESLint stricter indentation linting.

PR-URL: https://github.com/nodejs/node/pull/14079
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

commit e0a9eb513376031a818dfe48e05110c6d62176b1 Author: Rich Trott rtrott@gmail.com Date: Tue Jul 4 17:59:36 2017 -0700

lib: use consistent indentation for ternaries

In anticipation of stricter linting for indentation issues, modify
ternary operators in lib that do not conform with the expected ESLint
settings.

PR-URL: https://github.com/nodejs/node/pull/14078
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

commit 908305a51f636732cd6d30cca01e00ba93f4610d Author: Rich Trott rtrott@gmail.com Date: Wed Jul 5 09:21:40 2017 -0700

lib: remove excess indentation

In anticipation of stricter linting for indentation, remove instances of
extra indentation that will be flagged by the new rules.

PR-URL: https://github.com/nodejs/node/pull/14090
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

commit baa5ce49786a8d191a92d71024d05f948f3c0dc6 Author: Rich Trott rtrott@gmail.com Date: Fri Jul 7 07:31:05 2017 -0700

lib: normalize indentation in parentheses

In anticipation of stricter indentation linting, normalize indentation
of code in parentheses.

PR-URL: https://github.com/nodejs/node/pull/14125
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

commit 80843d231b2e375ac69312aca03f74fbd664add3 Author: Rich Trott rtrott@gmail.com Date: Fri Jul 14 21:00:36 2017 -0700

lib: update indentation of ternaries

In preparation for stricter indentation linting and to increase code
clarity, update indentation for ternaries in lib.

PR-URL: https://github.com/nodejs/node/pull/14247
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>

commit 50409adc8e6acee610e3855cdd7848c093a24c90 Author: Rich Trott rtrott@gmail.com Date: Tue Jul 25 10:37:08 2017 -0700

test: adjust indentation for stricter linting

ESLint 4.x has stricter linting than previous versions. We are currently
using the legacy indentation rules in the test directory. This commit
changes the indentation of files to comply with the stricter 4.x linting
and enable stricter linting in the test directory.

Backport-PR-URL: https://github.com/nodejs/node/pull/14522
Backport-Reviewed-By: Anna Henningsen <anna@addaleax.net>

PR-URL: https://github.com/nodejs/node/pull/14431
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>

commit 6c190ad39f2897bba1abc3717221acf52043baaa Author: Rich Trott rtrott@gmail.com Date: Tue Jun 27 13:32:32 2017 -0700

doc: fix indentation issues in sample code

In preparation for stricter ESLint indentation checking, fix a few
issues in sample code.

PR-URL: https://github.com/nodejs/node/pull/13950
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

commit 849e8182f0e3ad4330179f492b057bc2569372c3 Author: Rich Trott rtrott@gmail.com Date: Mon Aug 14 23:40:18 2017 -0700

tools: remove legacy indentation linting

All linting now uses the current ESLint 4.3.0 indentation linting.
Remove legacy indentation rules.

PR-URL: https://github.com/nodejs/node/pull/14515
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Claudio Rodriguez <cjrodr@yahoo.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>

Merge request reports