From 35073733974863edc674f2d4fb4c5e37dab7144c Mon Sep 17 00:00:00 2001
From: Maximo Mussini <maximomussini@gmail.com>
Date: Wed, 11 Jul 2018 10:31:18 +0200
Subject: [PATCH] Add 'OTHER_DIRECTIVE' category to attributes-order

---
 docs/rules/attributes-order.md      | 8 +++++---
 lib/rules/attributes-order.js       | 4 +++-
 tests/lib/rules/attributes-order.js | 5 +++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/rules/attributes-order.md b/docs/rules/attributes-order.md
index 999a19523..32101be08 100644
--- a/docs/rules/attributes-order.md
+++ b/docs/rules/attributes-order.md
@@ -18,6 +18,8 @@ ex: 'v-once', 'v-pre'
 ex: 'id'
 - UNIQUE
 ex: 'ref', 'key', 'slot'
+- OTHER_DIRECTIVE
+ex: 'v-focus', 'v-autosize'
 - BINDING
 ex: 'v-model', 'v-bind', ':property="foo"'
 - OTHER_ATTR
@@ -87,7 +89,7 @@ Specify custom order of attribute groups
 :+1: Examples of **correct** code with custom order`:
 
 ```html
-<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'BINDING', 'OTHER_ATTR', 'EVENTS', 'CONTENT', 'DEFINITION'] }] -->
+<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'BINDING', 'OTHER_ATTR', 'EVENTS', 'CONTENT', 'DEFINITION', 'OTHER_DIRECTIVE'] }] -->
 <div
   propOne="prop"
   propTwo="prop"
@@ -96,7 +98,7 @@ Specify custom order of attribute groups
 ```
 
 ```html
-<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'BINDING', 'DEFINITION', 'OTHER_ATTR', 'EVENTS', 'CONTENT'] }] -->
+<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'BINDING', 'DEFINITION', 'OTHER_ATTR', 'EVENTS', 'CONTENT', 'OTHER_DIRECTIVE'] }] -->
 <div
   ref="header"
   is="header"
@@ -108,7 +110,7 @@ Specify custom order of attribute groups
 :-1: Examples of **incorrect** code with custom order`:
 
 ```html
-<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'BINDING', 'DEFINITION', 'OTHER_ATTR', 'EVENTS', 'CONTENT'] }] -->
+<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'BINDING', 'DEFINITION', 'OTHER_ATTR', 'EVENTS', 'CONTENT', 'OTHER_DIRECTIVE'] }] -->
 <div
   ref="header"
   propOne="prop"
diff --git a/lib/rules/attributes-order.js b/lib/rules/attributes-order.js
index 0ae63b95a..cacd293c4 100644
--- a/lib/rules/attributes-order.js
+++ b/lib/rules/attributes-order.js
@@ -23,6 +23,8 @@ function getAttributeType (name, isDirective) {
       return 'EVENTS'
     } else if (name === 'html' || name === 'text') {
       return 'CONTENT'
+    } else {
+      return 'OTHER_DIRECTIVE'
     }
   } else {
     if (name === 'is') {
@@ -43,7 +45,7 @@ function getPosition (attribute, attributeOrder) {
 
 function create (context) {
   const sourceCode = context.getSourceCode()
-  let attributeOrder = ['DEFINITION', 'LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'BINDING', 'OTHER_ATTR', 'EVENTS', 'CONTENT']
+  let attributeOrder = ['DEFINITION', 'LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'OTHER_DIRECTIVE', 'BINDING', 'OTHER_ATTR', 'EVENTS', 'CONTENT']
   if (context.options[0] && context.options[0].order) {
     attributeOrder = context.options[0].order
   }
diff --git a/tests/lib/rules/attributes-order.js b/tests/lib/rules/attributes-order.js
index 9366ac130..d96f6889a 100644
--- a/tests/lib/rules/attributes-order.js
+++ b/tests/lib/rules/attributes-order.js
@@ -185,6 +185,7 @@ tester.run('attributes-order', rule, {
             'RENDER_MODIFIERS',
             'GLOBAL',
             'UNIQUE',
+            'OTHER_DIRECTIVE',
             'BINDING',
             'OTHER_ATTR',
             'EVENTS',
@@ -202,6 +203,7 @@ tester.run('attributes-order', rule, {
             'RENDER_MODIFIERS',
             'GLOBAL',
             'UNIQUE',
+            'OTHER_DIRECTIVE',
             'BINDING',
             'DEFINITION',
             'OTHER_ATTR',
@@ -236,6 +238,7 @@ tester.run('attributes-order', rule, {
             'DEFINITION',
             'EVENTS',
             'UNIQUE',
+            'OTHER_DIRECTIVE',
             'BINDING',
             'CONTENT',
             'GLOBAL',
@@ -343,6 +346,7 @@ tester.run('attributes-order', rule, {
             'RENDER_MODIFIERS',
             'GLOBAL',
             'UNIQUE',
+            'OTHER_DIRECTIVE',
             'BINDING',
             'DEFINITION',
             'OTHER_ATTR',
@@ -459,6 +463,7 @@ tester.run('attributes-order', rule, {
             'EVENTS',
             'BINDING',
             'UNIQUE',
+            'OTHER_DIRECTIVE',
             'DEFINITION',
             'CONDITIONALS',
             'LIST_RENDERING',