From 225d94068a071a03cc5b4bd1d0f7537f9eeb38e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Thu, 5 Nov 2015 20:56:29 +0100
Subject: [PATCH] tools: update eslint config

The no-reserved-keys rule doesn't exist anymore and we don't need ES3
compatibility.
escape and unescape are now known by eslint.
--reset flag was removed and it is now the default behavior.

PR-URL: https://github.com/nodejs/io.js/pull/2286
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 .eslintrc   | 6 +-----
 Makefile    | 2 +-
 vcbuild.bat | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 33a7919d88..2197bf35cc 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -27,8 +27,6 @@ rules:
   no-duplicate-case: 2
   ## disallow assignment of exceptional params
   no-ex-assign: 2
-  ## disallow use of reserved words as keys like enum, class
-  no-reserved-keys: 2
   ## disallow unreachable code
   no-unreachable: 2
   ## require valid typeof compared string like typeof foo === 'strnig'
@@ -44,7 +42,7 @@ rules:
   ## use single quote, we can use double quote when escape chars
   quotes: [2, "single", "avoid-escape"]
   ## 2 space indentation
-  indent: [2, 2]
+  indent: [2, 2, {SwitchCase: 1}]
   ## add space after comma
   comma-spacing: 2
   ## put semi-colon
@@ -112,5 +110,3 @@ globals:
   DTRACE_NET_SERVER_CONNECTION         : false
   LTTNG_NET_SERVER_CONNECTION          : false
   COUNTER_NET_SERVER_CONNECTION        : false
-  escape                               : false
-  unescape                             : false
diff --git a/Makefile b/Makefile
index 94eb419953..02f4363ab3 100644
--- a/Makefile
+++ b/Makefile
@@ -510,7 +510,7 @@ bench-idle:
 
 jslint:
 	$(NODE) tools/eslint/bin/eslint.js src lib test tools/eslint-rules \
-		--rulesdir tools/eslint-rules --reset --quiet
+		--rulesdir tools/eslint-rules --quiet
 
 CPPLINT_EXCLUDE ?=
 CPPLINT_EXCLUDE += src/node_lttng.cc
diff --git a/vcbuild.bat b/vcbuild.bat
index 25883a31c0..e33f8cb652 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -254,7 +254,7 @@ goto jslint
 :jslint
 if not defined jslint goto exit
 echo running jslint
-%config%\node tools\eslint\bin\eslint.js src lib test tools\eslint-rules --rulesdir tools\eslint-rules --reset --quiet
+%config%\node tools\eslint\bin\eslint.js src lib test tools\eslint-rules --rulesdir tools\eslint-rules --quiet
 goto exit
 
 :create-msvs-files-failed