fix SwitchCaseColon when not immediately followed by another case. cl…

…oses #392
millermedeiros · Jan 28, 2016 · f103c24 · f103c24
1 parent 2ddc6d7
commit f103c24
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/lib/hooks/SwitchCase.js b/lib/hooks/SwitchCase.js
@@ -14,16 +14,15 @@ exports.format = function SwitchCase(node) {
   }
   var endToken = node.endToken;
 
-  if (endToken.value === ':') {
-    limit.before(endToken, 'SwitchCaseColon');
-    limit.after(endToken, 'SwitchCaseColon');
-  } else {
-    // endToken might be ":" or "break" or ";"
-    var breakKeyword = _tk.findPrev(endToken.next, 'break');
-    if (breakKeyword) {
-      limit.before(breakKeyword, 'BreakKeyword');
-      limit.after(endToken, 'BreakKeyword');
-    }
+  var colon = _tk.findNext(node.startToken, ':');
+  limit.before(colon, 'SwitchCaseColon');
+  limit.after(colon, 'SwitchCaseColon');
+
+  // endToken might be ":" or "break" or ";"
+  var breakKeyword = _tk.findInBetweenFromEnd(node.startToken, endToken.next, 'break');
+  if (breakKeyword) {
+    limit.before(breakKeyword, 'BreakKeyword');
+    limit.after(endToken, 'BreakKeyword');
   }
 };
 

diff --git a/lib/preset/default.json b/lib/preset/default.json
@@ -130,6 +130,7 @@
       "ReturnStatement" : -1,
       "SwitchOpeningBrace" : 0,
       "SwitchClosingBrace" : ">=1",
+      "SwitchCaseColon": 0,
       "ThisExpression" : -1,
       "ThrowStatement" : ">=1",
       "TryKeyword": -1,

diff --git a/test/compare/custom/switch_statement-in.js b/test/compare/custom/switch_statement-in.js
@@ -11,6 +11,18 @@ switch ( event.keyCode ) {
     x();
 }
 
+switch ( event.keyCode ) {
+    case $.ui.keyCode.ENTER            :
+        whatever = 'nothing';
+        break
+    case $.ui.keyCode.ESCAPE
+    :
+        whatever = 'something';
+            break;
+    default:
+    x();
+}
+
 call(function(){
     switch (fruit) {
         case Fruit.APPLE:

diff --git a/test/compare/custom/switch_statement-out.js b/test/compare/custom/switch_statement-out.js
@@ -15,6 +15,20 @@ default:
   x();
 }
 
+switch ( event.keyCode )
+{
+case $.ui.keyCode.ENTER:
+  whatever = 'nothing';
+  break
+
+case $.ui.keyCode.ESCAPE:
+  whatever = 'something';
+  break;
+
+default:
+  x();
+}
+
 call(function() {
   switch ( fruit )
   {