From b0fe89180b330f2a75cc2aed763bdd4f86fb844a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Fri, 11 Mar 2022 16:37:03 +0100
Subject: [PATCH 01/12] Create a ``TypeVar`` style for ``invalid-name``

---
 ChangeLog                                     |  5 ++
 doc/user_guide/options.rst                    |  4 +
 doc/whatsnew/2.13.rst                         |  5 ++
 pylint/checkers/base.py                       | 82 +++++++++++--------
 pylint/constants.py                           |  1 +
 pylint/utils/linterstats.py                   |  7 ++
 pylintrc                                      |  4 +
 tests/checkers/unittest_base.py               | 50 ++++++++---
 .../t/typevar_naming_style_default.py         | 72 ++++++++++++++++
 .../t/typevar_naming_style_default.txt        | 19 +++++
 .../functional/t/typevar_naming_style_rgx.py  | 15 ++++
 .../functional/t/typevar_naming_style_rgx.rc  |  2 +
 .../functional/t/typevar_naming_style_rgx.txt |  3 +
 13 files changed, 224 insertions(+), 45 deletions(-)
 create mode 100644 tests/functional/t/typevar_naming_style_default.py
 create mode 100644 tests/functional/t/typevar_naming_style_default.txt
 create mode 100644 tests/functional/t/typevar_naming_style_rgx.py
 create mode 100644 tests/functional/t/typevar_naming_style_rgx.rc
 create mode 100644 tests/functional/t/typevar_naming_style_rgx.txt

diff --git a/ChangeLog b/ChangeLog
index 33dacc56bf..e32e36eda5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -450,6 +450,11 @@ Release date: TBA
   Insert your changelog randomly, it will reduce merge conflicts
   (Ie. not necessarily at the end)
 
+* ``invalid-name`` check now also checks ``TypeVar`` for a pattern set with the new option
+  ``--typevar-rgx`` option or a default ``PascalCase`` based style.
+
+  Closes #3401
+
 * Added new checker ``typevar-name-missing-variance``. Emitted when a covariant
   or contravariant ``TypeVar`` does not end with  ``_co`` or ``_contra`` respectively or
   when a ``TypeVar`` is not either but has a suffix.
diff --git a/doc/user_guide/options.rst b/doc/user_guide/options.rst
index 898c7a60a7..b7401680f0 100644
--- a/doc/user_guide/options.rst
+++ b/doc/user_guide/options.rst
@@ -39,6 +39,8 @@ name is found in, and not the type of object assigned.
 +--------------------+---------------------------------------------------------------------------------------------------+
 | ``inlinevar``      | Loop variables in list comprehensions and generator expressions.                                  |
 +--------------------+---------------------------------------------------------------------------------------------------+
+| ``typevar``        | Type variable declared with ``TypeVar``.                                                          |
++--------------------+---------------------------------------------------------------------------------------------------+
 
 Default behavior
 ~~~~~~~~~~~~~~~~
@@ -118,6 +120,8 @@ expression will lead to an instance of ``invalid-name``.
 
 .. option:: --inlinevar-rgx=<regex>
 
+.. option:: --typevar-rgx=<regex>
+
 Multiple naming styles for custom regular expressions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/whatsnew/2.13.rst b/doc/whatsnew/2.13.rst
index 96dfa518a9..fa637b6961 100644
--- a/doc/whatsnew/2.13.rst
+++ b/doc/whatsnew/2.13.rst
@@ -334,6 +334,11 @@ Other Changes
 
   Closes #5360, #3877
 
+* ``invalid-name`` check now also checks ``TypeVar`` for a pattern set with the new option
+  ``--typevar-rgx`` option or a default ``PascalCase`` based style.
+
+  Closes #3401
+
 * Fixed a false positive (affecting unreleased development) for
   ``used-before-assignment`` involving homonyms between filtered comprehensions
   and assignments in except blocks.
diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index 71dabd8efc..e677f29262 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -73,7 +73,7 @@
 import itertools
 import re
 import sys
-from typing import TYPE_CHECKING, Any, Dict, Iterator, Optional, Pattern, cast
+from typing import TYPE_CHECKING, Any, Dict, Iterator, Optional, Pattern, Tuple, cast
 
 import astroid
 from astroid import nodes
@@ -189,6 +189,13 @@ class AnyStyle(NamingStyle):
     "any": AnyStyle,
 }
 
+# Default patterns for name types that do not have styles
+DEFAULT_PATTERNS = {
+    "typevar": re.compile(
+        r"^_{0,2}(?:[^\W\da-z_]+|(?:[^\W\da-z_][^\WA-Z_]+)+T?(?<!Type))(?:_co(?:ntra)?)?$"
+    )
+}
+
 # do not require a doc string on private/system methods
 NO_REQUIRED_DOC_RGX = re.compile("^_")
 REVERSED_PROTOCOL_METHOD = "__reversed__"
@@ -1660,7 +1667,8 @@ def visit_for(self, node: nodes.For) -> None:
         self._check_redeclared_assign_name([node.target])
 
 
-KNOWN_NAME_TYPES = {
+# Name types that hae a style option
+KNOWN_NAME_TYPES_WITH_STYLE = {
     "module",
     "const",
     "class",
@@ -1674,6 +1682,12 @@ def visit_for(self, node: nodes.For) -> None:
     "inlinevar",
 }
 
+# Name types that only have a 'rgx' option
+KNOWN_NAME_TYPES = {
+    *KNOWN_NAME_TYPES_WITH_STYLE,
+    "typevar",
+}
+
 DEFAULT_NAMING_STYLES = {
     "module": "snake_case",
     "const": "UPPER_CASE",
@@ -1693,28 +1707,31 @@ def _create_naming_options():
     name_options = []
     for name_type in sorted(KNOWN_NAME_TYPES):
         human_readable_name = constants.HUMAN_READABLE_TYPES[name_type]
-        default_style = DEFAULT_NAMING_STYLES[name_type]
-        name_type = name_type.replace("_", "-")
-        name_options.append(
-            (
-                f"{name_type}-naming-style",
-                {
-                    "default": default_style,
-                    "type": "choice",
-                    "choices": list(NAMING_STYLES.keys()),
-                    "metavar": "<style>",
-                    "help": f"Naming style matching correct {human_readable_name} names.",
-                },
+        name_type_hyphened = name_type.replace("_", "-")
+
+        if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
+            default_style = DEFAULT_NAMING_STYLES[name_type]
+            name_options.append(
+                (
+                    f"{name_type_hyphened}-naming-style",
+                    {
+                        "default": default_style,
+                        "type": "choice",
+                        "choices": list(NAMING_STYLES.keys()),
+                        "metavar": "<style>",
+                        "help": f"Naming style matching correct {human_readable_name} names.",
+                    },
+                )
             )
-        )
+
         name_options.append(
             (
-                f"{name_type}-rgx",
+                f"{name_type_hyphened}-rgx",
                 {
                     "default": None,
                     "type": "regexp",
                     "metavar": "<regexp>",
-                    "help": f"Regular expression matching correct {human_readable_name} names. Overrides {name_type}-naming-style.",
+                    "help": f"Regular expression matching correct {human_readable_name} names. Overrides {name_type_hyphened}-naming-style.",
                 },
             )
         )
@@ -1862,15 +1879,19 @@ def open(self):
             re.compile(rgxp) for rgxp in self.config.bad_names_rgxs
         ]
 
-    def _create_naming_rules(self):
-        regexps = {}
-        hints = {}
+    def _create_naming_rules(self) -> Tuple[Dict[str, Pattern[str]], Dict[str, str]]:
+        regexps: Dict[str, Pattern[str]] = {}
+        hints: Dict[str, str] = {}
 
         for name_type in KNOWN_NAME_TYPES:
-            naming_style_option_name = f"{name_type}_naming_style"
-            naming_style_name = getattr(self.config, naming_style_option_name)
-
-            regexps[name_type] = NAMING_STYLES[naming_style_name].get_regex(name_type)
+            if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
+                naming_style_option_name = f"{name_type}_naming_style"
+                naming_style_name = getattr(self.config, naming_style_option_name)
+                regexps[name_type] = NAMING_STYLES[naming_style_name].get_regex(
+                    name_type
+                )
+            else:
+                regexps[name_type] = DEFAULT_PATTERNS[name_type]
 
             custom_regex_setting_name = f"{name_type}_rgx"
             custom_regex = getattr(self.config, custom_regex_setting_name, None)
@@ -1880,6 +1901,7 @@ def _create_naming_rules(self):
             if custom_regex is not None:
                 hints[name_type] = f"{custom_regex.pattern!r} pattern"
             else:
+                assert naming_style_name
                 hints[name_type] = f"{naming_style_name} naming style"
 
         return regexps, hints
@@ -2078,14 +2100,6 @@ def _name_disallowed_by_regex(self, name: str) -> bool:
     def _check_name(self, node_type, name, node, confidence=interfaces.HIGH):
         """Check for a name using the type's regexp."""
 
-        # pylint: disable=fixme
-        # TODO: move this down in the function and check TypeVar
-        # for name patterns as well.
-        # Check TypeVar names for variance suffixes
-        if node_type == "typevar":
-            self._check_typevar_variance(name, node)
-            return
-
         def _should_exempt_from_invalid_name(node):
             if node_type == "variable":
                 inferred = utils.safe_infer(node)
@@ -2111,6 +2125,10 @@ def _should_exempt_from_invalid_name(node):
         if match is None and not _should_exempt_from_invalid_name(node):
             self._raise_name_warning(None, node, node_type, name, confidence)
 
+        # Check TypeVar names for variance suffixes
+        if node_type == "typevar":
+            self._check_typevar_variance(name, node)
+
     def _check_assign_to_new_keyword_violation(self, name, node):
         keyword_first_version = self._name_became_keyword_in_version(
             name, self.KEYWORD_ONSET
diff --git a/pylint/constants.py b/pylint/constants.py
index ae87d4293d..9dd1ba7509 100644
--- a/pylint/constants.py
+++ b/pylint/constants.py
@@ -71,6 +71,7 @@ class WarningScope:
     "class_attribute": "class attribute",
     "class_const": "class constant",
     "inlinevar": "inline iteration",
+    "typevar": "type variable",
 }
 
 
diff --git a/pylint/utils/linterstats.py b/pylint/utils/linterstats.py
index 54b98d533e..deb83a2136 100644
--- a/pylint/utils/linterstats.py
+++ b/pylint/utils/linterstats.py
@@ -26,6 +26,7 @@ class BadNames(TypedDict):
     method: int
     module: int
     variable: int
+    typevar: int
 
 
 class CodeTypeCount(TypedDict):
@@ -102,6 +103,7 @@ def __init__(
             method=0,
             module=0,
             variable=0,
+            typevar=0,
         )
         self.by_module: Dict[str, ModuleStats] = by_module or {}
         self.by_msg: Dict[str, int] = by_msg or {}
@@ -171,6 +173,7 @@ def get_bad_names(
             "method",
             "module",
             "variable",
+            "typevar",
         ],
     ) -> int:
         """Get a bad names node count."""
@@ -192,6 +195,7 @@ def increase_bad_name(self, node_name: str, increase: int) -> None:
             "method",
             "module",
             "variable",
+            "typevar",
         }:
             raise ValueError("Node type not part of the bad_names stat")
 
@@ -208,6 +212,7 @@ def increase_bad_name(self, node_name: str, increase: int) -> None:
                 "method",
                 "module",
                 "variable",
+                "typevar",
             ],
             node_name,
         )
@@ -230,6 +235,7 @@ def reset_bad_names(self) -> None:
             method=0,
             module=0,
             variable=0,
+            typevar=0,
         )
 
     def get_code_count(
@@ -317,6 +323,7 @@ def merge_stats(stats: List[LinterStats]):
         merged.bad_names["method"] += stat.bad_names["method"]
         merged.bad_names["module"] += stat.bad_names["module"]
         merged.bad_names["variable"] += stat.bad_names["variable"]
+        merged.bad_names["typevar"] += stat.bad_names["typevar"]
 
         for mod_key, mod_value in stat.by_module.items():
             merged.by_module[mod_key] = mod_value
diff --git a/pylintrc b/pylintrc
index 4e093a87c5..dc47a95e4b 100644
--- a/pylintrc
+++ b/pylintrc
@@ -353,6 +353,10 @@ method-rgx=[a-z_][a-z0-9_]{2,}$
 # Naming hint for method names
 method-name-hint=[a-z_][a-z0-9_]{2,}$
 
+# Regular expression which can overwrite the naming style set by typevar-naming-style.
+# If left empty, type variables will be checked with the set naming style.
+typevar-rgx=
+
 # Regular expression which should only match function or class names that do
 # not require a docstring. Use ^(?!__init__$)_ to also check __init__.
 no-docstring-rgx=__.*__
diff --git a/tests/checkers/unittest_base.py b/tests/checkers/unittest_base.py
index fe46efcb4e..be32bbe968 100644
--- a/tests/checkers/unittest_base.py
+++ b/tests/checkers/unittest_base.py
@@ -210,17 +210,23 @@ class TestNamePresets(unittest.TestCase):
         SNAKE_CASE_NAMES | CAMEL_CASE_NAMES | UPPER_CASE_NAMES | PASCAL_CASE_NAMES
     )
 
-    def _test_name_is_correct_for_all_name_types(
+    def _test_name_is_correct_for_all_name_types_except_typevar(
         self, naming_style: Type[base.NamingStyle], name: str
     ) -> None:
         for name_type in base.KNOWN_NAME_TYPES:
-            self._test_is_correct(naming_style, name, name_type)
+            # pylint: disable-next=fixme
+            # TODO: See if there is a better way to tests these styles
+            if name_type != "typevar":
+                self._test_is_correct(naming_style, name, name_type)
 
-    def _test_name_is_incorrect_for_all_name_types(
+    def _test_name_is_incorrect_for_all_name_types_except_type_var(
         self, naming_style: Type[base.NamingStyle], name: str
     ) -> None:
         for name_type in base.KNOWN_NAME_TYPES:
-            self._test_is_incorrect(naming_style, name, name_type)
+            # pylint: disable-next=fixme
+            # TODO: See if there is a better way to tests these styles
+            if name_type != "typevar":
+                self._test_is_incorrect(naming_style, name, name_type)
 
     def _test_should_always_pass(self, naming_style: Type[base.NamingStyle]) -> None:
         always_pass_data = [
@@ -252,9 +258,13 @@ def test_snake_case(self) -> None:
         naming_style = base.SnakeCaseStyle
 
         for name in self.SNAKE_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
+            self._test_name_is_correct_for_all_name_types_except_typevar(
+                naming_style, name
+            )
         for name in self.ALL_NAMES - self.SNAKE_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+            self._test_name_is_incorrect_for_all_name_types_except_type_var(
+                naming_style, name
+            )
 
         self._test_should_always_pass(naming_style)
 
@@ -262,9 +272,13 @@ def test_camel_case(self) -> None:
         naming_style = base.CamelCaseStyle
 
         for name in self.CAMEL_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
+            self._test_name_is_correct_for_all_name_types_except_typevar(
+                naming_style, name
+            )
         for name in self.ALL_NAMES - self.CAMEL_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+            self._test_name_is_incorrect_for_all_name_types_except_type_var(
+                naming_style, name
+            )
 
         self._test_should_always_pass(naming_style)
 
@@ -272,10 +286,16 @@ def test_upper_case(self) -> None:
         naming_style = base.UpperCaseStyle
 
         for name in self.UPPER_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
+            self._test_name_is_correct_for_all_name_types_except_typevar(
+                naming_style, name
+            )
         for name in self.ALL_NAMES - self.UPPER_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
-        self._test_name_is_incorrect_for_all_name_types(naming_style, "UPPERcase")
+            self._test_name_is_incorrect_for_all_name_types_except_type_var(
+                naming_style, name
+            )
+        self._test_name_is_incorrect_for_all_name_types_except_type_var(
+            naming_style, "UPPERcase"
+        )
 
         self._test_should_always_pass(naming_style)
 
@@ -283,9 +303,13 @@ def test_pascal_case(self) -> None:
         naming_style = base.PascalCaseStyle
 
         for name in self.PASCAL_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
+            self._test_name_is_correct_for_all_name_types_except_typevar(
+                naming_style, name
+            )
         for name in self.ALL_NAMES - self.PASCAL_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+            self._test_name_is_incorrect_for_all_name_types_except_type_var(
+                naming_style, name
+            )
 
         self._test_should_always_pass(naming_style)
 
diff --git a/tests/functional/t/typevar_naming_style_default.py b/tests/functional/t/typevar_naming_style_default.py
new file mode 100644
index 0000000000..fcfc324dcd
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_default.py
@@ -0,0 +1,72 @@
+"""Test case for typevar-name-incorrect-variance with default settings"""
+# pylint: disable=too-few-public-methods
+
+from typing import TypeVar
+
+# PascalCase names with prefix
+GoodNameT = TypeVar("GoodNameT")
+_T = TypeVar("_T")
+_GoodNameT = TypeVar("_GoodNameT")
+__GoodNameT = TypeVar("__GoodNameT")
+GoodNameWithoutContra = TypeVar(  # [typevar-name-incorrect-variance]
+    "GoodNameWithoutContra", contravariant=True
+)
+GoodNameT_co = TypeVar("GoodNameT_co", covariant=True)
+GoodNameT_contra = TypeVar("GoodNameT_contra", contravariant=True)
+GoodBoundNameT = TypeVar("GoodBoundNameT", bound=int)
+GoodBoundNameT_co = TypeVar(  # [typevar-name-incorrect-variance]
+    "GoodBoundNameT_co", bound=int
+)
+GoodBoundNameT_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "GoodBoundNameT_contra", bound=int
+)
+GoodBoundNameT_co = TypeVar("GoodBoundNameT_co", bound=int, covariant=True)
+GoodBoundNameT_contra = TypeVar("GoodBoundNameT_contra", bound=int, contravariant=True)
+
+GoodBoundNameT_co = TypeVar("GoodBoundNameT_co", int, str, covariant=True)
+GoodBoundNameT_co = TypeVar(  # [typevar-name-incorrect-variance]
+    "GoodBoundNameT_co", int, str, contravariant=True
+)
+GoodBoundNameT_contra = TypeVar("GoodBoundNameT_contra", int, str, contravariant=True)
+GoodBoundNameT_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "GoodBoundNameT_contra", int, str, covariant=True
+)
+
+# Some of these will create a RunTime error but serve as a regression test
+T = TypeVar(  # [typevar-name-incorrect-variance]
+    "T", covariant=True, contravariant=True
+)
+T = TypeVar("T", covariant=False, contravariant=False)
+T_co = TypeVar("T_co", covariant=True, contravariant=True)
+T_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "T_contra", covariant=True, contravariant=True
+)
+T_co = TypeVar("T_co", covariant=True, contravariant=False)
+T_contra = TypeVar("T_contra", covariant=False, contravariant=True)
+
+# PascalCase names without prefix
+AnyStr = TypeVar("AnyStr")
+DeviceTypeT = TypeVar("DeviceTypeT")
+CALLABLE_T = TypeVar("CALLABLE_T")  # [invalid-name]
+DeviceType = TypeVar("DeviceType")  # [invalid-name]
+GoodNameWithoutContra = TypeVar(  # [typevar-name-incorrect-variance]
+    "GoodNameWithoutContra", contravariant=True
+)
+
+# camelCase names with prefix
+badName = TypeVar("badName")  # [invalid-name]
+badNameWithoutContra = TypeVar(  # [invalid-name, typevar-name-incorrect-variance]]
+    "badNameWithoutContra", contravariant=True
+)
+badName_co = TypeVar("badName_co", covariant=True)  # [invalid-name]
+badName_contra = TypeVar("badName_contra", contravariant=True)  # [invalid-name]
+
+# PascalCase names with lower letter prefix in tuple assignment
+(
+    a_BadName,  # [invalid-name]
+    a_BadNameWithoutContra,  # [invalid-name, typevar-name-incorrect-variance]
+) = TypeVar("a_BadName"), TypeVar("a_BadNameWithoutContra", contravariant=True)
+GoodName_co, a_BadName_contra = TypeVar(  # [invalid-name]
+    "GoodName_co", covariant=True
+), TypeVar("a_BadName_contra", contravariant=True)
+GoodName_co, VAR = TypeVar("GoodName_co", covariant=True), "a string"
diff --git a/tests/functional/t/typevar_naming_style_default.txt b/tests/functional/t/typevar_naming_style_default.txt
new file mode 100644
index 0000000000..52815e9e73
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_default.txt
@@ -0,0 +1,19 @@
+typevar-name-incorrect-variance:11:0:11:21::"Type variable ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
+typevar-name-incorrect-variance:17:0:17:17::"Type variable ""GoodBoundNameT_co"" is invariant, use ""GoodBoundNameT"" instead":INFERENCE
+typevar-name-incorrect-variance:20:0:20:21::"Type variable ""GoodBoundNameT_contra"" is invariant, use ""GoodBoundNameT"" instead":INFERENCE
+typevar-name-incorrect-variance:27:0:27:17::"Type variable ""GoodBoundNameT_co"" is contravariant, use ""GoodBoundNameT_contra"" instead":INFERENCE
+typevar-name-incorrect-variance:31:0:31:21::"Type variable ""GoodBoundNameT_contra"" is covariant, use ""GoodBoundNameT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:36:0:36:1::"Type variable ""T"" is covariant, use ""T_co"" instead":INFERENCE
+typevar-name-incorrect-variance:41:0:41:8::"Type variable ""T_contra"" is covariant, use ""T_co"" instead":INFERENCE
+invalid-name:50:0:50:10::"Type variable name ""CALLABLE_T"" doesn't conform to snake_case naming style":HIGH
+invalid-name:51:0:51:10::"Type variable name ""DeviceType"" doesn't conform to snake_case naming style":HIGH
+typevar-name-incorrect-variance:52:0:52:21::"Type variable ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
+invalid-name:57:0:57:7::"Type variable name ""badName"" doesn't conform to snake_case naming style":HIGH
+invalid-name:58:0:58:20::"Type variable name ""badNameWithoutContra"" doesn't conform to snake_case naming style":HIGH
+typevar-name-incorrect-variance:58:0:58:20::"Type variable ""badNameWithoutContra"" is contravariant, use ""badNameWithoutContra_contra"" instead":INFERENCE
+invalid-name:61:0:61:10::"Type variable name ""badName_co"" doesn't conform to snake_case naming style":HIGH
+invalid-name:62:0:62:14::"Type variable name ""badName_contra"" doesn't conform to snake_case naming style":HIGH
+invalid-name:66:4:66:13::"Type variable name ""a_BadName"" doesn't conform to snake_case naming style":HIGH
+invalid-name:67:4:67:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to snake_case naming style":HIGH
+typevar-name-incorrect-variance:67:4:67:26::"Type variable ""a_BadNameWithoutContra"" is contravariant, use ""a_BadNameWithoutContra_contra"" instead":INFERENCE
+invalid-name:69:13:69:29::"Type variable name ""a_BadName_contra"" doesn't conform to snake_case naming style":HIGH
diff --git a/tests/functional/t/typevar_naming_style_rgx.py b/tests/functional/t/typevar_naming_style_rgx.py
new file mode 100644
index 0000000000..c08eb9e41d
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_rgx.py
@@ -0,0 +1,15 @@
+"""Test case for typevar-name-missing-variance with non-default settings"""
+
+from typing import TypeVar
+
+# Name set by regex pattern
+TypeVarsShouldBeLikeThis = TypeVar("TypeVarsShouldBeLikeThis")
+TypeVarsShouldBeLikeThis_contra = TypeVar(
+    "TypeVarsShouldBeLikeThis_contra", contravariant=True
+)
+TypeVarsShouldBeLikeThis_co = TypeVar("TypeVarsShouldBeLikeThis_co", covariant=True)
+
+# Name using the standard style
+GoodNameT = TypeVar("GoodNameT")  # [invalid-name]
+GoodNameT_co = TypeVar("GoodNameT_co", covariant=True)  # [invalid-name]
+GoodNameT_contra = TypeVar("GoodNameT_contra", contravariant=True)  # [invalid-name]
diff --git a/tests/functional/t/typevar_naming_style_rgx.rc b/tests/functional/t/typevar_naming_style_rgx.rc
new file mode 100644
index 0000000000..347da995e9
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_rgx.rc
@@ -0,0 +1,2 @@
+[BASIC]
+typevar-rgx=TypeVarsShouldBeLikeThis(_co(ntra)?)?$
diff --git a/tests/functional/t/typevar_naming_style_rgx.txt b/tests/functional/t/typevar_naming_style_rgx.txt
new file mode 100644
index 0000000000..0b291bbf37
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_rgx.txt
@@ -0,0 +1,3 @@
+invalid-name:13:0:13:9::"Type variable name ""GoodNameT"" doesn't conform to 'TypeVarsShouldBeLikeThis(_co(ntra)?)?$' pattern":HIGH
+invalid-name:14:0:14:12::"Type variable name ""GoodNameT_co"" doesn't conform to 'TypeVarsShouldBeLikeThis(_co(ntra)?)?$' pattern":HIGH
+invalid-name:15:0:15:16::"Type variable name ""GoodNameT_contra"" doesn't conform to 'TypeVarsShouldBeLikeThis(_co(ntra)?)?$' pattern":HIGH

From 0edcdef36f1e9c20d3541974b9eacc8cb3c178f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Fri, 11 Mar 2022 16:45:02 +0100
Subject: [PATCH 02/12] Textual changes

---
 pylint/checkers/base.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index e677f29262..aa41464b1a 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -1667,7 +1667,7 @@ def visit_for(self, node: nodes.For) -> None:
         self._check_redeclared_assign_name([node.target])
 
 
-# Name types that hae a style option
+# Name types that have a style option
 KNOWN_NAME_TYPES_WITH_STYLE = {
     "module",
     "const",
@@ -1708,9 +1708,11 @@ def _create_naming_options():
     for name_type in sorted(KNOWN_NAME_TYPES):
         human_readable_name = constants.HUMAN_READABLE_TYPES[name_type]
         name_type_hyphened = name_type.replace("_", "-")
+        help_msg = f"Regular expression matching correct {human_readable_name} names."
 
         if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
             default_style = DEFAULT_NAMING_STYLES[name_type]
+            help_msg += f" Overrides {name_type_hyphened}-naming-style."
             name_options.append(
                 (
                     f"{name_type_hyphened}-naming-style",
@@ -1724,6 +1726,9 @@ def _create_naming_options():
                 )
             )
 
+        help_msg += (
+            " If left empty, type variables will be checked with the set naming style."
+        )
         name_options.append(
             (
                 f"{name_type_hyphened}-rgx",
@@ -1731,7 +1736,7 @@ def _create_naming_options():
                     "default": None,
                     "type": "regexp",
                     "metavar": "<regexp>",
-                    "help": f"Regular expression matching correct {human_readable_name} names. Overrides {name_type_hyphened}-naming-style.",
+                    "help": help_msg,
                 },
             )
         )

From 58fd897119455827a9db465f8bc52a7ef6325ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Fri, 11 Mar 2022 16:53:03 +0100
Subject: [PATCH 03/12] Fix tests

---
 pylint/checkers/base.py                        |  2 +-
 .../t/typevar_naming_style_default.txt         | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index aa41464b1a..473d892e00 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -1897,6 +1897,7 @@ def _create_naming_rules(self) -> Tuple[Dict[str, Pattern[str]], Dict[str, str]]
                 )
             else:
                 regexps[name_type] = DEFAULT_PATTERNS[name_type]
+                naming_style_name = "predefined"
 
             custom_regex_setting_name = f"{name_type}_rgx"
             custom_regex = getattr(self.config, custom_regex_setting_name, None)
@@ -1906,7 +1907,6 @@ def _create_naming_rules(self) -> Tuple[Dict[str, Pattern[str]], Dict[str, str]]
             if custom_regex is not None:
                 hints[name_type] = f"{custom_regex.pattern!r} pattern"
             else:
-                assert naming_style_name
                 hints[name_type] = f"{naming_style_name} naming style"
 
         return regexps, hints
diff --git a/tests/functional/t/typevar_naming_style_default.txt b/tests/functional/t/typevar_naming_style_default.txt
index 52815e9e73..a725a1e1ba 100644
--- a/tests/functional/t/typevar_naming_style_default.txt
+++ b/tests/functional/t/typevar_naming_style_default.txt
@@ -5,15 +5,15 @@ typevar-name-incorrect-variance:27:0:27:17::"Type variable ""GoodBoundNameT_co""
 typevar-name-incorrect-variance:31:0:31:21::"Type variable ""GoodBoundNameT_contra"" is covariant, use ""GoodBoundNameT_co"" instead":INFERENCE
 typevar-name-incorrect-variance:36:0:36:1::"Type variable ""T"" is covariant, use ""T_co"" instead":INFERENCE
 typevar-name-incorrect-variance:41:0:41:8::"Type variable ""T_contra"" is covariant, use ""T_co"" instead":INFERENCE
-invalid-name:50:0:50:10::"Type variable name ""CALLABLE_T"" doesn't conform to snake_case naming style":HIGH
-invalid-name:51:0:51:10::"Type variable name ""DeviceType"" doesn't conform to snake_case naming style":HIGH
+invalid-name:50:0:50:10::"Type variable name ""CALLABLE_T"" doesn't conform to predefined naming style":HIGH
+invalid-name:51:0:51:10::"Type variable name ""DeviceType"" doesn't conform to predefined naming style":HIGH
 typevar-name-incorrect-variance:52:0:52:21::"Type variable ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
-invalid-name:57:0:57:7::"Type variable name ""badName"" doesn't conform to snake_case naming style":HIGH
-invalid-name:58:0:58:20::"Type variable name ""badNameWithoutContra"" doesn't conform to snake_case naming style":HIGH
+invalid-name:57:0:57:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
+invalid-name:58:0:58:20::"Type variable name ""badNameWithoutContra"" doesn't conform to predefined naming style":HIGH
 typevar-name-incorrect-variance:58:0:58:20::"Type variable ""badNameWithoutContra"" is contravariant, use ""badNameWithoutContra_contra"" instead":INFERENCE
-invalid-name:61:0:61:10::"Type variable name ""badName_co"" doesn't conform to snake_case naming style":HIGH
-invalid-name:62:0:62:14::"Type variable name ""badName_contra"" doesn't conform to snake_case naming style":HIGH
-invalid-name:66:4:66:13::"Type variable name ""a_BadName"" doesn't conform to snake_case naming style":HIGH
-invalid-name:67:4:67:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to snake_case naming style":HIGH
+invalid-name:61:0:61:10::"Type variable name ""badName_co"" doesn't conform to predefined naming style":HIGH
+invalid-name:62:0:62:14::"Type variable name ""badName_contra"" doesn't conform to predefined naming style":HIGH
+invalid-name:66:4:66:13::"Type variable name ""a_BadName"" doesn't conform to predefined naming style":HIGH
+invalid-name:67:4:67:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to predefined naming style":HIGH
 typevar-name-incorrect-variance:67:4:67:26::"Type variable ""a_BadNameWithoutContra"" is contravariant, use ""a_BadNameWithoutContra_contra"" instead":INFERENCE
-invalid-name:69:13:69:29::"Type variable name ""a_BadName_contra"" doesn't conform to snake_case naming style":HIGH
+invalid-name:69:13:69:29::"Type variable name ""a_BadName_contra"" doesn't conform to predefined naming style":HIGH

From e9da6f09a950746829dc28da260b305f72c4c602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 09:39:01 +0100
Subject: [PATCH 04/12] Apply suggestions from code review

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
---
 ChangeLog               | 4 ++--
 doc/whatsnew/2.13.rst   | 4 ++--
 pylint/checkers/base.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e32e36eda5..9ce5147aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -450,8 +450,8 @@ Release date: TBA
   Insert your changelog randomly, it will reduce merge conflicts
   (Ie. not necessarily at the end)
 
-* ``invalid-name`` check now also checks ``TypeVar`` for a pattern set with the new option
-  ``--typevar-rgx`` option or a default ``PascalCase`` based style.
+* Improve ``invalid-name`` check for ``TypeVar`` names.
+  The accepted pattern can be customized with ``--typevar-rgx``.
 
   Closes #3401
 
diff --git a/doc/whatsnew/2.13.rst b/doc/whatsnew/2.13.rst
index fa637b6961..fa2ac92287 100644
--- a/doc/whatsnew/2.13.rst
+++ b/doc/whatsnew/2.13.rst
@@ -334,8 +334,8 @@ Other Changes
 
   Closes #5360, #3877
 
-* ``invalid-name`` check now also checks ``TypeVar`` for a pattern set with the new option
-  ``--typevar-rgx`` option or a default ``PascalCase`` based style.
+* Improve ``invalid-name`` check for ``TypeVar`` names.
+  The accepted pattern can be customized with ``--typevar-rgx``.
 
   Closes #3401
 
diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index 473d892e00..cde5d9dd91 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -1682,7 +1682,7 @@ def visit_for(self, node: nodes.For) -> None:
     "inlinevar",
 }
 
-# Name types that only have a 'rgx' option
+# Name types that have a 'rgx' option
 KNOWN_NAME_TYPES = {
     *KNOWN_NAME_TYPES_WITH_STYLE,
     "typevar",

From 93da592de8a741b39db491ae7dc429462ff9abb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 09:41:46 +0100
Subject: [PATCH 05/12] Improve help message

---
 pylint/checkers/base.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index cde5d9dd91..7a6d950aec 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -1708,11 +1708,13 @@ def _create_naming_options():
     for name_type in sorted(KNOWN_NAME_TYPES):
         human_readable_name = constants.HUMAN_READABLE_TYPES[name_type]
         name_type_hyphened = name_type.replace("_", "-")
-        help_msg = f"Regular expression matching correct {human_readable_name} names."
+        help_msg = f"Regular expression matching correct {human_readable_name} names. "
+        if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
+            help_msg += f"Overrides {name_type_hyphened}-naming-style. "
+        help_msg += f"If left empty, {human_readable_name} will be checked with the set naming style."
 
         if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
             default_style = DEFAULT_NAMING_STYLES[name_type]
-            help_msg += f" Overrides {name_type_hyphened}-naming-style."
             name_options.append(
                 (
                     f"{name_type_hyphened}-naming-style",
@@ -1726,9 +1728,6 @@ def _create_naming_options():
                 )
             )
 
-        help_msg += (
-            " If left empty, type variables will be checked with the set naming style."
-        )
         name_options.append(
             (
                 f"{name_type_hyphened}-rgx",

From ea087ab2f63fcd69e7980b149adf6dfbc9bc64c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 09:50:54 +0100
Subject: [PATCH 06/12] Review

---
 pylint/checkers/base.py         |  7 +++--
 tests/checkers/unittest_base.py | 54 +++++++++------------------------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index 7a6d950aec..86d6ce5b69 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -1708,11 +1708,13 @@ def _create_naming_options():
     for name_type in sorted(KNOWN_NAME_TYPES):
         human_readable_name = constants.HUMAN_READABLE_TYPES[name_type]
         name_type_hyphened = name_type.replace("_", "-")
+
         help_msg = f"Regular expression matching correct {human_readable_name} names. "
         if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
             help_msg += f"Overrides {name_type_hyphened}-naming-style. "
         help_msg += f"If left empty, {human_readable_name} will be checked with the set naming style."
 
+        # Add style option for names that support it
         if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
             default_style = DEFAULT_NAMING_STYLES[name_type]
             name_options.append(
@@ -1889,14 +1891,13 @@ def _create_naming_rules(self) -> Tuple[Dict[str, Pattern[str]], Dict[str, str]]
 
         for name_type in KNOWN_NAME_TYPES:
             if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
-                naming_style_option_name = f"{name_type}_naming_style"
-                naming_style_name = getattr(self.config, naming_style_option_name)
+                naming_style_name = getattr(self.config, f"{name_type}_naming_style")
                 regexps[name_type] = NAMING_STYLES[naming_style_name].get_regex(
                     name_type
                 )
             else:
-                regexps[name_type] = DEFAULT_PATTERNS[name_type]
                 naming_style_name = "predefined"
+                regexps[name_type] = DEFAULT_PATTERNS[name_type]
 
             custom_regex_setting_name = f"{name_type}_rgx"
             custom_regex = getattr(self.config, custom_regex_setting_name, None)
diff --git a/tests/checkers/unittest_base.py b/tests/checkers/unittest_base.py
index be32bbe968..83f919c16d 100644
--- a/tests/checkers/unittest_base.py
+++ b/tests/checkers/unittest_base.py
@@ -210,23 +210,17 @@ class TestNamePresets(unittest.TestCase):
         SNAKE_CASE_NAMES | CAMEL_CASE_NAMES | UPPER_CASE_NAMES | PASCAL_CASE_NAMES
     )
 
-    def _test_name_is_correct_for_all_name_types_except_typevar(
+    def _test_name_is_correct_for_all_name_types(
         self, naming_style: Type[base.NamingStyle], name: str
     ) -> None:
-        for name_type in base.KNOWN_NAME_TYPES:
-            # pylint: disable-next=fixme
-            # TODO: See if there is a better way to tests these styles
-            if name_type != "typevar":
-                self._test_is_correct(naming_style, name, name_type)
+        for name_type in base.KNOWN_NAME_TYPES_WITH_STYLE:
+            self._test_is_correct(naming_style, name, name_type)
 
-    def _test_name_is_incorrect_for_all_name_types_except_type_var(
+    def _test_name_is_incorrect_for_all_name_types(
         self, naming_style: Type[base.NamingStyle], name: str
     ) -> None:
-        for name_type in base.KNOWN_NAME_TYPES:
-            # pylint: disable-next=fixme
-            # TODO: See if there is a better way to tests these styles
-            if name_type != "typevar":
-                self._test_is_incorrect(naming_style, name, name_type)
+        for name_type in base.KNOWN_NAME_TYPES_WITH_STYLE:
+            self._test_is_incorrect(naming_style, name, name_type)
 
     def _test_should_always_pass(self, naming_style: Type[base.NamingStyle]) -> None:
         always_pass_data = [
@@ -258,13 +252,9 @@ def test_snake_case(self) -> None:
         naming_style = base.SnakeCaseStyle
 
         for name in self.SNAKE_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types_except_typevar(
-                naming_style, name
-            )
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
         for name in self.ALL_NAMES - self.SNAKE_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types_except_type_var(
-                naming_style, name
-            )
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
 
         self._test_should_always_pass(naming_style)
 
@@ -272,13 +262,9 @@ def test_camel_case(self) -> None:
         naming_style = base.CamelCaseStyle
 
         for name in self.CAMEL_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types_except_typevar(
-                naming_style, name
-            )
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
         for name in self.ALL_NAMES - self.CAMEL_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types_except_type_var(
-                naming_style, name
-            )
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
 
         self._test_should_always_pass(naming_style)
 
@@ -286,16 +272,10 @@ def test_upper_case(self) -> None:
         naming_style = base.UpperCaseStyle
 
         for name in self.UPPER_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types_except_typevar(
-                naming_style, name
-            )
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
         for name in self.ALL_NAMES - self.UPPER_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types_except_type_var(
-                naming_style, name
-            )
-        self._test_name_is_incorrect_for_all_name_types_except_type_var(
-            naming_style, "UPPERcase"
-        )
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+        self._test_name_is_incorrect_for_all_name_types(naming_style, "UPPERcase")
 
         self._test_should_always_pass(naming_style)
 
@@ -303,13 +283,9 @@ def test_pascal_case(self) -> None:
         naming_style = base.PascalCaseStyle
 
         for name in self.PASCAL_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types_except_typevar(
-                naming_style, name
-            )
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
         for name in self.ALL_NAMES - self.PASCAL_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types_except_type_var(
-                naming_style, name
-            )
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
 
         self._test_should_always_pass(naming_style)
 

From 49f91745bb738211a9d06e2832d3378d49e60e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 12 Mar 2022 10:01:24 +0100
Subject: [PATCH 07/12] Add doc

---
 doc/user_guide/options.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/user_guide/options.rst b/doc/user_guide/options.rst
index b7401680f0..c5d8fbaaf9 100644
--- a/doc/user_guide/options.rst
+++ b/doc/user_guide/options.rst
@@ -84,6 +84,15 @@ Following options are exposed:
 
 .. option:: --inlinevar-naming-style=<style>
 
+Predefined Naming Patterns
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Pylint provides predefined naming patterns for some names. These patterns are often
+based on a Naming Style but there is no option to choose one of the styles mentioned above.
+The pattern can be overwritten with the options discussed below.
+
+The following type of names are checked with a predefined pattern:
+
+- TypeVars. Accepted names include: `T`, `TypeVar`, `_CallableT`, `_T_co`.
 
 Custom regular expressions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

From 527e283089a7e40cd538261fa606f92e7fe3439a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Mon, 14 Mar 2022 21:00:54 +0100
Subject: [PATCH 08/12] Apply suggestions from code review

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
---
 pylint/checkers/base.py                            | 2 +-
 tests/functional/t/typevar_naming_style_default.py | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index 86d6ce5b69..cea9781ae4 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -1712,7 +1712,7 @@ def _create_naming_options():
         help_msg = f"Regular expression matching correct {human_readable_name} names. "
         if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
             help_msg += f"Overrides {name_type_hyphened}-naming-style. "
-        help_msg += f"If left empty, {human_readable_name} will be checked with the set naming style."
+        help_msg += f"If left empty, {human_readable_name} names will be checked with the set naming style."
 
         # Add style option for names that support it
         if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
diff --git a/tests/functional/t/typevar_naming_style_default.py b/tests/functional/t/typevar_naming_style_default.py
index fcfc324dcd..87f49d8ff1 100644
--- a/tests/functional/t/typevar_naming_style_default.py
+++ b/tests/functional/t/typevar_naming_style_default.py
@@ -49,15 +49,9 @@
 DeviceTypeT = TypeVar("DeviceTypeT")
 CALLABLE_T = TypeVar("CALLABLE_T")  # [invalid-name]
 DeviceType = TypeVar("DeviceType")  # [invalid-name]
-GoodNameWithoutContra = TypeVar(  # [typevar-name-incorrect-variance]
-    "GoodNameWithoutContra", contravariant=True
-)
 
 # camelCase names with prefix
 badName = TypeVar("badName")  # [invalid-name]
-badNameWithoutContra = TypeVar(  # [invalid-name, typevar-name-incorrect-variance]]
-    "badNameWithoutContra", contravariant=True
-)
 badName_co = TypeVar("badName_co", covariant=True)  # [invalid-name]
 badName_contra = TypeVar("badName_contra", contravariant=True)  # [invalid-name]
 

From 6bd9b6a8944b4724d75095a445f32a3ff455db8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Mon, 14 Mar 2022 21:01:06 +0100
Subject: [PATCH 09/12] Reformatted to table

---
 doc/user_guide/options.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/user_guide/options.rst b/doc/user_guide/options.rst
index c5d8fbaaf9..f55b96346a 100644
--- a/doc/user_guide/options.rst
+++ b/doc/user_guide/options.rst
@@ -92,7 +92,11 @@ The pattern can be overwritten with the options discussed below.
 
 The following type of names are checked with a predefined pattern:
 
-- TypeVars. Accepted names include: `T`, `TypeVar`, `_CallableT`, `_T_co`.
++--------------------+---------------------------------------------------+------------------------------------------------------------+
+| Name type          | Good names                                        | Bad names                                                  |
++====================+===================================================+============================================================+
+| ``TypeVar``        |`T`, `_CallableT`, `_T_co`, `AnyStr`, `DeviceTypeT`| `DICT_T`, `CALLABLE_T`, `ENUM_T`, `DeviceType`, `_StrType` |
++--------------------+---------------------------------------------------+------------------------------------------------------------+
 
 Custom regular expressions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

From bb4617b0a3d6574c9c51b5bf00ef6c8309f14957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Mon, 14 Mar 2022 21:02:48 +0100
Subject: [PATCH 10/12] Update tests

---
 .../t/typevar_naming_style_default.py         | 17 -----------
 .../t/typevar_naming_style_default.txt        | 29 +++++++------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/tests/functional/t/typevar_naming_style_default.py b/tests/functional/t/typevar_naming_style_default.py
index 87f49d8ff1..105ddd20c5 100644
--- a/tests/functional/t/typevar_naming_style_default.py
+++ b/tests/functional/t/typevar_naming_style_default.py
@@ -14,23 +14,6 @@
 GoodNameT_co = TypeVar("GoodNameT_co", covariant=True)
 GoodNameT_contra = TypeVar("GoodNameT_contra", contravariant=True)
 GoodBoundNameT = TypeVar("GoodBoundNameT", bound=int)
-GoodBoundNameT_co = TypeVar(  # [typevar-name-incorrect-variance]
-    "GoodBoundNameT_co", bound=int
-)
-GoodBoundNameT_contra = TypeVar(  # [typevar-name-incorrect-variance]
-    "GoodBoundNameT_contra", bound=int
-)
-GoodBoundNameT_co = TypeVar("GoodBoundNameT_co", bound=int, covariant=True)
-GoodBoundNameT_contra = TypeVar("GoodBoundNameT_contra", bound=int, contravariant=True)
-
-GoodBoundNameT_co = TypeVar("GoodBoundNameT_co", int, str, covariant=True)
-GoodBoundNameT_co = TypeVar(  # [typevar-name-incorrect-variance]
-    "GoodBoundNameT_co", int, str, contravariant=True
-)
-GoodBoundNameT_contra = TypeVar("GoodBoundNameT_contra", int, str, contravariant=True)
-GoodBoundNameT_contra = TypeVar(  # [typevar-name-incorrect-variance]
-    "GoodBoundNameT_contra", int, str, covariant=True
-)
 
 # Some of these will create a RunTime error but serve as a regression test
 T = TypeVar(  # [typevar-name-incorrect-variance]
diff --git a/tests/functional/t/typevar_naming_style_default.txt b/tests/functional/t/typevar_naming_style_default.txt
index a725a1e1ba..a0f2257d40 100644
--- a/tests/functional/t/typevar_naming_style_default.txt
+++ b/tests/functional/t/typevar_naming_style_default.txt
@@ -1,19 +1,12 @@
 typevar-name-incorrect-variance:11:0:11:21::"Type variable ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
-typevar-name-incorrect-variance:17:0:17:17::"Type variable ""GoodBoundNameT_co"" is invariant, use ""GoodBoundNameT"" instead":INFERENCE
-typevar-name-incorrect-variance:20:0:20:21::"Type variable ""GoodBoundNameT_contra"" is invariant, use ""GoodBoundNameT"" instead":INFERENCE
-typevar-name-incorrect-variance:27:0:27:17::"Type variable ""GoodBoundNameT_co"" is contravariant, use ""GoodBoundNameT_contra"" instead":INFERENCE
-typevar-name-incorrect-variance:31:0:31:21::"Type variable ""GoodBoundNameT_contra"" is covariant, use ""GoodBoundNameT_co"" instead":INFERENCE
-typevar-name-incorrect-variance:36:0:36:1::"Type variable ""T"" is covariant, use ""T_co"" instead":INFERENCE
-typevar-name-incorrect-variance:41:0:41:8::"Type variable ""T_contra"" is covariant, use ""T_co"" instead":INFERENCE
-invalid-name:50:0:50:10::"Type variable name ""CALLABLE_T"" doesn't conform to predefined naming style":HIGH
-invalid-name:51:0:51:10::"Type variable name ""DeviceType"" doesn't conform to predefined naming style":HIGH
-typevar-name-incorrect-variance:52:0:52:21::"Type variable ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
-invalid-name:57:0:57:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
-invalid-name:58:0:58:20::"Type variable name ""badNameWithoutContra"" doesn't conform to predefined naming style":HIGH
-typevar-name-incorrect-variance:58:0:58:20::"Type variable ""badNameWithoutContra"" is contravariant, use ""badNameWithoutContra_contra"" instead":INFERENCE
-invalid-name:61:0:61:10::"Type variable name ""badName_co"" doesn't conform to predefined naming style":HIGH
-invalid-name:62:0:62:14::"Type variable name ""badName_contra"" doesn't conform to predefined naming style":HIGH
-invalid-name:66:4:66:13::"Type variable name ""a_BadName"" doesn't conform to predefined naming style":HIGH
-invalid-name:67:4:67:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to predefined naming style":HIGH
-typevar-name-incorrect-variance:67:4:67:26::"Type variable ""a_BadNameWithoutContra"" is contravariant, use ""a_BadNameWithoutContra_contra"" instead":INFERENCE
-invalid-name:69:13:69:29::"Type variable name ""a_BadName_contra"" doesn't conform to predefined naming style":HIGH
+typevar-name-incorrect-variance:19:0:19:1::"Type variable ""T"" is covariant, use ""T_co"" instead":INFERENCE
+typevar-name-incorrect-variance:24:0:24:8::"Type variable ""T_contra"" is covariant, use ""T_co"" instead":INFERENCE
+invalid-name:33:0:33:10::"Type variable name ""CALLABLE_T"" doesn't conform to predefined naming style":HIGH
+invalid-name:34:0:34:10::"Type variable name ""DeviceType"" doesn't conform to predefined naming style":HIGH
+invalid-name:37:0:37:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
+invalid-name:38:0:38:10::"Type variable name ""badName_co"" doesn't conform to predefined naming style":HIGH
+invalid-name:39:0:39:14::"Type variable name ""badName_contra"" doesn't conform to predefined naming style":HIGH
+invalid-name:43:4:43:13::"Type variable name ""a_BadName"" doesn't conform to predefined naming style":HIGH
+invalid-name:44:4:44:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to predefined naming style":HIGH
+typevar-name-incorrect-variance:44:4:44:26::"Type variable ""a_BadNameWithoutContra"" is contravariant, use ""a_BadNameWithoutContra_contra"" instead":INFERENCE
+invalid-name:46:13:46:29::"Type variable name ""a_BadName_contra"" doesn't conform to predefined naming style":HIGH

From 57ca5218777ea9baa35512c5b233b2aa6faa7aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Mon, 14 Mar 2022 21:10:28 +0100
Subject: [PATCH 11/12] Comment tout

---
 pylintrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pylintrc b/pylintrc
index dc47a95e4b..1cacac6c71 100644
--- a/pylintrc
+++ b/pylintrc
@@ -354,8 +354,7 @@ method-rgx=[a-z_][a-z0-9_]{2,}$
 method-name-hint=[a-z_][a-z0-9_]{2,}$
 
 # Regular expression which can overwrite the naming style set by typevar-naming-style.
-# If left empty, type variables will be checked with the set naming style.
-typevar-rgx=
+#typevar-rgx=
 
 # Regular expression which should only match function or class names that do
 # not require a docstring. Use ^(?!__init__$)_ to also check __init__.

From cb78be423f38f6a8d0838516fcc2b6e2c24fe9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Tue, 15 Mar 2022 11:30:29 +0100
Subject: [PATCH 12/12] Update doc/user_guide/options.rst

---
 doc/user_guide/options.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user_guide/options.rst b/doc/user_guide/options.rst
index f55b96346a..6e1535e249 100644
--- a/doc/user_guide/options.rst
+++ b/doc/user_guide/options.rst
@@ -95,7 +95,7 @@ The following type of names are checked with a predefined pattern:
 +--------------------+---------------------------------------------------+------------------------------------------------------------+
 | Name type          | Good names                                        | Bad names                                                  |
 +====================+===================================================+============================================================+
-| ``TypeVar``        |`T`, `_CallableT`, `_T_co`, `AnyStr`, `DeviceTypeT`| `DICT_T`, `CALLABLE_T`, `ENUM_T`, `DeviceType`, `_StrType` |
+| ``typevar``        |`T`, `_CallableT`, `_T_co`, `AnyStr`, `DeviceTypeT`| `DICT_T`, `CALLABLE_T`, `ENUM_T`, `DeviceType`, `_StrType` |
 +--------------------+---------------------------------------------------+------------------------------------------------------------+
 
 Custom regular expressions