summaryrefslogtreecommitdiff
path: root/tools/node_modules/eslint/lib/rules/object-curly-spacing.js
diff options
context:
space:
mode:
authorzhangyongsheng <zhangyongsheng@youzan.com>2019-09-14 11:26:23 +0800
committerRich Trott <rtrott@gmail.com>2019-09-15 21:40:27 -0700
commit5de1052dc9253ef7d9bbfb3e620e60cfbf7081b5 (patch)
tree7c48658d99e844fcc11bf922c111a3fe752aa855 /tools/node_modules/eslint/lib/rules/object-curly-spacing.js
parente095e645e52f14e135e80f0f910c812ca767ff31 (diff)
downloadandroid-node-v8-5de1052dc9253ef7d9bbfb3e620e60cfbf7081b5.tar.gz
android-node-v8-5de1052dc9253ef7d9bbfb3e620e60cfbf7081b5.tar.bz2
android-node-v8-5de1052dc9253ef7d9bbfb3e620e60cfbf7081b5.zip
tools: update ESLint to 6.4.0
PR-URL: https://github.com/nodejs/node/pull/29553 Refs: https://github.com/eslint/eslint/releases/tag/v6.4.0 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
Diffstat (limited to 'tools/node_modules/eslint/lib/rules/object-curly-spacing.js')
-rw-r--r--tools/node_modules/eslint/lib/rules/object-curly-spacing.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/node_modules/eslint/lib/rules/object-curly-spacing.js b/tools/node_modules/eslint/lib/rules/object-curly-spacing.js
index 079cf5707d..48a7dd953b 100644
--- a/tools/node_modules/eslint/lib/rules/object-curly-spacing.js
+++ b/tools/node_modules/eslint/lib/rules/object-curly-spacing.js
@@ -167,7 +167,7 @@ module.exports = {
if (options.spaced && !firstSpaced) {
reportRequiredBeginningSpace(node, first);
}
- if (!options.spaced && firstSpaced) {
+ if (!options.spaced && firstSpaced && second.type !== "Line") {
reportNoBeginningSpace(node, first);
}
}