Fix: array-bracket-spacing for destructuring typed parameter (fixes #35)

babel · Dec 20, 2015 · e7b623d · e7b623d
1 parent 8e2f6f9
commit e7b623d
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ original ones as well!).
   "rules": {
     "babel/generator-star-spacing": 1,
     "babel/new-cap": 1,
+    "babel/array-bracket-spacing": 1,
     "babel/object-curly-spacing": 1,
     "babel/object-shorthand": 1,
     "babel/arrow-parens": 1,
@@ -39,6 +40,7 @@ Each rule corresponds to a core `eslint` rule, and has the same options.
 
 - `babel/generator-star-spacing`: Handles async/await functions correctly
 - `babel/new-cap`: Ignores capitalized decorators (`@Decorator`)
+- `babel/array-bracket-spacing`: Handles destructuring arrays with flow type in function parametres
 - `babel/object-curly-spacing`: doesn't complain about `export x from "mod";` or `export * as x from "mod";`
 - `babel/object-shorthand`: doesn't fail when using object spread (`...obj`)
 - `babel/arrow-parens`: Handles async functions correctly

diff --git a/rules/array-bracket-spacing.js b/rules/array-bracket-spacing.js
@@ -148,11 +148,16 @@ module.exports = function(context) {
 
         var first = sourceCode.getFirstToken(node),
             second = sourceCode.getFirstToken(node, 1),
-            penultimate = sourceCode.getLastToken(node, 1),
             last = sourceCode.getLastToken(node),
             firstElement = node.elements[0],
             lastElement = node.elements[node.elements.length - 1];
 
+        while (last.type !== "Punctuation" && last.value !== "]") {
+            last = sourceCode.getTokenBefore(last);
+        }
+
+        var penultimate = sourceCode.getTokenBefore(last);
+
         var openingBracketMustBeSpaced =
             options.objectsInArraysException && isObjectType(firstElement) ||
             options.arraysInArraysException && isArrayType(firstElement) ||

diff --git a/tests/array-bracket-spacing.js b/tests/array-bracket-spacing.js
@@ -159,7 +159,14 @@ ruleTester.run("array-bracket-spacing", rule, {
         { code: "var foo = [1, {'bar': 'baz'}, 5];", options: ["never"] },
         { code: "var foo = [{'bar': 'baz'}, 1,  5];", options: ["never"] },
         { code: "var foo = [1, 5, {'bar': 'baz'}];", options: ["never"] },
-        { code: "var obj = {'foo': [1, 2]}", options: ["never"] }
+        { code: "var obj = {'foo': [1, 2]}", options: ["never"] },
+
+        // Babel test cases.
+        // always - destructuring typed array param
+        { code: "function fn([ a,b ]: Array<any>){}", options: ["always"], parser: "babel-eslint", ecmaFeatures: { destructuring: true } },
+
+        // never - destructuring typed array param
+        { code: "function fn([a,b]: Array<any >){}", options: ["never"], parser: "babel-eslint", ecmaFeatures: { destructuring: true } },
 
     ],
 
@@ -669,6 +676,58 @@ ruleTester.run("array-bracket-spacing", rule, {
                     column: 26
                 }
             ]
+        },
+
+        // Babel test cases.
+
+        // always - destructuring typed array param
+        {
+            code: "function fn([a,b]: Array<any>){}",
+            output: "function fn([ a,b ]: Array<any>){}",
+            options: ["always"],
+            parser: "babel-eslint",
+            ecmaFeatures: {
+                destructuring: true
+            },
+            errors: [
+                {
+                    message: "A space is required after '['",
+                    type: "ArrayPattern",
+                    line: 1,
+                    column: 13
+                },
+                {
+                    message: "A space is required before ']'",
+                    type: "ArrayPattern",
+                    line: 1,
+                    column: 17
+                }
+            ]
+        },
+
+        // never - destructuring typed array param
+        {
+            code: "function fn([ a,b ]: Array<any>){}",
+            output: "function fn([a,b]: Array<any>){}",
+            options: ["never"],
+            parser: "babel-eslint",
+            ecmaFeatures: {
+                destructuring: true
+            },
+            errors: [
+                {
+                    message: "There should be no space after '['",
+                    type: "ArrayPattern",
+                    line: 1,
+                    column: 13
+                },
+                {
+                    message: "There should be no space before ']'",
+                    type: "ArrayPattern",
+                    line: 1,
+                    column: 19
+                }
+            ]
         }
     ]
 });