Merge pull request scala#15825 from tgodzik/dont-drop-type-params

bugfix: Retain partial type params typying information on error
ckipp01 · Aug 5, 2022 · e560c2d · e560c2d
2 parents 44a2f72 + 40c4fe3
commit e560c2d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -1993,7 +1993,10 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
       typed(tree.tpt, AnyTypeConstructorProto)
     }
     val tparams = tpt1.tpe.typeParams
-    if (tparams.isEmpty) {
+     if tpt1.tpe.isError then
+       val args1 = tree.args.mapconserve(typedType(_))
+       assignType(cpy.AppliedTypeTree(tree)(tpt1, args1), tpt1, args1)
+     else if (tparams.isEmpty) {
       report.error(TypeDoesNotTakeParameters(tpt1.tpe, tree.args), tree.srcPos)
       tpt1
     }

diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala
@@ -1518,4 +1518,14 @@ class CompletionTest {
       .noCompletions()
   }
 
+  @Test def badTypeCompletions: Unit = {
+    code"""trait Foo
+          |object Test:
+          |  def foo: ArrayBuffer[Fo${m1}] = ???
+          """
+      .completion(m1, Set(
+          ("Foo",Class,"Foo")
+        )
+      )
+  }
 }
diff --git a/tests/neg/closure-args.scala b/tests/neg/closure-args.scala
@@ -14,7 +14,7 @@ val d = xs   // error
   .map: x => x.toString + xs.dropWhile:
     y => y > 0
 
-val c = List(xs.map: y => y + y)  // error // error
+val c = List(xs.map: y => y + y)  // error // error // error // error
 val d2: String = xs    // error
   .map: x => x.toString + xs.dropWhile: y => y > 0  // error // error
   .filter: z => !z.isEmpty // error

diff --git a/tests/neg/i15750.scala b/tests/neg/i15750.scala
@@ -0,0 +1,4 @@
+
+val foo = A[B] // error // error
+
+val bar = A[Int] // error
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@

		val foo = A[B] // error // error

		val bar = A[Int] // error