From 5a03fb22bd73b086f7f5b1b465b888223840d462 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 7 Feb 2016 20:57:14 -0800
Subject: [PATCH 1/2] tools: alphabetize eslint stylistic issues section

Rearrange the style rules in .eslintrc to be in alphabetical order.

This has two benefits:

It means the rules appear in the same order as they do in the ESLint
documentation, easing cross-referencing.

It also means that it is much easier to determine with visual inspection
if a rule is set or not.
---
 .eslintrc | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index ef27556343b15b..24db5dff4eed04 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -55,36 +55,36 @@ rules:
 
   # Stylistic Issues
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#stylistic-issues
-  ## use single quote, we can use double quote when escape chars
-  quotes: [2, "single", "avoid-escape"]
-  ## 2 space indentation
-  indent: [2, 2, {SwitchCase: 1}]
   ## add space after comma
   comma-spacing: 2
-  ## put semi-colon
-  semi: 2
-  ## require spaces operator like var sum = 1 + 1;
-  space-infix-ops: 2
-  ## require spaces return, throw, case
-  space-return-throw-case: 2
-  ## no space before function, eg. 'function()'
-  space-before-function-paren: [2, "never"]
-  ## require space before blocks, eg 'function() {'
-  space-before-blocks: [2, "always"]
-  ## require parens for Constructor
-  new-parens: 2
+  ## require newline at end of files
+  eol-last: 2
+  ## 2 space indentation
+  indent: [2, 2, {SwitchCase: 1}]
   ## max 80 length
   max-len: [2, 80, 2]
+  ## require parens for Constructor
+  new-parens: 2
   ## max 2 consecutive empty lines
   no-multiple-empty-lines: [2, {max: 2}]
-  ## require newline at end of files
-  eol-last: 2
   ## no trailing spaces
   no-trailing-spaces: 2
+  ## use single quote, we can use double quote when escape chars
+  quotes: [2, "single", "avoid-escape"]
+  ## put semi-colon
+  semi: 2
   ## require space after keywords, eg 'for (..)'
   space-after-keywords: 2
+  ## require space before blocks, eg 'function() {'
+  space-before-blocks: [2, "always"]
+  ## no space before function, eg. 'function()'
+  space-before-function-paren: [2, "never"]
   ## no leading/trailing spaces in parens
   space-in-parens: [2, "never"]
+  ## require spaces operator like var sum = 1 + 1;
+  space-infix-ops: 2
+  ## require spaces return, throw, case
+  space-return-throw-case: 2
   ## no spaces with non-word unary operators, require for word unary operators
   space-unary-ops: 2
 

From d7dca68f14d009c244b5a288eb353a1424ab9ef3 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 8 Feb 2016 10:41:15 -0800
Subject: [PATCH 2/2] tools: disallow mixed spaces and tabs for indents

Enable eslint rule disallowing mixing tabs and spaces for indentation.
Modify the one file that had been mixing tabs and spaces.
---
 .eslintrc                                |  2 ++
 test/parallel/test-crypto-certificate.js | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 24db5dff4eed04..a03bb13ecaf773 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -65,6 +65,8 @@ rules:
   max-len: [2, 80, 2]
   ## require parens for Constructor
   new-parens: 2
+  ## disallow mixed spaces and tabs for indentation
+  no-mixed-spaces-and-tabs: 2
   ## max 2 consecutive empty lines
   no-multiple-empty-lines: [2, {max: 2}]
   ## no trailing spaces
diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
index 9814b395552e9f..9948303f32315e 100644
--- a/test/parallel/test-crypto-certificate.js
+++ b/test/parallel/test-crypto-certificate.js
@@ -22,14 +22,16 @@ var certificate = new crypto.Certificate();
 assert.equal(certificate.verifySpkac(spkacValid), true);
 assert.equal(certificate.verifySpkac(spkacFail), false);
 
-assert.equal(stripLineEndings(certificate.exportPublicKey(spkacValid)
-							  .toString('utf8')),
-			 stripLineEndings(spkacPem.toString('utf8')));
+assert.equal(
+  stripLineEndings(certificate.exportPublicKey(spkacValid).toString('utf8')),
+  stripLineEndings(spkacPem.toString('utf8'))
+);
 assert.equal(certificate.exportPublicKey(spkacFail), '');
 
-assert.equal(certificate.exportChallenge(spkacValid)
-			 .toString('utf8'),
-			 'fb9ab814-6677-42a4-a60c-f905d1a6924d');
+assert.equal(
+  certificate.exportChallenge(spkacValid).toString('utf8'),
+  'fb9ab814-6677-42a4-a60c-f905d1a6924d'
+);
 assert.equal(certificate.exportChallenge(spkacFail), '');
 
 function stripLineEndings(obj) {