From b85cbb5a3a64cd7b21bf6b2cbd3f75c0f11db8fd Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Mon, 17 Jul 2023 18:34:16 +0200
Subject: [PATCH] Disallow taking singleton types of packages again

Fixes #18109
---
 compiler/src/dotty/tools/dotc/typer/Checking.scala | 13 ++++++++-----
 tests/neg/i18109.scala                             | 11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 tests/neg/i18109.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
index b2ab5332c3b2..df5639b50302 100644
--- a/compiler/src/dotty/tools/dotc/typer/Checking.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -748,13 +748,16 @@ object Checking {
     if sym.isNoValue && !ctx.isJava then
       report.error(JavaSymbolIsNotAValue(sym), tree.srcPos)
 
+  /** Check that `tree` refers to a value, unless `tree` is selected or applied
+   *  (singleton types x.type don't count as selections).
+   */
   def checkValue(tree: Tree, proto: Type)(using Context): tree.type =
     tree match
-      case tree: RefTree
-      if tree.name.isTermName
-         && !proto.isInstanceOf[SelectionProto]
-         && !proto.isInstanceOf[FunOrPolyProto] =>
-        checkValue(tree)
+      case tree: RefTree if tree.name.isTermName =>
+        proto match
+          case _: SelectionProto if proto ne SingletonTypeProto => // no value check
+          case _: FunOrPolyProto => // no value check
+          case _ => checkValue(tree)
       case _ =>
     tree
 
diff --git a/tests/neg/i18109.scala b/tests/neg/i18109.scala
new file mode 100644
index 000000000000..7df13b0c36ff
--- /dev/null
+++ b/tests/neg/i18109.scala
@@ -0,0 +1,11 @@
+package foo {}
+
+package bar {
+  object Test {
+    def qux[A] = 123
+    def main(args: Array[String]): Unit = {
+      val y = qux[foo.type] // error
+      val x = valueOf[foo.type] // error
+    }
+  }
+}
\ No newline at end of file