Apply changes suggested in code review

Author: armano2

docs/rules/curly-bracket-spacing.md renamed to docs/rules/mustache-curly-spacing.md

@@ -1,4 +1,4 @@
-# Enforce spacing on the style of curly brackets. (curly-bracket-spacing)
+# Enforce spacing on the style of mustache curly brackets. (mustache-curly-spacing)
 
 - :wrench: The `--fix` option on the [command line](http://eslint.org/docs/user-guide/command-line-interface#fix) can automatically fix some of the problems reported by this rule.
 
@@ -27,7 +27,7 @@ This rule aims to enforce unified spacing of curly brackets.
 Default spacing is set to `always`
 
 ```
-'vue/curly-bracket-spacing': [2, 'always'|'never']
+'vue/mustache-curly-spacing': [2, 'always'|'never']
 ```
 
 ### `"always"` - Expect one space between expression and curly brackets.

lib/rules/curly-bracket-spacing.js renamed to lib/rules/mustache-curly-spacing.js

@@ -1,5 +1,5 @@
 /**
- * @fileoverview Enforce spacing on the style of curly brackets.
+ * @fileoverview Enforce spacing on the style of mustache curly brackets.
  * @author Armano
  */
 'use strict'
@@ -17,7 +17,7 @@ const utils = require('../utils')
 module.exports = {
   meta: {
     docs: {
-      description: 'Enforce spacing on the style of curly brackets.',
+      description: 'Enforce spacing on the style of mustache curly brackets.',
       category: 'Stylistic Issues',
       recommended: false
     },
@@ -31,7 +31,7 @@ module.exports = {
 
   create (context) {
     const options = context.options[0]
-    const optSpaces = options !== 'never' ? 1 : 0
+    const optSpaces = options !== 'never'
     const template = context.parserServices.getTemplateBodyTokenStore && context.parserServices.getTemplateBodyTokenStore()
 
     // ----------------------------------------------------------------------
@@ -41,7 +41,7 @@ module.exports = {
     function checkTokens (leftToken, rightToken) {
       if (leftToken.loc.end.line === rightToken.loc.start.line) {
         const spaces = rightToken.loc.start.column - leftToken.loc.end.column
-        if (optSpaces !== spaces) {
+        if (optSpaces === (spaces === 0)) {
           context.report({
             node: rightToken,
             loc: {
@@ -64,14 +64,17 @@ module.exports = {
     // ----------------------------------------------------------------------
 
     utils.registerTemplateBodyVisitor(context, {
-      VExpressionContainer (node) {
+      'VExpressionContainer[expression!=null]' (node) {
         const tokens = template.getTokens(node, {
           includeComments: true,
           filter: token => token.type !== 'HTMLWhitespace' // When there is only whitespace between ignore it
         })
 
         const startToken = tokens.shift()
+        if (!startToken || startToken.type !== 'VExpressionStart') return
         const endToken = tokens.pop()
+        if (!endToken || endToken.type !== 'VExpressionEnd') return
+
         if (tokens.length > 0) {
           checkTokens(startToken, tokens[0])
           checkTokens(tokens[tokens.length - 1], endToken)

tests/lib/rules/curly-bracket-spacing.js renamed to tests/lib/rules/mustache-curly-spacing.js

@@ -1,5 +1,5 @@
 /**
- * @fileoverview Enforce spacing on the style of curly brackets.
+ * @fileoverview Enforce spacing on the style of mustache curly brackets.
  * @author Armano
  */
 'use strict'
@@ -8,7 +8,7 @@
 // Requirements
 // ------------------------------------------------------------------------------
 
-const rule = require('../../../lib/rules/curly-bracket-spacing')
+const rule = require('../../../lib/rules/mustache-curly-spacing')
 const RuleTester = require('eslint').RuleTester
 
 // ------------------------------------------------------------------------------
@@ -20,7 +20,7 @@ const ruleTester = new RuleTester({
   parserOptions: { ecmaVersion: 2015 }
 })
 
-ruleTester.run('curly-bracket-spacing', rule, {
+ruleTester.run('mustache-curly-spacing', rule, {
 
   valid: [
     {
@@ -35,6 +35,10 @@ ruleTester.run('curly-bracket-spacing', rule, {
       filename: 'test.vue',
       code: '<template>             <div id="               "></div>         </template>'
     },
+    {
+      filename: 'test.vue',
+      code: '<template> <div :style="  " :class="       foo      " v-if=foo   ></div>      </template>'
+    },
     {
       filename: 'test.vue',
       code: '<template><div>{{ text }}</div></template>'
@@ -62,20 +66,25 @@ ruleTester.run('curly-bracket-spacing', rule, {
       filename: 'test.vue',
       code: '<template><div>{{ text }}</div></template>',
       options: ['always']
-    }
-  ],
-
-  invalid: [
+    },
     {
       filename: 'test.vue',
       code: '<template><div>{{         }}</div></template>',
-      output: '<template><div>{{ }}</div></template>',
-      options: ['always'],
-      errors: [{
-        message: 'Found 9 whitespaces, 1 expected.',
-        type: 'VExpressionEnd'
-      }]
+      options: ['always']
     },
+    {
+      filename: 'test.vue',
+      code: '<template><div>{{         }}</div></template>',
+      options: ['never']
+    },
+    {
+      filename: 'test.vue',
+      code: '<template><div>{{   text   }}</div></template>',
+      options: ['always']
+    }
+  ],
+
+  invalid: [
     {
       filename: 'test.vue',
       code: '<template><div>{{ text}}</div></template>',
@@ -142,19 +151,6 @@ ruleTester.run('curly-bracket-spacing', rule, {
         type: 'VExpressionEnd'
       }]
     },
-    {
-      filename: 'test.vue',
-      code: '<template><div>{{   text   }}</div></template>',
-      output: '<template><div>{{ text }}</div></template>',
-      options: ['always'],
-      errors: [{
-        message: 'Found 3 whitespaces, 1 expected.',
-        type: 'Identifier'
-      }, {
-        message: 'Found 3 whitespaces, 1 expected.',
-        type: 'VExpressionEnd'
-      }]
-    },
     {
       filename: 'test.vue',
       code: '<template><div>{{   text   }}</div></template>',