From 7b291b883503362aec0ba2641adba85848737fc7 Mon Sep 17 00:00:00 2001
From: ota <otameshiyo23@gmail.com>
Date: Fri, 1 Feb 2019 21:36:40 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E2=AD=90=EF=B8=8FNew:=20Add=20`vue/keyword?=
 =?UTF-8?q?-spacing`=20rule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/rules/README.md               |   1 +
 docs/rules/keyword-spacing.md      |  23 +++++
 lib/configs/no-layout-rules.js     |   1 +
 lib/index.js                       |   1 +
 lib/rules/keyword-spacing.js       |   9 ++
 tests/lib/rules/keyword-spacing.js | 142 +++++++++++++++++++++++++++++
 6 files changed, 177 insertions(+)
 create mode 100644 docs/rules/keyword-spacing.md
 create mode 100644 lib/rules/keyword-spacing.js
 create mode 100644 tests/lib/rules/keyword-spacing.js

diff --git a/docs/rules/README.md b/docs/rules/README.md
index 82baedd01..95fdb7104 100644
--- a/docs/rules/README.md
+++ b/docs/rules/README.md
@@ -149,6 +149,7 @@ For example:
 | [vue/dot-location](./dot-location.md) | enforce consistent newlines before and after dots | :wrench: |
 | [vue/eqeqeq](./eqeqeq.md) | require the use of `===` and `!==` | :wrench: |
 | [vue/key-spacing](./key-spacing.md) | enforce consistent spacing between keys and values in object literal properties | :wrench: |
+| [vue/keyword-spacing](./keyword-spacing.md) | enforce consistent spacing before and after keywords | :wrench: |
 | [vue/match-component-file-name](./match-component-file-name.md) | require component name property to match its file name |  |
 | [vue/no-boolean-default](./no-boolean-default.md) | disallow boolean defaults | :wrench: |
 | [vue/no-empty-pattern](./no-empty-pattern.md) | disallow empty destructuring patterns |  |
diff --git a/docs/rules/keyword-spacing.md b/docs/rules/keyword-spacing.md
new file mode 100644
index 000000000..f053a90b3
--- /dev/null
+++ b/docs/rules/keyword-spacing.md
@@ -0,0 +1,23 @@
+---
+pageClass: rule-details
+sidebarDepth: 0
+title: vue/keyword-spacing
+description: enforce consistent spacing before and after keywords
+---
+# vue/keyword-spacing
+> enforce consistent spacing before and after keywords
+
+- :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
+
+This rule is the same rule as core [keyword-spacing] rule but it applies to the expressions in `<template>`.
+
+## :books: Further reading
+
+- [keyword-spacing]
+
+[keyword-spacing]: https://eslint.org/docs/rules/keyword-spacing
+
+## :mag: Implementation
+
+- [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/keyword-spacing.js)
+- [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/keyword-spacing.js)
diff --git a/lib/configs/no-layout-rules.js b/lib/configs/no-layout-rules.js
index b50aaddba..1dcab2317 100644
--- a/lib/configs/no-layout-rules.js
+++ b/lib/configs/no-layout-rules.js
@@ -17,6 +17,7 @@ module.exports = {
     'vue/html-quotes': 'off',
     'vue/html-self-closing': 'off',
     'vue/key-spacing': 'off',
+    'vue/keyword-spacing': 'off',
     'vue/max-attributes-per-line': 'off',
     'vue/multiline-html-element-content-newline': 'off',
     'vue/mustache-interpolation-spacing': 'off',
diff --git a/lib/index.js b/lib/index.js
index 8dbae6823..51e821ae4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -27,6 +27,7 @@ module.exports = {
     'html-self-closing': require('./rules/html-self-closing'),
     'jsx-uses-vars': require('./rules/jsx-uses-vars'),
     'key-spacing': require('./rules/key-spacing'),
+    'keyword-spacing': require('./rules/keyword-spacing'),
     'match-component-file-name': require('./rules/match-component-file-name'),
     'max-attributes-per-line': require('./rules/max-attributes-per-line'),
     'multiline-html-element-content-newline': require('./rules/multiline-html-element-content-newline'),
diff --git a/lib/rules/keyword-spacing.js b/lib/rules/keyword-spacing.js
new file mode 100644
index 000000000..ea5059feb
--- /dev/null
+++ b/lib/rules/keyword-spacing.js
@@ -0,0 +1,9 @@
+/**
+ * @author Yosuke Ota
+ */
+'use strict'
+
+const { wrapCoreRule } = require('../utils')
+
+// eslint-disable-next-line
+module.exports = wrapCoreRule(require('eslint/lib/rules/keyword-spacing'))
diff --git a/tests/lib/rules/keyword-spacing.js b/tests/lib/rules/keyword-spacing.js
new file mode 100644
index 000000000..72583d3a4
--- /dev/null
+++ b/tests/lib/rules/keyword-spacing.js
@@ -0,0 +1,142 @@
+/**
+ * @author Yosuke Ota
+ */
+'use strict'
+
+const RuleTester = require('eslint').RuleTester
+const rule = require('../../../lib/rules/keyword-spacing')
+
+const tester = new RuleTester({
+  parser: 'vue-eslint-parser',
+  parserOptions: { ecmaVersion: 2015 }
+})
+
+tester.run('keyword-spacing', rule, {
+  valid: [
+    `<template>
+      <div @event="
+        if (foo) {
+          //...
+        } else if (bar) {
+          //...
+        } else {
+          //...
+        }
+      " />
+    </template>`,
+    {
+      code:
+      `<template>
+        <div @event="
+          if(foo) {
+            //...
+          }else if(bar) {
+            //...
+          }else{
+            //...
+          }
+        " />
+      </template>`,
+      options: [{ before: false, after: false }]
+    }
+  ],
+  invalid: [
+    {
+      code:
+      `<template>
+        <div @event="
+          if(foo) {
+            //...
+          }else if(bar) {
+            //...
+          }else{
+            //...
+          }
+        " />
+      </template>`,
+      output:
+      `<template>
+        <div @event="
+          if (foo) {
+            //...
+          } else if (bar) {
+            //...
+          } else {
+            //...
+          }
+        " />
+      </template>`,
+      errors: [
+        {
+          message: 'Expected space(s) after "if".',
+          line: 3
+        },
+        {
+          message: 'Expected space(s) before "else".',
+          line: 5
+        },
+        {
+          message: 'Expected space(s) after "if".',
+          line: 5
+        },
+        {
+          message: 'Expected space(s) before "else".',
+          line: 7
+        },
+        {
+          message: 'Expected space(s) after "else".',
+          line: 7
+        }
+      ]
+    },
+    {
+      code:
+      `<template>
+        <div @event="
+          if (foo) {
+            //...
+          } else if (bar) {
+            //...
+          } else {
+            //...
+          }
+        " />
+      </template>`,
+      options: [{ before: false, after: false }],
+      output:
+      `<template>
+        <div @event="
+          if(foo) {
+            //...
+          }else if(bar) {
+            //...
+          }else{
+            //...
+          }
+        " />
+      </template>`,
+      errors: [
+        {
+          message: 'Unexpected space(s) after "if".',
+          line: 3
+        },
+        {
+          message: 'Unexpected space(s) before "else".',
+          line: 5
+        },
+        {
+          message: 'Unexpected space(s) after "if".',
+          line: 5
+        },
+        {
+          message: 'Unexpected space(s) before "else".',
+          line: 7
+        },
+        {
+          message: 'Unexpected space(s) after "else".',
+          line: 7
+        }
+      ]
+    }
+  ]
+})

From 63eabd8edd30ffb66dfbe5efbfd339068ef853a7 Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Thu, 28 Feb 2019 13:28:31 +0900
Subject: [PATCH 2/2] use skipDynamicArguments

---
 lib/rules/keyword-spacing.js       |  7 +++++--
 tests/lib/rules/keyword-spacing.js | 20 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/rules/keyword-spacing.js b/lib/rules/keyword-spacing.js
index ea5059feb..548c39ef4 100644
--- a/lib/rules/keyword-spacing.js
+++ b/lib/rules/keyword-spacing.js
@@ -5,5 +5,8 @@
 
 const { wrapCoreRule } = require('../utils')
 
-// eslint-disable-next-line
-module.exports = wrapCoreRule(require('eslint/lib/rules/keyword-spacing'))
+// eslint-disable-next-line no-invalid-meta
+module.exports = wrapCoreRule(
+  require('eslint/lib/rules/keyword-spacing'),
+  { skipDynamicArguments: true }
+)
diff --git a/tests/lib/rules/keyword-spacing.js b/tests/lib/rules/keyword-spacing.js
index 72583d3a4..f20814ab4 100644
--- a/tests/lib/rules/keyword-spacing.js
+++ b/tests/lib/rules/keyword-spacing.js
@@ -38,7 +38,10 @@ tester.run('keyword-spacing', rule, {
         " />
       </template>`,
       options: [{ before: false, after: false }]
-    }
+    },
+    `<template>
+      <div :[(function(){return(1)})()]="val" />
+    </template>`
   ],
   invalid: [
     {
@@ -137,6 +140,21 @@ tester.run('keyword-spacing', rule, {
           line: 7
         }
       ]
+    },
+    {
+      code:
+      `<template>
+        <div :[(function(){return(1)})()]="(function(){return(1)})()" />
+      </template>`,
+      output:
+      `<template>
+        <div :[(function(){return(1)})()]="(function(){return (1)})()" />
+      </template>`,
+      errors: [
+        {
+          message: 'Expected space(s) after "return".',
+          line: 2
+        }]
     }
   ]
 })