From c25b2fec9cd5acc63ff66ee418763d963df29ef4 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Wed, 1 Mar 2023 15:36:26 +0200
Subject: [PATCH] PY-59241 Replace instantiations of PyGenericType with
 PyTypeVarTypeImpl

The rest of the usages will be updated later on not to cause excess conflicts
with a few big features currently being developed.

Also removed a redundant constructor that can be replicated with
toInstance/toClass methods.

GitOrigin-RevId: d9af65d8ac865b1eb822607987f8195809f3ec23
---
 .../python/codeInsight/typing/PyTypingTypeProvider.java       | 2 +-
 .../src/com/jetbrains/python/psi/types/PyTypeParser.java      | 4 ++--
 .../src/com/jetbrains/python/psi/types/PyTypeVarTypeImpl.java | 4 ----
 python/testSrc/com/jetbrains/python/Py3TypeTest.java          | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java
index 8acf1001d9b6..e693d91f8b12 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java
@@ -1549,7 +1549,7 @@ public class PyTypingTypeProvider extends PyTypeProviderWithCustomContext<PyTypi
             final PyExpression firstArgument = arguments[0];
             if (firstArgument instanceof PyStringLiteralExpression) {
               final String name = ((PyStringLiteralExpression)firstArgument).getStringValue();
-              return new PyGenericType(name, getGenericTypeBound(arguments, context));
+              return new PyTypeVarTypeImpl(name, getGenericTypeBound(arguments, context));
             }
           }
         }
diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java
index be27fded17fe..3e9c0b047d91 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java
@@ -179,11 +179,11 @@ public final class PyTypeParser {
           final TextRange range = token.getRange();
           final ParseResult boundResult = value.getSecond();
           if (boundResult != null) {
-            final PyGenericType type1 = new PyGenericType(name, boundResult.getType());
+            final PyGenericType type1 = new PyTypeVarTypeImpl(name, boundResult.getType());
             final ParseResult result = new ParseResult(type1, range);
             return result.merge(boundResult).withType(type1);
           }
-          return new ParseResult(new PyGenericType(name, null), range);
+          return new ParseResult(new PyTypeVarTypeImpl(name, null), range);
         })
         .named("type-parameter");
 
diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeVarTypeImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeVarTypeImpl.java
index 6bac87fe7c43..249edcbf3936 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeVarTypeImpl.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeVarTypeImpl.java
@@ -7,8 +7,4 @@ public final class PyTypeVarTypeImpl extends PyGenericType {
   public PyTypeVarTypeImpl(@NotNull String name, @Nullable PyType bound) {
     super(name, bound);
   }
-
-  public PyTypeVarTypeImpl(@NotNull String name, @Nullable PyType bound, boolean isDefinition) {
-    super(name, bound, isDefinition);
-  }
 }
diff --git a/python/testSrc/com/jetbrains/python/Py3TypeTest.java b/python/testSrc/com/jetbrains/python/Py3TypeTest.java
index 277018dc7312..8115c2771d6d 100644
--- a/python/testSrc/com/jetbrains/python/Py3TypeTest.java
+++ b/python/testSrc/com/jetbrains/python/Py3TypeTest.java
@@ -1604,8 +1604,8 @@ public class Py3TypeTest extends PyTestCase {
 
   // PY-54336
   public void testCyclePreventionDuringGenericsSubstitution() {
-    PyGenericType typeVarT = new PyGenericType("T", null, false);
-    PyGenericType typeVarV = new PyGenericType("V", null, false);
+    PyGenericType typeVarT = new PyTypeVarTypeImpl("T", null);
+    PyGenericType typeVarV = new PyTypeVarTypeImpl("V", null);
     TypeEvalContext context = TypeEvalContext.codeInsightFallback(myFixture.getProject());
     PyType substituted;