From 36dc7ce5b3e5486d459c0bfff98410e2ad0e4fd9 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <git@joshuakgoldberg.com>
Date: Sat, 19 Nov 2022 09:46:09 -0500
Subject: [PATCH] chore: removed eslint@6 fallbacks for rule messages, and a
 snapshot (#6041)

---
 packages/eslint-plugin/src/rules/no-invalid-this.ts       | 5 +----
 packages/eslint-plugin/src/rules/no-unused-expressions.ts | 6 +-----
 .../eslint-plugin/src/rules/no-useless-constructor.ts     | 8 ++------
 packages/eslint-plugin/src/rules/quotes.ts                | 5 +----
 packages/eslint-plugin/src/rules/semi.ts                  | 6 +-----
 5 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/packages/eslint-plugin/src/rules/no-invalid-this.ts b/packages/eslint-plugin/src/rules/no-invalid-this.ts
index 36236d0b4af..5cf502a7af9 100644
--- a/packages/eslint-plugin/src/rules/no-invalid-this.ts
+++ b/packages/eslint-plugin/src/rules/no-invalid-this.ts
@@ -23,10 +23,7 @@ export default createRule<Options, MessageIds>({
       recommended: false,
       extendsBaseRule: true,
     },
-    // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6
-    messages: baseRule.meta.messages ?? {
-      unexpectedThis: "Unexpected 'this'.",
-    },
+    messages: baseRule.meta.messages,
     hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
   },
diff --git a/packages/eslint-plugin/src/rules/no-unused-expressions.ts b/packages/eslint-plugin/src/rules/no-unused-expressions.ts
index 96830736f9d..0ad71a47fba 100644
--- a/packages/eslint-plugin/src/rules/no-unused-expressions.ts
+++ b/packages/eslint-plugin/src/rules/no-unused-expressions.ts
@@ -20,11 +20,7 @@ export default util.createRule<Options, MessageIds>({
     },
     hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
-    // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6
-    messages: baseRule.meta.messages ?? {
-      unusedExpression:
-        'Expected an assignment or function call and instead saw an expression.',
-    },
+    messages: baseRule.meta.messages,
   },
   defaultOptions: [
     {
diff --git a/packages/eslint-plugin/src/rules/no-useless-constructor.ts b/packages/eslint-plugin/src/rules/no-useless-constructor.ts
index 98fcc9631c5..b83b2706fc8 100644
--- a/packages/eslint-plugin/src/rules/no-useless-constructor.ts
+++ b/packages/eslint-plugin/src/rules/no-useless-constructor.ts
@@ -54,10 +54,7 @@ export default util.createRule<Options, MessageIds>({
     },
     hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
-    // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6
-    messages: baseRule.meta.messages ?? {
-      noUselessConstructor: 'Useless constructor.',
-    },
+    messages: baseRule.meta.messages,
   },
   defaultOptions: [],
   create(context) {
@@ -65,8 +62,7 @@ export default util.createRule<Options, MessageIds>({
     return {
       MethodDefinition(node): void {
         if (
-          node.value &&
-          node.value.type === AST_NODE_TYPES.FunctionExpression &&
+          node.value?.type === AST_NODE_TYPES.FunctionExpression &&
           node.value.body &&
           checkAccessibility(node) &&
           checkParams(node)
diff --git a/packages/eslint-plugin/src/rules/quotes.ts b/packages/eslint-plugin/src/rules/quotes.ts
index 4a23e9632d7..59f718c50ae 100644
--- a/packages/eslint-plugin/src/rules/quotes.ts
+++ b/packages/eslint-plugin/src/rules/quotes.ts
@@ -21,10 +21,7 @@ export default util.createRule<Options, MessageIds>({
     },
     fixable: 'code',
     hasSuggestions: baseRule.meta.hasSuggestions,
-    // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6
-    messages: baseRule.meta.messages ?? {
-      wrongQuotes: 'Strings must use {{description}}.',
-    },
+    messages: baseRule.meta.messages,
     schema: baseRule.meta.schema,
   },
   defaultOptions: [
diff --git a/packages/eslint-plugin/src/rules/semi.ts b/packages/eslint-plugin/src/rules/semi.ts
index c6da7c7912e..5fad3f3b395 100644
--- a/packages/eslint-plugin/src/rules/semi.ts
+++ b/packages/eslint-plugin/src/rules/semi.ts
@@ -22,11 +22,7 @@ export default util.createRule<Options, MessageIds>({
     fixable: 'code',
     hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
-    // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6
-    messages: baseRule.meta.messages ?? {
-      missingSemi: 'Missing semicolon.',
-      extraSemi: 'Extra semicolon.',
-    },
+    messages: baseRule.meta.messages,
   },
   defaultOptions: [
     'always',