bugfix: Case completions in summonFrom

scalameta · Mar 22, 2024 · 8e97536 · 8e97536
1 parent 63a0738
commit 8e97536
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala
@@ -26,6 +26,7 @@ import dotty.tools.dotc.core.Symbols.NoSymbol
 import dotty.tools.dotc.core.Symbols.Symbol
 import dotty.tools.dotc.core.Types.AndType
 import dotty.tools.dotc.core.Types.ClassInfo
+import dotty.tools.dotc.core.Types.NoType
 import dotty.tools.dotc.core.Types.OrType
 import dotty.tools.dotc.core.Types.Type
 import dotty.tools.dotc.core.Types.TypeRef
@@ -94,7 +95,7 @@ object CaseKeywordCompletion:
         Some(sel.tpe.widen.metalsDealias)
 
     selTpe
-      .map { selTpe =>
+      .collect { case selTpe if selTpe != NoType =>
         val selectorSym = selTpe.typeSymbol
         // Special handle case when selector is a tuple or `FunctionN`.
         if definitions.isTupleClass(selectorSym) || definitions.isFunctionClass(

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionCaseSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionCaseSuite.scala
@@ -833,4 +833,37 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     filter = _.contains("exhaustive")
   )
 
+  check(
+    "summonFrom".tag(IgnoreScala2),
+    """
+      |object A {
+      |  import scala.compiletime.summonFrom
+      |  class A
+      |  
+      |  inline def f: Any = summonFrom {
+      |    case x@@: A => ???  // error: ambiguous givens
+      |  }
+      |}
+      |""".stripMargin,
+    ""
+  )
+
+  check(
+    "summonFrom1".tag(IgnoreScala2),
+    """
+      |object A {
+      |  import scala.compiletime.summonFrom
+      |  
+      |  class A
+      |  given a1: A = new A
+      |  given a2: A = new A
+      |  
+      |  inline def f: Any = summonFrom {
+      |    case x@@: A => ???  // error: ambiguous givens
+      |  }
+      |}
+      |""".stripMargin,
+    ""
+  )
+
 }