[ESLint] Add options to 'indent' rule

 - Align declarations
 - Indent `case`

.eslintrc.yml

@@ -8,6 +8,12 @@ rules:
   indent:
     - error
     - 2
+    - VariableDeclarator:
+        var: 2
+        let: 2
+        const: 3
+      SwitchCase: 1
+
   brace-style:
     - error
     - stroustrup

frameworks/javascript/chai-display.js

@@ -1,11 +1,11 @@
 var display = require('./display'),
-  chai = require('chai');
+    chai = require('chai');
 
 // setup chai to render success messages, which it normally doesn't do when used with CW-2
 chai.use(function(_chai, util) {
   chai.Assertion.prototype.assert = function(expr, msg, negateMsg, expected, _actual, showDiff) {
     var ok = util.test(this, arguments),
-      result = ok ? 'passed' : 'failed';
+        result = ok ? 'passed' : 'failed';
 
     display.write(result, util.getMessage(this, arguments));
 

frameworks/javascript/cw-2.js

@@ -1,33 +1,33 @@
 
 try {
   var util = require('util'),
-    deepEquals = require('lodash').isEqual,
-    Promise = require("bluebird");
+      deepEquals = require('lodash').isEqual,
+      Promise = require("bluebird");
 
   require('./chai-display');
 
   var fnToString = Function.toString;
   Function.prototype.toString = function() {
     switch (this) {
-    case Test.expect:
-    case Test.randomNumber:
-    case Test.randomize:
-    case Test.randomToken:
-      return '[Codewars Code]';
-
-    default:
-      return fnToString.call(this);
+      case Test.expect:
+      case Test.randomNumber:
+      case Test.randomize:
+      case Test.randomToken:
+        return '[Codewars Code]';
+
+      default:
+        return fnToString.call(this);
     }
   };
 
   var describing = [],
-    async = false,
-    asyncIts = null,
-    asyncDone = null,
-    failed = [],
-    beforeCallbacks = [],
-    afterCallbacks = [],
-    alwaysExplain = false;
+      async = false,
+      asyncIts = null,
+      asyncDone = null,
+      failed = [],
+      beforeCallbacks = [],
+      afterCallbacks = [],
+      alwaysExplain = false;
 
   process.on('uncaughtException', function(err) {
     if (async) {
@@ -180,21 +180,21 @@ try {
         });
 
         var start = new Date(),
-          timeout,
-          done = function() {
-            if (timeout) clearTimeout(timeout);
+            timeout,
+            done = function() {
+              if (timeout) clearTimeout(timeout);
 
-            var ms = new Date() - start;
-            Test.display.write("COMPLETEDIN", ms);
+              var ms = new Date() - start;
+              Test.display.write("COMPLETEDIN", ms);
 
-            afterCallbacks.forEach(function(cb) {
-              cb();
-            });
+              afterCallbacks.forEach(function(cb) {
+                cb();
+              });
 
-            done = null;
+              done = null;
 
-            if (asyncIt) describeNext();
-          };
+              if (asyncIt) describeNext();
+            };
 
         if (asyncIt) {
           timeout = setTimeout(function() {

frameworks/javascript/display.js

@@ -1,7 +1,7 @@
 
 var util = require('util'),
-  isEqual = require('underscore').isEqual,
-  display = module.exports;
+    isEqual = require('underscore').isEqual,
+    display = module.exports;
 
 // prevent anyone from peeking at the code we passed in
 if (global.process) {
@@ -165,7 +165,7 @@ module.exports.explain = function explain(actual, expected, options) {
 
   options = options || {};
   var collapsed = options.collapsed ? "-" : "",
-    diff = true;
+      diff = true;
 
   if (options.mode) {
     if (typeof(options.mode) == 'string') {

lib/runners/arm.js

@@ -1,7 +1,7 @@
 var shovel = require('../shovel'),
-  util = require('../util'),
-  path = require('path'),
-  temp = require('temp');
+    util = require('../util'),
+    path = require('path'),
+    temp = require('temp');
 
 module.exports.run = function run(opts, cb) {
   temp.track();
@@ -10,12 +10,12 @@ module.exports.run = function run(opts, cb) {
   shovel.start(opts, cb, {
     solutionOnly: function(run) {
       var executable = path.join(dir, 'solution'),
-        solutionFile = util.codeWriteSync('arm', opts.solution + '\n', dir, 'solution.s'),
-        objectFile = solutionFile.replace(/\.[^\.]+$/, '.o'),
-        armCommand = ['arm-linux-gnueabi-as', solutionFile, '-o', objectFile].join(' '),
+          solutionFile = util.codeWriteSync('arm', opts.solution + '\n', dir, 'solution.s'),
+          objectFile = solutionFile.replace(/\.[^\.]+$/, '.o'),
+          armCommand = ['arm-linux-gnueabi-as', solutionFile, '-o', objectFile].join(' '),
         // Check for whether we need to link against libc
-        linker = opts.solution.search(/\.glob[a]?l\W+_start/) == -1 ? "arm-linux-gnueabi-gcc-4.7" : "arm-linux-gnueabi-ld",
-        linkerCommand = [linker, objectFile, '-o', executable].join(' ');
+          linker = opts.solution.search(/\.glob[a]?l\W+_start/) == -1 ? "arm-linux-gnueabi-gcc-4.7" : "arm-linux-gnueabi-ld",
+          linkerCommand = [linker, objectFile, '-o', executable].join(' ');
       util.exec(armCommand, function() {
         util.exec(linkerCommand, function() {
           run({'name': 'qemu-arm', 'args': ['-L', '/usr/arm-linux-gnueabi/', executable]});

lib/runners/c.js

@@ -1,14 +1,14 @@
 var shovel = require('../shovel'),
-  util = require('../util'),
-  exec = require('child_process').exec,
-  path = require('path');
+    util = require('../util'),
+    exec = require('child_process').exec,
+    path = require('path');
 
 module.exports.run = function run(opts, cb) {
   shovel.start(opts, cb, {
     solutionOnly: function(runCode, fail) {
       var executable = path.join(opts.dir, 'solution'),
-        solutionFile = util.codeWriteSync('c', opts.solution, opts.dir, 'solution.c'),
-        args = ['clang-3.6', '-std=c11', solutionFile, '-o', executable, '-lm'];
+          solutionFile = util.codeWriteSync('c', opts.solution, opts.dir, 'solution.c'),
+          args = ['clang-3.6', '-std=c11', solutionFile, '-o', executable, '-lm'];
       if (opts.setup) {
         var setupFile = util.codeWriteSync('c', opts.setup, opts.dir, 'setup.c');
         args.push(setupFile);
@@ -21,9 +21,9 @@ module.exports.run = function run(opts, cb) {
     },
     testIntegration: function(runCode, fail) {
       var executable = path.join(opts.dir, 'solution'),
-        solutionFile = util.codeWriteSync('c', opts.solution, opts.dir, 'solution.c'),
-        fixtureFile = util.codeWriteSync('c', opts.fixture, opts.dir, 'fixture.c'),
-        args = ['clang-3.6', '-std=c11', fixtureFile, solutionFile, '-o', executable, './frameworks/c/criterion.c', '-I./frameworks/c', '-lcriterion', '-lm'];
+          solutionFile = util.codeWriteSync('c', opts.solution, opts.dir, 'solution.c'),
+          fixtureFile = util.codeWriteSync('c', opts.fixture, opts.dir, 'fixture.c'),
+          args = ['clang-3.6', '-std=c11', fixtureFile, solutionFile, '-o', executable, './frameworks/c/criterion.c', '-I./frameworks/c', '-lcriterion', '-lm'];
       if (opts.setup) {
         var setupFile = util.codeWriteSync('c', opts.setup, opts.dir, 'setup.c');
         args.push(setupFile);

lib/runners/clojure.js

@@ -1,5 +1,5 @@
 var shovel = require('../shovel'),
-  path = require('path');
+    path = require('path');
 
 module.exports.run = function run(opts, cb) {
   var uberJar = path.resolve(__dirname, '../../jvm-runner/target/jvm-runner-0.1.3-standalone.jar');

lib/runners/coffeescript.js

@@ -10,12 +10,12 @@ module.exports.run = function run(opts, cb) {
     },
     testIntegration: function(runCode) {
       switch (opts.testFramework) {
-      case 'cw':
-      case 'cw-2':
-        return prepareCw2(opts, runCode);
+        case 'cw':
+        case 'cw-2':
+          return prepareCw2(opts, runCode);
 
-      default:
-        throw 'Test framework is not supported';
+        default:
+          throw 'Test framework is not supported';
       }
     }
   });

lib/runners/cpp.js

@@ -1,11 +1,11 @@
 var shovel = require('../shovel'),
-  util = require('../util'),
-  path = require('path'),
-  temp = require('temp'),
-  exec = require('child_process').exec,
-  fs = require('fs'),
-  cppDir = path.resolve(__dirname, '..', '..', 'frameworks', 'cpp'),
-  main = fs.readFileSync(path.resolve(cppDir, 'main.cpp'));
+    util = require('../util'),
+    path = require('path'),
+    temp = require('temp'),
+    exec = require('child_process').exec,
+    fs = require('fs'),
+    cppDir = path.resolve(__dirname, '..', '..', 'frameworks', 'cpp'),
+    main = fs.readFileSync(path.resolve(cppDir, 'main.cpp'));
 
 function compile(args, cb) {
   args.unshift('clang++-3.6', '-stdlib=libc++ -std=c++1y');
@@ -26,7 +26,7 @@ module.exports.run = function run(opts, cb) {
   shovel.start(opts, cb, {
     solutionOnly: function(runCode, fail) {
       var executable = path.join(dir, 'solution'),
-        solutionFile = util.codeWriteSync('cpp', opts.solution, dir, 'solution.cpp');
+          solutionFile = util.codeWriteSync('cpp', opts.solution, dir, 'solution.cpp');
       args = [solutionFile, '-o', executable];
       compile(args, function(error, stdout, stderr) {
         if (error) return fail(error, stdout, stderr);
@@ -36,13 +36,13 @@ module.exports.run = function run(opts, cb) {
     },
     testIntegration: function(runCode, fail) {
       var executable = path.join(dir, 'solution'),
-        solutionFile = util.codeWriteSync('cpp', [
-          '#include <igloo/igloo_alt.h>',
-          'using namespace igloo;',
-          opts.solution,
-          opts.fixture,
-          main
-        ].join('\n'), dir, 'solution.cpp');
+          solutionFile = util.codeWriteSync('cpp', [
+            '#include <igloo/igloo_alt.h>',
+            'using namespace igloo;',
+            opts.solution,
+            opts.fixture,
+            main
+          ].join('\n'), dir, 'solution.cpp');
       args = ['-isystem', cppDir, solutionFile, '-o', executable];
       compile(args, function(error, stdout, stderr) {
         if (error) return fail(error, stdout, stderr);

lib/runners/crystal.js

@@ -1,7 +1,7 @@
 var shovel = require('../shovel'),
-  util = require('../util'),
-  Convert = require('ansi-to-html'),
-  convert = new Convert();
+    util = require('../util'),
+    Convert = require('ansi-to-html'),
+    convert = new Convert();
 
 module.exports.run = function run(opts, cb) {
   shovel.start(opts, cb, {

lib/runners/csharp.js

@@ -1,15 +1,15 @@
 var shovel = require('../shovel'),
-  util = require('../util'),
-  path = require('path'),
-  nunitAssemblies = ['nunit.core.dll', 'nunit.framework.dll', 'nunit.core.interfaces.dll', 'nunit.util', 'Newtonsoft.Json.dll'].join(','),
-  nunitPath = '/runner/frameworks/csharp/nunit/bin';
+    util = require('../util'),
+    path = require('path'),
+    nunitAssemblies = ['nunit.core.dll', 'nunit.framework.dll', 'nunit.core.interfaces.dll', 'nunit.util', 'Newtonsoft.Json.dll'].join(','),
+    nunitPath = '/runner/frameworks/csharp/nunit/bin';
 
 module.exports.run = function run(opts, cb) {
   shovel.start(opts, cb, {
     solutionOnly: function(runCode, fail) {
       var codeFile = util.codeWriteSync('csharp', opts.solution, opts.dir, 'code.cs'),
-        exe = path.join(opts.dir, 'solution.exe'),
-        args = ['mcs', '-out:' + exe, codeFile];
+          exe = path.join(opts.dir, 'solution.exe'),
+          args = ['mcs', '-out:' + exe, codeFile];
 
       if (opts.setup) {
         args.push(util.codeWriteSync('csharp', opts.setup, opts.dir, 'setup.cs'));
@@ -24,29 +24,29 @@ module.exports.run = function run(opts, cb) {
       // copydir('/runner/frameworks/nunit', opts.dir);
 
       var dll = path.join(opts.dir, 'test.dll'),
-        args = [
-          'mcs',
-          '-out:' + dll,
-          `-lib:${opts.dir},/runner/frameworks/csharp/mono-4.5,${nunitPath}`,
-          '-langversion:Default',
-          '-sdk:4.5',
-          '-warn:2',
-          '-target:library',
-          '-r:' + nunitAssemblies,
-          '-r:System.Numerics.dll',
-          '-r:System.Drawing.dll',
-          '-r:System.Data.dll',
-          '-r:System.Data.SQLite.dll',
-          '-r:System.Data.SQLite.Linq.dll',
-          '-r:System.IO.dll',
-          '-r:System.Linq.dll',
-          '-r:System.Linq.Dynamic.dll',
-          '-r:System.Linq.Expressions.dll',
-          '-r:System.Messaging.dll',
-          '-r:System.Threading.Tasks.dll',
-          '-r:System.Xml.dll',
-          '-r:Mono.Linq.Expressions.dll',
-        ];
+          args = [
+            'mcs',
+            '-out:' + dll,
+            `-lib:${opts.dir},/runner/frameworks/csharp/mono-4.5,${nunitPath}`,
+            '-langversion:Default',
+            '-sdk:4.5',
+            '-warn:2',
+            '-target:library',
+            '-r:' + nunitAssemblies,
+            '-r:System.Numerics.dll',
+            '-r:System.Drawing.dll',
+            '-r:System.Data.dll',
+            '-r:System.Data.SQLite.dll',
+            '-r:System.Data.SQLite.Linq.dll',
+            '-r:System.IO.dll',
+            '-r:System.Linq.dll',
+            '-r:System.Linq.Dynamic.dll',
+            '-r:System.Linq.Expressions.dll',
+            '-r:System.Messaging.dll',
+            '-r:System.Threading.Tasks.dll',
+            '-r:System.Xml.dll',
+            '-r:Mono.Linq.Expressions.dll',
+          ];
 
       if (opts.services.includes("mongodb")) {
         args.push('-r:MongoDB.Bson.dll');

lib/runners/elixir.js

@@ -1,6 +1,6 @@
 var shovel = require('../shovel'),
-  util = require('../util'),
-  temp = require('temp');
+    util = require('../util'),
+    temp = require('temp');
 
 module.exports.run = function run(opts, cb) {
   shovel.start(opts, cb, {
@@ -12,12 +12,12 @@ module.exports.run = function run(opts, cb) {
     },
     testIntegration: function(runCode) {
       switch (opts.testFramework) {
-      case 'ex_unit':
-      case 'exunit':
-        return prepareExUnit(opts, runCode);
+        case 'ex_unit':
+        case 'exunit':
+          return prepareExUnit(opts, runCode);
 
-      default:
-        throw 'Test framework is not supported';
+        default:
+          throw 'Test framework is not supported';
       }
     },
   });