Chore: use meta.messages in no-fallthrough

eslint · Aug 20, 2018 · 2f741f7 · 2f741f7
1 parent e6fbac2
commit 2f741f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/lib/rules/no-fallthrough.js b/lib/rules/no-fallthrough.js
@@ -72,7 +72,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            case: "Expected a 'break' statement before 'case'.",
+            default: "Expected a 'break' statement before 'default'."
+        }
     },
 
     create(context) {
@@ -109,8 +113,7 @@ module.exports = {
                  */
                 if (fallthroughCase && !hasFallthroughComment(node, context, fallthroughCommentPattern)) {
                     context.report({
-                        message: "Expected a 'break' statement before '{{type}}'.",
-                        data: { type: node.test ? "case" : "default" },
+                        messageId: node.test ? "case" : "default",
                         node
                     });
                 }

diff --git a/tests/lib/rules/no-fallthrough.js b/tests/lib/rules/no-fallthrough.js
@@ -17,7 +17,7 @@ const rule = require("../../../lib/rules/no-fallthrough"),
 //------------------------------------------------------------------------------
 
 const errorsDefault = [{
-    message: "Expected a 'break' statement before 'default'.",
+    messageId: "default",
     type: "SwitchCase"
 }];
 
@@ -91,7 +91,7 @@ ruleTester.run("no-fallthrough", rule, {
             code: "switch(foo) { case 0: a();\ncase 1: b() }",
             errors: [
                 {
-                    message: "Expected a 'break' statement before 'case'.",
+                    messageId: "case",
                     type: "SwitchCase",
                     line: 2,
                     column: 1
@@ -102,7 +102,7 @@ ruleTester.run("no-fallthrough", rule, {
             code: "switch(foo) { case 0: a();\ndefault: b() }",
             errors: [
                 {
-                    message: "Expected a 'break' statement before 'default'.",
+                    messageId: "default",
                     type: "SwitchCase",
                     line: 2,
                     column: 1
@@ -148,7 +148,7 @@ ruleTester.run("no-fallthrough", rule, {
             }],
             errors: [
                 {
-                    message: "Expected a 'break' statement before 'case'.",
+                    messageId: "case",
                     type: "SwitchCase",
                     line: 3,
                     column: 1
@@ -162,8 +162,8 @@ ruleTester.run("no-fallthrough", rule, {
             }],
             errors: [
                 {
-                    message: errorsDefault[0].message,
-                    type: errorsDefault[0].type,
+                    messageId: "default",
+                    type: "SwitchCase",
                     line: 4,
                     column: 1
                 }