Chore: use meta.messages in space-unary-ops

eslint · Aug 23, 2018 · fbd5867 · fbd5867
1 parent 2f741f7
commit fbd5867
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 53 deletions.
diff --git a/lib/rules/space-unary-ops.js b/lib/rules/space-unary-ops.js
@@ -44,7 +44,14 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            unexpectedBefore: "Unexpected space before unary operator '{{operator}}'.",
+            unexpectedAfter: "Unexpected space after unary operator '{{word}}'.",
+            wordOperator: "Unary word operator '{{word}}' must be followed by whitespace.",
+            operator: "Unary operator '{{operator}}' must be followed by whitespace.",
+            beforeUnaryExpressions: "Space is required before unary expressions '{{token}}'."
+        }
     },
 
     create(context) {
@@ -96,7 +103,7 @@ module.exports = {
             if (secondToken.range[0] === firstToken.range[1]) {
                 context.report({
                     node,
-                    message: "Unary word operator '{{word}}' must be followed by whitespace.",
+                    messageId: "wordOperator",
                     data: {
                         word
                     },
@@ -120,7 +127,7 @@ module.exports = {
                 if (secondToken.range[0] > firstToken.range[1]) {
                     context.report({
                         node,
-                        message: "Unexpected space after unary word operator '{{word}}'.",
+                        messageId: "unexpectedAfter",
                         data: {
                             word
                         },
@@ -196,7 +203,7 @@ module.exports = {
                 if (firstToken.range[1] === secondToken.range[0]) {
                     context.report({
                         node,
-                        message: "Unary operator '{{operator}}' must be followed by whitespace.",
+                        messageId: "operator",
                         data: {
                             operator: firstToken.value
                         },
@@ -209,7 +216,7 @@ module.exports = {
                 if (firstToken.range[1] === secondToken.range[0]) {
                     context.report({
                         node,
-                        message: "Space is required before unary expressions '{{token}}'.",
+                        messageId: "beforeUnaryExpressions",
                         data: {
                             token: secondToken.value
                         },
@@ -233,9 +240,9 @@ module.exports = {
                 if (secondToken.range[0] > firstToken.range[1]) {
                     context.report({
                         node,
-                        message: "Unexpected space after unary operator '{{operator}}'.",
+                        messageId: "unexpectedAfter",
                         data: {
-                            operator: firstToken.value
+                            word: firstToken.value
                         },
                         fix(fixer) {
                             if (astUtils.canTokensBeAdjacent(firstToken, secondToken)) {
@@ -249,7 +256,7 @@ module.exports = {
                 if (secondToken.range[0] > firstToken.range[1]) {
                     context.report({
                         node,
-                        message: "Unexpected space before unary operator '{{operator}}'.",
+                        messageId: "unexpectedBefore",
                         data: {
                             operator: secondToken.value
                         },