bugfix when generating scala imports: consider type parameter names w…

…hen inside a class
ScalablyTyped · Dec 28, 2021 · 14a68c4 · 14a68c4
1 parent f6a7e28
commit 14a68c4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...src/main/scala/org/scalablytyped/converter/internal/scalajs/transforms/ShortenNames.scala b/...src/main/scala/org/scalablytyped/converter/internal/scalajs/transforms/ShortenNames.scala
@@ -137,9 +137,15 @@ object ShortenNames {
             case c: ClassTree => c.ctors.exists(_.params.exists(_.name === shortName))
             case _ => false
           }
+          def tparamsClash = x match {
+            case cls: ClassTree => cls.tparams.exists(_.name === shortName)
+            case _ => false
+          }
+
           (x.name === shortName && x.codePath =/= longName) ||
           among(x.index, longName, methodsAreConflict) ||
           amongParents(scope, parentsResolver, x, longName, methodsAreConflict) ||
+          tparamsClash ||
           ctorClash
 
         case x: PackageTree =>