From 8617586b3e089c8abb4a4095c22e0e6b806f32bb Mon Sep 17 00:00:00 2001
From: noti0na1 <8036790+noti0na1@users.noreply.github.com>
Date: Wed, 20 Mar 2024 22:17:49 +0000
Subject: [PATCH 001/505] Skip widenSingletons in widenInferred if the inferred
 type is too large

---
 .../tools/dotc/core/ConstraintHandling.scala  |   31 +-
 tests/pos/i19907/slow_1000_3.scala            | 1024 ++++++++++++++++
 tests/pos/i19907/slow_1000_4.scala            | 1026 +++++++++++++++++
 tests/pos/i19907/slow_100_3.scala             |  124 ++
 4 files changed, 2200 insertions(+), 5 deletions(-)
 create mode 100644 tests/pos/i19907/slow_1000_3.scala
 create mode 100644 tests/pos/i19907/slow_1000_4.scala
 create mode 100644 tests/pos/i19907/slow_100_3.scala

diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
index 0ceaaac75063..df20505e65ce 100644
--- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
+++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
@@ -657,11 +657,24 @@ trait ConstraintHandling {
    * as those could leak the annotation to users (see run/inferred-repeated-result).
    */
   def widenInferred(inst: Type, bound: Type, widenUnions: Boolean)(using Context): Type =
+    def typeSize(tp: Type): Int = tp match
+      case tp: AndOrType => typeSize(tp.tp1) + typeSize(tp.tp2)
+      case _ => 1
+
     def widenOr(tp: Type) =
       if widenUnions then
-        val tpw = tp.widenUnion
-        if (tpw ne tp) && !isTransparent(tpw, traitOnly = false) && (tpw <:< bound) then tpw else tp
-      else tp.hardenUnions
+         val tpw = tp.widenUnion
+         if tpw ne tp then
+           if tpw.isTransparent() then
+             // Now also widen singletons of soft unions. Before these were skipped
+             // since we widenUnion on soft unions is independent of whether singletons
+             // are widened or not. This avoids an expensive subtype check in widenSingle,
+             // see 19907_*.scala for test cases.
+             tp.widenSingletons()
+           else if tpw <:< bound then tpw
+           else tp
+         else tp
+       else tp.hardenUnions
 
     def widenSingle(tp: Type) =
       val tpw = tp.widenSingletons
@@ -674,8 +687,16 @@ trait ConstraintHandling {
     val wideInst =
       if isSingleton(bound) then inst
       else
-        val widenedFromSingle = widenSingle(inst)
-        val widenedFromUnion = widenOr(widenedFromSingle)
+        val widenedFromUnion =
+          if widenUnions && typeSize(inst) > 64 then
+            // If the inferred type `inst` is too large, the subtype check for `bound` in `widenSingle`
+            // can be expensive due to comparisons between large union types, so we avoid it by
+            // `widenUnion` directly here.
+            // See issue #19907.
+            widenOr(inst)
+          else
+            val widenedFromSingle = widenSingle(inst)
+            if widenUnions then widenOr(widenedFromSingle) else widenedFromSingle.hardenUnions
         val widened = dropTransparentTraits(widenedFromUnion, bound)
         widenIrreducible(widened)
 
diff --git a/tests/pos/i19907/slow_1000_3.scala b/tests/pos/i19907/slow_1000_3.scala
new file mode 100644
index 000000000000..5ed7d2f7e1bf
--- /dev/null
+++ b/tests/pos/i19907/slow_1000_3.scala
@@ -0,0 +1,1024 @@
+
+
+abstract class ServerEndpoint[-R, F[_]] {
+  type T0
+  type T1
+  type T2
+}
+object ServerEndpoint {
+  type Full[_T0, _T1, _T2, -R, F[_]] =
+    ServerEndpoint[R, F] { 
+    type T0 = _T0
+    type T1 = _T1
+    type T2 = _T2
+    }
+  def apply[_T0, _T1, _T2, R, F[_]]: ServerEndpoint.Full[_T0, _T1, _T2, R, F] = ???
+}
+
+object Test {
+  type Route = ServerEndpoint[Any, Option]
+  def routes: List[ServerEndpoint[Any, Option]] = { 
+    val instance0 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance1 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance2 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance3 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance4 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance5 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance6 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance7 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance8 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance9 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance10 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance11 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance12 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance13 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance14 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance15 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance16 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance17 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance18 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance19 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance20 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance21 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance22 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance23 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance24 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance25 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance26 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance27 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance28 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance29 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance30 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance31 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance32 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance33 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance34 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance35 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance36 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance37 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance38 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance39 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance40 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance41 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance42 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance43 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance44 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance45 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance46 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance47 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance48 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance49 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance50 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance51 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance52 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance53 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance54 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance55 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance56 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance57 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance58 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance59 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance60 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance61 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance62 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance63 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance64 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance65 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance66 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance67 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance68 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance69 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance70 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance71 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance72 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance73 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance74 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance75 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance76 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance77 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance78 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance79 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance80 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance81 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance82 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance83 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance84 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance85 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance86 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance87 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance88 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance89 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance90 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance91 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance92 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance93 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance94 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance95 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance96 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance97 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance98 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance99 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance100 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance101 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance102 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance103 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance104 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance105 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance106 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance107 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance108 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance109 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance110 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance111 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance112 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance113 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance114 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance115 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance116 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance117 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance118 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance119 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance120 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance121 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance122 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance123 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance124 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance125 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance126 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance127 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance128 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance129 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance130 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance131 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance132 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance133 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance134 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance135 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance136 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance137 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance138 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance139 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance140 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance141 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance142 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance143 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance144 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance145 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance146 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance147 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance148 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance149 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance150 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance151 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance152 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance153 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance154 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance155 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance156 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance157 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance158 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance159 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance160 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance161 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance162 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance163 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance164 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance165 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance166 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance167 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance168 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance169 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance170 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance171 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance172 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance173 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance174 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance175 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance176 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance177 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance178 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance179 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance180 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance181 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance182 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance183 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance184 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance185 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance186 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance187 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance188 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance189 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance190 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance191 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance192 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance193 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance194 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance195 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance196 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance197 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance198 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance199 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance200 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance201 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance202 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance203 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance204 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance205 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance206 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance207 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance208 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance209 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance210 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance211 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance212 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance213 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance214 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance215 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance216 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance217 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance218 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance219 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance220 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance221 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance222 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance223 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance224 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance225 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance226 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance227 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance228 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance229 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance230 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance231 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance232 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance233 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance234 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance235 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance236 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance237 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance238 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance239 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance240 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance241 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance242 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance243 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance244 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance245 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance246 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance247 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance248 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance249 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance250 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance251 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance252 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance253 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance254 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance255 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance256 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance257 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance258 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance259 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance260 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance261 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance262 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance263 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance264 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance265 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance266 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance267 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance268 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance269 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance270 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance271 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance272 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance273 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance274 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance275 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance276 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance277 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance278 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance279 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance280 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance281 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance282 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance283 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance284 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance285 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance286 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance287 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance288 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance289 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance290 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance291 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance292 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance293 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance294 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance295 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance296 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance297 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance298 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance299 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance300 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance301 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance302 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance303 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance304 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance305 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance306 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance307 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance308 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance309 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance310 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance311 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance312 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance313 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance314 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance315 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance316 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance317 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance318 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance319 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance320 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance321 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance322 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance323 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance324 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance325 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance326 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance327 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance328 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance329 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance330 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance331 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance332 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance333 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance334 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance335 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance336 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance337 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance338 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance339 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance340 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance341 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance342 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance343 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance344 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance345 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance346 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance347 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance348 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance349 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance350 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance351 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance352 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance353 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance354 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance355 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance356 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance357 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance358 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance359 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance360 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance361 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance362 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance363 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance364 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance365 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance366 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance367 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance368 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance369 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance370 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance371 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance372 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance373 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance374 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance375 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance376 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance377 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance378 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance379 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance380 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance381 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance382 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance383 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance384 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance385 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance386 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance387 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance388 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance389 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance390 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance391 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance392 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance393 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance394 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance395 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance396 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance397 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance398 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance399 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance400 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance401 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance402 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance403 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance404 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance405 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance406 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance407 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance408 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance409 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance410 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance411 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance412 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance413 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance414 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance415 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance416 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance417 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance418 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance419 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance420 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance421 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance422 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance423 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance424 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance425 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance426 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance427 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance428 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance429 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance430 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance431 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance432 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance433 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance434 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance435 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance436 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance437 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance438 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance439 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance440 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance441 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance442 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance443 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance444 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance445 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance446 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance447 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance448 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance449 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance450 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance451 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance452 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance453 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance454 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance455 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance456 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance457 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance458 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance459 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance460 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance461 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance462 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance463 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance464 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance465 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance466 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance467 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance468 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance469 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance470 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance471 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance472 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance473 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance474 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance475 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance476 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance477 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance478 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance479 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance480 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance481 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance482 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance483 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance484 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance485 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance486 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance487 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance488 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance489 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance490 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance491 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance492 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance493 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance494 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance495 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance496 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance497 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance498 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance499 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance500 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance501 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance502 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance503 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance504 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance505 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance506 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance507 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance508 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance509 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance510 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance511 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance512 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance513 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance514 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance515 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance516 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance517 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance518 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance519 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance520 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance521 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance522 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance523 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance524 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance525 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance526 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance527 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance528 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance529 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance530 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance531 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance532 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance533 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance534 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance535 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance536 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance537 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance538 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance539 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance540 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance541 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance542 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance543 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance544 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance545 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance546 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance547 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance548 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance549 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance550 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance551 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance552 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance553 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance554 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance555 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance556 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance557 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance558 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance559 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance560 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance561 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance562 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance563 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance564 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance565 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance566 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance567 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance568 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance569 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance570 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance571 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance572 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance573 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance574 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance575 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance576 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance577 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance578 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance579 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance580 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance581 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance582 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance583 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance584 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance585 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance586 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance587 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance588 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance589 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance590 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance591 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance592 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance593 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance594 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance595 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance596 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance597 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance598 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance599 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance600 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance601 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance602 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance603 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance604 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance605 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance606 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance607 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance608 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance609 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance610 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance611 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance612 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance613 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance614 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance615 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance616 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance617 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance618 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance619 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance620 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance621 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance622 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance623 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance624 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance625 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance626 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance627 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance628 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance629 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance630 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance631 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance632 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance633 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance634 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance635 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance636 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance637 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance638 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance639 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance640 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance641 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance642 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance643 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance644 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance645 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance646 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance647 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance648 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance649 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance650 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance651 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance652 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance653 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance654 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance655 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance656 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance657 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance658 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance659 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance660 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance661 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance662 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance663 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance664 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance665 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance666 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance667 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance668 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance669 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance670 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance671 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance672 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance673 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance674 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance675 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance676 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance677 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance678 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance679 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance680 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance681 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance682 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance683 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance684 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance685 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance686 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance687 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance688 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance689 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance690 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance691 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance692 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance693 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance694 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance695 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance696 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance697 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance698 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance699 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance700 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance701 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance702 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance703 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance704 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance705 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance706 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance707 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance708 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance709 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance710 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance711 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance712 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance713 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance714 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance715 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance716 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance717 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance718 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance719 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance720 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance721 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance722 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance723 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance724 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance725 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance726 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance727 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance728 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance729 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance730 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance731 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance732 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance733 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance734 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance735 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance736 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance737 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance738 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance739 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance740 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance741 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance742 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance743 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance744 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance745 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance746 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance747 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance748 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance749 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance750 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance751 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance752 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance753 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance754 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance755 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance756 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance757 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance758 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance759 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance760 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance761 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance762 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance763 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance764 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance765 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance766 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance767 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance768 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance769 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance770 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance771 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance772 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance773 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance774 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance775 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance776 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance777 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance778 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance779 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance780 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance781 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance782 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance783 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance784 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance785 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance786 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance787 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance788 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance789 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance790 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance791 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance792 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance793 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance794 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance795 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance796 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance797 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance798 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance799 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance800 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance801 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance802 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance803 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance804 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance805 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance806 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance807 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance808 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance809 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance810 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance811 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance812 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance813 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance814 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance815 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance816 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance817 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance818 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance819 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance820 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance821 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance822 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance823 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance824 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance825 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance826 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance827 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance828 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance829 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance830 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance831 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance832 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance833 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance834 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance835 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance836 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance837 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance838 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance839 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance840 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance841 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance842 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance843 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance844 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance845 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance846 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance847 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance848 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance849 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance850 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance851 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance852 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance853 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance854 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance855 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance856 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance857 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance858 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance859 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance860 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance861 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance862 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance863 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance864 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance865 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance866 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance867 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance868 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance869 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance870 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance871 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance872 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance873 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance874 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance875 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance876 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance877 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance878 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance879 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance880 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance881 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance882 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance883 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance884 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance885 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance886 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance887 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance888 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance889 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance890 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance891 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance892 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance893 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance894 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance895 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance896 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance897 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance898 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance899 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance900 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance901 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance902 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance903 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance904 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance905 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance906 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance907 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance908 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance909 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance910 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance911 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance912 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance913 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance914 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance915 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance916 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance917 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance918 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance919 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance920 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance921 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance922 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance923 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance924 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance925 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance926 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance927 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance928 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance929 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance930 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance931 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance932 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance933 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance934 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance935 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance936 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance937 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance938 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance939 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance940 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance941 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance942 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance943 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance944 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance945 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance946 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance947 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance948 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance949 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance950 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance951 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance952 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance953 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance954 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance955 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance956 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance957 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance958 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance959 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance960 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance961 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance962 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance963 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance964 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance965 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance966 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance967 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance968 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance969 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance970 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance971 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance972 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance973 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance974 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance975 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance976 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance977 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance978 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance979 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance980 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance981 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance982 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance983 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance984 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance985 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance986 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance987 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance988 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance989 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance990 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance991 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance992 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance993 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance994 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance995 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance996 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance997 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance998 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance999 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    List(instance0, instance1, instance2, instance3, instance4, instance5, instance6, instance7, instance8, instance9, instance10, instance11, instance12, instance13, instance14, instance15, instance16, instance17, instance18, instance19, instance20, instance21, instance22, instance23, instance24, instance25, instance26, instance27, instance28, instance29, instance30, instance31, instance32, instance33, instance34, instance35, instance36, instance37, instance38, instance39, instance40, instance41, instance42, instance43, instance44, instance45, instance46, instance47, instance48, instance49, instance50, instance51, instance52, instance53, instance54, instance55, instance56, instance57, instance58, instance59, instance60, instance61, instance62, instance63, instance64, instance65, instance66, instance67, instance68, instance69, instance70, instance71, instance72, instance73, instance74, instance75, instance76, instance77, instance78, instance79, instance80, instance81, instance82, instance83, instance84, instance85, instance86, instance87, instance88, instance89, instance90, instance91, instance92, instance93, instance94, instance95, instance96, instance97, instance98, instance99, instance100, instance101, instance102, instance103, instance104, instance105, instance106, instance107, instance108, instance109, instance110, instance111, instance112, instance113, instance114, instance115, instance116, instance117, instance118, instance119, instance120, instance121, instance122, instance123, instance124, instance125, instance126, instance127, instance128, instance129, instance130, instance131, instance132, instance133, instance134, instance135, instance136, instance137, instance138, instance139, instance140, instance141, instance142, instance143, instance144, instance145, instance146, instance147, instance148, instance149, instance150, instance151, instance152, instance153, instance154, instance155, instance156, instance157, instance158, instance159, instance160, instance161, instance162, instance163, instance164, instance165, instance166, instance167, instance168, instance169, instance170, instance171, instance172, instance173, instance174, instance175, instance176, instance177, instance178, instance179, instance180, instance181, instance182, instance183, instance184, instance185, instance186, instance187, instance188, instance189, instance190, instance191, instance192, instance193, instance194, instance195, instance196, instance197, instance198, instance199, instance200, instance201, instance202, instance203, instance204, instance205, instance206, instance207, instance208, instance209, instance210, instance211, instance212, instance213, instance214, instance215, instance216, instance217, instance218, instance219, instance220, instance221, instance222, instance223, instance224, instance225, instance226, instance227, instance228, instance229, instance230, instance231, instance232, instance233, instance234, instance235, instance236, instance237, instance238, instance239, instance240, instance241, instance242, instance243, instance244, instance245, instance246, instance247, instance248, instance249, instance250, instance251, instance252, instance253, instance254, instance255, instance256, instance257, instance258, instance259, instance260, instance261, instance262, instance263, instance264, instance265, instance266, instance267, instance268, instance269, instance270, instance271, instance272, instance273, instance274, instance275, instance276, instance277, instance278, instance279, instance280, instance281, instance282, instance283, instance284, instance285, instance286, instance287, instance288, instance289, instance290, instance291, instance292, instance293, instance294, instance295, instance296, instance297, instance298, instance299, instance300, instance301, instance302, instance303, instance304, instance305, instance306, instance307, instance308, instance309, instance310, instance311, instance312, instance313, instance314, instance315, instance316, instance317, instance318, instance319, instance320, instance321, instance322, instance323, instance324, instance325, instance326, instance327, instance328, instance329, instance330, instance331, instance332, instance333, instance334, instance335, instance336, instance337, instance338, instance339, instance340, instance341, instance342, instance343, instance344, instance345, instance346, instance347, instance348, instance349, instance350, instance351, instance352, instance353, instance354, instance355, instance356, instance357, instance358, instance359, instance360, instance361, instance362, instance363, instance364, instance365, instance366, instance367, instance368, instance369, instance370, instance371, instance372, instance373, instance374, instance375, instance376, instance377, instance378, instance379, instance380, instance381, instance382, instance383, instance384, instance385, instance386, instance387, instance388, instance389, instance390, instance391, instance392, instance393, instance394, instance395, instance396, instance397, instance398, instance399, instance400, instance401, instance402, instance403, instance404, instance405, instance406, instance407, instance408, instance409, instance410, instance411, instance412, instance413, instance414, instance415, instance416, instance417, instance418, instance419, instance420, instance421, instance422, instance423, instance424, instance425, instance426, instance427, instance428, instance429, instance430, instance431, instance432, instance433, instance434, instance435, instance436, instance437, instance438, instance439, instance440, instance441, instance442, instance443, instance444, instance445, instance446, instance447, instance448, instance449, instance450, instance451, instance452, instance453, instance454, instance455, instance456, instance457, instance458, instance459, instance460, instance461, instance462, instance463, instance464, instance465, instance466, instance467, instance468, instance469, instance470, instance471, instance472, instance473, instance474, instance475, instance476, instance477, instance478, instance479, instance480, instance481, instance482, instance483, instance484, instance485, instance486, instance487, instance488, instance489, instance490, instance491, instance492, instance493, instance494, instance495, instance496, instance497, instance498, instance499, instance500, instance501, instance502, instance503, instance504, instance505, instance506, instance507, instance508, instance509, instance510, instance511, instance512, instance513, instance514, instance515, instance516, instance517, instance518, instance519, instance520, instance521, instance522, instance523, instance524, instance525, instance526, instance527, instance528, instance529, instance530, instance531, instance532, instance533, instance534, instance535, instance536, instance537, instance538, instance539, instance540, instance541, instance542, instance543, instance544, instance545, instance546, instance547, instance548, instance549, instance550, instance551, instance552, instance553, instance554, instance555, instance556, instance557, instance558, instance559, instance560, instance561, instance562, instance563, instance564, instance565, instance566, instance567, instance568, instance569, instance570, instance571, instance572, instance573, instance574, instance575, instance576, instance577, instance578, instance579, instance580, instance581, instance582, instance583, instance584, instance585, instance586, instance587, instance588, instance589, instance590, instance591, instance592, instance593, instance594, instance595, instance596, instance597, instance598, instance599, instance600, instance601, instance602, instance603, instance604, instance605, instance606, instance607, instance608, instance609, instance610, instance611, instance612, instance613, instance614, instance615, instance616, instance617, instance618, instance619, instance620, instance621, instance622, instance623, instance624, instance625, instance626, instance627, instance628, instance629, instance630, instance631, instance632, instance633, instance634, instance635, instance636, instance637, instance638, instance639, instance640, instance641, instance642, instance643, instance644, instance645, instance646, instance647, instance648, instance649, instance650, instance651, instance652, instance653, instance654, instance655, instance656, instance657, instance658, instance659, instance660, instance661, instance662, instance663, instance664, instance665, instance666, instance667, instance668, instance669, instance670, instance671, instance672, instance673, instance674, instance675, instance676, instance677, instance678, instance679, instance680, instance681, instance682, instance683, instance684, instance685, instance686, instance687, instance688, instance689, instance690, instance691, instance692, instance693, instance694, instance695, instance696, instance697, instance698, instance699, instance700, instance701, instance702, instance703, instance704, instance705, instance706, instance707, instance708, instance709, instance710, instance711, instance712, instance713, instance714, instance715, instance716, instance717, instance718, instance719, instance720, instance721, instance722, instance723, instance724, instance725, instance726, instance727, instance728, instance729, instance730, instance731, instance732, instance733, instance734, instance735, instance736, instance737, instance738, instance739, instance740, instance741, instance742, instance743, instance744, instance745, instance746, instance747, instance748, instance749, instance750, instance751, instance752, instance753, instance754, instance755, instance756, instance757, instance758, instance759, instance760, instance761, instance762, instance763, instance764, instance765, instance766, instance767, instance768, instance769, instance770, instance771, instance772, instance773, instance774, instance775, instance776, instance777, instance778, instance779, instance780, instance781, instance782, instance783, instance784, instance785, instance786, instance787, instance788, instance789, instance790, instance791, instance792, instance793, instance794, instance795, instance796, instance797, instance798, instance799, instance800, instance801, instance802, instance803, instance804, instance805, instance806, instance807, instance808, instance809, instance810, instance811, instance812, instance813, instance814, instance815, instance816, instance817, instance818, instance819, instance820, instance821, instance822, instance823, instance824, instance825, instance826, instance827, instance828, instance829, instance830, instance831, instance832, instance833, instance834, instance835, instance836, instance837, instance838, instance839, instance840, instance841, instance842, instance843, instance844, instance845, instance846, instance847, instance848, instance849, instance850, instance851, instance852, instance853, instance854, instance855, instance856, instance857, instance858, instance859, instance860, instance861, instance862, instance863, instance864, instance865, instance866, instance867, instance868, instance869, instance870, instance871, instance872, instance873, instance874, instance875, instance876, instance877, instance878, instance879, instance880, instance881, instance882, instance883, instance884, instance885, instance886, instance887, instance888, instance889, instance890, instance891, instance892, instance893, instance894, instance895, instance896, instance897, instance898, instance899, instance900, instance901, instance902, instance903, instance904, instance905, instance906, instance907, instance908, instance909, instance910, instance911, instance912, instance913, instance914, instance915, instance916, instance917, instance918, instance919, instance920, instance921, instance922, instance923, instance924, instance925, instance926, instance927, instance928, instance929, instance930, instance931, instance932, instance933, instance934, instance935, instance936, instance937, instance938, instance939, instance940, instance941, instance942, instance943, instance944, instance945, instance946, instance947, instance948, instance949, instance950, instance951, instance952, instance953, instance954, instance955, instance956, instance957, instance958, instance959, instance960, instance961, instance962, instance963, instance964, instance965, instance966, instance967, instance968, instance969, instance970, instance971, instance972, instance973, instance974, instance975, instance976, instance977, instance978, instance979, instance980, instance981, instance982, instance983, instance984, instance985, instance986, instance987, instance988, instance989, instance990, instance991, instance992, instance993, instance994, instance995, instance996, instance997, instance998, instance999)
+  }
+}
+
diff --git a/tests/pos/i19907/slow_1000_4.scala b/tests/pos/i19907/slow_1000_4.scala
new file mode 100644
index 000000000000..231bfadc9354
--- /dev/null
+++ b/tests/pos/i19907/slow_1000_4.scala
@@ -0,0 +1,1026 @@
+
+
+abstract class ServerEndpoint[-R, F[_]] {
+  type T0
+  type T1
+  type T2
+  type T3
+}
+object ServerEndpoint {
+  type Full[_T0, _T1, _T2, _T3, -R, F[_]] =
+    ServerEndpoint[R, F] { 
+    type T0 = _T0
+    type T1 = _T1
+    type T2 = _T2
+    type T3 = _T3
+    }
+  def apply[_T0, _T1, _T2, _T3, R, F[_]]: ServerEndpoint.Full[_T0, _T1, _T2, _T3, R, F] = ???
+}
+
+object Test {
+  type Route = ServerEndpoint[Any, Option]
+  def routes: List[ServerEndpoint[Any, Option]] = { 
+    val instance0 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance1 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance2 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance3 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance4 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance5 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance6 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance7 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance8 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance9 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance10 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance11 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance12 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance13 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance14 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance15 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance16 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance17 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance18 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance19 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance20 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance21 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance22 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance23 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance24 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance25 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance26 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance27 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance28 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance29 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance30 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance31 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance32 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance33 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance34 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance35 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance36 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance37 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance38 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance39 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance40 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance41 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance42 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance43 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance44 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance45 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance46 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance47 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance48 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance49 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance50 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance51 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance52 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance53 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance54 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance55 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance56 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance57 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance58 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance59 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance60 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance61 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance62 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance63 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance64 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance65 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance66 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance67 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance68 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance69 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance70 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance71 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance72 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance73 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance74 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance75 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance76 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance77 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance78 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance79 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance80 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance81 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance82 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance83 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance84 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance85 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance86 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance87 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance88 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance89 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance90 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance91 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance92 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance93 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance94 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance95 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance96 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance97 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance98 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance99 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance100 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance101 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance102 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance103 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance104 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance105 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance106 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance107 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance108 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance109 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance110 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance111 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance112 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance113 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance114 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance115 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance116 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance117 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance118 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance119 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance120 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance121 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance122 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance123 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance124 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance125 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance126 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance127 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance128 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance129 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance130 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance131 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance132 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance133 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance134 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance135 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance136 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance137 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance138 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance139 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance140 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance141 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance142 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance143 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance144 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance145 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance146 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance147 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance148 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance149 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance150 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance151 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance152 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance153 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance154 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance155 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance156 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance157 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance158 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance159 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance160 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance161 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance162 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance163 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance164 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance165 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance166 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance167 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance168 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance169 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance170 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance171 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance172 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance173 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance174 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance175 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance176 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance177 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance178 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance179 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance180 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance181 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance182 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance183 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance184 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance185 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance186 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance187 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance188 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance189 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance190 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance191 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance192 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance193 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance194 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance195 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance196 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance197 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance198 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance199 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance200 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance201 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance202 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance203 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance204 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance205 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance206 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance207 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance208 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance209 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance210 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance211 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance212 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance213 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance214 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance215 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance216 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance217 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance218 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance219 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance220 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance221 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance222 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance223 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance224 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance225 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance226 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance227 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance228 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance229 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance230 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance231 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance232 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance233 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance234 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance235 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance236 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance237 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance238 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance239 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance240 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance241 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance242 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance243 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance244 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance245 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance246 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance247 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance248 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance249 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance250 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance251 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance252 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance253 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance254 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance255 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance256 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance257 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance258 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance259 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance260 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance261 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance262 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance263 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance264 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance265 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance266 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance267 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance268 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance269 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance270 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance271 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance272 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance273 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance274 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance275 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance276 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance277 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance278 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance279 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance280 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance281 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance282 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance283 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance284 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance285 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance286 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance287 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance288 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance289 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance290 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance291 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance292 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance293 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance294 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance295 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance296 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance297 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance298 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance299 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance300 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance301 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance302 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance303 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance304 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance305 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance306 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance307 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance308 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance309 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance310 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance311 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance312 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance313 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance314 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance315 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance316 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance317 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance318 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance319 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance320 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance321 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance322 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance323 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance324 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance325 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance326 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance327 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance328 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance329 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance330 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance331 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance332 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance333 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance334 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance335 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance336 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance337 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance338 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance339 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance340 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance341 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance342 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance343 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance344 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance345 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance346 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance347 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance348 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance349 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance350 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance351 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance352 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance353 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance354 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance355 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance356 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance357 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance358 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance359 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance360 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance361 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance362 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance363 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance364 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance365 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance366 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance367 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance368 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance369 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance370 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance371 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance372 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance373 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance374 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance375 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance376 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance377 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance378 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance379 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance380 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance381 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance382 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance383 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance384 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance385 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance386 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance387 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance388 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance389 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance390 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance391 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance392 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance393 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance394 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance395 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance396 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance397 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance398 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance399 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance400 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance401 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance402 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance403 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance404 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance405 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance406 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance407 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance408 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance409 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance410 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance411 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance412 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance413 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance414 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance415 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance416 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance417 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance418 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance419 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance420 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance421 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance422 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance423 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance424 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance425 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance426 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance427 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance428 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance429 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance430 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance431 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance432 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance433 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance434 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance435 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance436 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance437 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance438 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance439 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance440 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance441 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance442 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance443 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance444 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance445 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance446 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance447 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance448 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance449 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance450 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance451 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance452 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance453 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance454 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance455 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance456 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance457 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance458 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance459 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance460 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance461 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance462 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance463 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance464 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance465 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance466 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance467 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance468 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance469 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance470 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance471 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance472 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance473 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance474 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance475 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance476 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance477 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance478 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance479 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance480 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance481 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance482 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance483 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance484 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance485 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance486 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance487 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance488 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance489 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance490 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance491 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance492 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance493 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance494 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance495 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance496 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance497 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance498 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance499 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance500 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance501 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance502 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance503 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance504 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance505 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance506 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance507 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance508 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance509 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance510 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance511 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance512 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance513 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance514 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance515 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance516 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance517 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance518 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance519 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance520 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance521 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance522 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance523 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance524 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance525 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance526 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance527 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance528 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance529 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance530 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance531 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance532 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance533 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance534 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance535 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance536 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance537 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance538 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance539 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance540 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance541 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance542 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance543 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance544 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance545 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance546 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance547 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance548 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance549 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance550 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance551 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance552 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance553 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance554 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance555 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance556 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance557 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance558 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance559 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance560 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance561 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance562 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance563 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance564 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance565 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance566 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance567 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance568 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance569 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance570 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance571 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance572 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance573 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance574 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance575 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance576 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance577 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance578 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance579 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance580 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance581 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance582 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance583 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance584 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance585 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance586 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance587 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance588 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance589 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance590 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance591 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance592 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance593 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance594 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance595 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance596 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance597 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance598 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance599 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance600 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance601 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance602 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance603 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance604 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance605 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance606 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance607 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance608 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance609 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance610 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance611 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance612 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance613 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance614 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance615 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance616 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance617 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance618 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance619 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance620 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance621 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance622 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance623 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance624 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance625 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance626 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance627 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance628 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance629 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance630 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance631 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance632 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance633 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance634 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance635 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance636 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance637 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance638 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance639 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance640 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance641 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance642 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance643 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance644 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance645 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance646 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance647 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance648 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance649 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance650 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance651 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance652 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance653 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance654 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance655 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance656 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance657 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance658 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance659 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance660 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance661 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance662 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance663 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance664 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance665 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance666 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance667 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance668 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance669 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance670 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance671 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance672 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance673 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance674 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance675 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance676 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance677 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance678 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance679 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance680 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance681 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance682 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance683 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance684 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance685 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance686 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance687 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance688 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance689 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance690 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance691 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance692 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance693 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance694 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance695 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance696 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance697 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance698 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance699 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance700 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance701 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance702 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance703 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance704 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance705 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance706 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance707 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance708 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance709 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance710 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance711 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance712 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance713 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance714 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance715 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance716 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance717 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance718 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance719 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance720 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance721 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance722 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance723 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance724 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance725 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance726 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance727 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance728 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance729 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance730 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance731 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance732 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance733 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance734 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance735 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance736 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance737 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance738 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance739 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance740 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance741 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance742 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance743 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance744 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance745 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance746 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance747 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance748 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance749 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance750 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance751 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance752 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance753 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance754 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance755 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance756 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance757 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance758 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance759 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance760 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance761 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance762 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance763 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance764 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance765 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance766 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance767 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance768 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance769 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance770 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance771 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance772 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance773 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance774 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance775 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance776 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance777 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance778 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance779 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance780 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance781 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance782 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance783 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance784 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance785 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance786 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance787 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance788 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance789 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance790 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance791 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance792 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance793 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance794 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance795 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance796 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance797 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance798 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance799 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance800 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance801 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance802 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance803 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance804 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance805 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance806 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance807 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance808 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance809 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance810 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance811 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance812 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance813 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance814 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance815 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance816 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance817 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance818 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance819 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance820 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance821 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance822 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance823 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance824 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance825 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance826 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance827 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance828 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance829 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance830 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance831 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance832 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance833 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance834 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance835 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance836 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance837 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance838 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance839 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance840 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance841 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance842 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance843 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance844 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance845 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance846 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance847 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance848 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance849 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance850 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance851 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance852 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance853 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance854 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance855 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance856 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance857 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance858 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance859 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance860 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance861 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance862 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance863 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance864 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance865 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance866 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance867 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance868 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance869 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance870 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance871 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance872 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance873 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance874 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance875 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance876 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance877 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance878 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance879 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance880 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance881 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance882 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance883 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance884 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance885 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance886 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance887 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance888 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance889 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance890 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance891 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance892 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance893 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance894 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance895 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance896 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance897 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance898 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance899 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance900 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance901 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance902 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance903 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance904 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance905 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance906 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance907 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance908 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance909 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance910 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance911 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance912 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance913 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance914 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance915 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance916 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance917 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance918 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance919 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance920 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance921 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance922 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance923 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance924 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance925 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance926 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance927 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance928 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance929 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance930 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance931 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance932 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance933 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance934 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance935 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance936 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance937 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance938 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance939 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance940 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance941 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance942 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance943 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance944 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance945 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance946 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance947 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance948 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance949 = ServerEndpoint[Unit, Unit, Int, Unit, Any, Option]
+    val instance950 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance951 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance952 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance953 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance954 = ServerEndpoint[Int, Int, Unit, Int, Any, Option]
+    val instance955 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance956 = ServerEndpoint[Int, Unit, Int, Unit, Any, Option]
+    val instance957 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance958 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance959 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance960 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance961 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance962 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance963 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance964 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance965 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance966 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance967 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance968 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance969 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance970 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance971 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    val instance972 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance973 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance974 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance975 = ServerEndpoint[Int, Int, Int, Int, Any, Option]
+    val instance976 = ServerEndpoint[Unit, Int, Int, Int, Any, Option]
+    val instance977 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance978 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance979 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance980 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance981 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance982 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance983 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance984 = ServerEndpoint[Unit, Unit, Int, Int, Any, Option]
+    val instance985 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance986 = ServerEndpoint[Unit, Int, Unit, Unit, Any, Option]
+    val instance987 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance988 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance989 = ServerEndpoint[Int, Unit, Unit, Unit, Any, Option]
+    val instance990 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance991 = ServerEndpoint[Unit, Int, Int, Unit, Any, Option]
+    val instance992 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance993 = ServerEndpoint[Unit, Int, Unit, Int, Any, Option]
+    val instance994 = ServerEndpoint[Int, Int, Unit, Unit, Any, Option]
+    val instance995 = ServerEndpoint[Unit, Unit, Unit, Int, Any, Option]
+    val instance996 = ServerEndpoint[Int, Unit, Unit, Int, Any, Option]
+    val instance997 = ServerEndpoint[Unit, Unit, Unit, Unit, Any, Option]
+    val instance998 = ServerEndpoint[Int, Unit, Int, Int, Any, Option]
+    val instance999 = ServerEndpoint[Int, Int, Int, Unit, Any, Option]
+    List(instance0, instance1, instance2, instance3, instance4, instance5, instance6, instance7, instance8, instance9, instance10, instance11, instance12, instance13, instance14, instance15, instance16, instance17, instance18, instance19, instance20, instance21, instance22, instance23, instance24, instance25, instance26, instance27, instance28, instance29, instance30, instance31, instance32, instance33, instance34, instance35, instance36, instance37, instance38, instance39, instance40, instance41, instance42, instance43, instance44, instance45, instance46, instance47, instance48, instance49, instance50, instance51, instance52, instance53, instance54, instance55, instance56, instance57, instance58, instance59, instance60, instance61, instance62, instance63, instance64, instance65, instance66, instance67, instance68, instance69, instance70, instance71, instance72, instance73, instance74, instance75, instance76, instance77, instance78, instance79, instance80, instance81, instance82, instance83, instance84, instance85, instance86, instance87, instance88, instance89, instance90, instance91, instance92, instance93, instance94, instance95, instance96, instance97, instance98, instance99, instance100, instance101, instance102, instance103, instance104, instance105, instance106, instance107, instance108, instance109, instance110, instance111, instance112, instance113, instance114, instance115, instance116, instance117, instance118, instance119, instance120, instance121, instance122, instance123, instance124, instance125, instance126, instance127, instance128, instance129, instance130, instance131, instance132, instance133, instance134, instance135, instance136, instance137, instance138, instance139, instance140, instance141, instance142, instance143, instance144, instance145, instance146, instance147, instance148, instance149, instance150, instance151, instance152, instance153, instance154, instance155, instance156, instance157, instance158, instance159, instance160, instance161, instance162, instance163, instance164, instance165, instance166, instance167, instance168, instance169, instance170, instance171, instance172, instance173, instance174, instance175, instance176, instance177, instance178, instance179, instance180, instance181, instance182, instance183, instance184, instance185, instance186, instance187, instance188, instance189, instance190, instance191, instance192, instance193, instance194, instance195, instance196, instance197, instance198, instance199, instance200, instance201, instance202, instance203, instance204, instance205, instance206, instance207, instance208, instance209, instance210, instance211, instance212, instance213, instance214, instance215, instance216, instance217, instance218, instance219, instance220, instance221, instance222, instance223, instance224, instance225, instance226, instance227, instance228, instance229, instance230, instance231, instance232, instance233, instance234, instance235, instance236, instance237, instance238, instance239, instance240, instance241, instance242, instance243, instance244, instance245, instance246, instance247, instance248, instance249, instance250, instance251, instance252, instance253, instance254, instance255, instance256, instance257, instance258, instance259, instance260, instance261, instance262, instance263, instance264, instance265, instance266, instance267, instance268, instance269, instance270, instance271, instance272, instance273, instance274, instance275, instance276, instance277, instance278, instance279, instance280, instance281, instance282, instance283, instance284, instance285, instance286, instance287, instance288, instance289, instance290, instance291, instance292, instance293, instance294, instance295, instance296, instance297, instance298, instance299, instance300, instance301, instance302, instance303, instance304, instance305, instance306, instance307, instance308, instance309, instance310, instance311, instance312, instance313, instance314, instance315, instance316, instance317, instance318, instance319, instance320, instance321, instance322, instance323, instance324, instance325, instance326, instance327, instance328, instance329, instance330, instance331, instance332, instance333, instance334, instance335, instance336, instance337, instance338, instance339, instance340, instance341, instance342, instance343, instance344, instance345, instance346, instance347, instance348, instance349, instance350, instance351, instance352, instance353, instance354, instance355, instance356, instance357, instance358, instance359, instance360, instance361, instance362, instance363, instance364, instance365, instance366, instance367, instance368, instance369, instance370, instance371, instance372, instance373, instance374, instance375, instance376, instance377, instance378, instance379, instance380, instance381, instance382, instance383, instance384, instance385, instance386, instance387, instance388, instance389, instance390, instance391, instance392, instance393, instance394, instance395, instance396, instance397, instance398, instance399, instance400, instance401, instance402, instance403, instance404, instance405, instance406, instance407, instance408, instance409, instance410, instance411, instance412, instance413, instance414, instance415, instance416, instance417, instance418, instance419, instance420, instance421, instance422, instance423, instance424, instance425, instance426, instance427, instance428, instance429, instance430, instance431, instance432, instance433, instance434, instance435, instance436, instance437, instance438, instance439, instance440, instance441, instance442, instance443, instance444, instance445, instance446, instance447, instance448, instance449, instance450, instance451, instance452, instance453, instance454, instance455, instance456, instance457, instance458, instance459, instance460, instance461, instance462, instance463, instance464, instance465, instance466, instance467, instance468, instance469, instance470, instance471, instance472, instance473, instance474, instance475, instance476, instance477, instance478, instance479, instance480, instance481, instance482, instance483, instance484, instance485, instance486, instance487, instance488, instance489, instance490, instance491, instance492, instance493, instance494, instance495, instance496, instance497, instance498, instance499, instance500, instance501, instance502, instance503, instance504, instance505, instance506, instance507, instance508, instance509, instance510, instance511, instance512, instance513, instance514, instance515, instance516, instance517, instance518, instance519, instance520, instance521, instance522, instance523, instance524, instance525, instance526, instance527, instance528, instance529, instance530, instance531, instance532, instance533, instance534, instance535, instance536, instance537, instance538, instance539, instance540, instance541, instance542, instance543, instance544, instance545, instance546, instance547, instance548, instance549, instance550, instance551, instance552, instance553, instance554, instance555, instance556, instance557, instance558, instance559, instance560, instance561, instance562, instance563, instance564, instance565, instance566, instance567, instance568, instance569, instance570, instance571, instance572, instance573, instance574, instance575, instance576, instance577, instance578, instance579, instance580, instance581, instance582, instance583, instance584, instance585, instance586, instance587, instance588, instance589, instance590, instance591, instance592, instance593, instance594, instance595, instance596, instance597, instance598, instance599, instance600, instance601, instance602, instance603, instance604, instance605, instance606, instance607, instance608, instance609, instance610, instance611, instance612, instance613, instance614, instance615, instance616, instance617, instance618, instance619, instance620, instance621, instance622, instance623, instance624, instance625, instance626, instance627, instance628, instance629, instance630, instance631, instance632, instance633, instance634, instance635, instance636, instance637, instance638, instance639, instance640, instance641, instance642, instance643, instance644, instance645, instance646, instance647, instance648, instance649, instance650, instance651, instance652, instance653, instance654, instance655, instance656, instance657, instance658, instance659, instance660, instance661, instance662, instance663, instance664, instance665, instance666, instance667, instance668, instance669, instance670, instance671, instance672, instance673, instance674, instance675, instance676, instance677, instance678, instance679, instance680, instance681, instance682, instance683, instance684, instance685, instance686, instance687, instance688, instance689, instance690, instance691, instance692, instance693, instance694, instance695, instance696, instance697, instance698, instance699, instance700, instance701, instance702, instance703, instance704, instance705, instance706, instance707, instance708, instance709, instance710, instance711, instance712, instance713, instance714, instance715, instance716, instance717, instance718, instance719, instance720, instance721, instance722, instance723, instance724, instance725, instance726, instance727, instance728, instance729, instance730, instance731, instance732, instance733, instance734, instance735, instance736, instance737, instance738, instance739, instance740, instance741, instance742, instance743, instance744, instance745, instance746, instance747, instance748, instance749, instance750, instance751, instance752, instance753, instance754, instance755, instance756, instance757, instance758, instance759, instance760, instance761, instance762, instance763, instance764, instance765, instance766, instance767, instance768, instance769, instance770, instance771, instance772, instance773, instance774, instance775, instance776, instance777, instance778, instance779, instance780, instance781, instance782, instance783, instance784, instance785, instance786, instance787, instance788, instance789, instance790, instance791, instance792, instance793, instance794, instance795, instance796, instance797, instance798, instance799, instance800, instance801, instance802, instance803, instance804, instance805, instance806, instance807, instance808, instance809, instance810, instance811, instance812, instance813, instance814, instance815, instance816, instance817, instance818, instance819, instance820, instance821, instance822, instance823, instance824, instance825, instance826, instance827, instance828, instance829, instance830, instance831, instance832, instance833, instance834, instance835, instance836, instance837, instance838, instance839, instance840, instance841, instance842, instance843, instance844, instance845, instance846, instance847, instance848, instance849, instance850, instance851, instance852, instance853, instance854, instance855, instance856, instance857, instance858, instance859, instance860, instance861, instance862, instance863, instance864, instance865, instance866, instance867, instance868, instance869, instance870, instance871, instance872, instance873, instance874, instance875, instance876, instance877, instance878, instance879, instance880, instance881, instance882, instance883, instance884, instance885, instance886, instance887, instance888, instance889, instance890, instance891, instance892, instance893, instance894, instance895, instance896, instance897, instance898, instance899, instance900, instance901, instance902, instance903, instance904, instance905, instance906, instance907, instance908, instance909, instance910, instance911, instance912, instance913, instance914, instance915, instance916, instance917, instance918, instance919, instance920, instance921, instance922, instance923, instance924, instance925, instance926, instance927, instance928, instance929, instance930, instance931, instance932, instance933, instance934, instance935, instance936, instance937, instance938, instance939, instance940, instance941, instance942, instance943, instance944, instance945, instance946, instance947, instance948, instance949, instance950, instance951, instance952, instance953, instance954, instance955, instance956, instance957, instance958, instance959, instance960, instance961, instance962, instance963, instance964, instance965, instance966, instance967, instance968, instance969, instance970, instance971, instance972, instance973, instance974, instance975, instance976, instance977, instance978, instance979, instance980, instance981, instance982, instance983, instance984, instance985, instance986, instance987, instance988, instance989, instance990, instance991, instance992, instance993, instance994, instance995, instance996, instance997, instance998, instance999)
+  }
+}
+
diff --git a/tests/pos/i19907/slow_100_3.scala b/tests/pos/i19907/slow_100_3.scala
new file mode 100644
index 000000000000..a723ea8e4623
--- /dev/null
+++ b/tests/pos/i19907/slow_100_3.scala
@@ -0,0 +1,124 @@
+
+
+abstract class ServerEndpoint[-R, F[_]] {
+  type T0
+  type T1
+  type T2
+}
+object ServerEndpoint {
+  type Full[_T0, _T1, _T2, -R, F[_]] =
+    ServerEndpoint[R, F] { 
+    type T0 = _T0
+    type T1 = _T1
+    type T2 = _T2
+    }
+  def apply[_T0, _T1, _T2, R, F[_]]: ServerEndpoint.Full[_T0, _T1, _T2, R, F] = ???
+}
+
+object Test {
+  type Route = ServerEndpoint[Any, Option]
+  def routes: List[ServerEndpoint[Any, Option]] = { 
+    val instance0 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance1 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance2 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance3 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance4 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance5 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance6 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance7 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance8 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance9 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance10 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance11 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance12 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance13 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance14 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance15 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance16 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance17 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance18 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance19 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance20 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance21 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance22 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance23 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance24 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance25 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance26 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance27 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance28 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance29 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance30 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance31 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance32 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance33 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance34 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance35 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance36 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance37 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance38 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance39 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance40 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance41 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance42 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance43 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance44 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance45 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance46 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance47 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance48 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance49 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance50 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance51 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance52 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance53 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance54 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance55 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance56 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance57 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance58 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance59 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance60 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance61 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance62 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance63 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance64 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance65 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance66 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance67 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance68 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance69 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance70 = ServerEndpoint[Unit, Unit, Int, Any, Option]
+    val instance71 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance72 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance73 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance74 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance75 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance76 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance77 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance78 = ServerEndpoint[Unit, Unit, Unit, Any, Option]
+    val instance79 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance80 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance81 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance82 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance83 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance84 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance85 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance86 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance87 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance88 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance89 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance90 = ServerEndpoint[Int, Int, Unit, Any, Option]
+    val instance91 = ServerEndpoint[Unit, Int, Int, Any, Option]
+    val instance92 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance93 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    val instance94 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance95 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance96 = ServerEndpoint[Int, Unit, Int, Any, Option]
+    val instance97 = ServerEndpoint[Int, Int, Int, Any, Option]
+    val instance98 = ServerEndpoint[Int, Unit, Unit, Any, Option]
+    val instance99 = ServerEndpoint[Unit, Int, Unit, Any, Option]
+    List(instance0, instance1, instance2, instance3, instance4, instance5, instance6, instance7, instance8, instance9, instance10, instance11, instance12, instance13, instance14, instance15, instance16, instance17, instance18, instance19, instance20, instance21, instance22, instance23, instance24, instance25, instance26, instance27, instance28, instance29, instance30, instance31, instance32, instance33, instance34, instance35, instance36, instance37, instance38, instance39, instance40, instance41, instance42, instance43, instance44, instance45, instance46, instance47, instance48, instance49, instance50, instance51, instance52, instance53, instance54, instance55, instance56, instance57, instance58, instance59, instance60, instance61, instance62, instance63, instance64, instance65, instance66, instance67, instance68, instance69, instance70, instance71, instance72, instance73, instance74, instance75, instance76, instance77, instance78, instance79, instance80, instance81, instance82, instance83, instance84, instance85, instance86, instance87, instance88, instance89, instance90, instance91, instance92, instance93, instance94, instance95, instance96, instance97, instance98, instance99)
+  }
+}
+

From 370c418f5482235506c80f29d3a4c6b6501c3dfc Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Apr 2025 16:10:54 +0200
Subject: [PATCH 002/505] Skip widenSingletons in widenInferred if the inferred
 type is too large

[Cherry-picked 7aef4159fab30bd7d1fd7f4e9180fbf55cd9b1f3][modified]

From 6ef1e8d5e99bcfa6792d29de788339e4c8fff544 Mon Sep 17 00:00:00 2001
From: noti0na1 <8036790+noti0na1@users.noreply.github.com>
Date: Wed, 20 Mar 2024 23:02:56 +0000
Subject: [PATCH 003/505] Make individual tests

[Cherry-picked c5c94f0a5c0be43c6c79edca2f853bdf4e0e4ec1]
---
 tests/pos/{i19907/slow_1000_3.scala => i19907_slow_1000_3.scala} | 0
 tests/pos/{i19907/slow_1000_4.scala => i19907_slow_1000_4.scala} | 0
 tests/pos/{i19907/slow_100_3.scala => i19907_slow_100_3.scala}   | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/pos/{i19907/slow_1000_3.scala => i19907_slow_1000_3.scala} (100%)
 rename tests/pos/{i19907/slow_1000_4.scala => i19907_slow_1000_4.scala} (100%)
 rename tests/pos/{i19907/slow_100_3.scala => i19907_slow_100_3.scala} (100%)

diff --git a/tests/pos/i19907/slow_1000_3.scala b/tests/pos/i19907_slow_1000_3.scala
similarity index 100%
rename from tests/pos/i19907/slow_1000_3.scala
rename to tests/pos/i19907_slow_1000_3.scala
diff --git a/tests/pos/i19907/slow_1000_4.scala b/tests/pos/i19907_slow_1000_4.scala
similarity index 100%
rename from tests/pos/i19907/slow_1000_4.scala
rename to tests/pos/i19907_slow_1000_4.scala
diff --git a/tests/pos/i19907/slow_100_3.scala b/tests/pos/i19907_slow_100_3.scala
similarity index 100%
rename from tests/pos/i19907/slow_100_3.scala
rename to tests/pos/i19907_slow_100_3.scala

From 613e6e52a930cf3259ec7dd6b0cea8a41f91d877 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Fri, 22 Mar 2024 18:00:59 +0100
Subject: [PATCH 004/505] Alternative scheme that does not require a size limit

---
 .../tools/dotc/core/ConstraintHandling.scala  | 42 +++++++------------
 .../dotty/tools/dotc/core/TypeComparer.scala  |  2 +-
 .../src/dotty/tools/dotc/core/Types.scala     | 24 ++++++-----
 3 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
index df20505e65ce..e05cb61feef8 100644
--- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
+++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
@@ -657,27 +657,23 @@ trait ConstraintHandling {
    * as those could leak the annotation to users (see run/inferred-repeated-result).
    */
   def widenInferred(inst: Type, bound: Type, widenUnions: Boolean)(using Context): Type =
-    def typeSize(tp: Type): Int = tp match
-      case tp: AndOrType => typeSize(tp.tp1) + typeSize(tp.tp2)
-      case _ => 1
-
     def widenOr(tp: Type) =
       if widenUnions then
-         val tpw = tp.widenUnion
-         if tpw ne tp then
-           if tpw.isTransparent() then
-             // Now also widen singletons of soft unions. Before these were skipped
-             // since we widenUnion on soft unions is independent of whether singletons
-             // are widened or not. This avoids an expensive subtype check in widenSingle,
-             // see 19907_*.scala for test cases.
-             tp.widenSingletons()
-           else if tpw <:< bound then tpw
-           else tp
-         else tp
-       else tp.hardenUnions
+        val tpw = tp.widenUnion
+        if tpw ne tp then
+          if tpw.isTransparent() then
+            // Now also widen singletons of soft unions. Before these were skipped
+            // since we widenUnion on soft unions is independent of whether singletons
+            // are widened or not. This avoids an expensive subtype check in widenSingle,
+            // see 19907_*.scala for test cases.
+            tp.widenSingletons()
+          else if tpw <:< bound then tpw
+          else tp
+        else tp
+      else tp.hardenUnions
 
     def widenSingle(tp: Type) =
-      val tpw = tp.widenSingletons
+      val tpw = tp.widenSingletons(skipSoftUnions = widenUnions)
       if (tpw ne tp) && (tpw <:< bound) then tpw else tp
 
     def isSingleton(tp: Type): Boolean = tp match
@@ -687,16 +683,8 @@ trait ConstraintHandling {
     val wideInst =
       if isSingleton(bound) then inst
       else
-        val widenedFromUnion =
-          if widenUnions && typeSize(inst) > 64 then
-            // If the inferred type `inst` is too large, the subtype check for `bound` in `widenSingle`
-            // can be expensive due to comparisons between large union types, so we avoid it by
-            // `widenUnion` directly here.
-            // See issue #19907.
-            widenOr(inst)
-          else
-            val widenedFromSingle = widenSingle(inst)
-            if widenUnions then widenOr(widenedFromSingle) else widenedFromSingle.hardenUnions
+        val widenedFromSingle = widenSingle(inst)
+        val widenedFromUnion = widenOr(widenedFromSingle)
         val widened = dropTransparentTraits(widenedFromUnion, bound)
         widenIrreducible(widened)
 
diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
index c69ea177ee96..5e0d9a98aa74 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -479,7 +479,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
         def widenOK =
           (tp2.widenSingletons eq tp2)
           && (tp1.widenSingletons ne tp1)
-          && inFrozenGadtAndConstraint(recur(tp1.widenSingletons, tp2))
+          && inFrozenGadtAndConstraint(recur(tp1.widenSingletons(), tp2))
 
         def joinOK = tp2.dealiasKeepRefiningAnnots match {
           case tp2: AppliedType if !tp2.tycon.typeSymbol.isClass =>
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 6cfe58bae2ea..f60c609eadd1 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -1365,15 +1365,15 @@ object Types extends TypeUtils {
      *  and going to the operands of & and |.
      *  Overridden and cached in OrType.
      */
-    def widenSingletons(using Context): Type = dealias match {
+    def widenSingletons(skipSoftUnions: Boolean = false)(using Context): Type = dealias match {
       case tp: SingletonType =>
         tp.widen
       case tp: OrType =>
-        val tp1w = tp.widenSingletons
+        val tp1w = tp.widenSingletons(skipSoftUnions)
         if (tp1w eq tp) this else tp1w
       case tp: AndType =>
-        val tp1w = tp.tp1.widenSingletons
-        val tp2w = tp.tp2.widenSingletons
+        val tp1w = tp.tp1.widenSingletons(skipSoftUnions)
+        val tp2w = tp.tp2.widenSingletons(skipSoftUnions)
         if ((tp.tp1 eq tp1w) && (tp.tp2 eq tp2w)) this else tp1w & tp2w
       case _ =>
         this
@@ -3532,8 +3532,8 @@ object Types extends TypeUtils {
       else tp1.atoms | tp2.atoms
 
     private def computeWidenSingletons()(using Context): Type =
-      val tp1w = tp1.widenSingletons
-      val tp2w = tp2.widenSingletons
+      val tp1w = tp1.widenSingletons()
+      val tp2w = tp2.widenSingletons()
       if ((tp1 eq tp1w) && (tp2 eq tp2w)) this else TypeComparer.lub(tp1w, tp2w, isSoft = isSoft)
 
     override def atoms(using Context): Atoms =
@@ -3542,11 +3542,13 @@ object Types extends TypeUtils {
         if !isProvisional then atomsRunId = ctx.runId
       myAtoms
 
-    override def widenSingletons(using Context): Type =
-      if widenedRunId != ctx.runId then
-        myWidened = computeWidenSingletons()
-        if !isProvisional then widenedRunId = ctx.runId
-      myWidened
+    override def widenSingletons(skipSoftUnions: Boolean)(using Context): Type =
+      if isSoft && skipSoftUnions then this
+      else
+        if widenedRunId != ctx.runId then
+          myWidened = computeWidenSingletons()
+          if !isProvisional then widenedRunId = ctx.runId
+        myWidened
 
     def derivedOrType(tp1: Type, tp2: Type, soft: Boolean = isSoft)(using Context): Type =
       if ((tp1 eq this.tp1) && (tp2 eq this.tp2) && soft == isSoft) this

From 9a08f21683596f23fd2a0ed083a73f59bcc5f511 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Apr 2025 16:17:49 +0200
Subject: [PATCH 005/505] Alternative scheme that does not require a size limit

[Cherry-picked 612ba920474b44fefa26821412a5b7f0efe0bbcd][modified]

From 2ea9d6e3a78b4775c29b0b421a426784edc9fec2 Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:17:59 +0100
Subject: [PATCH 006/505] Refine logic for widenSingle

[Cherry-picked fd61afbd1a403ca9093d871d8a1ca0d83f3d2ce1]
---
 .../dotty/tools/dotc/core/ConstraintHandling.scala   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
index e05cb61feef8..617104630850 100644
--- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
+++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
@@ -663,17 +663,17 @@ trait ConstraintHandling {
         if tpw ne tp then
           if tpw.isTransparent() then
             // Now also widen singletons of soft unions. Before these were skipped
-            // since we widenUnion on soft unions is independent of whether singletons
+            // since widenUnion on soft unions is independent of whether singletons
             // are widened or not. This avoids an expensive subtype check in widenSingle,
-            // see 19907_*.scala for test cases.
-            tp.widenSingletons()
+            // see i19907_*.scala for test cases.
+            widenSingle(tp, skipSoftUnions = false)
           else if tpw <:< bound then tpw
           else tp
         else tp
       else tp.hardenUnions
 
-    def widenSingle(tp: Type) =
-      val tpw = tp.widenSingletons(skipSoftUnions = widenUnions)
+    def widenSingle(tp: Type, skipSoftUnions: Boolean) =
+      val tpw = tp.widenSingletons(skipSoftUnions)
       if (tpw ne tp) && (tpw <:< bound) then tpw else tp
 
     def isSingleton(tp: Type): Boolean = tp match
@@ -683,7 +683,7 @@ trait ConstraintHandling {
     val wideInst =
       if isSingleton(bound) then inst
       else
-        val widenedFromSingle = widenSingle(inst)
+        val widenedFromSingle = widenSingle(inst, skipSoftUnions = widenUnions)
         val widenedFromUnion = widenOr(widenedFromSingle)
         val widened = dropTransparentTraits(widenedFromUnion, bound)
         widenIrreducible(widened)

From 579278bbd5480afe9be7b9b2a02450ac62d8983f Mon Sep 17 00:00:00 2001
From: Katarzyna Marek <kasia@marek.net>
Date: Wed, 15 Jan 2025 13:23:56 +0100
Subject: [PATCH 007/505] fix: hover and go to definition for named tuples
 (#22202)

resolves: https://github.com/scala/scala3/issues/20500
[Cherry-picked 6a1714b84547e7074343550c57aa2a8825f9018b]
---
 .../main/dotty/tools/pc/HoverProvider.scala   | 51 +++++++++++++-----
 .../dotty/tools/pc/MetalsInteractive.scala    | 54 ++++++++++++-------
 .../dotty/tools/pc/PcDefinitionProvider.scala |  2 +-
 .../tests/definition/PcDefinitionSuite.scala  |  9 ++++
 .../tools/pc/tests/hover/HoverTermSuite.scala | 30 +++++++++++
 5 files changed, 113 insertions(+), 33 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
index a667b038c894..769eaf024862 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -104,10 +104,10 @@ object HoverProvider:
       ) match
         case Nil =>
           fallbackToDynamics(path, printer, contentType)
-        case (symbol, tpe) :: _
+        case (symbol, tpe, _) :: _
             if symbol.name == nme.selectDynamic || symbol.name == nme.applyDynamic =>
           fallbackToDynamics(path, printer, contentType)
-        case symbolTpes @ ((symbol, tpe) :: _) =>
+        case symbolTpes @ ((symbol, tpe, None) :: _) =>
           val exprTpw = tpe.widenTermRefExpr.deepDealias
           val hoverString =
             tpw match
@@ -153,6 +153,21 @@ object HoverProvider:
             case _ =>
               ju.Optional.empty().nn
           end match
+        case (_, tpe, Some(namedTupleArg)) :: _ =>
+          val exprTpw = tpe.widenTermRefExpr.deepDealias
+          printer.expressionType(exprTpw) match
+            case Some(tpe) =>
+              ju.Optional.of(
+                new ScalaHover(
+                  expressionType = Some(tpe),
+                  symbolSignature = Some(s"$namedTupleArg: $tpe"),
+                  docstring = None,
+                  forceExpressionType = false,
+                  contextInfo = printer.getUsedRenamesInfo,
+                  contentType = contentType
+                )
+              ).nn
+            case _ => ju.Optional.empty().nn
       end match
     end if
   end hover
@@ -165,23 +180,31 @@ object HoverProvider:
       printer: ShortenedTypePrinter,
       contentType: ContentType
   )(using Context): ju.Optional[HoverSignature] = path match
-    case SelectDynamicExtractor(sel, n, name) =>
+    case SelectDynamicExtractor(sel, n, name, rest) =>
       def findRefinement(tp: Type): Option[HoverSignature] =
         tp match
-          case RefinedType(_, refName, tpe) if name == refName.toString() =>
+          case RefinedType(_, refName, tpe) if (name == refName.toString() || refName.toString() == nme.Fields.toString()) =>
+            val resultType =
+              rest match
+                case Select(_, asInstanceOf) :: TypeApply(_, List(tpe)) :: _ if asInstanceOf == nme.asInstanceOfPM =>
+                    tpe.tpe.widenTermRefExpr.deepDealias
+                case _ if n == nme.selectDynamic => tpe.resultType
+                case _ => tpe
+
             val tpeString =
-              if n == nme.selectDynamic then s": ${printer.tpe(tpe.resultType)}"
-              else printer.tpe(tpe)
+              if n == nme.selectDynamic then s": ${printer.tpe(resultType)}"
+              else printer.tpe(resultType)
 
             val valOrDef =
-              if n == nme.selectDynamic && !tpe.isInstanceOf[ExprType]
-              then "val"
-              else "def"
+              if refName.toString() == nme.Fields.toString() then ""
+              else if n == nme.selectDynamic && !tpe.isInstanceOf[ExprType]
+              then "val "
+              else "def "
 
             Some(
               new ScalaHover(
                 expressionType = Some(tpeString),
-                symbolSignature = Some(s"$valOrDef $name$tpeString"),
+                symbolSignature = Some(s"$valOrDef$name$tpeString"),
                 contextInfo = printer.getUsedRenamesInfo,
                 contentType = contentType
               )
@@ -208,16 +231,16 @@ object SelectDynamicExtractor:
       case Select(_, _) :: Apply(
             Select(Apply(reflSel, List(sel)), n),
             List(Literal(Constant(name: String)))
-          ) :: _
+          ) :: rest
           if (n == nme.selectDynamic || n == nme.applyDynamic) &&
             nme.reflectiveSelectable == reflSel.symbol.name =>
-        Some(sel, n, name)
+        Some(sel, n, name, rest)
       // tests `selectable`,  `selectable2` and `selectable-full` in HoverScala3TypeSuite
       case Select(_, _) :: Apply(
             Select(sel, n),
             List(Literal(Constant(name: String)))
-          ) :: _ if n == nme.selectDynamic || n == nme.applyDynamic =>
-        Some(sel, n, name)
+          ) :: rest if n == nme.selectDynamic || n == nme.applyDynamic =>
+        Some(sel, n, name, rest)
       case _ => None
     end match
   end unapply
diff --git a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
index 0e978049d177..a24ed5c7c9e7 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
@@ -5,12 +5,16 @@ import scala.annotation.tailrec
 
 import dotc.*
 import ast.*, tpd.*
+import dotty.tools.dotc.core.Constants.*
 import core.*, Contexts.*, Flags.*, Names.*, Symbols.*, Types.*
+import dotty.tools.dotc.core.StdNames.*
 import interactive.*
 import util.*
 import util.SourcePosition
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 object MetalsInteractive:
+  type NamedTupleArg = String
 
   def contextOfStat(
       stats: List[Tree],
@@ -110,7 +114,7 @@ object MetalsInteractive:
       pos: SourcePosition,
       indexed: IndexedContext,
       skipCheckOnName: Boolean = false
-  ): List[(Symbol, Type)] =
+  ): List[(Symbol, Type, Option[String])] =
     import indexed.ctx
     path match
       // For a named arg, find the target `DefDef` and jump to the param
@@ -118,59 +122,59 @@ object MetalsInteractive:
         val funSym = fn.symbol
         if funSym.is(Synthetic) && funSym.owner.is(CaseClass) then
           val sym = funSym.owner.info.member(name).symbol
-          List((sym, sym.info))
+          List((sym, sym.info, None))
         else
           val paramSymbol =
             for param <- funSym.paramSymss.flatten.find(_.name == name)
             yield param
           val sym = paramSymbol.getOrElse(fn.symbol)
-          List((sym, sym.info))
+          List((sym, sym.info, None))
 
       case (_: untpd.ImportSelector) :: (imp: Import) :: _ =>
         importedSymbols(imp, _.span.contains(pos.span)).map(sym =>
-          (sym, sym.info)
+          (sym, sym.info, None)
         )
 
       case (imp: Import) :: _ =>
         importedSymbols(imp, _.span.contains(pos.span)).map(sym =>
-          (sym, sym.info)
+          (sym, sym.info, None)
         )
 
       // wildcard param
       case head :: _ if (head.symbol.is(Param) && head.symbol.is(Synthetic)) =>
-        List((head.symbol, head.typeOpt))
+        List((head.symbol, head.typeOpt, None))
 
       case (head @ Select(target, name)) :: _
           if head.symbol.is(Synthetic) && name == StdNames.nme.apply =>
         val sym = target.symbol
         if sym.is(Synthetic) && sym.is(Module) then
-          List((sym.companionClass, sym.companionClass.info))
-        else List((target.symbol, target.typeOpt))
+          List((sym.companionClass, sym.companionClass.info, None))
+        else List((target.symbol, target.typeOpt, None))
 
       // L@@ft(...)
       case (head @ ApplySelect(select)) :: _
           if select.qualifier.sourcePos.contains(pos) &&
             select.name == StdNames.nme.apply =>
-        List((head.symbol, head.typeOpt))
+        List((head.symbol, head.typeOpt, None))
 
       // for Inlined we don't have a symbol, but it's needed to show proper type
       case (head @ Inlined(call, bindings, expansion)) :: _ =>
-        List((call.symbol, head.typeOpt))
+        List((call.symbol, head.typeOpt, None))
 
       // for comprehension
       case (head @ ApplySelect(select)) :: _ if isForSynthetic(head) =>
         // If the cursor is on the qualifier, return the symbol for it
         // `for { x <- List(1).head@@Option }`  returns the symbol of `headOption`
         if select.qualifier.sourcePos.contains(pos) then
-          List((select.qualifier.symbol, select.qualifier.typeOpt))
+          List((select.qualifier.symbol, select.qualifier.typeOpt, None))
         // Otherwise, returns the symbol of for synthetics such as "withFilter"
-        else List((head.symbol, head.typeOpt))
+        else List((head.symbol, head.typeOpt, None))
 
       // f@@oo.bar
       case Select(target, _) :: _
           if target.span.isSourceDerived &&
             target.sourcePos.contains(pos) =>
-        List((target.symbol, target.typeOpt))
+        List((target.symbol, target.typeOpt, None))
 
       /* In some cases type might be represented by TypeTree, however it's possible
        * that the type tree will not be marked properly as synthetic even if it doesn't
@@ -185,7 +189,7 @@ object MetalsInteractive:
        */
       case (tpt: TypeTree) :: parent :: _
           if tpt.span != parent.span && !tpt.symbol.is(Synthetic) =>
-        List((tpt.symbol, tpt.typeOpt))
+        List((tpt.symbol, tpt.typeOpt, None))
 
       /* TypeTest class https://dotty.epfl.ch/docs/reference/other-new-features/type-test.html
        * compiler automatically adds unapply if possible, we need to find the type symbol
@@ -195,14 +199,28 @@ object MetalsInteractive:
         pat match
           case UnApply(fun, _, pats) =>
             val tpeSym = pats.head.typeOpt.typeSymbol
-            List((tpeSym, tpeSym.info))
+            List((tpeSym, tpeSym.info, None))
           case _ =>
             Nil
 
+      // Handle select on named tuples
+      case (Apply(Apply(TypeApply(fun, List(t1, t2)), List(ddef)), List(Literal(Constant(i: Int))))) :: _
+        if fun.symbol.exists && fun.symbol.name == nme.apply &&
+            fun.symbol.owner.exists && fun.symbol.owner == getModuleIfDefined("scala.NamedTuple").moduleClass =>
+        def getIndex(t: Tree): Option[Type] =
+          t.tpe.dealias match
+            case AppliedType(_, args) => args.get(i)
+            case _ => None
+        val name = getIndex(t1) match
+          case Some(c: ConstantType) => c.value.stringValue
+          case _ => ""
+        val tpe = getIndex(t2).getOrElse(NoType)
+        List((ddef.symbol, tpe, Some(name)))
+
       case path @ head :: tail =>
         if head.symbol.is(Exported) then
           val sym = head.symbol.sourceSymbol
-          List((sym, sym.info))
+          List((sym, sym.info, None))
         else if head.symbol.is(Synthetic) then
           enclosingSymbolsWithExpressionType(
             tail,
@@ -217,7 +235,7 @@ object MetalsInteractive:
               pos,
               indexed.ctx.source
             )
-          then List((head.symbol, head.typeOpt))
+          then List((head.symbol, head.typeOpt, None))
           /* Type tree for List(1) has an Int type variable, which has span
            * but doesn't exist in code.
            * https://github.com/lampepfl/dotty/issues/15937
@@ -234,7 +252,7 @@ object MetalsInteractive:
               indexed,
               skipCheckOnName
             )
-          else recovered.map(sym => (sym, sym.info))
+          else recovered.map(sym => (sym, sym.info, None))
         end if
       case Nil => Nil
     end match
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
index 3b2284bef1d0..7d8e4dfad081 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
@@ -101,7 +101,7 @@ class PcDefinitionProvider(
     val enclosing = path.expandRangeToEnclosingApply(pos)
     val typeSymbols = MetalsInteractive
       .enclosingSymbolsWithExpressionType(enclosing, pos, indexed)
-      .map { case (_, tpe) =>
+      .map { case (_, tpe, _) =>
         tpe.typeSymbol
       }
     typeSymbols match
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
index fab21ffdee0a..ff4c6ec25e27 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
@@ -504,3 +504,12 @@ class PcDefinitionSuite extends BasePcDefinitionSuite:
          |val a = MyIntOut(1).un@@even
          |""".stripMargin,
     )
+
+  @Test def `named-tuples` =
+    check(
+      """|import scala.language.experimental.namedTuples
+         |
+         |val <<foo>> = (name = "Bob", age = 42, height = 1.9d)
+         |val foo_name = foo.na@@me
+         |""".stripMargin
+    )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
index 2828b946c7c3..5e20045babfb 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -717,3 +717,33 @@ class HoverTermSuite extends BaseHoverSuite:
         |""".stripMargin,
       """def ???: Nothing""".stripMargin.hover
   )
+
+  @Test def `named-tuples`: Unit =
+    check(
+      """import scala.language.experimental.namedTuples
+        |
+        |val foo = (name = "Bob", age = 42, height = 1.9d)
+        |val foo_name = foo.na@@me
+        |""".stripMargin,
+      "name: String".hover
+    )
+
+  @Test def `named-tuples2`: Unit =
+    check(
+      """|import scala.language.experimental.namedTuples
+         |
+         |import NamedTuple.*
+         |
+         |class NamedTupleSelectable extends Selectable {
+         |  type Fields <: AnyNamedTuple
+         |  def selectDynamic(name: String): Any = ???
+         |}
+         |
+         |val person = new NamedTupleSelectable {
+         |  type Fields = (name: String, city: String)
+         |}
+         |
+         |val person_name = person.na@@me
+         |""".stripMargin,
+      "name: String".hover
+    )

From c83d67c5802e0fd0cf277f1ca4a060756d7cedf8 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Tue, 14 Jan 2025 15:50:04 +0000
Subject: [PATCH 008/505] Preserve hard unions in widenSingletons

[Cherry-picked 2472a58b4d7ae99f4992bb5d1a1b4d4b77d04528]
---
 .../src/dotty/tools/dotc/core/Types.scala     |  8 ++++----
 tests/pos/22219.scala                         |  5 +++++
 tests/pos/22219b.scala                        | 20 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 tests/pos/22219.scala
 create mode 100644 tests/pos/22219b.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index f60c609eadd1..5fe6c3174c04 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -1361,9 +1361,9 @@ object Types extends TypeUtils {
       case tp =>
         tp
 
-    /** Widen all top-level singletons reachable by dealiasing
-     *  and going to the operands of & and |.
-     *  Overridden and cached in OrType.
+    /** Widen all top-level singletons reachable by dealiasing and going to the
+     *  operands of intersections and soft unions (only when `skipSoftUnions` is
+     *  `false`). Overridden and cached in [[OrType]].
      */
     def widenSingletons(skipSoftUnions: Boolean = false)(using Context): Type = dealias match {
       case tp: SingletonType =>
@@ -3543,7 +3543,7 @@ object Types extends TypeUtils {
       myAtoms
 
     override def widenSingletons(skipSoftUnions: Boolean)(using Context): Type =
-      if isSoft && skipSoftUnions then this
+      if !isSoft || skipSoftUnions then this
       else
         if widenedRunId != ctx.runId then
           myWidened = computeWidenSingletons()
diff --git a/tests/pos/22219.scala b/tests/pos/22219.scala
new file mode 100644
index 000000000000..fd455d5dc902
--- /dev/null
+++ b/tests/pos/22219.scala
@@ -0,0 +1,5 @@
+type MonthNumber = 1 | 2
+
+def main =
+  val x = 1: MonthNumber
+  val y: MonthNumber = x
diff --git a/tests/pos/22219b.scala b/tests/pos/22219b.scala
new file mode 100644
index 000000000000..8046ef802845
--- /dev/null
+++ b/tests/pos/22219b.scala
@@ -0,0 +1,20 @@
+type MonthNumber =
+  1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12
+
+def main =
+  List[(String, MonthNumber)](
+      "January" -> 1,
+      "February" -> 2,
+      "March" -> 3,
+      "April" -> 4,
+      "May" -> 5,
+      "June"-> 6,
+      "July" -> 7,
+      "August" -> 8,
+      "September" -> 9,
+      "October" -> 10,
+      "November" -> 11,
+      "December" -> 12
+    ).foreach { (name, number) =>
+      summon[number.type <:< MonthNumber]
+    }

From bb623f1e232a7de63cb893fa8c6f07483d15516f Mon Sep 17 00:00:00 2001
From: Yichen Xu <yichen.x@outlook.com>
Date: Mon, 13 Jan 2025 20:46:01 +0800
Subject: [PATCH 009/505] Improve the usage of inclusive language

Changes:
- blacklist -> excludelist
- whitelist -> allowlist

Discussion:
- https://github.com/scala/scala3/issues/21988
- https://github.com/scala/scala3/pull/22360#issuecomment-2587398739
---
 .../src/dotty/tools/dotc/core/Contexts.scala  |   2 +-
 .../src/dotty/tools/dotc/core/Names.scala     |   2 +-
 .../dotc/core/classfile/ClassfileParser.scala |   4 +-
 .../dotc/neg-best-effort-pickling.excludelist |  23 +++
 .../neg-best-effort-unpickling.excludelist    |  17 +++
 ...it-global-scala2-library-tasty.excludelist |  21 +++
 .../dotc/neg-scala2-library-tasty.excludelist |   2 +
 ...austivity-scala2-library-tasty.excludelist |   4 +
 ...y.blacklist => pos-from-tasty.excludelist} |   0
 ...it-global-scala2-library-tasty.excludelist |   5 +
 .../test/dotc/pos-test-pickling.excludelist   | 143 ++++++++++++++++++
 ...y.blacklist => run-from-tasty.excludelist} |   0
 ...un-macros-scala2-library-tasty.excludelist |   5 +
 .../test/dotc/run-test-pickling.excludelist   |  52 +++++++
 compiler/test/dotty/tools/TestSources.scala   |  17 +--
 .../dotty/tools/dotc/CompilationTests.scala   |   4 +-
 .../dotty/tools/dotc/FromTastyTests.scala     |   4 +-
 .../tools/dotc/parsing/ScannerTest.scala      |  10 +-
 .../test/dotty/tools/vulpix/FileFilter.scala  |   8 +-
 .../dotty/tools/vulpix/ParallelTesting.scala  |   2 +-
 project/Build.scala                           |   2 +-
 .../tools/scaladoc/tasty/BasicSupport.scala   |   4 +-
 22 files changed, 301 insertions(+), 30 deletions(-)
 create mode 100644 compiler/test/dotc/neg-best-effort-pickling.excludelist
 create mode 100644 compiler/test/dotc/neg-best-effort-unpickling.excludelist
 create mode 100644 compiler/test/dotc/neg-init-global-scala2-library-tasty.excludelist
 create mode 100644 compiler/test/dotc/neg-scala2-library-tasty.excludelist
 create mode 100644 compiler/test/dotc/patmat-exhaustivity-scala2-library-tasty.excludelist
 rename compiler/test/dotc/{pos-from-tasty.blacklist => pos-from-tasty.excludelist} (100%)
 create mode 100644 compiler/test/dotc/pos-init-global-scala2-library-tasty.excludelist
 create mode 100644 compiler/test/dotc/pos-test-pickling.excludelist
 rename compiler/test/dotc/{run-from-tasty.blacklist => run-from-tasty.excludelist} (100%)
 create mode 100644 compiler/test/dotc/run-macros-scala2-library-tasty.excludelist
 create mode 100644 compiler/test/dotc/run-test-pickling.excludelist

diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala
index bde23de135e4..8c09a3f24fa0 100644
--- a/compiler/src/dotty/tools/dotc/core/Contexts.scala
+++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala
@@ -121,7 +121,7 @@ object Contexts {
    *      risk of capturing complete trees.
    *    - To make sure these rules are kept, it would be good to do a sanity
    *      check using bytecode inspection with javap or scalap: Keep track
-   *      of all class fields of type context; allow them only in whitelisted
+   *      of all class fields of type context; allow them only in allowlisted
    *      classes (which should be short-lived).
    */
   abstract class Context(val base: ContextBase) { thiscontext =>
diff --git a/compiler/src/dotty/tools/dotc/core/Names.scala b/compiler/src/dotty/tools/dotc/core/Names.scala
index 3f9667b08067..a31ab0662ee4 100644
--- a/compiler/src/dotty/tools/dotc/core/Names.scala
+++ b/compiler/src/dotty/tools/dotc/core/Names.scala
@@ -401,7 +401,7 @@ object Names {
       }
 
     /** It's OK to take a toString if the stacktrace does not contain a method
-     *  from GenBCode or it also contains one of the whitelisted methods below.
+     *  from GenBCode or it also contains one of the allowed methods below.
      */
     private def toStringOK = {
       val trace: Array[StackTraceElement] = Thread.currentThread.nn.getStackTrace.asInstanceOf[Array[StackTraceElement]]
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
index c20b6c73b1ea..37367ca56488 100644
--- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
+++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
@@ -904,7 +904,7 @@ class ClassfileParser(
 
   // Nothing$ and Null$ were incorrectly emitted with a Scala attribute
   // instead of ScalaSignature before 2.13.0-M2, see https://github.com/scala/scala/pull/5952
-  private val scalaUnpickleWhitelist = List(tpnme.nothingClass, tpnme.nullClass)
+  private val scalaUnpickleAllowlist = List(tpnme.nothingClass, tpnme.nullClass)
 
   /** Parse inner classes. Expects `in.bp` to point to the superclass entry.
    *  Restores the old `bp`.
@@ -1028,7 +1028,7 @@ class ClassfileParser(
           report.error(s"Found a TASTY attribute with a length different from 16 in $classfile. This is likely a bug in the compiler. Please report.", NoSourcePosition)
       }
 
-      if scan(tpnme.ScalaATTR) && !scalaUnpickleWhitelist.contains(classRoot.name)
+      if scan(tpnme.ScalaATTR) && !scalaUnpickleAllowlist.contains(classRoot.name)
         && !(classRoot.name.startsWith("Tuple") && classRoot.name.endsWith("$sp"))
         && !(classRoot.name.startsWith("Product") && classRoot.name.endsWith("$sp"))
       then
diff --git a/compiler/test/dotc/neg-best-effort-pickling.excludelist b/compiler/test/dotc/neg-best-effort-pickling.excludelist
new file mode 100644
index 000000000000..99a83a467f08
--- /dev/null
+++ b/compiler/test/dotc/neg-best-effort-pickling.excludelist
@@ -0,0 +1,23 @@
+export-in-extension.scala
+i12456.scala
+i8623.scala
+i1642.scala
+i16696.scala
+constructor-proxy-values.scala
+i9328.scala
+i15414.scala
+i6796.scala
+i14013.scala
+toplevel-cyclic
+curried-dependent-ift.scala
+i17121.scala
+illegal-match-types.scala
+i13780-1.scala
+i20317a.scala
+i11226.scala
+i974.scala
+i13864.scala
+
+# semantic db generation fails in the first compilation
+i1642.scala
+i15158.scala
diff --git a/compiler/test/dotc/neg-best-effort-unpickling.excludelist b/compiler/test/dotc/neg-best-effort-unpickling.excludelist
new file mode 100644
index 000000000000..1e22d919f25a
--- /dev/null
+++ b/compiler/test/dotc/neg-best-effort-unpickling.excludelist
@@ -0,0 +1,17 @@
+# cyclic reference crashes
+i4368.scala
+i827.scala
+cycles.scala
+i5332.scala
+i4369c.scala
+i1806.scala
+i0091-infpaths.scala
+exports.scala
+i14834.scala
+
+# other type related crashes
+i4653.scala
+overrideClass.scala
+
+# repeating <error> on a top level type definition
+i18750.scala
diff --git a/compiler/test/dotc/neg-init-global-scala2-library-tasty.excludelist b/compiler/test/dotc/neg-init-global-scala2-library-tasty.excludelist
new file mode 100644
index 000000000000..03b020db64d9
--- /dev/null
+++ b/compiler/test/dotc/neg-init-global-scala2-library-tasty.excludelist
@@ -0,0 +1,21 @@
+## See #18882
+patmat.scala
+t9312.scala
+unapplySeq-implicit-arg.scala
+unapplySeq-implicit-arg2.scala
+unapplySeq-implicit-arg3.scala
+ScalaCheck.scala
+mutable-read8.scala
+TypeCast.scala
+global-cycle8.scala
+global-cycle6.scala
+i12544b.scala
+t9360.scala
+mutable-array.scala
+patmat-unapplySeq2.scala
+line-spacing.scala
+global-list.scala
+t5366.scala
+mutable-read7.scala
+t9115.scala
+Color.scala
\ No newline at end of file
diff --git a/compiler/test/dotc/neg-scala2-library-tasty.excludelist b/compiler/test/dotc/neg-scala2-library-tasty.excludelist
new file mode 100644
index 000000000000..d46a021ddd50
--- /dev/null
+++ b/compiler/test/dotc/neg-scala2-library-tasty.excludelist
@@ -0,0 +1,2 @@
+i8752.scala
+f-interpolator-neg.scala # Additional: A pure expression does nothing in statement position
diff --git a/compiler/test/dotc/patmat-exhaustivity-scala2-library-tasty.excludelist b/compiler/test/dotc/patmat-exhaustivity-scala2-library-tasty.excludelist
new file mode 100644
index 000000000000..6f1717d532fd
--- /dev/null
+++ b/compiler/test/dotc/patmat-exhaustivity-scala2-library-tasty.excludelist
@@ -0,0 +1,4 @@
+t7746.scala # order of exhaustivity suggestions differs
+t4408.scala # order of exhaustivity suggestions differs
+patmat-ortype.scala # order of exhaustivity suggestions differs
+i13003.scala # order of exhaustivity suggestions differs
diff --git a/compiler/test/dotc/pos-from-tasty.blacklist b/compiler/test/dotc/pos-from-tasty.excludelist
similarity index 100%
rename from compiler/test/dotc/pos-from-tasty.blacklist
rename to compiler/test/dotc/pos-from-tasty.excludelist
diff --git a/compiler/test/dotc/pos-init-global-scala2-library-tasty.excludelist b/compiler/test/dotc/pos-init-global-scala2-library-tasty.excludelist
new file mode 100644
index 000000000000..eb60fc3b7c14
--- /dev/null
+++ b/compiler/test/dotc/pos-init-global-scala2-library-tasty.excludelist
@@ -0,0 +1,5 @@
+## See #18882
+patmat.scala
+patmat-interpolator.scala
+unapplySeq-implicit-arg-pos.scala
+global-cycle11.scala
diff --git a/compiler/test/dotc/pos-test-pickling.excludelist b/compiler/test/dotc/pos-test-pickling.excludelist
new file mode 100644
index 000000000000..23c79affada0
--- /dev/null
+++ b/compiler/test/dotc/pos-test-pickling.excludelist
@@ -0,0 +1,143 @@
+i94-nada.scala
+i1812.scala
+i1867.scala
+i3067.scala
+t2712-5.scala
+t284-pos.scala
+t3249
+t3486
+t3612.scala
+reference
+scala-days-2019-slides
+i7048e.scala
+i8052.scala
+tuple-filter.scala
+i7740a.scala
+i7740b.scala
+i6507b.scala
+i12299a.scala
+i13871.scala
+i15181.scala
+i15922.scala
+i15926.scala
+t5031_2.scala
+i16997.scala
+i7414.scala
+i17588.scala
+i8300.scala
+i9804.scala
+i13433.scala
+i16649-irrefutable.scala
+strict-pattern-bindings-3.0-migration.scala
+i17186b.scala
+i11982a.scala
+i17255
+i17735.scala
+
+# Tree is huge and blows stack for printing Text
+i7034.scala
+
+# Causes cyclic reference by interacting with compiler stdlib types
+stdlib
+
+# Stale symbol: package object scala
+seqtype-cycle
+
+# type of super reference changes due to late addition of Mirror.Singleton
+i939.scala
+i13332super.scala
+
+# Match types
+i7872.scala
+i11236.scala
+i11247.scala
+i11250
+i9999.scala
+8649.scala
+12093.scala
+9757.scala
+9890.scala
+13491.scala
+7512.scala
+i6505.scala
+i15158.scala
+i15155.scala
+i15827.scala
+i17149.scala
+tuple-fold.scala
+mt-redux-norm.perspective.scala
+i18211.scala
+10867.scala
+named-tuples1.scala
+i20897.scala
+i20512.scala
+
+# Opaque type
+i5720.scala
+
+# Tuples
+toexproftuple.scala
+i7580.scala
+
+# Nullability
+nullable.scala
+
+# parameter untupling with overloaded functions (see comment in Applications.normArg)
+i7757.scala
+
+# splice type tag dealiased in this reference
+i8651b.scala
+
+# uneliminated @uncheckedVariance after pickling
+annot-bootstrap.scala
+
+# interaction with Scala-2's implicitly
+i9793.scala
+
+# lazy_implicit symbol has different position after pickling
+i8182.scala
+
+# local lifted value in annotation argument has different position after pickling
+i2797a
+
+# Late instantiation of type variable in tryInsertImplicitOnQualifier
+# allows to simplify a type that was already computed
+i13842.scala
+
+# Position change under captureChecking
+boxmap-paper.scala
+
+# Function types print different after unpickling since test mispredicts Feature.preFundsEnabled
+caps-universal.scala
+
+# GADT cast applied to singleton type difference
+i4176-gadt.scala
+
+# GADT difference
+i13974a.scala
+i15867.scala
+
+java-inherited-type1
+
+# recursion limit exceeded
+i7445b.scala
+
+# more aggresive reduce projection makes a difference
+i15525.scala
+i19955a.scala
+i19955b.scala
+i20053b.scala
+
+# alias types at different levels of dereferencing
+parsercombinators-givens.scala
+parsercombinators-givens-2.scala
+parsercombinators-ctx-bounds.scala
+parsercombinators-this.scala
+parsercombinators-arrow.scala
+parsercombinators-new-syntax.scala
+hylolib-deferred-given
+hylolib-cb
+hylolib
+
+# typecheckErrors method unpickling
+i21415.scala
diff --git a/compiler/test/dotc/run-from-tasty.blacklist b/compiler/test/dotc/run-from-tasty.excludelist
similarity index 100%
rename from compiler/test/dotc/run-from-tasty.blacklist
rename to compiler/test/dotc/run-from-tasty.excludelist
diff --git a/compiler/test/dotc/run-macros-scala2-library-tasty.excludelist b/compiler/test/dotc/run-macros-scala2-library-tasty.excludelist
new file mode 100644
index 000000000000..6fdfccf7646c
--- /dev/null
+++ b/compiler/test/dotc/run-macros-scala2-library-tasty.excludelist
@@ -0,0 +1,5 @@
+# Checkfile differences for equivalent type
+tasty-extractors-1
+tasty-extractors-2
+tasty-extractors-types
+type-print
diff --git a/compiler/test/dotc/run-test-pickling.excludelist b/compiler/test/dotc/run-test-pickling.excludelist
new file mode 100644
index 000000000000..c880a4b78f23
--- /dev/null
+++ b/compiler/test/dotc/run-test-pickling.excludelist
@@ -0,0 +1,52 @@
+## Many of these tests fail because CompilationTests.pickling does not handle
+## tests containing java files correctly
+
+derive-generic.scala
+eff-dependent.scala
+enum-java
+i5257.scala
+i7212
+i7868.scala
+i9011.scala
+i9473.scala
+i13433.scala
+i13433b.scala
+macros-in-same-project1
+mixin-forwarder-overload
+t10889
+t3452d
+t3452e
+t3452g
+t7374
+t8905
+tuple-drop.scala
+tuple-ops.scala
+tuple-ops.scala
+tuple-take.scala
+tuple-zip.scala
+tuples1.scala
+tuples1a.scala
+tuples1b.scala
+typeclass-derivation-doc-example.scala
+typeclass-derivation1.scala
+typeclass-derivation2.scala
+typeclass-derivation2a.scala
+typeclass-derivation2b.scala
+typeclass-derivation2c.scala
+typeclass-derivation2d.scala
+typeclass-derivation3.scala
+varargs-abstract
+zero-arity-case-class.scala
+i12194.scala
+i12753
+t6138
+t6138-2
+i12656.scala
+trait-static-forwarder
+i17255
+named-tuples-strawman-2.scala
+
+# typecheckErrors method unpickling
+typeCheckErrors.scala
+i18150.scala
+
diff --git a/compiler/test/dotty/tools/TestSources.scala b/compiler/test/dotty/tools/TestSources.scala
index 68a260de81e4..15cb0c741ede 100644
--- a/compiler/test/dotty/tools/TestSources.scala
+++ b/compiler/test/dotty/tools/TestSources.scala
@@ -11,28 +11,27 @@ object TestSources {
 
   // pos tests lists
 
-  def posFromTastyBlacklistFile: String = "compiler/test/dotc/pos-from-tasty.blacklist"
-  def posTestPicklingBlacklistFile: String = "compiler/test/dotc/pos-test-pickling.blacklist"
+  def posFromTastyExcludelistFile: String = "compiler/test/dotc/pos-from-tasty.excludelist"
+  def posTestPicklingExcludelistFile: String = "compiler/test/dotc/pos-test-pickling.excludelist"
   def posTestRecheckExcludesFile: String = "compiler/test/dotc/pos-test-recheck.excludes"
   def posLazyValsAllowlistFile: String = "compiler/test/dotc/pos-lazy-vals-tests.allowlist"
   def posLintingAllowlistFile: String = "compiler/test/dotc/pos-linting.allowlist"
 
-  def posFromTastyBlacklisted: List[String] = loadList(posFromTastyBlacklistFile)
-  def posTestPicklingBlacklisted: List[String] = loadList(posTestPicklingBlacklistFile)
+  def posFromTastyExcludelisted: List[String] = loadList(posFromTastyExcludelistFile)
+  def posTestPicklingExcludelisted: List[String] = loadList(posTestPicklingExcludelistFile)
   def posTestRecheckExcluded: List[String] = loadList(posTestRecheckExcludesFile)
   def posLazyValsAllowlist: List[String] = loadList(posLazyValsAllowlistFile)
   def posLintingAllowlist: List[String] = loadList(posLintingAllowlistFile)
 
   // run tests lists
 
-  def runFromTastyBlacklistFile: String = "compiler/test/dotc/run-from-tasty.blacklist"
-  def runTestPicklingBlacklistFile: String = "compiler/test/dotc/run-test-pickling.blacklist"
+  def runFromTastyExcludelistFile: String = "compiler/test/dotc/run-from-tasty.excludelist"
+  def runTestPicklingExcludelistFile: String = "compiler/test/dotc/run-test-pickling.excludelist"
   def runTestRecheckExcludesFile: String = "compiler/test/dotc/run-test-recheck.excludes"
   def runLazyValsAllowlistFile: String = "compiler/test/dotc/run-lazy-vals-tests.allowlist"
 
-
-  def runFromTastyBlacklisted: List[String] = loadList(runFromTastyBlacklistFile)
-  def runTestPicklingBlacklisted: List[String] = loadList(runTestPicklingBlacklistFile)
+  def runFromTastyExcludelisted: List[String] = loadList(runFromTastyExcludelistFile)
+  def runTestPicklingExcludelisted: List[String] = loadList(runTestPicklingExcludelistFile)
   def runTestRecheckExcluded: List[String] = loadList(runTestRecheckExcludesFile)
   def runLazyValsAllowlist: List[String] = loadList(runLazyValsAllowlistFile)
 
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index f10e159beb86..71bf5a7e7844 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -170,8 +170,8 @@ class CompilationTests {
   @Test def pickling: Unit = {
     implicit val testGroup: TestGroup = TestGroup("testPickling")
     aggregateTests(
-      compileFilesInDir("tests/pos", picklingOptions, FileFilter.exclude(TestSources.posTestPicklingBlacklisted)),
-      compileFilesInDir("tests/run", picklingOptions, FileFilter.exclude(TestSources.runTestPicklingBlacklisted))
+      compileFilesInDir("tests/pos", picklingOptions, FileFilter.exclude(TestSources.posTestPicklingExcludelisted)),
+      compileFilesInDir("tests/run", picklingOptions, FileFilter.exclude(TestSources.runTestPicklingExcludelisted))
     ).checkCompile()
   }
 
diff --git a/compiler/test/dotty/tools/dotc/FromTastyTests.scala b/compiler/test/dotty/tools/dotc/FromTastyTests.scala
index 1d46cbbce95c..874088fb618e 100644
--- a/compiler/test/dotty/tools/dotc/FromTastyTests.scala
+++ b/compiler/test/dotty/tools/dotc/FromTastyTests.scala
@@ -23,7 +23,7 @@ class FromTastyTests {
 
     implicit val testGroup: TestGroup = TestGroup("posTestFromTasty")
     compileTastyInDir(s"tests${JFile.separator}pos", defaultOptions,
-      fromTastyFilter = FileFilter.exclude(TestSources.posFromTastyBlacklisted)
+      fromTastyFilter = FileFilter.exclude(TestSources.posFromTastyExcludelisted)
     ).checkCompile()
   }
 
@@ -35,7 +35,7 @@ class FromTastyTests {
 
     implicit val testGroup: TestGroup = TestGroup("runTestFromTasty")
     compileTastyInDir(s"tests${JFile.separator}run", defaultOptions,
-      fromTastyFilter = FileFilter.exclude(TestSources.runFromTastyBlacklisted)
+      fromTastyFilter = FileFilter.exclude(TestSources.runFromTastyExcludelisted)
     ).checkRuns()
   }
 }
diff --git a/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala b/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala
index 659cd27e62f4..9f78d0778b41 100644
--- a/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala
+++ b/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala
@@ -10,7 +10,7 @@ import org.junit.Test
 
 class ScannerTest extends DottyTest {
 
-  val blackList = List(
+  val excluded = List(
       "/scaladoc/scala/tools/nsc/doc/html/page/Index.scala",
       "/scaladoc/scala/tools/nsc/doc/html/page/Template.scala"
     )
@@ -33,13 +33,13 @@ class ScannerTest extends DottyTest {
   def scanDir(path: String): Unit = scanDir(Directory(path))
 
   def scanDir(dir: Directory): Unit = {
-    if (blackList exists (dir.jpath.toString endsWith _))
-      println(s"blacklisted package: ${dir.toAbsolute.jpath}")
+    if (excluded exists (dir.jpath.toString endsWith _))
+      println(s"excluded package: ${dir.toAbsolute.jpath}")
     else
       for (f <- dir.files)
         if (f.name.endsWith(".scala"))
-          if (blackList exists (f.jpath.toString endsWith _))
-            println(s"blacklisted file: ${f.toAbsolute.jpath}")
+          if (excluded exists (f.jpath.toString endsWith _))
+            println(s"excluded file: ${f.toAbsolute.jpath}")
           else
             scan(new PlainFile(f))
     for (d <- dir.dirs)
diff --git a/compiler/test/dotty/tools/vulpix/FileFilter.scala b/compiler/test/dotty/tools/vulpix/FileFilter.scala
index b2aef8af038e..b59b4d4f209d 100644
--- a/compiler/test/dotty/tools/vulpix/FileFilter.scala
+++ b/compiler/test/dotty/tools/vulpix/FileFilter.scala
@@ -11,13 +11,13 @@ object FileFilter {
     exclude(file :: files.toList)
 
   def exclude(files: List[String]): FileFilter = new FileFilter {
-    private val blackList = files.toSet
-    def accept(file: String): Boolean = !blackList.contains(file)
+    private val excluded = files.toSet
+    def accept(file: String): Boolean = !excluded.contains(file)
   }
 
   def include(files: List[String]): FileFilter = new FileFilter {
-    private val whiteList = files.toSet
-    def accept(file: String): Boolean = whiteList.contains(file)
+    private val included = files.toSet
+    def accept(file: String): Boolean = included.contains(file)
   }
 
   object NoFilter extends FileFilter {
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index f701a348d233..b4189deb805c 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -1499,7 +1499,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
             |
             |  sbt "testCompilation --from-tasty $file"
             |
-            |This tests can be disabled by adding `${file.getName}` to `compiler${JFile.separator}test${JFile.separator}dotc${JFile.separator}$runOrPos-$listName.blacklist`
+            |This tests can be disabled by adding `${file.getName}` to `compiler${JFile.separator}test${JFile.separator}dotc${JFile.separator}$runOrPos-$listName.excludelist`
             |
             |""".stripMargin
       }
diff --git a/project/Build.scala b/project/Build.scala
index 2e172a7e005a..7e0fe2b4c761 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -1459,7 +1459,7 @@ object Build {
         )
       },
 
-      // A first blacklist of tests for those that do not compile or do not link
+      // A first excludelist of tests for those that do not compile or do not link
       (Test / managedSources) ++= {
         val dir = fetchScalaJSSource.value / "test-suite"
 
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala
index a5e32c7332bd..81415377beeb 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala
@@ -42,7 +42,7 @@ trait BasicSupport:
     def getAnnotations(): List[Annotation] =
       // Custom annotations should be documented only if annotated by @java.lang.annotation.Documented
       // We allow also some special cases
-      val fqNameWhitelist = Set(
+      val fqNameAllowlist = Set(
         "scala.specialized",
         "scala.throws",
         "scala.transient",
@@ -56,7 +56,7 @@ trait BasicSupport:
       )
       val documentedSymbol = summon[Quotes].reflect.Symbol.requiredClass("java.lang.annotation.Documented")
       val annotations = sym.annotations.filter { a =>
-        a.tpe.typeSymbol.hasAnnotation(documentedSymbol) || fqNameWhitelist.contains(a.symbol.fullName)
+        a.tpe.typeSymbol.hasAnnotation(documentedSymbol) || fqNameAllowlist.contains(a.symbol.fullName)
       }
       annotations.map(parseAnnotation).reverse
 

From b354b70b5cb5da2b75910f363f2daf427ce09683 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Apr 2025 16:27:52 +0200
Subject: [PATCH 010/505] Improve the usage of inclusive language

Changes:
- blacklist -> excludelist
- whitelist -> allowlist

Discussion:
- https://github.com/scala/scala3/issues/21988
- https://github.com/scala/scala3/pull/22360#issuecomment-2587398739

[Cherry-picked 910fca9026e6b10ad07fd0fd6d1381888c3954cb][modified]

From 491e4cd31e572953e5a74a988b41f2495fcd9a84 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 8 Jan 2025 14:35:33 +0000
Subject: [PATCH 011/505] Fix SeparateCompilationSource toString

[Cherry-picked 7d7e2dcd0915ac69991ec4f222581fc0b6692d83]
---
 compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index b4189deb805c..7d32b3d6c9fa 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -156,6 +156,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         }
       }
     }
+
+    final override def toString: String = sourceFiles match {
+      case Array(f) => f.getPath
+      case _        => outDir.getPath.stripPrefix(defaultOutputDir).stripPrefix(name).stripPrefix("/")
+    }
   }
 
   /** A group of files that may all be compiled together, with the same flags
@@ -170,8 +175,6 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     decompilation: Boolean = false
   ) extends TestSource {
     def sourceFiles: Array[JFile] = files.filter(isSourceFile)
-
-    override def toString() = sourceFiles match { case Array(f) => f.getPath case _ => outDir.getPath }
   }
 
   /** A test source whose files will be compiled separately according to their

From 2dbead67fb4b6b5a949b47914cb195136fbc7784 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Apr 2025 16:29:32 +0200
Subject: [PATCH 012/505] chore: regroup all the library settings in a single
 function

[Cherry-picked f46687e7992ae05f439976188aefa8941ac7d7e1][modified]
---
 project/Build.scala | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 7e0fe2b4c761..332dea92894f 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -959,7 +959,9 @@ object Build {
   }
 
   // Settings shared between scala3-library, scala3-library-bootstrapped and scala3-library-bootstrappedJS
-  lazy val dottyLibrarySettings = Seq(
+  def dottyLibrarySettings(implicit mode: Mode) = Seq(
+    versionScheme := Some("semver-spec"),
+    libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion,
     (Compile / scalacOptions) ++= Seq(
       // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
       "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator),
@@ -2043,16 +2045,9 @@ object Build {
       settings(dottyCompilerSettings)
 
     def asDottyLibrary(implicit mode: Mode): Project = {
-      val base =
-        project.withCommonSettings.
-          settings(
-            versionScheme := Some("semver-spec"),
-            libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion,
-            // Make sure we do not refer to experimental features outside an experimental scope.
-            // In other words, disable NIGHTLY/SNAPSHOT experimental scope.
-            scalacOptions += "-Yno-experimental",
-          ).
-          settings(dottyLibrarySettings)
+      val base = project
+        .withCommonSettings
+        .settings(dottyLibrarySettings)
       if (mode == Bootstrapped) {
         base.settings(
           (Compile/doc) := {
@@ -2111,6 +2106,7 @@ object Build {
       case NonBootstrapped => commonNonBootstrappedSettings
       case Bootstrapped => commonBootstrappedSettings
     })
+
   }
 
   /* Tests TASTy version invariants during NIGHLY, RC or Stable releases */

From 822a29c5098082fc225e6f64343244fe0290fd27 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Sun, 19 Jan 2025 20:03:10 +0100
Subject: [PATCH 013/505] Fix mapping of annotations

We previously did not do an (expensive) TreeTypeMap on an annotation if the mapped versions
of all types of subtrees of the annotation tree were =:= to the original types. But it turns
out this is too coarse. In the test we have capture set variables where we intend to map a
TypeRef to a TypeParamRef but the two were considered as =:= because of the bounds they had.
So no mapping took place.

We now use `eql` instead of =:=, which is structural comparison with `eq` for references to
corresponding binders.

[Cherry-picked 6d6da118ac15b16dc58e35ce85127f468e7c4674]
---
 compiler/src/dotty/tools/dotc/core/Annotations.scala | 2 +-
 compiler/src/dotty/tools/dotc/core/Types.scala       | 2 ++
 tests/pos-custom-args/captures/setup/a_1.scala       | 6 ++++++
 tests/pos-custom-args/captures/setup/b_1.scala       | 5 +++++
 tests/pos-custom-args/captures/setup/b_2.scala       | 5 +++++
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos-custom-args/captures/setup/a_1.scala
 create mode 100644 tests/pos-custom-args/captures/setup/b_1.scala
 create mode 100644 tests/pos-custom-args/captures/setup/b_2.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Annotations.scala b/compiler/src/dotty/tools/dotc/core/Annotations.scala
index f5825df84a8b..0706003f533e 100644
--- a/compiler/src/dotty/tools/dotc/core/Annotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/Annotations.scala
@@ -65,7 +65,7 @@ object Annotations {
             if tm.isRange(x) then x
             else
               val tp1 = tm(tree.tpe)
-              foldOver(if !tp1.exists || (tp1 frozen_=:= tree.tpe) then x else tp1, tree)
+              foldOver(if !tp1.exists || tp1.eql(tree.tpe) then x else tp1, tree)
         val diff = findDiff(NoType, args)
         if tm.isRange(diff) then EmptyAnnotation
         else if diff.exists then derivedAnnotation(tm.mapOver(tree))
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 5fe6c3174c04..ac6089516571 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -5967,6 +5967,8 @@ object Types extends TypeUtils {
       override def stopAt = thisMap.stopAt
       def apply(tp: Type) = f(thisMap(tp))
     }
+
+    override def toString = s"${getClass.getSimpleName}@$hashCode" // otherwise would print as <function1>
   }
 
   /** A type map that maps also parents and self type of a ClassInfo */
diff --git a/tests/pos-custom-args/captures/setup/a_1.scala b/tests/pos-custom-args/captures/setup/a_1.scala
new file mode 100644
index 000000000000..21afde8be3ea
--- /dev/null
+++ b/tests/pos-custom-args/captures/setup/a_1.scala
@@ -0,0 +1,6 @@
+// a.scala
+import language.experimental.captureChecking
+import scala.caps.CapSet
+
+trait A:
+  def f[C^](x: AnyRef^{C^}): Unit
diff --git a/tests/pos-custom-args/captures/setup/b_1.scala b/tests/pos-custom-args/captures/setup/b_1.scala
new file mode 100644
index 000000000000..d5ba925970ba
--- /dev/null
+++ b/tests/pos-custom-args/captures/setup/b_1.scala
@@ -0,0 +1,5 @@
+import language.experimental.captureChecking
+import scala.caps.CapSet
+
+class B extends A:
+  def f[C^](x: AnyRef^{C^}): Unit = ???
diff --git a/tests/pos-custom-args/captures/setup/b_2.scala b/tests/pos-custom-args/captures/setup/b_2.scala
new file mode 100644
index 000000000000..d5ba925970ba
--- /dev/null
+++ b/tests/pos-custom-args/captures/setup/b_2.scala
@@ -0,0 +1,5 @@
+import language.experimental.captureChecking
+import scala.caps.CapSet
+
+class B extends A:
+  def f[C^](x: AnyRef^{C^}): Unit = ???

From e92279fc0f58533b3f237ef8d66d1d59a98f6ce5 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Mon, 20 Jan 2025 02:25:38 -0800
Subject: [PATCH 014/505] Suppress spurious Suppression (#22383)

Guard against multiple registrations of nowarn on related elements.

Fixes #18341
---
 compiler/src/dotty/tools/dotc/Run.scala       | 16 +++++++-------
 .../dotty/tools/dotc/reporting/WConf.scala    |  2 +-
 tests/warn/i18341.scala                       | 21 +++++++++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 tests/warn/i18341.scala

diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala
index 8e98f276a7c2..7dace14ac068 100644
--- a/compiler/src/dotty/tools/dotc/Run.scala
+++ b/compiler/src/dotty/tools/dotc/Run.scala
@@ -30,7 +30,7 @@ import StdNames.nme
 import java.io.{BufferedWriter, OutputStreamWriter}
 import java.nio.charset.StandardCharsets
 
-import scala.collection.mutable
+import scala.collection.mutable, mutable.ListBuffer
 import scala.util.control.NonFatal
 import scala.io.Codec
 
@@ -68,7 +68,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
   private var myFiles: Set[AbstractFile] = _
 
   // `@nowarn` annotations by source file, populated during typer
-  private val mySuppressions: mutable.LinkedHashMap[SourceFile, mutable.ListBuffer[Suppression]] = mutable.LinkedHashMap.empty
+  private val mySuppressions: mutable.LinkedHashMap[SourceFile, ListBuffer[Suppression]] = mutable.LinkedHashMap.empty
   // source files whose `@nowarn` annotations are processed
   private val mySuppressionsComplete: mutable.Set[SourceFile] = mutable.Set.empty
   // warnings issued before a source file's `@nowarn` annotations are processed, suspended so that `@nowarn` can filter them
@@ -98,8 +98,9 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       }
 
     def addSuppression(sup: Suppression): Unit =
-      val source = sup.annotPos.source
-      mySuppressions.getOrElseUpdate(source, mutable.ListBuffer.empty) += sup
+      val suppressions = mySuppressions.getOrElseUpdate(sup.annotPos.source, ListBuffer.empty)
+      if sup.start != sup.end && suppressions.forall(x => x.start != sup.start || x.end != sup.end) then
+        suppressions += sup
 
     def reportSuspendedMessages(source: SourceFile)(using Context): Unit = {
       // sort suppressions. they are not added in any particular order because of lazy type completion
@@ -114,11 +115,12 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       mySuspendedMessages.keysIterator.toList.foreach(reportSuspendedMessages)
       // report unused nowarns only if all all phases are done
       if !hasErrors && ctx.settings.WunusedHas.nowarn then
-        for {
+        for
           source <- mySuppressions.keysIterator.toList
           sups   <- mySuppressions.remove(source)
           sup    <- sups.reverse
-        } if (!sup.used)
+          if !sup.used
+        do
           report.warning("@nowarn annotation does not suppress any warnings", sup.annotPos)
 
   /** The compilation units currently being compiled, this may return different
@@ -167,7 +169,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
   val staticRefs = util.EqHashMap[Name, Denotation](initialCapacity = 1024)
 
   /** Actions that need to be performed at the end of the current compilation run */
-  private var finalizeActions = mutable.ListBuffer[() => Unit]()
+  private var finalizeActions = ListBuffer.empty[() => Unit]
 
   private var _progress: Progress | Null = null // Set if progress reporting is enabled
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/WConf.scala b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
index 3842067f5390..b1afc2ab5dba 100644
--- a/compiler/src/dotty/tools/dotc/reporting/WConf.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
@@ -134,7 +134,7 @@ object WConf:
       if (parseErrorss.nonEmpty) Left(parseErrorss.flatten)
       else Right(WConf(configs))
 
-class Suppression(val annotPos: SourcePosition, filters: List[MessageFilter], val start: Int, end: Int, val verbose: Boolean):
+class Suppression(val annotPos: SourcePosition, filters: List[MessageFilter], val start: Int, val end: Int, val verbose: Boolean):
   private[this] var _used = false
   def used: Boolean = _used
   def markUsed(): Unit = { _used = true }
diff --git a/tests/warn/i18341.scala b/tests/warn/i18341.scala
new file mode 100644
index 000000000000..63b725df000f
--- /dev/null
+++ b/tests/warn/i18341.scala
@@ -0,0 +1,21 @@
+
+//> using options -Wunused:params,nowarn
+
+import annotation.*
+
+class B(@nowarn useless: Int)
+
+class C(@nowarn("msg=unused") useless: Int)
+
+class D(useless: Int) // warn
+
+class E(@nowarn useful: Int): // warn
+  def e = useful * 10 // 10x useful
+
+class X:
+  def extensionInCompanion: String = ???
+@nowarn // extensionInCompanion
+object X:
+  implicit def companionConversion(x: X): B = ???
+
+  extension (x: X) def extensionInCompanion: String = ???

From 12a27a38734783e14705fdd43e7bcd1188ff40dd Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Apr 2025 16:32:13 +0200
Subject: [PATCH 015/505] Suppress spurious Suppression (#22383)

Guard against multiple registrations of nowarn on related elements.

Fixes #18341
[Cherry-picked a377c8a04782b9763657abc0283d27b3f364ac54][modified]

From 0886974876ad228bb96919d193f8f6d609ccc140 Mon Sep 17 00:00:00 2001
From: Jan Chyb <48855024+jchyb@users.noreply.github.com>
Date: Mon, 20 Jan 2025 11:57:50 +0100
Subject: [PATCH 016/505] Fix inline proxy generation for opaque types
 referencing other opaque types (#22381)

Fixes #22359
Fixes #17243
[Cherry-picked fe2e6e9203236921c0976fcb0f891ab8d4a42d66]
---
 .../dotty/tools/dotc/inlines/Inliner.scala    | 46 ++++++++++++++++++-
 tests/pos/22359a.scala                        | 15 ++++++
 tests/pos/22359b.scala                        | 17 +++++++
 tests/pos/i17243.scala                        | 17 +++++++
 4 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/22359a.scala
 create mode 100644 tests/pos/22359b.scala
 create mode 100644 tests/pos/i17243.scala

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index d83817dd90e0..5a8111a4cc28 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -144,9 +144,28 @@ object Inliner:
           else Nil
         case _ => Nil
       val refinements = openOpaqueAliases(cls.givenSelfType)
+
+      // Map references in the refinements from the proxied termRef
+      // to the recursive type of the refined type
+      // e.g.: Obj.type{type A = Obj.B; type B = Int} -> Obj.type{type A = <recthis>.B; type B = Int}
+      def mapRecTermRefReferences(recType: RecType, refinedType: Type) =
+        new TypeMap {
+          def apply(tp: Type) = tp match
+            case RefinedType(a: RefinedType, b, info) => RefinedType(apply(a), b, apply(info))
+            case RefinedType(a, b, info) => RefinedType(a, b, apply(info))
+            case TypeRef(prefix, des) => TypeRef(apply(prefix), des)
+            case termRef: TermRef if termRef == ref => recType.recThis
+            case _ => mapOver(tp)
+        }.apply(refinedType)
+
       val refinedType = refinements.foldLeft(ref: Type): (parent, refinement) =>
         RefinedType(parent, refinement._1, TypeAlias(refinement._2))
-      val refiningSym = newSym(InlineBinderName.fresh(), Synthetic, refinedType, span)
+
+      val recType = RecType.closeOver ( recType =>
+        mapRecTermRefReferences(recType, refinedType)
+      )
+
+      val refiningSym = newSym(InlineBinderName.fresh(), Synthetic, recType, span)
       refiningSym.termRef
 
     def unapply(refiningRef: TermRef)(using Context): Option[TermRef] =
@@ -387,7 +406,9 @@ class Inliner(val call: tpd.Tree)(using Context):
             val refiningRef = OpaqueProxy(ref, cls, call.span)
             val refiningSym = refiningRef.symbol.asTerm
             val refinedType = refiningRef.info
-            val refiningDef = ValDef(refiningSym, tpd.ref(ref).cast(refinedType), inferred = true).withSpan(span)
+            val refiningDef = addProxiesForRecurrentOpaques(
+              ValDef(refiningSym, tpd.ref(ref).cast(refinedType), inferred = true).withSpan(span)
+            )
             inlining.println(i"add opaque alias proxy $refiningDef for $ref in $tp")
             bindingsBuf += refiningDef
             opaqueProxies += ((ref, refiningSym.termRef))
@@ -407,6 +428,27 @@ class Inliner(val call: tpd.Tree)(using Context):
           }
     )
 
+  /** Transforms proxies that reference other opaque types, like for:
+   * object Obj1 { opaque type A = Int }
+   * object Obj2 { opaque type B = A }
+   * and proxy$1 of type Obj2.type{type B = Obj1.A}
+   * creates proxy$2 of type Obj1.type{type A = Int}
+   * and transforms proxy$1 into Obj2.type{type B = proxy$2.A}
+   */
+  private def addProxiesForRecurrentOpaques(binding: ValDef)(using Context): ValDef =
+    def fixRefinedTypes(ref: Type): Unit  =
+      ref match
+        case recType: RecType => fixRefinedTypes(recType.underlying)
+        case RefinedType(parent, name, info) =>
+          addOpaqueProxies(info.widen, binding.span, true)
+          fixRefinedTypes(parent)
+        case _ =>
+    fixRefinedTypes(binding.symbol.info)
+    binding.symbol.info = mapOpaques.typeMap(binding.symbol.info)
+    mapOpaques.transform(binding).asInstanceOf[ValDef]
+      .showing(i"transformed this binding exposing opaque aliases: $result", inlining)
+  end addProxiesForRecurrentOpaques
+
   /** If `binding` contains TermRefs that refer to objects with opaque
    *  type aliases, add proxy definitions that expose these aliases
    *  and substitute such TermRefs with theproxies. Example from pos/opaque-inline1.scala:
diff --git a/tests/pos/22359a.scala b/tests/pos/22359a.scala
new file mode 100644
index 000000000000..a3b9ef63257a
--- /dev/null
+++ b/tests/pos/22359a.scala
@@ -0,0 +1,15 @@
+opaque type NT[N <: Tuple, V <: Tuple] = V
+opaque type System = NT[Tuple1["wires"], Tuple1[Any]]
+
+extension [N <: Tuple, V <: Tuple] (x: NT[N, V]) {
+  inline def apply(n: Int): Any =
+    x.productElement(n)
+}
+
+extension (system: System) {
+  inline def foo =
+    system.apply(0)
+}
+
+val simulation: System = ???
+val _ = simulation.foo
diff --git a/tests/pos/22359b.scala b/tests/pos/22359b.scala
new file mode 100644
index 000000000000..f6b7cbb462c1
--- /dev/null
+++ b/tests/pos/22359b.scala
@@ -0,0 +1,17 @@
+object Obj2:
+  opaque type NT[N <: Tuple, V <: Tuple] = V
+
+  extension [N <: Tuple, V <: Tuple] (x: NT[N, V]) {
+    inline def apply(n: Int): Any =
+      x.productElement(n)
+  }
+
+object Obj:
+  opaque type System = Obj2.NT[Tuple1["wires"], Tuple1[Any]]
+
+  extension (system: System) {
+    inline def foo = system.apply(0)
+  }
+import Obj._
+val simulation: System = ???
+val _ = simulation.foo
diff --git a/tests/pos/i17243.scala b/tests/pos/i17243.scala
new file mode 100644
index 000000000000..3d42495b26b0
--- /dev/null
+++ b/tests/pos/i17243.scala
@@ -0,0 +1,17 @@
+object Opaque:
+  opaque type A = Int
+
+  val va: A = 1
+
+  inline def a(x: A) =
+    x + 1
+
+object Opaque2:
+  opaque type B = Opaque.A
+
+  val vb: B = Opaque.va
+
+  inline def b(x: B) = Opaque.a(x)
+
+@main def Test() =
+  print(Opaque2.b(Opaque2.vb))

From a4a9dff62dab7625c6df37a6b1c6fe580a4e6f00 Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Mon, 20 Jan 2025 12:03:28 +0100
Subject: [PATCH 017/505] Only check logicalOwners for methods, and not for
 classes, when looking for proxies (#22356)

possible fix for #21931
[Cherry-picked 08442e883b0dacdbc60c6f697e2467bfdf1643cd]
---
 .../dotty/tools/dotc/transform/Dependencies.scala   |  2 +-
 .../src/dotty/tools/dotc/transform/LambdaLift.scala |  4 +++-
 tests/pos/i21931.scala                              | 13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/i21931.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
index 733f4601e363..28fd21200759 100644
--- a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
@@ -29,7 +29,7 @@ abstract class Dependencies(root: ast.tpd.Tree, @constructorOnly rootContext: Co
   def tracked: Iterable[Symbol] = free.keys
 
   /** The outermost class that captures all free variables of a function
-   *  that are captured by enclosinh classes (this means that the function could
+   *  that are captured by enclosing classes (this means that the function could
    *  be placed in that class without having to add more environment parameters)
    */
   def logicalOwner: collection.Map[Symbol, Symbol] = logicOwner
diff --git a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
index 3fbdf1fa5427..6a7dee2ff4fe 100644
--- a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
@@ -127,7 +127,9 @@ object LambdaLift:
 
     private def proxy(sym: Symbol)(using Context): Symbol = {
       def liftedEnclosure(sym: Symbol) =
-        deps.logicalOwner.getOrElse(sym, sym.enclosure)
+        if sym.is(Method)
+        then deps.logicalOwner.getOrElse(sym, sym.enclosure)
+        else sym.enclosure
       def searchIn(enclosure: Symbol): Symbol = {
         if (!enclosure.exists) {
           def enclosures(encl: Symbol): List[Symbol] =
diff --git a/tests/pos/i21931.scala b/tests/pos/i21931.scala
new file mode 100644
index 000000000000..6765768874af
--- /dev/null
+++ b/tests/pos/i21931.scala
@@ -0,0 +1,13 @@
+def f() =
+  val NotFound: Char = 'a'
+  class crashing() {
+    class issue() {
+      NotFound
+    }
+    class Module() {
+      val obligatory =
+        class anonIssue() {
+          issue()
+        }
+    }
+  }

From 987a8eccb1643cd7b5cfdcc298e51cb7f51580f8 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Apr 2025 16:49:44 +0200
Subject: [PATCH 018/505] chore: Update versions to allow work on 3.3.7

---
 project/Build.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 2e172a7e005a..ec0c4ea2a252 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -88,7 +88,7 @@ object Build {
    *
    *  Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
    */
-  val referenceVersion = "3.3.5"
+  val referenceVersion = "3.3.6-RC1"
 
   /** Version of the Scala compiler targeted in the current release cycle
    *  Contains a version without RC/SNAPSHOT/NIGHTLY specific suffixes
@@ -99,7 +99,7 @@ object Build {
    *
    *  Warning: Change of this variable might require updating `expectedTastyVersion`
    */
-  val developedVersion = "3.3.6"
+  val developedVersion = "3.3.7"
 
   /** The version of the compiler including the RC prefix.
    *  Defined as common base before calculating environment specific suffixes in `dottyVersion`

From 2881275cb289cdf2eb31b8d82476c1b0e72b54cd Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Apr 2025 16:46:47 +0200
Subject: [PATCH 019/505] bugfix: Fix issues after backporting

- remove named tuples specific parts (we anyway try to port as much as possible to avoid conflicts in the future)
- add isTransparent method which was probably added in some incompatible PR
---
 .../src/dotty/tools/dotc/core/TypeUtils.scala |  10 ++
 .../dotc/neg-best-effort-pickling.excludelist |  23 ----
 .../neg-best-effort-unpickling.excludelist    |  17 ---
 .../test/dotc/pos-test-pickling.blacklist     | 120 ------------------
 .../test/dotc/pos-test-pickling.excludelist   |   3 +
 .../test/dotc/run-test-pickling.blacklist     |  52 --------
 .../main/dotty/tools/pc/HoverProvider.scala   |  22 +---
 .../dotty/tools/pc/MetalsInteractive.scala    |  14 --
 .../tests/definition/PcDefinitionSuite.scala  |   9 --
 .../tools/pc/tests/hover/HoverTermSuite.scala |  29 -----
 .../pos-custom-args/captures/setup/a_1.scala  |   6 -
 .../pos-custom-args/captures/setup/b_1.scala  |   5 -
 .../pos-custom-args/captures/setup/b_2.scala  |   5 -
 13 files changed, 16 insertions(+), 299 deletions(-)
 delete mode 100644 compiler/test/dotc/neg-best-effort-pickling.excludelist
 delete mode 100644 compiler/test/dotc/neg-best-effort-unpickling.excludelist
 delete mode 100644 compiler/test/dotc/pos-test-pickling.blacklist
 delete mode 100644 compiler/test/dotc/run-test-pickling.blacklist
 delete mode 100644 tests/pos-custom-args/captures/setup/a_1.scala
 delete mode 100644 tests/pos-custom-args/captures/setup/b_1.scala
 delete mode 100644 tests/pos-custom-args/captures/setup/b_2.scala

diff --git a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
index 41d6bf1f4fae..73acc24c38c2 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
@@ -127,6 +127,16 @@ class TypeUtils:
       case mt: MethodType => mt.isImplicitMethod || mt.resType.takesImplicitParams
       case _ => false
 
+   /** Is this a type deriving only from transparent classes?
+     *  @param traitOnly  if true, all class symbols must be transparent traits
+     */
+    def isTransparent(traitOnly: Boolean = false)(using Context): Boolean = self match
+      case AndType(tp1, tp2) =>
+        tp1.isTransparent(traitOnly) && tp2.isTransparent(traitOnly)
+      case _ =>
+        val cls = self.underlyingClassRef(refinementOK = false).typeSymbol
+        cls.isTransparentClass && (!traitOnly || cls.is(Trait))
+
     /** The constructors of this type that are applicable to `argTypes`, without needing
      *  an implicit conversion. Curried constructors are always excluded.
      *  @param adaptVarargs   if true, allow a constructor with just a varargs argument to
diff --git a/compiler/test/dotc/neg-best-effort-pickling.excludelist b/compiler/test/dotc/neg-best-effort-pickling.excludelist
deleted file mode 100644
index 99a83a467f08..000000000000
--- a/compiler/test/dotc/neg-best-effort-pickling.excludelist
+++ /dev/null
@@ -1,23 +0,0 @@
-export-in-extension.scala
-i12456.scala
-i8623.scala
-i1642.scala
-i16696.scala
-constructor-proxy-values.scala
-i9328.scala
-i15414.scala
-i6796.scala
-i14013.scala
-toplevel-cyclic
-curried-dependent-ift.scala
-i17121.scala
-illegal-match-types.scala
-i13780-1.scala
-i20317a.scala
-i11226.scala
-i974.scala
-i13864.scala
-
-# semantic db generation fails in the first compilation
-i1642.scala
-i15158.scala
diff --git a/compiler/test/dotc/neg-best-effort-unpickling.excludelist b/compiler/test/dotc/neg-best-effort-unpickling.excludelist
deleted file mode 100644
index 1e22d919f25a..000000000000
--- a/compiler/test/dotc/neg-best-effort-unpickling.excludelist
+++ /dev/null
@@ -1,17 +0,0 @@
-# cyclic reference crashes
-i4368.scala
-i827.scala
-cycles.scala
-i5332.scala
-i4369c.scala
-i1806.scala
-i0091-infpaths.scala
-exports.scala
-i14834.scala
-
-# other type related crashes
-i4653.scala
-overrideClass.scala
-
-# repeating <error> on a top level type definition
-i18750.scala
diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
deleted file mode 100644
index 1cb73da4c2eb..000000000000
--- a/compiler/test/dotc/pos-test-pickling.blacklist
+++ /dev/null
@@ -1,120 +0,0 @@
-i94-nada.scala
-i1812.scala
-i1867.scala
-i3067.scala
-t2712-5.scala
-t284-pos.scala
-t3249
-t3486
-t3612.scala
-reference
-scala-days-2019-slides
-i7048e.scala
-i8052.scala
-tuple-filter.scala
-i7740a.scala
-i7740b.scala
-i6507b.scala
-i12299a.scala
-i13871.scala
-i15181.scala
-i15922.scala
-i15926.scala
-t5031_2.scala
-i16997.scala
-i7414.scala
-i17588.scala
-i9804.scala
-i13433.scala
-i16649-irrefutable.scala
-strict-pattern-bindings-3.0-migration.scala
-i17255
-i17735.scala
-
-# Tree is huge and blows stack for printing Text
-i7034.scala
-
-# Stale symbol: package object scala
-seqtype-cycle
-
-# type of super reference changes due to late addition of Mirror.Singleton
-i939.scala
-i13332super.scala
-
-# Match types
-i7872.scala
-i11236.scala
-i11247.scala
-i11250
-i9999.scala
-8649.scala
-12093.scala
-9757.scala
-9890.scala
-13491.scala
-7512.scala
-i6505.scala
-i15158.scala
-i15155.scala
-i15827.scala
-i18211.scala
-i20897.scala
-
-# Opaque type
-i5720.scala
-
-# Tuples
-toexproftuple.scala
-i7580.scala
-
-# Nullability
-nullable.scala
-
-# parameter untupling with overloaded functions (see comment in Applications.normArg)
-i7757.scala
-
-# splice type tag dealiased in this reference
-i8651b.scala
-
-# uneliminated @uncheckedVariance after pickling
-annot-bootstrap.scala
-
-# interaction with Scala-2's implicitly
-i9793.scala
-
-# lazy_implicit symbol has different position after pickling
-i8182.scala
-
-# local lifted value in annotation argument has different position after pickling
-i2797a
-
-# Late instantiation of type variable in tryInsertImplicitOnQualifier
-# allows to simplify a type that was already computed
-i13842.scala
-
-# Position change under captureChecking
-boxmap-paper.scala
-
-# Function types print differnt after unpickling since test mispredicts Feature.preFundsEnabled
-caps-universal.scala
-
-# GADT cast applied to singleton type difference
-i4176-gadt.scala
-
-# GADT difference
-i13974a.scala
-
-java-inherited-type1
-
-# recursion limit exceeded
-i7445b.scala
-
-# more aggresive reduce projection makes a difference
-i15525.scala
-i19955a.scala
-i19955b.scala
-i20053b.scala
-
-
-# LTS specific
-i21390.TrieMap.scala
diff --git a/compiler/test/dotc/pos-test-pickling.excludelist b/compiler/test/dotc/pos-test-pickling.excludelist
index 23c79affada0..8f09dc61609b 100644
--- a/compiler/test/dotc/pos-test-pickling.excludelist
+++ b/compiler/test/dotc/pos-test-pickling.excludelist
@@ -141,3 +141,6 @@ hylolib
 
 # typecheckErrors method unpickling
 i21415.scala
+
+# LTS specific
+i21390.TrieMap.scala
diff --git a/compiler/test/dotc/run-test-pickling.blacklist b/compiler/test/dotc/run-test-pickling.blacklist
deleted file mode 100644
index 32fa44d0cb20..000000000000
--- a/compiler/test/dotc/run-test-pickling.blacklist
+++ /dev/null
@@ -1,52 +0,0 @@
-## Many of these tests fail because CompilationTests.pickling does not handle
-## tests containing java files correctly
-
-derive-generic.scala
-eff-dependent.scala
-enum-java
-i5257.scala
-i7212
-i7868.scala
-i9011.scala
-i9473.scala
-i13433.scala
-i13433b.scala
-macros-in-same-project1
-mixin-forwarder-overload
-t10889
-t3452d
-t3452e
-t3452g
-t7374
-t8905
-tuple-drop.scala
-tuple-ops.scala
-tuple-ops.scala
-tuple-take.scala
-tuple-zip.scala
-tuples1.scala
-tuples1a.scala
-tuples1b.scala
-typeCheckErrors.scala
-typeclass-derivation-doc-example.scala
-typeclass-derivation1.scala
-typeclass-derivation2.scala
-typeclass-derivation2a.scala
-typeclass-derivation2b.scala
-typeclass-derivation2c.scala
-typeclass-derivation2d.scala
-typeclass-derivation3.scala
-varargs-abstract
-zero-arity-case-class.scala
-i12194.scala
-i12753
-t6138
-t6138-2
-i12656.scala
-trait-static-forwarder
-i17255
-
-# typecheckErrors method unpickling
-typeCheckErrors.scala
-i18150.scala
-
diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
index 769eaf024862..f8249aebf68c 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -107,7 +107,7 @@ object HoverProvider:
         case (symbol, tpe, _) :: _
             if symbol.name == nme.selectDynamic || symbol.name == nme.applyDynamic =>
           fallbackToDynamics(path, printer, contentType)
-        case symbolTpes @ ((symbol, tpe, None) :: _) =>
+        case symbolTpes @ ((symbol, tpe, _) :: _) =>
           val exprTpw = tpe.widenTermRefExpr.deepDealias
           val hoverString =
             tpw match
@@ -153,21 +153,6 @@ object HoverProvider:
             case _ =>
               ju.Optional.empty().nn
           end match
-        case (_, tpe, Some(namedTupleArg)) :: _ =>
-          val exprTpw = tpe.widenTermRefExpr.deepDealias
-          printer.expressionType(exprTpw) match
-            case Some(tpe) =>
-              ju.Optional.of(
-                new ScalaHover(
-                  expressionType = Some(tpe),
-                  symbolSignature = Some(s"$namedTupleArg: $tpe"),
-                  docstring = None,
-                  forceExpressionType = false,
-                  contextInfo = printer.getUsedRenamesInfo,
-                  contentType = contentType
-                )
-              ).nn
-            case _ => ju.Optional.empty().nn
       end match
     end if
   end hover
@@ -183,7 +168,7 @@ object HoverProvider:
     case SelectDynamicExtractor(sel, n, name, rest) =>
       def findRefinement(tp: Type): Option[HoverSignature] =
         tp match
-          case RefinedType(_, refName, tpe) if (name == refName.toString() || refName.toString() == nme.Fields.toString()) =>
+          case RefinedType(_, refName, tpe) if name == refName.toString() =>
             val resultType =
               rest match
                 case Select(_, asInstanceOf) :: TypeApply(_, List(tpe)) :: _ if asInstanceOf == nme.asInstanceOfPM =>
@@ -196,8 +181,7 @@ object HoverProvider:
               else printer.tpe(resultType)
 
             val valOrDef =
-              if refName.toString() == nme.Fields.toString() then ""
-              else if n == nme.selectDynamic && !tpe.isInstanceOf[ExprType]
+              if n == nme.selectDynamic && !tpe.isInstanceOf[ExprType]
               then "val "
               else "def "
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
index a24ed5c7c9e7..dc4fa0446715 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
@@ -203,20 +203,6 @@ object MetalsInteractive:
           case _ =>
             Nil
 
-      // Handle select on named tuples
-      case (Apply(Apply(TypeApply(fun, List(t1, t2)), List(ddef)), List(Literal(Constant(i: Int))))) :: _
-        if fun.symbol.exists && fun.symbol.name == nme.apply &&
-            fun.symbol.owner.exists && fun.symbol.owner == getModuleIfDefined("scala.NamedTuple").moduleClass =>
-        def getIndex(t: Tree): Option[Type] =
-          t.tpe.dealias match
-            case AppliedType(_, args) => args.get(i)
-            case _ => None
-        val name = getIndex(t1) match
-          case Some(c: ConstantType) => c.value.stringValue
-          case _ => ""
-        val tpe = getIndex(t2).getOrElse(NoType)
-        List((ddef.symbol, tpe, Some(name)))
-
       case path @ head :: tail =>
         if head.symbol.is(Exported) then
           val sym = head.symbol.sourceSymbol
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
index ff4c6ec25e27..fab21ffdee0a 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
@@ -504,12 +504,3 @@ class PcDefinitionSuite extends BasePcDefinitionSuite:
          |val a = MyIntOut(1).un@@even
          |""".stripMargin,
     )
-
-  @Test def `named-tuples` =
-    check(
-      """|import scala.language.experimental.namedTuples
-         |
-         |val <<foo>> = (name = "Bob", age = 42, height = 1.9d)
-         |val foo_name = foo.na@@me
-         |""".stripMargin
-    )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
index 5e20045babfb..6f682139506e 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -718,32 +718,3 @@ class HoverTermSuite extends BaseHoverSuite:
       """def ???: Nothing""".stripMargin.hover
   )
 
-  @Test def `named-tuples`: Unit =
-    check(
-      """import scala.language.experimental.namedTuples
-        |
-        |val foo = (name = "Bob", age = 42, height = 1.9d)
-        |val foo_name = foo.na@@me
-        |""".stripMargin,
-      "name: String".hover
-    )
-
-  @Test def `named-tuples2`: Unit =
-    check(
-      """|import scala.language.experimental.namedTuples
-         |
-         |import NamedTuple.*
-         |
-         |class NamedTupleSelectable extends Selectable {
-         |  type Fields <: AnyNamedTuple
-         |  def selectDynamic(name: String): Any = ???
-         |}
-         |
-         |val person = new NamedTupleSelectable {
-         |  type Fields = (name: String, city: String)
-         |}
-         |
-         |val person_name = person.na@@me
-         |""".stripMargin,
-      "name: String".hover
-    )
diff --git a/tests/pos-custom-args/captures/setup/a_1.scala b/tests/pos-custom-args/captures/setup/a_1.scala
deleted file mode 100644
index 21afde8be3ea..000000000000
--- a/tests/pos-custom-args/captures/setup/a_1.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-// a.scala
-import language.experimental.captureChecking
-import scala.caps.CapSet
-
-trait A:
-  def f[C^](x: AnyRef^{C^}): Unit
diff --git a/tests/pos-custom-args/captures/setup/b_1.scala b/tests/pos-custom-args/captures/setup/b_1.scala
deleted file mode 100644
index d5ba925970ba..000000000000
--- a/tests/pos-custom-args/captures/setup/b_1.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import language.experimental.captureChecking
-import scala.caps.CapSet
-
-class B extends A:
-  def f[C^](x: AnyRef^{C^}): Unit = ???
diff --git a/tests/pos-custom-args/captures/setup/b_2.scala b/tests/pos-custom-args/captures/setup/b_2.scala
deleted file mode 100644
index d5ba925970ba..000000000000
--- a/tests/pos-custom-args/captures/setup/b_2.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import language.experimental.captureChecking
-import scala.caps.CapSet
-
-class B extends A:
-  def f[C^](x: AnyRef^{C^}): Unit = ???

From db7ebdf460fd0db053d4dc6569dcc492244b411a Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Mon, 20 Jan 2025 16:17:04 +0100
Subject: [PATCH 020/505] Fix chocolatey-test when used in stable releases

---
 .github/workflows/ci.yaml             | 8 ++++----
 .github/workflows/test-chocolatey.yml | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9239020335e7..b22a44c7db7c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -782,14 +782,14 @@ jobs:
     uses: ./.github/workflows/build-chocolatey.yml
     needs: [ build-sdk-package ]
     with:
-      version: 3.3.5-local # unused
-      url    : https://api.github.com/repos/scala/scala3/actions/artifacts/${{ needs.build-sdk-package.outputs.universal-id }}/zip
-      digest : ${{ needs.build-sdk-package.outputs.universal-digest }}
+      version: 3.3.7-SNAPSHOT # Fake version, used only for choco tests
+      url    : https://api.github.com/repos/scala/scala3/actions/artifacts/${{ needs.build-sdk-package.outputs.win-x86_64-id }}/zip
+      digest : ${{ needs.build-sdk-package.outputs.win-x86_64-digest }}
 
   test-chocolatey-package:
     uses: ./.github/workflows/test-chocolatey.yml
     with:
-      version     : 3.3.5-local # unused
+      version     : 3.3.7-SNAPSHOT # Fake version, used only for choco tests
       java-version: 8
     if: github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_chocolatey]')
     needs: [ build-chocolatey-package ]
diff --git a/.github/workflows/test-chocolatey.yml b/.github/workflows/test-chocolatey.yml
index b6ca9bf74b12..e302968b9129 100644
--- a/.github/workflows/test-chocolatey.yml
+++ b/.github/workflows/test-chocolatey.yml
@@ -21,7 +21,10 @@ on:
 
 env:
   CHOCOLATEY-REPOSITORY: chocolatey-pkgs
-  DOTTY_CI_INSTALLATION: ${{ secrets.GITHUB_TOKEN }}
+  # Controls behaviour of chocolatey{Install,Uninstall}.ps1 scripts
+  # During snapshot releases it uses a different layout and requires access token to GH Actions artifacts
+  # During stable releases it uses publically available archives
+  DOTTY_CI_INSTALLATION: ${{ endsWith(inputs.version, '-SNAPSHOT') && secrets.GITHUB_TOKEN || '' }}
 
 jobs:
   test:

From 85f54f1d2c239d7951deb47cd8fa21946d65d5c1 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 3 Apr 2025 20:19:13 +0200
Subject: [PATCH 021/505] Fix chocolatey-test when used in stable releases

[Cherry-picked 11238467eeffa9a2741668543a48a913fbf6f6e3][modified]

From 75450da4c18ac177b997bfb4f061b571bf8cdc07 Mon Sep 17 00:00:00 2001
From: fan-tom <lokomot476@gmail.com>
Date: Fri, 17 Jan 2025 01:50:02 +0400
Subject: [PATCH 022/505] fix: annotations are not expected in the middle of an
 array type by java parser

Java parser doesn't expect an annotation in the next types, while it should:
- `Object @my.Ann []`
- `Object @my.Ann [] @my.OtherAnn []`

closes #19642

[Cherry-picked 9c971be202ab73688dbcff50a8240cb2878097aa]
---
 .../dotty/tools/dotc/parsing/JavaParsers.scala  |  6 ++++--
 tests/pos/i19642/Valid.java                     | 17 +++++++++++++++++
 tests/pos/i19642/i19642.java                    |  9 +++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/i19642/Valid.java
 create mode 100644 tests/pos/i19642/i19642.java

diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
index 092ab2eeea0d..1556b31e4ce8 100644
--- a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
@@ -254,7 +254,8 @@ object JavaParsers {
       t
     }
 
-    def optArrayBrackets(tpt: Tree): Tree =
+    def optArrayBrackets(tpt: Tree): Tree = {
+      annotations()
       if (in.token == LBRACKET) {
         val tpt1 = atSpan(tpt.span.start, in.offset) { arrayOf(tpt) }
         in.nextToken()
@@ -262,6 +263,7 @@ object JavaParsers {
         optArrayBrackets(tpt1)
       }
       else tpt
+    }
 
     def basicType(): Tree =
       atSpan(in.offset) {
@@ -335,7 +337,7 @@ object JavaParsers {
     }
 
     def annotations(): List[Tree] = {
-      var annots = new ListBuffer[Tree]
+      val annots = new ListBuffer[Tree]
       while (in.token == AT) {
         in.nextToken()
         annotation() match {
diff --git a/tests/pos/i19642/Valid.java b/tests/pos/i19642/Valid.java
new file mode 100644
index 000000000000..17e0e1173726
--- /dev/null
+++ b/tests/pos/i19642/Valid.java
@@ -0,0 +1,17 @@
+package lib;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({ METHOD, FIELD, CONSTRUCTOR, PARAMETER, TYPE_USE })
+@Retention(RUNTIME)
+@Documented
+public @interface Valid {}
diff --git a/tests/pos/i19642/i19642.java b/tests/pos/i19642/i19642.java
new file mode 100644
index 000000000000..c7d8ba9f0e72
--- /dev/null
+++ b/tests/pos/i19642/i19642.java
@@ -0,0 +1,9 @@
+package app;
+
+import java.util.Optional;
+import lib.*;
+
+public class i19642 {
+  private String @lib.Valid [] flatArray;
+  private String @lib.Valid [] @lib.Valid [] nestedArray;
+}

From 6fa34a22a77f5a31ad42aa46bb07431cce4a71df Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 3 Apr 2025 20:21:51 +0200
Subject: [PATCH 023/505] Fix cyclic check, regardless of definition order

[Cherry-picked 2bdf8dd59079f46295665dd0528cd37bffafc09a][modified]
---
 .../src/dotty/tools/dotc/typer/Checking.scala | 32 +++++++++---
 tests/neg/i4368.scala                         |  6 +--
 tests/neg/i4369c.scala                        | 17 +++++-
 tests/neg/toplevel-cyclic/defs_1.scala        |  2 +-
 tests/neg/toplevel-cyclic/moredefs_1.scala    |  2 +-
 tests/pos/i22257.fixed.scala                  | 52 +++++++++++++++++++
 tests/pos/i22257.orig.scala                   | 52 +++++++++++++++++++
 tests/pos/i22257.scala                        | 26 ++++++++++
 8 files changed, 175 insertions(+), 14 deletions(-)
 create mode 100644 tests/pos/i22257.fixed.scala
 create mode 100644 tests/pos/i22257.orig.scala
 create mode 100644 tests/pos/i22257.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
index bf99def353b0..2757304f32e8 100644
--- a/compiler/src/dotty/tools/dotc/typer/Checking.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -274,11 +274,16 @@ object Checking {
      */
     def checkInfo(tp: Type): Type = tp match {
       case tp @ TypeAlias(alias) =>
-        tp.derivedAlias(checkPart(alias, "alias"))
+        val lo1 = atVariance(-1)(checkPart(alias, "alias"))
+        val hi1 = checkUpper(alias, "alias")
+        if lo1 eq hi1 then
+          tp.derivedAlias(lo1)
+        else
+          tp.derivedTypeBounds(lo1, hi1)
       case tp @ MatchAlias(alias) =>
-        tp.derivedAlias(checkUpper(alias, "match"))
+        tp.derivedAlias(atVariance(0)(checkUpper(alias, "match")))
       case tp @ TypeBounds(lo, hi) =>
-        tp.derivedTypeBounds(checkPart(lo, "lower bound"), checkUpper(hi, "upper bound"))
+        tp.derivedTypeBounds(atVariance(-1)(checkPart(lo, "lower bound")), checkUpper(hi, "upper bound"))
       case _ =>
         tp
     }
@@ -299,12 +304,12 @@ object Checking {
       case tp: TermRef =>
         this(tp.info)
         mapOver(tp)
-      case tp @ AppliedType(tycon, args) =>
-        tp.derivedAppliedType(this(tycon), args.mapConserve(this(_, nestedCycleOK, nestedCycleOK)))
       case tp @ RefinedType(parent, name, rinfo) =>
         tp.derivedRefinedType(this(parent), name, this(rinfo, nestedCycleOK, nestedCycleOK))
       case tp: RecType =>
         tp.rebind(this(tp.parent))
+      case tp: LazyRef =>
+        tp
       case tp @ TypeRef(pre, _) =>
         try {
           // A prefix is interesting if it might contain (transitively) a reference
@@ -337,14 +342,17 @@ object Checking {
 
           if isInteresting(pre) then
             CyclicReference.trace(i"explore ${tp.symbol} for cyclic references"):
-              val pre1 = this(pre, false, false)
+              val pre1 = atVariance(variance max 0)(this(pre, false, false))
               if locked.contains(tp)
                   || tp.symbol.infoOrCompleter.isInstanceOf[NoCompleter]
+                  && tp.symbol == sym
               then
                 throw CyclicReference(tp.symbol)
               locked += tp
               try
-                if tp.symbol.isOpaqueAlias then
+                if tp.symbol.infoOrCompleter.isInstanceOf[NoCompleter] then
+                  ; // skip checking info (and avoid forcing the symbol with .isOpaqueAlias/etc)
+                else if tp.symbol.isOpaqueAlias then
                   checkInfo(TypeAlias(tp.translucentSuperType))
                 else if !tp.symbol.isClass then
                   checkInfo(tp.info)
@@ -362,6 +370,16 @@ object Checking {
         }
       case _ => mapOver(tp)
     }
+
+    override def mapArg(arg: Type, tparam: ParamInfo): Type =
+      val varianceDiff = variance != tparam.paramVarianceSign
+      atVariance(variance * tparam.paramVarianceSign):
+        // Using tests/pos/i22257.scala as an example,
+        // if we consider FP's lower-bound of Fixed[Node]
+        // than `Node` is a type argument in contravariant
+        // position, while the type parameter is covariant.
+        val nestedCycleOK1 = nestedCycleOK || variance != 0 && varianceDiff
+        this(arg, nestedCycleOK, nestedCycleOK1)
   }
 
   /** Under -Yrequire-targetName, if `sym` has an operator name, check that it has a
diff --git a/tests/neg/i4368.scala b/tests/neg/i4368.scala
index 95c342d5fe2a..6718aece4eba 100644
--- a/tests/neg/i4368.scala
+++ b/tests/neg/i4368.scala
@@ -98,7 +98,7 @@ object Test6 {
 
 object Test7 {
   class Fix[F[_]] {
-    class Foo { type R >: F[T] <: F[T] } // error: cyclic
+    class Foo { type R >: F[T] <: F[T] } // error
     type T = F[Foo#R]
   }
 
@@ -149,9 +149,9 @@ object Test9 {
 object i4369 {
   trait X { self =>
     type R <: Z
-    type Z >: X { type R = self.R; type Z = self.R } // error: cyclic // error: cyclic // error: cyclic
+    type Z >: X { type R = self.R; type Z = self.R } // error: cyclic
   }
-  class Foo extends X { type R = Foo; type Z = Foo }
+  class Foo extends X { type R = Foo; type Z = Foo } // error
 }
 object i4370 {
   class Foo { type R = A }
diff --git a/tests/neg/i4369c.scala b/tests/neg/i4369c.scala
index a2bfbcb598d6..06a77d51cdbe 100644
--- a/tests/neg/i4369c.scala
+++ b/tests/neg/i4369c.scala
@@ -1,5 +1,18 @@
 trait X { self =>
   type R <: Z
-  type Z >: X { type R = self.R; type Z = self.R } // error // error // error
+  type Z >:
+    X { // error
+      type R = // was-error
+        self.R
+      type Z = // was-error
+        self.R
+    }
+}
+
+class Foo // error
+    extends X {
+  type R =
+    Foo
+  type Z =
+    Foo
 }
-class Foo extends X { type R = Foo; type Z = Foo }
diff --git a/tests/neg/toplevel-cyclic/defs_1.scala b/tests/neg/toplevel-cyclic/defs_1.scala
index 34b0475066b0..f40fa5bdebdd 100644
--- a/tests/neg/toplevel-cyclic/defs_1.scala
+++ b/tests/neg/toplevel-cyclic/defs_1.scala
@@ -1 +1 @@
-type A = B
+type A = B // error: recursion limit exceeded
diff --git a/tests/neg/toplevel-cyclic/moredefs_1.scala b/tests/neg/toplevel-cyclic/moredefs_1.scala
index 3c8c3de93aa7..91360d0c0f4d 100644
--- a/tests/neg/toplevel-cyclic/moredefs_1.scala
+++ b/tests/neg/toplevel-cyclic/moredefs_1.scala
@@ -1 +1 @@
-type B = A // error: recursion limit exceeded
+type B = A
diff --git a/tests/pos/i22257.fixed.scala b/tests/pos/i22257.fixed.scala
new file mode 100644
index 000000000000..d0fa1a0e81cb
--- /dev/null
+++ b/tests/pos/i22257.fixed.scala
@@ -0,0 +1,52 @@
+
+object Scaffold {
+
+  trait Arrow
+  object Arrow {
+    trait Outbound extends Arrow
+  }
+
+  trait NodeKOrGraphK {}
+
+  trait NodeK extends NodeKOrGraphK {
+
+    type FBound <: Induction
+
+    protected def getInduction: Seq[FBound]
+  }
+
+  trait Induction {
+    def arrow: Arrow
+    def node: NodeK
+  }
+
+  object Induction {
+
+    trait FP[+N <: NodeK] extends Induction { // short for "fixed point"
+      def node: N
+    }
+  }
+
+  trait GraphK extends NodeKOrGraphK {
+
+    type Batch[+T] <: Iterable[T]
+
+    type _Node <: NodeK
+
+    def entries: Batch[_Node]
+  }
+
+  trait Topology {
+
+    type Node = NodeK { type FBound <: Topology.this.FBound }
+    trait Node_ extends NodeK {
+      type FBound = Topology.this.FBound
+    }
+
+    type FP = Induction.FP[Node]
+    type FBound <: FP
+
+    type Graph = GraphK { type _Node <: Node }
+  }
+
+}
diff --git a/tests/pos/i22257.orig.scala b/tests/pos/i22257.orig.scala
new file mode 100644
index 000000000000..0be8d02d5a85
--- /dev/null
+++ b/tests/pos/i22257.orig.scala
@@ -0,0 +1,52 @@
+
+object Scaffold {
+
+  trait Arrow
+  object Arrow {
+    trait Outbound extends Arrow
+  }
+
+  trait NodeKOrGraphK {}
+
+  trait NodeK extends NodeKOrGraphK {
+
+    type FBound <: Induction
+
+    protected def getInduction: Seq[FBound]
+  }
+
+  trait Induction {
+    def arrow: Arrow
+    def node: NodeK
+  }
+
+  object Induction {
+
+    trait FP[+N <: NodeK] extends Induction { // short for "fixed point"
+      def node: N
+    }
+  }
+
+  trait GraphK extends NodeKOrGraphK {
+
+    type Batch[+T] <: Iterable[T]
+
+    type _Node <: NodeK
+
+    def entries: Batch[_Node]
+  }
+
+  trait Topology {
+
+    type FP = Induction.FP[Node]
+    type FBound <: FP
+
+    type Node = NodeK { type FBound <: Topology.this.FBound }
+    trait Node_ extends NodeK {
+      type FBound = Topology.this.FBound
+    }
+
+    type Graph = GraphK { type _Node <: Node }
+  }
+
+}
diff --git a/tests/pos/i22257.scala b/tests/pos/i22257.scala
new file mode 100644
index 000000000000..8cd797529097
--- /dev/null
+++ b/tests/pos/i22257.scala
@@ -0,0 +1,26 @@
+trait NodeK { type FBound }
+trait Fixed[+N <: NodeK]
+
+type Bound1 <: FP1
+type FP1     = Fixed[Node1]
+type Node1   = NodeK { type FBound <: Bound1 } // was-error
+
+type FP2     = Fixed[Node2]                    // was-error
+type Bound2 <: FP2
+type Node2   = NodeK { type FBound <: Bound2 }
+
+type Node3   = NodeK { type FBound <: Bound3 }
+type FP3     = Fixed[Node3]
+type Bound3 <: FP3
+
+type Bound4 <: FP4
+type Node4   = NodeK { type FBound <: Bound4 } // was-error
+type FP4     = Fixed[Node4]
+
+type FP5     = Fixed[Node5]                    // was-error
+type Node5   = NodeK { type FBound <: Bound5 }
+type Bound5 <: FP5
+
+type Node6   = NodeK { type FBound <: Bound6 }
+type Bound6 <: FP6
+type FP6     = Fixed[Node6]

From ebbc7936678c64a9196e9c193e49f1eadb308bb0 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 21 Jan 2025 15:45:16 +0100
Subject: [PATCH 024/505] refactor: Use codeAction interface for most code
 actions

[Cherry-picked 8d3c8ca1a717d82d6d60a564557fb4abdc756941]
---
 .../tools/pc/ScalaPresentationCompiler.scala  | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index 218d92c38ffa..f8480c0e9784 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -55,6 +55,14 @@ case class ScalaPresentationCompiler(
     completionItemPriority: CompletionItemPriority = (_: String) => 0,
 ) extends PresentationCompiler:
 
+  override def supportedCodeActions(): ju.List[String] = List(
+     CodeActionId.ConvertToNamedArguments,
+     CodeActionId.ImplementAbstractMembers,
+     CodeActionId.ExtractMethod,
+     CodeActionId.InlineValue,
+     CodeActionId.InsertInferredType
+   ).asJava
+
   def this() = this("", None, Nil, Nil)
 
   val scalaVersion = BuildInfo.scalaVersion
@@ -67,6 +75,42 @@ case class ScalaPresentationCompiler(
       .map(StdReportContext(_, _ => buildTargetName, reportsLevel))
       .getOrElse(EmptyReportContext)
 
+  override def codeAction[T](
+    params: OffsetParams,
+    codeActionId: String,
+    codeActionPayload: Optional[T]
+   ): CompletableFuture[ju.List[TextEdit]] = {
+     (codeActionId, codeActionPayload.asScala) match {
+       case (
+             CodeActionId.ConvertToNamedArguments,
+             Some(argIndices: ju.List[_])
+           ) =>
+         val payload = argIndices.asScala.collect { case i: Integer =>
+           i.toInt
+         }.toSet
+         convertToNamedArguments(params, payload)
+       case (CodeActionId.ImplementAbstractMembers, _) =>
+         implementAbstractMembers(params)
+       case (CodeActionId.InsertInferredType, _) =>
+         insertInferredType(params)
+       case (CodeActionId.InlineValue, _) =>
+         inlineValue(params)
+       case (CodeActionId.ExtractMethod, Some(extractionPos: OffsetParams)) =>
+         params match {
+           case range: RangeParams =>
+             extractMethod(range, extractionPos)
+           case _ =>
+             CompletableFuture.failedFuture(
+               new IllegalArgumentException(s"Expected range parameters")
+             )
+         }
+       case (id, _) =>
+         CompletableFuture.failedFuture(
+           new IllegalArgumentException(s"Unsupported action id $id")
+         )
+     }
+   }
+
   override def withCompletionItemPriority(
     priority: CompletionItemPriority
   ): PresentationCompiler =
@@ -348,6 +392,12 @@ case class ScalaPresentationCompiler(
   override def convertToNamedArguments(
       params: OffsetParams,
       argIndices: ju.List[Integer]
+  ): CompletableFuture[ju.List[l.TextEdit]] =
+    convertToNamedArguments(params, argIndices.asScala.toSet.map(_.toInt))
+
+  def convertToNamedArguments(
+      params: OffsetParams,
+      argIndices: Set[Int]
   ): CompletableFuture[ju.List[l.TextEdit]] =
     val empty: Either[String, List[l.TextEdit]] = Right(List())
     (compilerAccess
@@ -355,7 +405,7 @@ case class ScalaPresentationCompiler(
         new ConvertToNamedArgumentsProvider(
           pc.compiler(),
           params,
-          argIndices.asScala.map(_.toInt).toSet
+          argIndices
         ).convertToNamedArguments
       })
       .thenApplyAsync {

From ac629bc78d8df24ccfd1fdaeb26a499a62185b34 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 21 Jan 2025 15:47:13 +0100
Subject: [PATCH 025/505] Update ScalaPresentationCompiler.scala

[Cherry-picked 31f5b4ed4faa570a43cdc0773b0d4642f56c3185]
---
 .../dotty/tools/pc/ScalaPresentationCompiler.scala    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index f8480c0e9784..b3f8bba78953 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -79,15 +79,14 @@ case class ScalaPresentationCompiler(
     params: OffsetParams,
     codeActionId: String,
     codeActionPayload: Optional[T]
-   ): CompletableFuture[ju.List[TextEdit]] = {
-     (codeActionId, codeActionPayload.asScala) match {
+   ): CompletableFuture[ju.List[TextEdit]] =
+     (codeActionId, codeActionPayload.asScala) match
        case (
              CodeActionId.ConvertToNamedArguments,
              Some(argIndices: ju.List[_])
            ) =>
-         val payload = argIndices.asScala.collect { case i: Integer =>
-           i.toInt
-         }.toSet
+         val payload =
+          argIndices.asScala.collect { case i: Integer => i.toInt }.toSet
          convertToNamedArguments(params, payload)
        case (CodeActionId.ImplementAbstractMembers, _) =>
          implementAbstractMembers(params)
@@ -108,8 +107,6 @@ case class ScalaPresentationCompiler(
          CompletableFuture.failedFuture(
            new IllegalArgumentException(s"Unsupported action id $id")
          )
-     }
-   }
 
   override def withCompletionItemPriority(
     priority: CompletionItemPriority

From d193f734a2c3c5d48485701f948781ceb02b1492 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 21 Jan 2025 16:11:10 +0100
Subject: [PATCH 026/505] bugfix: Show implicit chained calls in inlay hints

[Cherry-picked a40b9999804393c85ee6e68d4d66e6a61dd68509]
---
 .../dotty/tools/pc/PcInlayHintsProvider.scala |  81 ++++++++++--
 .../pc/tests/inlayHints/InlayHintsSuite.scala | 117 +++++++++++++++++-
 2 files changed, 185 insertions(+), 13 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 9c0e6bcfa9d8..4b1b3f5fe7ba 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -80,15 +80,15 @@ class PcInlayHintsProvider(
             LabelPart(")") :: Nil,
             InlayHintKind.Parameter,
           )
-      case ImplicitParameters(symbols, pos, allImplicit) =>
-        val labelParts = symbols.map(s => List(labelPart(s, s.decodedName)))
-        val label =
-          if allImplicit then labelParts.separated("(using ", ", ", ")")
-          else labelParts.separated(", ")
+      case ImplicitParameters(trees, pos) =>
         inlayHints.add(
           adjustPos(pos).toLsp,
-          label,
-          InlayHintKind.Parameter,
+          ImplicitParameters.partsFromImplicitArgs(trees).map((label, maybeSymbol) =>
+             maybeSymbol match
+               case Some(symbol) => labelPart(symbol, label)
+               case None => LabelPart(label)
+           ),
+           InlayHintKind.Parameter
         )
       case ValueOf(label, pos) =>
         inlayHints.add(
@@ -221,12 +221,8 @@ object ImplicitParameters:
         case Apply(fun, args)
             if args.exists(isSyntheticArg) && !tree.sourcePos.span.isZeroExtent && !args.exists(isQuotes(_)) =>
           val (implicitArgs, providedArgs) = args.partition(isSyntheticArg)
-          val allImplicit = providedArgs.isEmpty || providedArgs.forall {
-            case Ident(name) => name == nme.MISSING
-            case _ => false
-          }
           val pos = implicitArgs.head.sourcePos
-          Some(implicitArgs.map(_.symbol), pos, allImplicit)
+          Some(implicitArgs, pos)
         case _ => None
     } else None
 
@@ -242,6 +238,67 @@ object ImplicitParameters:
   private def isQuotes(tree: Tree)(using Context) =
     tree.tpe.typeSymbol == defn.QuotesClass
 
+  def partsFromImplicitArgs(trees: List[Tree])(using Context): List[(String, Option[Symbol])] = {
+    @tailrec
+    def recurseImplicitArgs(
+        currentArgs: List[Tree],
+        remainingArgsLists: List[List[Tree]],
+        parts: List[(String, Option[Symbol])]
+    ): List[(String, Option[Symbol])] =
+      (currentArgs, remainingArgsLists) match {
+        case (Nil, Nil) => parts
+        case (Nil, headArgsList :: tailArgsList) =>
+          if (headArgsList.isEmpty) {
+            recurseImplicitArgs(
+              headArgsList,
+              tailArgsList,
+              (")", None) :: parts
+            )
+          } else {
+            recurseImplicitArgs(
+              headArgsList,
+              tailArgsList,
+              (", ", None) :: (")", None) :: parts
+            )
+          }
+        case (arg :: remainingArgs, remainingArgsLists) =>
+          arg match {
+            case Apply(fun, args) =>
+              val applyLabel = (fun.symbol.decodedName, Some(fun.symbol))
+              recurseImplicitArgs(
+                args,
+                remainingArgs :: remainingArgsLists,
+                ("(", None) :: applyLabel :: parts
+              )
+            case t if t.isTerm =>
+              val termLabel = (t.symbol.decodedName, Some(t.symbol))
+              if (remainingArgs.isEmpty)
+                recurseImplicitArgs(
+                  remainingArgs,
+                  remainingArgsLists,
+                  termLabel :: parts
+                )
+              else
+                recurseImplicitArgs(
+                  remainingArgs,
+                  remainingArgsLists,
+                  (", ", None) :: termLabel :: parts
+                )
+            case _ =>
+              recurseImplicitArgs(
+                remainingArgs,
+                remainingArgsLists,
+                parts
+              )
+          }
+      }
+    ((")", None) :: recurseImplicitArgs(
+      trees,
+      Nil,
+      List(("(using ", None))
+    )).reverse
+  }
+
 end ImplicitParameters
 
 object ValueOf:
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
index ce9a89f313ef..8aa885149852 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
@@ -937,7 +937,122 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |  given A = A()
         |  implicit def bar(using a: A): B[A] = B[A]()
         |  def foo(using b: B[A]): String = "aaa"
-        |  val g: String = foo/*(using bar<<(5:15)>>)*/
+        |  val g: String = foo/*(using bar<<(5:15)>>(given_A<<(4:8)>>))*/
         |""".stripMargin
     )
+
+  @Test def `multiple-params-list` =
+    check(
+      """|object Main {
+         |  case class A()
+         |  case class B()
+         |  implicit val theA: A = A()
+         |  def foo(b: B)(implicit a: A): String = "aaa"
+         |  val g: String = foo(B())
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  case class A()
+         |  case class B()
+         |  implicit val theA: A = A()
+         |  def foo(b: B)(implicit a: A): String = "aaa"
+         |  val g: String = foo(B())/*(using theA<<(4:15)>>)*/
+         |}
+         |""".stripMargin,
+    )
+
+  @Test def `implicit-chain` =
+    check(
+      """|object Main{
+         |  def hello()(implicit string: String, integer: Int, long: Long): String = {
+         |    println(s"Hello $string, $long, $integer!")
+         |  }
+         |  implicit def theString(implicit i: Int): String = i.toString
+         |  implicit def theInt(implicit l: Long): Int = l
+         |  implicit val theLong: Long = 42
+         |  hello()
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  def hello()(implicit string: String, integer: Int, long: Long): String = {
+         |    println(s"Hello $string, $long, $integer!")
+         |  }
+         |  implicit def theString(implicit i: Int): String = i.toString
+         |  implicit def theInt(implicit l: Long): Int = l
+         |  implicit val theLong: Long = 42
+         |  hello()/*(using theString<<(5:15)>>(theInt<<(6:15)>>(theLong<<(7:15)>>)), theInt<<(6:15)>>(theLong<<(7:15)>>), theLong<<(7:15)>>)*/
+         |}
+         |""".stripMargin,
+    )
+
+  @Test def `implicit-parameterless-def` =
+    check(
+      """|object Main{
+         |  def hello()(implicit string: String, integer: Int, long: Long): String = {
+         |    println(s"Hello $string, $long, $integer!")
+         |  }
+         |  implicit def theString(implicit i: Int): String = i.toString
+         |  implicit def theInt: Int = 43
+         |  implicit def theLong: Long = 42
+         |  hello()
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  def hello()(implicit string: String, integer: Int, long: Long): String = {
+         |    println(s"Hello $string, $long, $integer!")
+         |  }
+         |  implicit def theString(implicit i: Int): String = i.toString
+         |  implicit def theInt: Int = 43
+         |  implicit def theLong: Long = 42
+         |  hello()/*(using theString<<(5:15)>>(theInt<<(6:15)>>), theInt<<(6:15)>>, theLong<<(7:15)>>)*/
+         |}
+         |""".stripMargin,
+    )
+
+  @Test def `implicit-fn` =
+    check(
+     """|object Main{
+        |  implicit def stringLength(s: String): Int = s.length
+        |  implicitly[String => Int]
+        |
+        |  implicit val namedStringLength: String => Long = (s: String) => s.length.toLong
+        |  implicitly[String => Long]
+        |}
+        |""".stripMargin,
+     """|object Main{
+        |  implicit def stringLength(s: String): Int = s.length
+        |  implicitly[String => Int]
+        |
+        |  implicit val namedStringLength: String => Long = (s: String) => s.length.toLong
+        |  implicitly[String => Long]/*(using namedStringLength<<(5:15)>>)*/
+        |}
+        |""".stripMargin,
+    )
+
+  @Test def `implicit-fn2` =
+    check(
+      """|object Main{
+         |  implicit def stringLength(s: String, i: Int): Int = s.length
+         |  implicitly[(String, Int) => Int]
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  implicit def stringLength(s: String, i: Int): Int = s.length
+         |  implicitly[(String, Int) => Int]
+         |}
+         |""".stripMargin,
+    )
+
+  @Test def `strip-margin` =
+    check(
+      """|object Main{
+         |  "".stripMargin
+         |}
+         |""".stripMargin,
+      """|package test
+         |object Main{
+         |  /*augmentString<<scala/Predef.augmentString().>>(*/""/*)*/.stripMargin
+         |}
+         |""".stripMargin
+    )
 }

From 3b85e8b4afc519ce2f0b1e0f35480557713f2251 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 21 Jan 2025 16:32:43 +0100
Subject: [PATCH 027/505] improvement: Make including detail in completion
 label configurable

[Cherry-picked eaa827eef7b15ad0bebc76f8dcb83b44a02b0102]
---
 .../pc/completions/CompletionProvider.scala   |   4 +-
 .../CompletionWithoutDetailsSuite.scala       | 120 ++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionWithoutDetailsSuite.scala

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
index adaeadb12978..28519debec63 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -218,7 +218,9 @@ class CompletionProvider(
     // related issue https://github.com/lampepfl/scala3/issues/11941
     lazy val kind: CompletionItemKind = underlyingCompletion.completionItemKind
     val description = underlyingCompletion.description(printer)
-    val label = underlyingCompletion.labelWithDescription(printer)
+    val label =
+      if config.isDetailIncludedInLabel then completion.labelWithDescription(printer)
+      else completion.label
     val ident = underlyingCompletion.insertText.getOrElse(underlyingCompletion.label)
 
     lazy val isInStringInterpolation =
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionWithoutDetailsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionWithoutDetailsSuite.scala
new file mode 100644
index 000000000000..f265b5393ccc
--- /dev/null
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionWithoutDetailsSuite.scala
@@ -0,0 +1,120 @@
+package dotty.tools.pc.tests.completion
+
+import dotty.tools.pc.base.BaseCompletionSuite
+
+import scala.meta.internal.pc.PresentationCompilerConfigImpl
+import scala.meta.pc.PresentationCompilerConfig
+
+import org.junit.Test
+
+class CompletionWithoutDetailsSuite extends BaseCompletionSuite:
+
+  override def config: PresentationCompilerConfig =
+    PresentationCompilerConfigImpl().copy(
+      isDetailIncludedInLabel = false
+    )
+
+  @Test def `scope` =
+    check(
+      """
+        |object A {
+        |  Lis@@
+        |}""".stripMargin,
+      """|List
+         |List
+         |List
+         |List
+         |ListUI
+         |""".stripMargin,
+      includeDetail = false,
+      topLines = Some(5)
+    )
+
+  @Test def `scope-detail` =
+    check(
+      """
+        |object A {
+        |  Lis@@
+        |}""".stripMargin,
+      """|List[A](elems: A*): List[A]
+         |List scala.collection.immutable
+         |List java.awt
+         |List java.util
+         |ListUI javax.swing.plaf
+        |""".stripMargin,
+      includeDetail = true,
+      topLines = Some(5)
+    )
+
+  @Test def member =
+    check(
+      """
+        |object A {
+        |  List.emp@@
+        |}""".stripMargin,
+      """
+        |empty
+        |""".stripMargin,
+      includeDetail = false
+    )
+
+  @Test def extension =
+    check(
+      """
+        |object A {
+        |  "".stripSu@@
+        |}""".stripMargin,
+      """|stripSuffix
+        |""".stripMargin,
+      includeDetail = false
+    )
+
+  @Test def tparam =
+    check(
+      """
+        |class Foo[A] {
+        |  def identity[B >: A](a: B): B = a
+        |}
+        |object Foo {
+        |  new Foo[Int].ident@@
+        |}""".stripMargin,
+      """|identity
+        |""".stripMargin,
+      includeDetail = false
+    )
+
+  @Test def tparam1 =
+    check(
+      """
+        |class Foo[A] {
+        |  def identity(a: A): A = a
+        |}
+        |object Foo {
+        |  new Foo[Int].ident@@
+        |}""".stripMargin,
+      """|identity
+         |""".stripMargin,
+      includeDetail = false
+    )
+
+  @Test def tparam2 =
+    check(
+      """
+        |object A {
+        |  Map.empty[Int, String].getOrEl@@
+        |}
+        |""".stripMargin,
+      """|getOrElse
+         |""".stripMargin,
+      includeDetail = false
+    )
+
+  @Test def pkg =
+    check(
+      """
+        |import scala.collection.conc@@
+        |""".stripMargin,
+      """|concurrent
+         |""".stripMargin,
+      includeDetail = false
+    )
\ No newline at end of file

From 91ceb8e23dec4f8e99d63ce2c2aec7932bfb615b Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 21 Jan 2025 16:39:01 +0100
Subject: [PATCH 028/505] fix: deduplicate scaladoc

[Cherry-picked 7e50b1efc8f316cfbcac6609a56aec300bc88ce3]
---
 .../src/main/dotty/tools/pc/CompletionItemResolver.scala        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala b/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
index 291ffe1fec30..ffd7377c8181 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
@@ -75,7 +75,7 @@ object CompletionItemResolver extends ItemResolver:
       else gsymDoc
     else
       val companionDoc = docs(companion)
-      if companionDoc.isEmpty() then gsymDoc
+      if companionDoc.isEmpty() || companionDoc == gsymDoc then gsymDoc
       else if gsymDoc.isEmpty() then companionDoc
       else
         List(

From 583a4c6fd0e32be26050f3dc18d82992f1810d91 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 21 Jan 2025 16:48:34 +0100
Subject: [PATCH 029/505] fix: don't look for overshadow conflicts for symbols
 not in the scope

[Cherry-picked 6187ac02a23e1fb848dbbd0518e4e87681e583b8]
---
 .../tools/pc/PcInlineValueProviderImpl.scala  | 23 +++----
 .../pc/tests/edit/InlineValueSuite.scala      | 61 +++++++++++++++++++
 2 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala
index bbba44d0d84f..fc4b53e60bbd 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala
@@ -18,6 +18,7 @@ import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.utils.InteractiveEnrichments.*
+import dotty.tools.pc.IndexedContext.Result
 
 import org.eclipse.lsp4j as l
 
@@ -49,7 +50,9 @@ final class PcInlineValueProviderImpl(
           DefinitionTree(defn, pos)
         }
         .toRight(Errors.didNotFindDefinition)
-      symbols = symbolsUsedInDefn(definition.tree.rhs)
+      path = Interactive.pathTo(unit.tpdTree, definition.tree.rhs.span)(using newctx)
+      indexedContext = IndexedContext(Interactive.contextOfPath(path)(using newctx))
+      symbols = symbolsUsedInDefn(definition.tree.rhs).filter(indexedContext.lookupSym(_) == Result.InScope)
       references <- getReferencesToInline(definition, allOccurences, symbols)
     yield
       val (deleteDefinition, refsEdits) = references
@@ -111,27 +114,25 @@ final class PcInlineValueProviderImpl(
     val adjustedEnd = extend(pos.end - 1, ')', 1) + 1
     text.slice(adjustedStart, adjustedEnd).mkString
 
-  private def symbolsUsedInDefn(
-      rhs: Tree
-  ): List[Symbol] =
+  private def symbolsUsedInDefn(rhs: Tree): Set[Symbol] =
     def collectNames(
-        symbols: List[Symbol],
+        symbols: Set[Symbol],
         tree: Tree
-    ): List[Symbol] =
+    ): Set[Symbol] =
       tree match
         case id: (Ident | Select)
             if !id.symbol.is(Synthetic) && !id.symbol.is(Implicit) =>
-          tree.symbol :: symbols
+          symbols + tree.symbol
         case _ => symbols
 
-    val traverser = new DeepFolder[List[Symbol]](collectNames)
-    traverser(List(), rhs)
+    val traverser = new DeepFolder[Set[Symbol]](collectNames)
+    traverser(Set(), rhs)
   end symbolsUsedInDefn
 
   private def getReferencesToInline(
       definition: DefinitionTree,
       allOccurences: List[Occurence],
-      symbols: List[Symbol]
+      symbols: Set[Symbol]
   ): Either[String, (Boolean, List[Reference])] =
     val defIsLocal = definition.tree.symbol.ownersIterator
       .drop(1)
@@ -156,7 +157,7 @@ final class PcInlineValueProviderImpl(
 
   private def makeRefsEdits(
       refs: List[Occurence],
-      symbols: List[Symbol]
+      symbols: Set[Symbol]
   ): Either[String, List[Reference]] =
     val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)
     def buildRef(occurrence: Occurence): Either[String, Reference] =
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
index 0cec3952a7ef..cee0aada9f86 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
@@ -301,6 +301,47 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments:
          |}""".stripMargin
     )
 
+
+  @Test def `i6924` =
+    checkEdit(
+      """|object O {
+         |  def test(n: Int) = {
+         |    val isOne = n == 1
+         |    <<i>>sOne
+         |  }
+         |}
+         |""".stripMargin,
+      """|object O {
+         |  def test(n: Int) = {
+         |    n == 1
+         |  }
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `i6924-2` =
+    checkEdit(
+      """|object O {
+         |  def ==(o: O) = false
+         |}
+         |object P {
+         |  def test() = {
+         |    val isOne = O == O
+         |    <<i>>sOne
+         |  }
+         |}
+         |""".stripMargin,
+      """|object O {
+         |  def ==(o: O) = false
+         |}
+         |object P {
+         |  def test() = {
+         |    O == O
+         |  }
+         |}
+         |""".stripMargin
+    )
+
   @Test def `scoping-packages` =
     checkError(
       """|package a
@@ -346,6 +387,26 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments:
       InlineErrors.variablesAreShadowed("A.k")
     )
 
+  @Test def `bad-scoping-3` =
+    checkError(
+      """|class T {
+         |    val a = 1
+         |}
+         |
+         |class O {
+         |  val t = new T()
+         |  import t._
+         |  val bb = a + a
+         |
+         |  class Inner {
+         |    val a = 123
+         |    val cc = <<b>>b
+         |  }
+         |}
+         |""".stripMargin,
+      InlineErrors.variablesAreShadowed("T.a")
+    )
+
   def checkEdit(
       original: String,
       expected: String,

From 0a6b8a464e18664275277852cdb12ba04bd0ff8f Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 21 Jan 2025 16:58:50 +0100
Subject: [PATCH 030/505] fix: don't show incorrect docs for inner methods

[Cherry-picked 9a028cdca1a4b0e35f698f1e53db50d32bd31953]
---
 .../tools/pc/utils/InteractiveEnrichments.scala   | 15 ++++++++++-----
 .../tools/pc/tests/hover/HoverDocSuite.scala      | 12 ++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
index 66080a363d51..b65f23fae40f 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
@@ -1,5 +1,7 @@
 package dotty.tools.pc.utils
 
+import java.util.Optional
+
 import scala.annotation.tailrec
 import scala.meta.internal.jdk.CollectionConverters.*
 import scala.meta.internal.mtags.CommonMtagsEnrichments
@@ -272,11 +274,14 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
             symbol.maybeOwner.companion,
           ).filter(_ != NoSymbol) ++ symbol.allOverriddenSymbols
         else symbol.allOverriddenSymbols
-      val documentation = search.documentation(
-        sym,
-        () => parentSymbols.iterator.map(toSemanticdbSymbol).toList.asJava,
-        contentType,
-      )
+      val documentation =
+        if symbol.isLocal then Optional.empty
+        else
+          search.documentation(
+            sym,
+            () => parentSymbols.iterator.map(toSemanticdbSymbol).toList.asJava,
+            contentType,
+          )
       documentation.nn.toScala
     end symbolDocumentation
   end extension
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDocSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDocSuite.scala
index fc9b6835e319..a82fa73865c8 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDocSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDocSuite.scala
@@ -254,3 +254,15 @@ class HoverDocSuite extends BaseHoverSuite:
          |Found documentation for _empty_/Alpha#
          |""".stripMargin,
     )
+
+  @Test def `i7093` =
+    check(
+      """|object O:
+         |  /** Ooopsie daisy */
+         |  val computeLogicOwners: Unit =
+         |    /** This is a comment */
+         |    <<def logi@@cOwners = ???>>
+         |    ???
+         |""".stripMargin,
+      """def logicOwners: Nothing""".hover.stripMargin
+    )

From 174b497edc9553bfc08ad0558289d54411ceba8e Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Wed, 22 Jan 2025 11:54:25 +0100
Subject: [PATCH 031/505] adjust for Java 8 and fix doc test

[Cherry-picked d1a150af4873dcccaccc6e3f3cd7b901071fc3b2]
---
 .../tools/pc/ScalaPresentationCompiler.scala      | 15 +++++++--------
 .../tools/pc/tests/hover/HoverNamedArgSuite.scala |  1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index b3f8bba78953..a44c16ecc748 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -98,15 +98,14 @@ case class ScalaPresentationCompiler(
          params match {
            case range: RangeParams =>
              extractMethod(range, extractionPos)
-           case _ =>
-             CompletableFuture.failedFuture(
-               new IllegalArgumentException(s"Expected range parameters")
-             )
+           case _ => failedFuture(new IllegalArgumentException(s"Expected range parameters"))
          }
-       case (id, _) =>
-         CompletableFuture.failedFuture(
-           new IllegalArgumentException(s"Unsupported action id $id")
-         )
+       case (id, _) => failedFuture(new IllegalArgumentException(s"Unsupported action id $id"))
+
+  private def failedFuture[T](e: Throwable): CompletableFuture[T] =
+    val f = new CompletableFuture[T]()
+    f.completeExceptionally(e)
+    f
 
   override def withCompletionItemPriority(
     priority: CompletionItemPriority
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverNamedArgSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverNamedArgSuite.scala
index 182f8e1e0644..9f9e11725447 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverNamedArgSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverNamedArgSuite.scala
@@ -29,7 +29,6 @@ class HoverNamedArgSuite extends BaseHoverSuite:
       """|```scala
          |named: Int
          |```
-         |Found documentation for a/b.foo().(named)
          |""".stripMargin
     )
 

From 2b87171968eb49263c74f13de8188ca31e4005d4 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 22 Jan 2025 07:46:29 -0800
Subject: [PATCH 032/505] Filter help renders box border

[Cherry-picked e1bdfad9d1a47d54f038bce0928101bf43a57a9a]
---
 .../tools/dotc/reporting/MessageRendering.scala     | 13 +++++++------
 tests/neg/nowarn.check                              |  6 +++---
 tests/warn/deprecated-origin-verbose.check          | 12 ++++++------
 tests/warn/i22412.check                             | 10 ++++++++++
 tests/warn/i22412.scala                             |  3 +++
 5 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 tests/warn/i22412.check
 create mode 100644 tests/warn/i22412.scala

diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
index 7db5112b6674..45caf480f65e 100644
--- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -209,20 +209,21 @@ trait MessageRendering {
     sb.toString
   }
 
-  private def appendFilterHelp(dia: Diagnostic, sb: StringBuilder): Unit =
+  private def appendFilterHelp(dia: Diagnostic, sb: StringBuilder)(using Context, Level, Offset): Unit =
+    extension (sb: StringBuilder) def nl: sb.type = sb.append(EOL).append(offsetBox)
     import dia.msg
     val hasId = msg.errorId.errorNumber >= 0
     val (category, origin) = dia match
-      case _: UncheckedWarning => ("unchecked", "")
+      case _: UncheckedWarning   => ("unchecked", "")
       case w: DeprecationWarning => ("deprecation", w.origin)
-      case _: FeatureWarning => ("feature", "")
-      case _ => ("", "")
+      case _: FeatureWarning     => ("feature", "")
+      case _                     => ("", "")
     var entitled = false
     def addHelp(what: String)(value: String): Unit =
       if !entitled then
-        sb.append(EOL).append("Matching filters for @nowarn or -Wconf:")
+        sb.nl.append("Matching filters for @nowarn or -Wconf:")
         entitled = true
-      sb.append(EOL).append("  - ").append(what).append(value)
+      sb.nl.append("  - ").append(what).append(value)
     if hasId then
       addHelp("id=E")(msg.errorId.errorNumber.toString)
       addHelp("name=")(msg.errorId.productPrefix.stripSuffix("ID"))
diff --git a/tests/neg/nowarn.check b/tests/neg/nowarn.check
index 636cabd44d07..ff01de1788bd 100644
--- a/tests/neg/nowarn.check
+++ b/tests/neg/nowarn.check
@@ -24,9 +24,9 @@
    |                            ^^^^^
    |                            A try without catch or finally is equivalent to putting
    |                            its body in a block; no exceptions are handled.
-Matching filters for @nowarn or -Wconf:
-  - id=E2
-  - name=EmptyCatchAndFinallyBlock
+   |Matching filters for @nowarn or -Wconf:
+   |  - id=E2
+   |  - name=EmptyCatchAndFinallyBlock
    |
    | longer explanation available when compiling with `-explain`
 -- [E129] Potential Issue Warning: tests/neg/nowarn.scala:15:11 --------------------------------------------------------
diff --git a/tests/warn/deprecated-origin-verbose.check b/tests/warn/deprecated-origin-verbose.check
index e67efaf8668d..db0ee26fd779 100644
--- a/tests/warn/deprecated-origin-verbose.check
+++ b/tests/warn/deprecated-origin-verbose.check
@@ -2,13 +2,13 @@
 12 |  class D extends C // warn
    |                  ^
    |                  class C in package p is deprecated since 1.0: Old style
-Matching filters for @nowarn or -Wconf:
-  - cat=deprecation
-  - origin=p.C
+   |Matching filters for @nowarn or -Wconf:
+   |  - cat=deprecation
+   |  - origin=p.C
 -- Deprecation Warning: tests/warn/deprecated-origin-verbose.scala:13:20 -----------------------------------------------
 13 |  class Oil extends Crude // warn
    |                    ^^^^^
    |                    class Crude in package p is deprecated since 1.0: Bad style
-Matching filters for @nowarn or -Wconf:
-  - cat=deprecation
-  - origin=p.Crude
+   |Matching filters for @nowarn or -Wconf:
+   |  - cat=deprecation
+   |  - origin=p.Crude
diff --git a/tests/warn/i22412.check b/tests/warn/i22412.check
new file mode 100644
index 000000000000..adbe698db058
--- /dev/null
+++ b/tests/warn/i22412.check
@@ -0,0 +1,10 @@
+-- [E002] Syntax Warning: tests/warn/i22412.scala:3:34 -----------------------------------------------------------------
+3 |  @annotation.nowarn("v") def f = try 1 // warn
+  |                                  ^^^^^
+  |                                  A try without catch or finally is equivalent to putting
+  |                                  its body in a block; no exceptions are handled.
+  |Matching filters for @nowarn or -Wconf:
+  |  - id=E2
+  |  - name=EmptyCatchAndFinallyBlock
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/warn/i22412.scala b/tests/warn/i22412.scala
new file mode 100644
index 000000000000..870a264c1df1
--- /dev/null
+++ b/tests/warn/i22412.scala
@@ -0,0 +1,3 @@
+
+class C:
+  @annotation.nowarn("v") def f = try 1 // warn

From 42a56678057dc29f5e8dac7ba9d151b1b7ce410c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= <sjrdoeraene@gmail.com>
Date: Fri, 17 Jan 2025 17:04:40 +0100
Subject: [PATCH 033/505] Scala.js: Emit `js.NewArray` IR nodes when possible.

Although there is a *correct* implementation of `sr.Arrays.newArray`,
it is not efficient when creating 1-dimensional arrays. The JVM
backend special-cases it to emit `newarray` bytecode instructions.

We now also special-case it in the JS backend. In the Scala.js IR
however, `js.NewArray` only accepts a single dimension. For multiple
dimensions, the right thing to do is to emit a direct call to
`jlr.Array.newInstance`.

[Cherry-picked 2852168e8ddac8aa318635a73c79f64282aa39d1]
---
 .../dotty/tools/backend/sjs/JSCodeGen.scala   | 24 +++++++++++++++++++
 .../tools/backend/sjs/JSPrimitives.scala      |  6 +++--
 .../src/dotty/tools/dotc/core/Types.scala     |  8 ++++---
 .../pc/utils/InteractiveEnrichments.scala     |  2 +-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
index 1572ed476c6c..9e5743147122 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
@@ -2553,6 +2553,8 @@ class JSCodeGen()(using genCtx: Context) {
       genCoercion(tree, receiver, code)
     else if (code == JSPrimitives.THROW)
       genThrow(tree, args)
+    else if (code == JSPrimitives.NEW_ARRAY)
+      genNewArray(tree, args)
     else if (JSPrimitives.isJSPrimitive(code))
       genJSPrimitive(tree, args, code, isStat)
     else
@@ -3022,6 +3024,24 @@ class JSCodeGen()(using genCtx: Context) {
     }
   }
 
+  /** Gen a call to the special `newArray` method. */
+  private def genNewArray(tree: Apply, args: List[Tree]): js.Tree = {
+    implicit val pos: SourcePosition = tree.sourcePos
+
+    val List(elemClazz, Literal(arrayClassConstant), dimsArray: JavaSeqLiteral) = args: @unchecked
+
+    dimsArray.elems match {
+      case singleDim :: Nil =>
+        // Use a js.NewArray
+        val arrayTypeRef = toTypeRef(arrayClassConstant.typeValue).asInstanceOf[jstpe.ArrayTypeRef]
+        js.NewArray(arrayTypeRef, List(genExpr(singleDim)))
+      case _ =>
+        // Delegate to jlr.Array.newInstance
+        js.ApplyStatic(js.ApplyFlags.empty, JLRArrayClassName, js.MethodIdent(JLRArrayNewInstanceMethodName),
+            List(genExpr(elemClazz), genJavaSeqLiteral(dimsArray)))(jstpe.AnyType)
+    }
+  }
+
   /** Gen a "normal" apply (to a true method).
    *
    *  But even these are further refined into:
@@ -4835,6 +4855,7 @@ class JSCodeGen()(using genCtx: Context) {
 object JSCodeGen {
 
   private val NullPointerExceptionClass = ClassName("java.lang.NullPointerException")
+  private val JLRArrayClassName = ClassName("java.lang.reflect.Array")
   private val JSObjectClassName = ClassName("scala.scalajs.js.Object")
   private val JavaScriptExceptionClassName = ClassName("scala.scalajs.js.JavaScriptException")
 
@@ -4844,6 +4865,9 @@ object JSCodeGen {
 
   private val selectedValueMethodName = MethodName("selectedValue", Nil, ObjectClassRef)
 
+  private val JLRArrayNewInstanceMethodName =
+    MethodName("newInstance", List(jstpe.ClassRef(jsNames.ClassClass), jstpe.ArrayTypeRef(jstpe.IntRef, 1)), ObjectClassRef)
+
   private val ObjectArgConstructorName = MethodName.constructor(List(ObjectClassRef))
 
   private val thisOriginalName = OriginalName("this")
diff --git a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
index a3a37795826a..f23c816b5204 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
@@ -48,9 +48,10 @@ object JSPrimitives {
   inline val UNWRAP_FROM_THROWABLE = WRAP_AS_THROWABLE + 1 // js.special.unwrapFromThrowable
   inline val DEBUGGER = UNWRAP_FROM_THROWABLE + 1          // js.special.debugger
 
-  inline val THROW = DEBUGGER + 1
+  inline val THROW = DEBUGGER + 1  // <special-ops>.throw
+  inline val NEW_ARRAY = THROW + 1 // scala.runtime.Arrays.newArray
 
-  inline val UNION_FROM = THROW + 1                       // js.|.from
+  inline val UNION_FROM = NEW_ARRAY + 1                   // js.|.from
   inline val UNION_FROM_TYPE_CONSTRUCTOR = UNION_FROM + 1 // js.|.fromTypeConstructor
 
   inline val REFLECT_SELECTABLE_SELECTDYN = UNION_FROM_TYPE_CONSTRUCTOR + 1 // scala.reflect.Selectable.selectDynamic
@@ -137,6 +138,7 @@ class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) {
     addPrimitive(jsdefn.Special_debugger, DEBUGGER)
 
     addPrimitive(defn.throwMethod, THROW)
+    addPrimitive(defn.newArrayMethod, NEW_ARRAY)
 
     addPrimitive(jsdefn.PseudoUnion_from, UNION_FROM)
     addPrimitive(jsdefn.PseudoUnion_fromTypeConstructor, UNION_FROM_TYPE_CONSTRUCTOR)
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index ac6089516571..1113f7413e6e 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -5794,11 +5794,13 @@ object Types extends TypeUtils {
     protected def derivedLambdaType(tp: LambdaType)(formals: List[tp.PInfo], restpe: Type): Type =
       tp.derivedLambdaType(tp.paramNames, formals, restpe)
 
+    protected def mapArg(arg: Type, tparam: ParamInfo): Type = arg match
+      case arg: TypeBounds => this(arg)
+      case arg => atVariance(variance * tparam.paramVarianceSign)(this(arg))
+
     protected def mapArgs(args: List[Type], tparams: List[ParamInfo]): List[Type] = args match
       case arg :: otherArgs if tparams.nonEmpty =>
-        val arg1 = arg match
-          case arg: TypeBounds => this(arg)
-          case arg => atVariance(variance * tparams.head.paramVarianceSign)(this(arg))
+        val arg1 = mapArg(arg, tparams.head)
         val otherArgs1 = mapArgs(otherArgs, tparams.tail)
         if ((arg1 eq arg) && (otherArgs1 eq otherArgs)) args
         else arg1 :: otherArgs1
diff --git a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
index b65f23fae40f..d909b6ee7e04 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
@@ -281,7 +281,7 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
             sym,
             () => parentSymbols.iterator.map(toSemanticdbSymbol).toList.asJava,
             contentType,
-          )
+          ).nn
       documentation.nn.toScala
     end symbolDocumentation
   end extension

From a76ababad00cec70ae1199992e0a306e74654e0b Mon Sep 17 00:00:00 2001
From: Jan Chyb <48855024+jchyb@users.noreply.github.com>
Date: Thu, 30 Jan 2025 11:53:37 +0100
Subject: [PATCH 034/505] Fix stack overflow errors when generating opaque type
 proxies (#22479)

Before the regressive PR, we would check via the generated opaqueProxies
list whether one was already generated. In that PR, we tried allowing
generating proxies for rhs of currently generated proxy. Since we have
to add the generated proxy to opaqueProxies only after that step, this
could cause infinite recursion (and adding the proxies earlier could
cause another infinite loop).

To fix that, we add another collection for termrefs which we already
visited this way, but which is not used in the `mapOpaques` function.
[Cherry-picked 6d9b0f14f18b89d1719fd5346284eae9cc6e39bc]
---
 compiler/src/dotty/tools/dotc/inlines/Inliner.scala |  6 +++++-
 tests/pos/i22468.scala                              | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22468.scala

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 5a8111a4cc28..7e9e4498e310 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -384,6 +384,9 @@ class Inliner(val call: tpd.Tree)(using Context):
    */
   private val opaqueProxies = new mutable.ListBuffer[(TermRef, TermRef)]
 
+  /** TermRefs for which we already started synthesising proxies */
+  private val visitedTermRefs = new mutable.HashSet[TermRef]
+
   protected def hasOpaqueProxies = opaqueProxies.nonEmpty
 
   /** Map first halves of opaqueProxies pairs to second halves, using =:= as equality */
@@ -401,8 +404,9 @@ class Inliner(val call: tpd.Tree)(using Context):
         for cls <- ref.widen.baseClasses do
           if cls.containsOpaques
              && (forThisProxy || inlinedMethod.isContainedIn(cls))
-             && mapRef(ref).isEmpty
+             && !visitedTermRefs.contains(ref)
           then
+            visitedTermRefs += ref
             val refiningRef = OpaqueProxy(ref, cls, call.span)
             val refiningSym = refiningRef.symbol.asTerm
             val refinedType = refiningRef.info
diff --git a/tests/pos/i22468.scala b/tests/pos/i22468.scala
new file mode 100644
index 000000000000..265d6d3a89b7
--- /dev/null
+++ b/tests/pos/i22468.scala
@@ -0,0 +1,10 @@
+import Result.*
+opaque type Result[+E, +A] = Success[A] | Error[E]
+
+object Result:
+  opaque type Success[+A] = A
+  sealed abstract class Error[+E]
+
+  extension [E, A](self: Result[E, A])
+    inline def transform[B]: B = ???
+    def problem: Boolean = transform[Boolean]

From 08a0f29944e7ebe2f0a4c89c5644d4077006cd62 Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Thu, 30 Jan 2025 14:35:10 +0100
Subject: [PATCH 035/505] fix: record calls to constructors in lambdaLift

[Cherry-picked 5dddf7e0f7ffd5835754bd2ceedba363b15b6e0c]
---
 .../tools/dotc/transform/Dependencies.scala   |  6 ++++-
 .../tools/dotc/transform/LambdaLift.scala     |  4 +--
 tests/pos/i21931.scala                        | 25 +++++++++++--------
 tests/pos/i22470.scala                        | 17 +++++++++++++
 4 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 tests/pos/i22470.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
index 28fd21200759..ad40141fad43 100644
--- a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
@@ -136,6 +136,7 @@ abstract class Dependencies(root: ast.tpd.Tree, @constructorOnly rootContext: Co
       if !enclosure.exists then throw NoPath()
       if enclosure == sym.enclosure then NoSymbol
       else
+        /** is sym a constructor or a term that is nested in a constructor? */
         def nestedInConstructor(sym: Symbol): Boolean =
           sym.isConstructor
           || sym.isTerm && nestedInConstructor(sym.enclosure)
@@ -236,6 +237,10 @@ abstract class Dependencies(root: ast.tpd.Tree, @constructorOnly rootContext: Co
         captureImplicitThis(tree.tpe)
       case tree: Select =>
         if isExpr(sym) && isLocal(sym) then markCalled(sym, enclosure)
+      case tree: New =>
+        val constr = tree.tpe.typeSymbol.primaryConstructor
+        if isExpr(constr) then
+          symSet(called, enclosure) += constr
       case tree: This =>
         narrowTo(tree.symbol.asClass)
       case tree: MemberDef if isExpr(sym) && sym.owner.isTerm =>
@@ -290,7 +295,6 @@ abstract class Dependencies(root: ast.tpd.Tree, @constructorOnly rootContext: Co
         val calleeOwner = normalizedCallee.owner
         if calleeOwner.isTerm then narrowLogicOwner(caller, logicOwner(normalizedCallee))
         else
-          assert(calleeOwner.is(Trait))
           // methods nested inside local trait methods cannot be lifted out
           // beyond the trait. Note that we can also call a trait method through
           // a qualifier; in that case no restriction to lifted owner arises.
diff --git a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
index 6a7dee2ff4fe..3fbdf1fa5427 100644
--- a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
@@ -127,9 +127,7 @@ object LambdaLift:
 
     private def proxy(sym: Symbol)(using Context): Symbol = {
       def liftedEnclosure(sym: Symbol) =
-        if sym.is(Method)
-        then deps.logicalOwner.getOrElse(sym, sym.enclosure)
-        else sym.enclosure
+        deps.logicalOwner.getOrElse(sym, sym.enclosure)
       def searchIn(enclosure: Symbol): Symbol = {
         if (!enclosure.exists) {
           def enclosures(encl: Symbol): List[Symbol] =
diff --git a/tests/pos/i21931.scala b/tests/pos/i21931.scala
index 6765768874af..d4deb93f4c2e 100644
--- a/tests/pos/i21931.scala
+++ b/tests/pos/i21931.scala
@@ -1,13 +1,18 @@
-def f() =
-  val NotFound: Char = 'a'
-  class crashing() {
-    class issue() {
-      NotFound
-    }
-    class Module() {
-      val obligatory =
-        class anonIssue() {
-          issue()
+object Test {
+  def f() = {
+    val NotFound: Char = 'a'
+    class crashing() {
+      class issue() {
+        NotFound
+      }
+      class Module() {
+        val obligatory = {
+          def anonIssue = {
+            issue()
+          }
+          anonIssue
         }
+      }
     }
   }
+}
diff --git a/tests/pos/i22470.scala b/tests/pos/i22470.scala
new file mode 100644
index 000000000000..83599f2564fc
--- /dev/null
+++ b/tests/pos/i22470.scala
@@ -0,0 +1,17 @@
+trait A
+trait OuterClass
+trait MidClass
+trait InnerClass
+
+object Obj:
+  def outerDef(a: A) =
+    new OuterClass {
+      def midDef(): Unit = {
+        new MidClass {
+          val valdef = new InnerClass {
+            def innerDef() =
+              println(a)
+          }
+        }
+      }
+    }

From 64fb8d6fedaddbbda414dfefb4c613af0cf5b31d Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Tue, 18 Feb 2025 13:08:57 +0100
Subject: [PATCH 036/505] Review fixes

[Cherry-picked 51c5c41227ae7d70d6fd7b5dde20336e73288e0e]
---
 compiler/src/dotty/tools/dotc/transform/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
index ad40141fad43..5d76158edc96 100644
--- a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
@@ -239,7 +239,7 @@ abstract class Dependencies(root: ast.tpd.Tree, @constructorOnly rootContext: Co
         if isExpr(sym) && isLocal(sym) then markCalled(sym, enclosure)
       case tree: New =>
         val constr = tree.tpe.typeSymbol.primaryConstructor
-        if isExpr(constr) then
+        if constr.exists then
           symSet(called, enclosure) += constr
       case tree: This =>
         narrowTo(tree.symbol.asClass)

From b6462388fbdbc03bb659cb697b76b9b6bef4f030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= <sjrdoeraene@gmail.com>
Date: Thu, 13 Mar 2025 17:05:16 +0100
Subject: [PATCH 037/505] Fix #22794: Emit the definition of `Arrays.newArray`
 even though it's a primitive.

Until 3.6.x, we used the user-space definition of `Arrays.newArray`
in Scala.js. We changed it to a primitve in
2852168e8ddac8aa318635a73c79f64282aa39d1, to match the behavior of
the JVM backend.

However, that had the side effect of not emitting its definition
at all, like other primitives. For backward binary compat reasons,
we do need that definition.

We specifically make an exception for that method, which is now
emitted, even though it is otherwise treated as a primitive.

[Cherry-picked 9c7193a2889b139e2cdbee2e4ea06cf82428e404]
---
 compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala         | 2 +-
 sbt-test/scalajs/backward-compat/build.sbt                   | 5 +++++
 sbt-test/scalajs/backward-compat/project/plugins.sbt         | 2 ++
 .../src/test/scala/NewArrayIssue22794Test.scala              | 5 +++++
 sbt-test/scalajs/backward-compat/test                        | 1 +
 5 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 sbt-test/scalajs/backward-compat/build.sbt
 create mode 100644 sbt-test/scalajs/backward-compat/project/plugins.sbt
 create mode 100644 sbt-test/scalajs/backward-compat/src/test/scala/NewArrayIssue22794Test.scala
 create mode 100644 sbt-test/scalajs/backward-compat/test

diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
index 9e5743147122..4e63d31b6842 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
@@ -1496,7 +1496,7 @@ class JSCodeGen()(using genCtx: Context) {
 
       def jsParams = params.map(genParamDef(_))
 
-      if (primitives.isPrimitive(sym)) {
+      if (primitives.isPrimitive(sym) && sym != defn.newArrayMethod) {
         None
       } else if (sym.is(Deferred) && currentClassSym.isNonNativeJSClass) {
         // scala-js/#4409: Do not emit abstract methods in non-native JS classes
diff --git a/sbt-test/scalajs/backward-compat/build.sbt b/sbt-test/scalajs/backward-compat/build.sbt
new file mode 100644
index 000000000000..552452b72f6f
--- /dev/null
+++ b/sbt-test/scalajs/backward-compat/build.sbt
@@ -0,0 +1,5 @@
+enablePlugins(ScalaJSPlugin)
+
+scalaVersion := sys.props("plugin.scalaVersion")
+
+libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10"
diff --git a/sbt-test/scalajs/backward-compat/project/plugins.sbt b/sbt-test/scalajs/backward-compat/project/plugins.sbt
new file mode 100644
index 000000000000..b30c6e8c5ec8
--- /dev/null
+++ b/sbt-test/scalajs/backward-compat/project/plugins.sbt
@@ -0,0 +1,2 @@
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))
diff --git a/sbt-test/scalajs/backward-compat/src/test/scala/NewArrayIssue22794Test.scala b/sbt-test/scalajs/backward-compat/src/test/scala/NewArrayIssue22794Test.scala
new file mode 100644
index 000000000000..0385b537bfe4
--- /dev/null
+++ b/sbt-test/scalajs/backward-compat/src/test/scala/NewArrayIssue22794Test.scala
@@ -0,0 +1,5 @@
+class NewArrayIssue22794Test extends munit.FunSuite {
+  test("foo") {
+    assert(2 + 2 == 4)
+  }
+}
diff --git a/sbt-test/scalajs/backward-compat/test b/sbt-test/scalajs/backward-compat/test
new file mode 100644
index 000000000000..dfffb838b4b3
--- /dev/null
+++ b/sbt-test/scalajs/backward-compat/test
@@ -0,0 +1 @@
+> test

From 76e7558421c24ca35d0cb36c4c54e9a679d2f280 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 28 Jun 2024 17:26:23 -0700
Subject: [PATCH 038/505] Respect prefix when checking if selector selects

Use miniphase api instead of traversing.

Share a megaphase with CheckShadowing.

Perform more expensive checks last. Avoid intermediate collections.

Tighten allowance for serialization methods.

Don't ignore params of public methods.

Show misplaced warn comment, unfulfilled expectations.

Warn for unused patvars.
Don't warn about canonical names (case class element names).
Warn unassigned mutable patvars

No transparent inline exclusion. Handle match types.
No warn inline proxy. Detect summon inline.

Unused import diagnostics have an origin.

Original of literal.

Typos in build. Handle aliased boolean settings.

Resolve imports post inlining.

Excuse only empty interfaces as unused bound.

Use result of TypeTest.
---
 .../tools/backend/jvm/BCodeSkelBuilder.scala  |    6 +-
 compiler/src/dotty/tools/dotc/Compiler.scala  |    6 +-
 .../src/dotty/tools/dotc/ast/Desugar.scala    |   14 +-
 .../tools/dotc/config/ScalaSettings.scala     |   20 +-
 .../dotty/tools/dotc/core/Definitions.scala   |    5 +
 compiler/src/dotty/tools/dotc/report.scala    |   15 +-
 .../tools/dotc/reporting/Diagnostic.scala     |   22 +-
 .../dotty/tools/dotc/reporting/WConf.scala    |   24 +-
 .../dotty/tools/dotc/reporting/messages.scala |   25 +-
 .../tools/dotc/transform/CheckShadowing.scala |   40 +-
 .../tools/dotc/transform/CheckUnused.scala    | 1656 +++++++++--------
 .../tools/dotc/transform/PostTyper.scala      |    4 +-
 .../src/dotty/tools/dotc/typer/Deriving.scala |   25 +-
 .../src/dotty/tools/dotc/typer/Typer.scala    |    9 +-
 .../src/dotty/tools/dotc/util/chaining.scala  |    8 +
 .../src/dotty/tools/repl/ReplCompiler.scala   |    3 +-
 .../dotty/tools/dotc/CompilationTests.scala   |    1 +
 .../dotty/tools/vulpix/ParallelTesting.scala  |   70 +-
 library/src/scala/deriving/Mirror.scala       |    2 +-
 library/src/scala/quoted/Quotes.scala         |    7 +-
 library/src/scala/runtime/Arrays.scala        |    3 +-
 project/Build.scala                           |    8 +-
 tasty/src/dotty/tools/tasty/TastyReader.scala |    2 +-
 tests/pos/i11729.scala                        |    4 +-
 tests/pos/i17631.scala                        |   22 +-
 tests/pos/i18366.scala                        |   10 -
 tests/pos/i3323.scala                         |    9 -
 tests/pos/tuple-exaustivity.scala             |    6 -
 .../ambiguous-named-tuple-assignment.check    |   19 +
 .../ambiguous-named-tuple-assignment.scala    |   19 +
 tests/rewrites/unused.check                   |   55 +
 tests/rewrites/unused.scala                   |   61 +
 tests/semanticdb/metac.expect                 |  265 +--
 tests/untried/neg/warn-unused-privates.scala  |  105 --
 tests/{pos => warn}/i15226.scala              |    0
 tests/warn/i15503a.scala                      |   89 +-
 tests/warn/i15503b.scala                      |    4 +-
 tests/warn/i15503c.scala                      |   22 +-
 tests/warn/i15503d.scala                      |  128 +-
 tests/warn/i15503e.scala                      |   39 +-
 tests/warn/i15503f.scala                      |   44 +-
 tests/warn/i15503g.scala                      |    7 +-
 tests/warn/i15503h.scala                      |    8 +-
 tests/warn/i15503i.scala                      |  105 +-
 tests/warn/i15503k.scala                      |   43 +
 tests/warn/i15503kb/power.scala               |   14 +
 tests/warn/i15503kb/square.scala              |    5 +
 tests/{pos => warn}/i15967.scala              |    0
 tests/warn/i16639a.scala                      |   46 +-
 tests/{pos => warn}/i17230.min1.scala         |    0
 tests/{pos => warn}/i17230.orig.scala         |    0
 tests/{pos => warn}/i17314.scala              |    6 +-
 tests/{pos => warn}/i17314a.scala             |    2 +-
 tests/warn/i17314b.scala                      |    2 +-
 tests/warn/i17318.scala                       |   33 +
 tests/warn/i17371.scala                       |   39 +
 tests/warn/i17667.scala                       |   10 +
 tests/warn/i17667b.scala                      |   22 +
 tests/warn/i17753.scala                       |   10 +
 tests/warn/i18313.scala                       |   14 +
 tests/warn/i18366.scala                       |   19 +
 tests/warn/i18564.scala                       |   39 +
 tests/warn/i19252.scala                       |   13 +
 tests/warn/i19657-mega.scala                  |    4 +
 tests/warn/i19657.scala                       |  117 ++
 tests/warn/i20520.scala                       |   11 +
 tests/{pos => warn}/i20860.scala              |    2 +
 tests/warn/i20951.scala                       |    7 +
 tests/warn/i21420.scala                       |    6 +-
 tests/warn/i21525.scala                       |   20 +
 tests/warn/i21809.scala                       |   17 +
 tests/warn/i21917.scala                       |   27 +
 tests/warn/i22371.scala                       |    8 +
 tests/warn/i3323.scala                        |    8 +
 tests/{pos => warn}/patmat-exhaustive.scala   |    6 +-
 tests/warn/scala2-t11681.scala                |   24 +-
 tests/warn/tuple-exhaustivity.scala           |    6 +
 tests/warn/unused-can-equal.scala             |   16 +
 tests/warn/unused-locals.scala                |   43 +
 tests/warn/unused-params.scala                |  159 ++
 tests/warn/unused-privates.scala              |  310 +++
 81 files changed, 2764 insertions(+), 1340 deletions(-)
 create mode 100644 compiler/src/dotty/tools/dotc/util/chaining.scala
 delete mode 100644 tests/pos/i18366.scala
 delete mode 100644 tests/pos/i3323.scala
 delete mode 100644 tests/pos/tuple-exaustivity.scala
 create mode 100644 tests/rewrites/ambiguous-named-tuple-assignment.check
 create mode 100644 tests/rewrites/ambiguous-named-tuple-assignment.scala
 create mode 100644 tests/rewrites/unused.check
 create mode 100644 tests/rewrites/unused.scala
 delete mode 100644 tests/untried/neg/warn-unused-privates.scala
 rename tests/{pos => warn}/i15226.scala (100%)
 create mode 100644 tests/warn/i15503k.scala
 create mode 100644 tests/warn/i15503kb/power.scala
 create mode 100644 tests/warn/i15503kb/square.scala
 rename tests/{pos => warn}/i15967.scala (100%)
 rename tests/{pos => warn}/i17230.min1.scala (100%)
 rename tests/{pos => warn}/i17230.orig.scala (100%)
 rename tests/{pos => warn}/i17314.scala (84%)
 rename tests/{pos => warn}/i17314a.scala (70%)
 create mode 100644 tests/warn/i17318.scala
 create mode 100644 tests/warn/i17371.scala
 create mode 100644 tests/warn/i17667.scala
 create mode 100644 tests/warn/i17667b.scala
 create mode 100644 tests/warn/i17753.scala
 create mode 100644 tests/warn/i18313.scala
 create mode 100644 tests/warn/i18366.scala
 create mode 100644 tests/warn/i18564.scala
 create mode 100644 tests/warn/i19252.scala
 create mode 100644 tests/warn/i19657-mega.scala
 create mode 100644 tests/warn/i19657.scala
 create mode 100644 tests/warn/i20520.scala
 rename tests/{pos => warn}/i20860.scala (74%)
 create mode 100644 tests/warn/i20951.scala
 create mode 100644 tests/warn/i21525.scala
 create mode 100644 tests/warn/i21809.scala
 create mode 100644 tests/warn/i21917.scala
 create mode 100644 tests/warn/i22371.scala
 create mode 100644 tests/warn/i3323.scala
 rename tests/{pos => warn}/patmat-exhaustive.scala (56%)
 create mode 100644 tests/warn/tuple-exhaustivity.scala
 create mode 100644 tests/warn/unused-can-equal.scala
 create mode 100644 tests/warn/unused-locals.scala
 create mode 100644 tests/warn/unused-params.scala
 create mode 100644 tests/warn/unused-privates.scala

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
index ef65b699d06d..955597261327 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
@@ -818,7 +818,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
 
       methSymbol  = dd.symbol
       jMethodName = methSymbol.javaSimpleName
-      returnType  = asmMethodType(dd.symbol).returnType
+      returnType  = asmMethodType(methSymbol).returnType
       isMethSymStaticCtor = methSymbol.isStaticConstructor
 
       resetMethodBookkeeping(dd)
@@ -915,7 +915,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
             for (p <- params) { emitLocalVarScope(p.symbol, veryFirstProgramPoint, onePastLastProgramPoint, force = true) }
           }
 
-          if (isMethSymStaticCtor) { appendToStaticCtor(dd) }
+          if (isMethSymStaticCtor) { appendToStaticCtor() }
         } // end of emitNormalMethodBody()
 
         lineNumber(rhs)
@@ -936,7 +936,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
      *
      *  TODO document, explain interplay with `fabricateStaticInitAndroid()`
      */
-    private def appendToStaticCtor(dd: DefDef): Unit = {
+    private def appendToStaticCtor(): Unit = {
 
       def insertBefore(
             location: asm.tree.AbstractInsnNode,
diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala
index b3757a9ddce7..c888dabdd61f 100644
--- a/compiler/src/dotty/tools/dotc/Compiler.scala
+++ b/compiler/src/dotty/tools/dotc/Compiler.scala
@@ -8,7 +8,6 @@ import cc.CheckCaptures
 import parsing.Parser
 import Phases.Phase
 import transform.*
-import dotty.tools.backend
 import backend.jvm.{CollectSuperCalls, GenBCode}
 import localopt.StringInterpolatorOpt
 
@@ -35,8 +34,7 @@ class Compiler {
   protected def frontendPhases: List[List[Phase]] =
     List(new Parser) ::             // Compiler frontend: scanner, parser
     List(new TyperPhase) ::         // Compiler frontend: namer, typer
-    List(new CheckUnused.PostTyper) :: // Check for unused elements
-    List(new CheckShadowing) :: // Check shadowing elements
+    List(CheckUnused.PostTyper(), CheckShadowing()) :: // Check for unused, shadowed elements
     List(new YCheckPositions) ::    // YCheck positions
     List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
     List(new semanticdb.ExtractSemanticDB.ExtractSemanticInfo) :: // Extract info into .semanticdb files
@@ -51,10 +49,10 @@ class Compiler {
     List(new Pickler) ::            // Generate TASTY info
     List(new Inlining) ::           // Inline and execute macros
     List(new PostInlining) ::       // Add mirror support for inlined code
-    List(new CheckUnused.PostInlining) ::  // Check for unused elements
     List(new Staging) ::            // Check staging levels and heal staged types
     List(new Splicing) ::           // Replace level 1 splices with holes
     List(new PickleQuotes) ::       // Turn quoted trees into explicit run-time data structures
+    List(new CheckUnused.PostInlining) ::  // Check for unused elements
     Nil
 
   /** Phases dealing with the transformation from pickled trees to backend trees */
diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
index 9db12e21913a..ca180e5ea612 100644
--- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -45,6 +45,14 @@ object desugar {
    */
   val UntupledParam: Property.Key[Unit] = Property.StickyKey()
 
+  /** An attachment key to indicate that a ValDef originated from a pattern.
+   */
+  val PatternVar: Property.Key[Unit] = Property.StickyKey()
+
+  /** An attachment key for Trees originating in for-comprehension, such as tupling of assignments.
+   */
+  val ForArtifact: Property.Key[Unit] = Property.StickyKey()
+
   /** What static check should be applied to a Match? */
   enum MatchCheck {
     case None, Exhaustive, IrrefutablePatDef, IrrefutableGenFrom
@@ -1221,7 +1229,7 @@ object desugar {
       val matchExpr =
         if (tupleOptimizable) rhs
         else
-          val caseDef = CaseDef(pat, EmptyTree, makeTuple(ids))
+          val caseDef = CaseDef(pat, EmptyTree, makeTuple(ids).withAttachment(ForArtifact, ()))
           Match(makeSelector(rhs, MatchCheck.IrrefutablePatDef), caseDef :: Nil)
       vars match {
         case Nil if !mods.is(Lazy) =>
@@ -1251,6 +1259,7 @@ object desugar {
                   ValDef(named.name.asTermName, tpt, selector(n))
                     .withMods(mods)
                     .withSpan(named.span)
+                    .withAttachment(PatternVar, ())
                 )
           flatTree(firstDef :: restDefs)
       }
@@ -1542,6 +1551,7 @@ object desugar {
     val vdef = ValDef(named.name.asTermName, tpt, rhs)
       .withMods(mods)
       .withSpan(original.span.withPoint(named.span.start))
+      .withAttachment(PatternVar, ())
     val mayNeedSetter = valDef(vdef)
     mayNeedSetter
   }
@@ -1733,7 +1743,7 @@ object desugar {
               case _ => Modifiers()
             makePatDef(valeq, mods, defpat, rhs)
           }
-          val rhs1 = makeFor(nme.map, nme.flatMap, GenFrom(defpat0, gen.expr, gen.checkMode) :: Nil, Block(pdefs, makeTuple(id0 :: ids)))
+          val rhs1 = makeFor(nme.map, nme.flatMap, GenFrom(defpat0, gen.expr, gen.checkMode) :: Nil, Block(pdefs, makeTuple(id0 :: ids).withAttachment(ForArtifact, ())))
           val allpats = gen.pat :: pats
           val vfrom1 = GenFrom(makeTuple(allpats), rhs1, GenCheckMode.Ignore)
           makeFor(mapName, flatMapName, vfrom1 :: rest1, body)
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index 6928e0617069..b864446f19d5 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -179,28 +179,20 @@ private sealed trait WarningSettings:
     choices = List(
       ChoiceWithHelp("nowarn", ""),
       ChoiceWithHelp("all", ""),
-      ChoiceWithHelp(
-        name = "imports",
-        description = "Warn if an import selector is not referenced.\n" +
-        "NOTE : overrided by -Wunused:strict-no-implicit-warn"),
+      ChoiceWithHelp("imports", "Warn if an import selector is not referenced."),
       ChoiceWithHelp("privates", "Warn if a private member is unused"),
       ChoiceWithHelp("locals", "Warn if a local definition is unused"),
       ChoiceWithHelp("explicits", "Warn if an explicit parameter is unused"),
       ChoiceWithHelp("implicits", "Warn if an implicit parameter is unused"),
       ChoiceWithHelp("params", "Enable -Wunused:explicits,implicits"),
+      ChoiceWithHelp("patvars","Warn if a variable bound in a pattern is unused"),
+      //ChoiceWithHelp("inlined", "Apply -Wunused to inlined expansions"), // TODO
       ChoiceWithHelp("linted", "Enable -Wunused:imports,privates,locals,implicits"),
       ChoiceWithHelp(
         name = "strict-no-implicit-warn",
         description = "Same as -Wunused:import, only for imports of explicit named members.\n" +
         "NOTE : This overrides -Wunused:imports and NOT set by -Wunused:all"
       ),
-      // ChoiceWithHelp("patvars","Warn if a variable bound in a pattern is unused"),
-      ChoiceWithHelp(
-        name = "unsafe-warn-patvars",
-        description = "(UNSAFE) Warn if a variable bound in a pattern is unused.\n" +
-        "This warning can generate false positive, as warning cannot be\n" +
-        "suppressed yet."
-      )
     ),
     default = Nil
   )
@@ -212,7 +204,6 @@ private sealed trait WarningSettings:
     // Is any choice set for -Wunused?
     def any(using Context): Boolean = Wall.value || Wunused.value.nonEmpty
 
-    // overrided by strict-no-implicit-warn
     def imports(using Context) =
       (allOr("imports") || allOr("linted")) && !(strictNoImplicitWarn)
     def locals(using Context) =
@@ -226,9 +217,8 @@ private sealed trait WarningSettings:
     def params(using Context) = allOr("params")
     def privates(using Context) =
       allOr("privates") || allOr("linted")
-    def patvars(using Context) =
-      isChoiceSet("unsafe-warn-patvars") // not with "all"
-      // allOr("patvars") // todo : rename once fixed
+    def patvars(using Context) = allOr("patvars")
+    def inlined(using Context) = isChoiceSet("inlined")
     def linted(using Context) =
       allOr("linted")
     def strictNoImplicitWarn(using Context) =
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
index 4aed3d310b03..26ddc47c6b89 100644
--- a/compiler/src/dotty/tools/dotc/core/Definitions.scala
+++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -482,6 +482,8 @@ class Definitions {
     @tu lazy val Predef_undefined: Symbol = ScalaPredefModule.requiredMethod(nme.???)
   @tu lazy val ScalaPredefModuleClass: ClassSymbol = ScalaPredefModule.moduleClass.asClass
 
+  @tu lazy val SameTypeClass: ClassSymbol = requiredClass("scala.=:=")
+  @tu lazy val SameType_refl: Symbol = SameTypeClass.companionModule.requiredMethod(nme.refl)
   @tu lazy val SubTypeClass: ClassSymbol = requiredClass("scala.<:<")
   @tu lazy val SubType_refl: Symbol = SubTypeClass.companionModule.requiredMethod(nme.refl)
 
@@ -816,6 +818,7 @@ class Definitions {
   @tu lazy val QuotedExprClass: ClassSymbol = requiredClass("scala.quoted.Expr")
 
   @tu lazy val QuotesClass: ClassSymbol = requiredClass("scala.quoted.Quotes")
+    @tu lazy val Quotes_reflectModule: Symbol = QuotesClass.requiredClass("reflectModule")
     @tu lazy val Quotes_reflect: Symbol = QuotesClass.requiredValue("reflect")
       @tu lazy val Quotes_reflect_asTerm: Symbol = Quotes_reflect.requiredMethod("asTerm")
       @tu lazy val Quotes_reflect_Apply: Symbol = Quotes_reflect.requiredValue("Apply")
@@ -941,6 +944,7 @@ class Definitions {
   def NonEmptyTupleClass(using Context): ClassSymbol = NonEmptyTupleTypeRef.symbol.asClass
     lazy val NonEmptyTuple_tail: Symbol = NonEmptyTupleClass.requiredMethod("tail")
   @tu lazy val PairClass: ClassSymbol = requiredClass("scala.*:")
+    @tu lazy val PairClass_unapply: Symbol = PairClass.companionModule.requiredMethod("unapply")
 
   @tu lazy val TupleXXLClass: ClassSymbol = requiredClass("scala.runtime.TupleXXL")
   def TupleXXLModule(using Context): Symbol = TupleXXLClass.companionModule
@@ -1031,6 +1035,7 @@ class Definitions {
   @tu lazy val UncheckedCapturesAnnot: ClassSymbol = requiredClass("scala.annotation.unchecked.uncheckedCaptures")
   @tu lazy val VolatileAnnot: ClassSymbol = requiredClass("scala.volatile")
   @tu lazy val WithPureFunsAnnot: ClassSymbol = requiredClass("scala.annotation.internal.WithPureFuns")
+  @tu lazy val LanguageFeatureMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.languageFeature")
   @tu lazy val BeanGetterMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.beanGetter")
   @tu lazy val BeanSetterMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.beanSetter")
   @tu lazy val FieldMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.field")
diff --git a/compiler/src/dotty/tools/dotc/report.scala b/compiler/src/dotty/tools/dotc/report.scala
index 5517bd005077..7bc301184022 100644
--- a/compiler/src/dotty/tools/dotc/report.scala
+++ b/compiler/src/dotty/tools/dotc/report.scala
@@ -1,13 +1,11 @@
 package dotty.tools.dotc
 
-import reporting.*
-import Diagnostic.*
-import util.{SourcePosition, NoSourcePosition, SrcPos}
-import core.*
-import Contexts.*, Flags.*, Symbols.*, Decorators.*
-import config.SourceVersion
 import ast.*
-import config.Feature.sourceVersion
+import core.*, Contexts.*, Flags.*, Symbols.*, Decorators.*
+import config.Feature.sourceVersion, config.SourceVersion
+import reporting.*, Diagnostic.*
+import util.{SourcePosition, NoSourcePosition, SrcPos}
+
 import java.lang.System.currentTimeMillis
 
 object report:
@@ -54,6 +52,9 @@ object report:
     else issueWarning(new FeatureWarning(msg, pos.sourcePos))
   end featureWarning
 
+  def warning(msg: Message, pos: SrcPos, origin: String)(using Context): Unit =
+    issueWarning(LintWarning(msg, addInlineds(pos), origin))
+
   def warning(msg: Message, pos: SrcPos)(using Context): Unit =
     issueWarning(new Warning(msg, addInlineds(pos)))
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala b/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
index 6a2d88f4e82f..102572b82bbc 100644
--- a/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
@@ -36,6 +36,18 @@ object Diagnostic:
     pos: SourcePosition
   ) extends Error(msg, pos)
 
+  /** A Warning with an origin. The semantics of `origin` depend on the warning.
+   *  For example, an unused import warning has an origin that specifies the unused selector.
+   *  The origin of a deprecation is the deprecated element.
+   */
+  trait OriginWarning(val origin: String):
+    self: Warning =>
+
+  /** Lints are likely to be filtered. Provide extra axes for filtering by `-Wconf`.
+   */
+  class LintWarning(msg: Message, pos: SourcePosition, origin: String)
+  extends Warning(msg, pos), OriginWarning(origin)
+
   class Warning(
     msg: Message,
     pos: SourcePosition
@@ -73,13 +85,9 @@ object Diagnostic:
     def enablingOption(using Context): Setting[Boolean] = ctx.settings.unchecked
   }
 
-  class DeprecationWarning(
-    msg: Message,
-    pos: SourcePosition,
-    val origin: String
-  ) extends ConditionalWarning(msg, pos) {
+  class DeprecationWarning(msg: Message, pos: SourcePosition, origin: String)
+  extends ConditionalWarning(msg, pos), OriginWarning(origin):
     def enablingOption(using Context): Setting[Boolean] = ctx.settings.deprecation
-  }
 
   class MigrationWarning(
     msg: Message,
@@ -104,5 +112,5 @@ class Diagnostic(
   override def diagnosticRelatedInformation: JList[interfaces.DiagnosticRelatedInformation] =
     Collections.emptyList()
 
-  override def toString: String = s"$getClass at $pos: $message"
+  override def toString: String = s"$getClass at $pos L${pos.line+1}: $message"
 end Diagnostic
diff --git a/compiler/src/dotty/tools/dotc/reporting/WConf.scala b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
index b1afc2ab5dba..fd5c7cc0dbeb 100644
--- a/compiler/src/dotty/tools/dotc/reporting/WConf.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
@@ -14,11 +14,13 @@ import scala.annotation.internal.sharable
 import scala.util.matching.Regex
 
 enum MessageFilter:
-  def matches(message: Diagnostic): Boolean = this match
+  def matches(message: Diagnostic): Boolean =
+    import Diagnostic.*
+    this match
     case Any => true
-    case Deprecated => message.isInstanceOf[Diagnostic.DeprecationWarning]
-    case Feature => message.isInstanceOf[Diagnostic.FeatureWarning]
-    case Unchecked => message.isInstanceOf[Diagnostic.UncheckedWarning]
+    case Deprecated => message.isInstanceOf[DeprecationWarning]
+    case Feature => message.isInstanceOf[FeatureWarning]
+    case Unchecked => message.isInstanceOf[UncheckedWarning]
     case MessageID(errorId) => message.msg.errorId == errorId
     case MessagePattern(pattern) =>
       val noHighlight = message.msg.message.replaceAll("\\e\\[[\\d;]*[^\\d;]","")
@@ -31,7 +33,7 @@ enum MessageFilter:
       pattern.findFirstIn(path).nonEmpty
     case Origin(pattern) =>
       message match
-      case message: Diagnostic.DeprecationWarning => pattern.findFirstIn(message.origin).nonEmpty
+      case message: OriginWarning => pattern.findFirstIn(message.origin).nonEmpty
       case _ => false
     case None => false
 
@@ -56,12 +58,12 @@ object WConf:
   private type Conf = (List[MessageFilter], Action)
 
   def parseAction(s: String): Either[List[String], Action] = s match
-    case "error" | "e"            => Right(Error)
-    case "warning" | "w"          => Right(Warning)
-    case "verbose" | "v"          => Right(Verbose)
-    case "info" | "i"             => Right(Info)
-    case "silent" | "s"           => Right(Silent)
-    case _                        => Left(List(s"unknown action: `$s`"))
+    case "error"   | "e" => Right(Error)
+    case "warning" | "w" => Right(Warning)
+    case "verbose" | "v" => Right(Verbose)
+    case "info"    | "i" => Right(Info)
+    case "silent"  | "s" => Right(Silent)
+    case _               => Left(List(s"unknown action: `$s`"))
 
   private def regex(s: String) =
     try Right(s.r)
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index f9210845bd54..886ed3979ba5 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3155,22 +3155,25 @@ extends SyntaxMsg(VolatileOnValID):
   protected def msg(using Context): String = "values cannot be volatile"
   protected def explain(using Context): String = ""
 
-class UnusedSymbol(errorText: String)(using Context)
+
+class UnusedSymbol(errorText: String, val actions: List[CodeAction] = Nil)(using Context)
 extends Message(UnusedSymbolID) {
   def kind = MessageKind.UnusedSymbol
 
   override def msg(using Context) = errorText
   override def explain(using Context) = ""
-}
-
-object UnusedSymbol {
-    def imports(using Context): UnusedSymbol = new UnusedSymbol(i"unused import")
-    def localDefs(using Context): UnusedSymbol = new UnusedSymbol(i"unused local definition")
-    def explicitParams(using Context): UnusedSymbol = new UnusedSymbol(i"unused explicit parameter")
-    def implicitParams(using Context): UnusedSymbol = new UnusedSymbol(i"unused implicit parameter")
-    def privateMembers(using Context): UnusedSymbol = new UnusedSymbol(i"unused private member")
-    def patVars(using Context): UnusedSymbol = new UnusedSymbol(i"unused pattern variable")
-}
+  override def actions(using Context) = this.actions
+}
+
+object UnusedSymbol:
+  def imports(actions: List[CodeAction])(using Context): UnusedSymbol = UnusedSymbol(i"unused import", actions)
+  def localDefs(using Context): UnusedSymbol = UnusedSymbol(i"unused local definition")
+  def explicitParams(using Context): UnusedSymbol = UnusedSymbol(i"unused explicit parameter")
+  def implicitParams(using Context): UnusedSymbol = UnusedSymbol(i"unused implicit parameter")
+  def privateMembers(using Context): UnusedSymbol = UnusedSymbol(i"unused private member")
+  def patVars(using Context): UnusedSymbol = UnusedSymbol(i"unused pattern variable")
+  def unsetLocals(using Context): UnusedSymbol = UnusedSymbol(i"unset local variable, consider using an immutable val instead")
+  def unsetPrivates(using Context): UnusedSymbol = UnusedSymbol(i"unset private variable, consider using an immutable val instead")
 
 final class QuotedTypeMissing(tpe: Type)(using Context) extends StagingMessage(QuotedTypeMissingID):
 
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckShadowing.scala b/compiler/src/dotty/tools/dotc/transform/CheckShadowing.scala
index a85cabdd5460..7ecdf79af984 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckShadowing.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckShadowing.scala
@@ -49,26 +49,22 @@ class CheckShadowing extends MiniPhase:
 
   override def description: String = CheckShadowing.description
 
+  override def isEnabled(using Context): Boolean = ctx.settings.Xlint.value.nonEmpty
+
   override def isRunnable(using Context): Boolean =
-    super.isRunnable &&
-    ctx.settings.Xlint.value.nonEmpty &&
-    !ctx.isJava
+    super.isRunnable && ctx.settings.Xlint.value.nonEmpty && !ctx.isJava
 
-  // Setup before the traversal
   override def prepareForUnit(tree: tpd.Tree)(using Context): Context =
     val data = ShadowingData()
     val fresh = ctx.fresh.setProperty(_key, data)
     shadowingDataApply(sd => sd.registerRootImports())(using fresh)
 
-  // Reporting on traversal's end
   override def transformUnit(tree: tpd.Tree)(using Context): tpd.Tree =
     shadowingDataApply(sd =>
       reportShadowing(sd.getShadowingResult)
     )
     tree
 
-  // MiniPhase traversal :
-
   override def prepareForPackageDef(tree: tpd.PackageDef)(using Context): Context =
     shadowingDataApply(sd => sd.inNewScope())
     ctx
@@ -91,16 +87,16 @@ class CheckShadowing extends MiniPhase:
     )
 
   override def prepareForTypeDef(tree: tpd.TypeDef)(using Context): Context =
-    if tree.symbol.isAliasType then // if alias, the parent is the current symbol
-      nestedTypeTraverser(tree.symbol).traverse(tree.rhs)
-    if tree.symbol.is(Param) then // if param, the parent is up
-      val owner = tree.symbol.owner
+    val sym = tree.symbol
+    if sym.isAliasType then // if alias, the parent is the current symbol
+      nestedTypeTraverser(sym).traverse(tree.rhs)
+    if sym.is(Param) then // if param, the parent is up
+      val owner = sym.owner
       val parent = if (owner.isConstructor) then owner.owner else owner
       nestedTypeTraverser(parent).traverse(tree.rhs)(using ctx.outer)
-      shadowingDataApply(sd => sd.registerCandidate(parent, tree))
-    else
-      ctx
-
+      if isValidTypeParamOwner(sym.owner) then
+        shadowingDataApply(sd => sd.registerCandidate(parent, tree))
+    ctx
 
   override def transformPackageDef(tree: tpd.PackageDef)(using Context): tpd.Tree =
     shadowingDataApply(sd => sd.outOfScope())
@@ -115,13 +111,14 @@ class CheckShadowing extends MiniPhase:
     tree
 
   override def transformTypeDef(tree: tpd.TypeDef)(using Context): tpd.Tree =
-    if tree.symbol.is(Param) &&  isValidTypeParamOwner(tree.symbol.owner) then // Do not register for constructors the work is done for the Class owned equivalent TypeDef
+    // Do not register for constructors the work is done for the Class owned equivalent TypeDef
+    if tree.symbol.is(Param) && isValidTypeParamOwner(tree.symbol.owner) then
       shadowingDataApply(sd => sd.computeTypeParamShadowsFor(tree.symbol.owner)(using ctx.outer))
-    if tree.symbol.isAliasType then // No need to start outer here, because the TypeDef reached here it's already the parent
+    // No need to start outer here, because the TypeDef reached here it's already the parent
+    if tree.symbol.isAliasType then
       shadowingDataApply(sd => sd.computeTypeParamShadowsFor(tree.symbol)(using ctx))
     tree
 
-  // Helpers :
   private def isValidTypeParamOwner(owner: Symbol)(using Context): Boolean =
     !owner.isConstructor && !owner.is(Synthetic) && !owner.is(Exported)
 
@@ -141,7 +138,7 @@ class CheckShadowing extends MiniPhase:
 
     override def traverse(tree: tpd.Tree)(using Context): Unit =
       tree match
-        case t:tpd.TypeDef =>
+        case t: tpd.TypeDef =>
           val newCtx = shadowingDataApply(sd =>
             sd.registerCandidate(parent, t)
           )
@@ -157,7 +154,7 @@ class CheckShadowing extends MiniPhase:
 
     override def traverse(tree: tpd.Tree)(using Context): Unit =
       tree match
-        case t:tpd.Import =>
+        case t: tpd.Import =>
           val newCtx = shadowingDataApply(sd => sd.registerImport(t))
           traverseChildren(tree)(using newCtx)
         case _ =>
@@ -240,7 +237,7 @@ object CheckShadowing:
         val declarationScope = ctx.effectiveScope
         val res = declarationScope.lookup(symbol.name)
         res match
-          case s: Symbol if s.isType => Some(s)
+          case s: Symbol if s.isType && s != symbol => Some(s)
           case _ => lookForUnitShadowedType(symbol)(using ctx.outer)
 
     /** Register if the valDef is a private declaration that shadows an inherited field */
@@ -310,4 +307,3 @@ object CheckShadowing:
       case class ShadowResult(warnings: List[ShadowWarning])
 
 end CheckShadowing
-
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 6e626fc5dd9e..dc15bb80cbb6 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -1,883 +1,905 @@
 package dotty.tools.dotc.transform
 
-import scala.annotation.tailrec
-import scala.collection.mutable
-
-import dotty.tools.uncheckedNN
-import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Symbols.*
-import dotty.tools.dotc.ast.tpd.{Inlined, TreeTraverser}
-import dotty.tools.dotc.ast.untpd
-import dotty.tools.dotc.ast.untpd.ImportSelector
+import dotty.tools.dotc.ast.desugar.{ForArtifact, PatternVar}
+import dotty.tools.dotc.ast.tpd.*
+import dotty.tools.dotc.ast.untpd, untpd.ImportSelector
 import dotty.tools.dotc.config.ScalaSettings
 import dotty.tools.dotc.core.Contexts.*
-import dotty.tools.dotc.core.Decorators.{em, i}
-import dotty.tools.dotc.core.Denotations.SingleDenotation
 import dotty.tools.dotc.core.Flags.*
-import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.core.StdNames
+import dotty.tools.dotc.core.Names.{Name, SimpleName, DerivedName, TermName, termName}
+import dotty.tools.dotc.core.NameOps.{isAnonymousFunctionName, isReplWrapperName}
+import dotty.tools.dotc.core.NameKinds.{ContextBoundParamName, ContextFunctionParamName, WildcardParamName}
+import dotty.tools.dotc.core.StdNames.nme
+import dotty.tools.dotc.core.Symbols.{ClassSymbol, NoSymbol, Symbol, defn, isDeprecated, requiredClass, requiredModule}
+import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.report
-import dotty.tools.dotc.reporting.Message
-import dotty.tools.dotc.reporting.UnusedSymbol as UnusedSymbolMessage
-import dotty.tools.dotc.typer.ImportInfo
-import dotty.tools.dotc.util.{Property, SrcPos}
-import dotty.tools.dotc.core.Mode
-import dotty.tools.dotc.core.Types.{AnnotatedType, ConstantType, NoType, TermRef, Type, TypeTraverser}
-import dotty.tools.dotc.core.Flags.flagsString
-import dotty.tools.dotc.core.Flags
-import dotty.tools.dotc.core.Names.{Name, TermName}
-import dotty.tools.dotc.core.NameOps.isReplWrapperName
+import dotty.tools.dotc.reporting.{CodeAction, UnusedSymbol}
+import dotty.tools.dotc.rewrites.Rewrites
 import dotty.tools.dotc.transform.MegaPhase.MiniPhase
-import dotty.tools.dotc.core.Annotations
-import dotty.tools.dotc.core.Definitions
-import dotty.tools.dotc.core.NameKinds.WildcardParamName
-import dotty.tools.dotc.core.Symbols.Symbol
-import dotty.tools.dotc.core.StdNames.nme
-import dotty.tools.dotc.util.Spans.Span
-import scala.math.Ordering
+import dotty.tools.dotc.typer.{ImportInfo, Typer}
+import dotty.tools.dotc.typer.Deriving.OriginalTypeClass
+import dotty.tools.dotc.util.{Property, Spans, SrcPos}, Spans.Span
+import dotty.tools.dotc.util.Chars.{isLineBreakChar, isWhitespace}
+import dotty.tools.dotc.util.chaining.*
 
+import java.util.IdentityHashMap
 
-/**
- * A compiler phase that checks for unused imports or definitions
- *
- * Basically, it gathers definition/imports and their usage. If a
- * definition/imports does not have any usage, then it is reported.
- */
-class CheckUnused private (phaseMode: CheckUnused.PhaseMode, suffix: String, _key: Property.Key[CheckUnused.UnusedData]) extends MiniPhase:
-  import CheckUnused.*
-  import UnusedData.*
-
-  private inline def unusedDataApply[U](inline f: UnusedData => U)(using Context): Context =
-    ctx.property(_key) match
-      case Some(ud) => f(ud)
-      case None     => ()
-    ctx
+import scala.collection.mutable, mutable.{ArrayBuilder, ListBuffer, Stack}
 
-  override def phaseName: String = CheckUnused.phaseNamePrefix + suffix
+import CheckUnused.*
 
-  override def description: String = CheckUnused.description
+/** A compiler phase that checks for unused imports or definitions.
+ */
+class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPhase:
 
-  override def isRunnable(using Context): Boolean =
-    super.isRunnable &&
-    ctx.settings.WunusedHas.any &&
-    !ctx.isJava
+  override def phaseName: String = s"checkUnused$suffix"
 
-  // ========== SETUP ============
+  override def description: String = "check for unused elements"
 
-  override def prepareForUnit(tree: tpd.Tree)(using Context): Context =
-    val data = UnusedData()
-    tree.getAttachment(_key).foreach(oldData =>
-      data.unusedAggregate = oldData.unusedAggregate
-    )
-    val fresh = ctx.fresh.setProperty(_key, data)
-    tree.putAttachment(_key, data)
-    fresh
+  override def isEnabled(using Context): Boolean = ctx.settings.WunusedHas.any
 
-  // ========== END + REPORTING ==========
+  override def isRunnable(using Context): Boolean = super.isRunnable && ctx.settings.WunusedHas.any && !ctx.isJava
 
-  override def transformUnit(tree: tpd.Tree)(using Context): tpd.Tree =
-    unusedDataApply { ud =>
-      ud.finishAggregation()
-      if(phaseMode == PhaseMode.Report) then
-        ud.unusedAggregate.foreach(reportUnused)
-    }
+  override def prepareForUnit(tree: Tree)(using Context): Context =
+    val infos = tree.getAttachment(refInfosKey).getOrElse:
+      RefInfos().tap(tree.withAttachment(refInfosKey, _))
+    ctx.fresh.setProperty(refInfosKey, infos)
+  override def transformUnit(tree: Tree)(using Context): tree.type =
+    if phaseMode == PhaseMode.Report then
+      reportUnused()
+      tree.removeAttachment(refInfosKey)
     tree
 
-  // ========== MiniPhase Prepare ==========
-  override def prepareForOther(tree: tpd.Tree)(using Context): Context =
-    // A standard tree traverser covers cases not handled by the Mega/MiniPhase
-    traverser.traverse(tree)
-    ctx
-
-  override def prepareForInlined(tree: tpd.Inlined)(using Context): Context =
-    traverser.traverse(tree.call)
-    ctx
-
-  override def prepareForIdent(tree: tpd.Ident)(using Context): Context =
+  override def transformIdent(tree: Ident)(using Context): tree.type =
     if tree.symbol.exists then
-      unusedDataApply { ud =>
-        @tailrec
-        def loopOnNormalizedPrefixes(prefix: Type, depth: Int): Unit =
-          // limit to 10 as failsafe for the odd case where there is an infinite cycle
-          if depth < 10 && prefix.exists then
-            ud.registerUsed(prefix.classSymbol, None)
-            loopOnNormalizedPrefixes(prefix.normalizedPrefix, depth + 1)
-
-        loopOnNormalizedPrefixes(tree.typeOpt.normalizedPrefix, depth = 0)
-        ud.registerUsed(tree.symbol, Some(tree.name))
-      }
+      // if in an inline expansion, resolve at summonInline (synthetic pos) or in an enclosing call site
+      val resolving =
+           refInfos.inlined.isEmpty
+        || tree.srcPos.isZeroExtentSynthetic
+        || refInfos.inlined.exists(_.sourcePos.contains(tree.srcPos.sourcePos))
+      if resolving && !ignoreTree(tree) then
+        resolveUsage(tree.symbol, tree.name, tree.typeOpt.importPrefix.skipPackageObject)
     else if tree.hasType then
-      unusedDataApply(_.registerUsed(tree.tpe.classSymbol, Some(tree.name)))
+      resolveUsage(tree.tpe.classSymbol, tree.name, tree.tpe.importPrefix.skipPackageObject)
+    tree
+
+  // import x.y; y may be rewritten x.y, also import x.z as y
+  override def transformSelect(tree: Select)(using Context): tree.type =
+    val name = tree.removeAttachment(OriginalName).getOrElse(nme.NO_NAME)
+    if tree.span.isSynthetic && tree.symbol == defn.TypeTest_unapply then
+      tree.qualifier.tpe.underlying.finalResultType match
+      case AppliedType(_, args) => // tycon.typeSymbol == defn.TypeTestClass
+        val res = args(1) // T in TypeTest[-S, T]
+        val target = res.dealias.typeSymbol
+        resolveUsage(target, target.name, res.importPrefix.skipPackageObject) // case _: T =>
+      case _ =>
+    else if tree.qualifier.span.isSynthetic || name.exists(_ != tree.symbol.name) then
+      if !ignoreTree(tree) then
+        resolveUsage(tree.symbol, name, tree.qualifier.tpe)
     else
-      ctx
-
-  override def prepareForSelect(tree: tpd.Select)(using Context): Context =
-    val name = tree.removeAttachment(OriginalName)
-    unusedDataApply(_.registerUsed(tree.symbol, name, includeForImport = tree.qualifier.span.isSynthetic))
-
-  override def prepareForBlock(tree: tpd.Block)(using Context): Context =
-    pushInBlockTemplatePackageDef(tree)
-
-  override def prepareForTemplate(tree: tpd.Template)(using Context): Context =
-    pushInBlockTemplatePackageDef(tree)
-
-  override def prepareForPackageDef(tree: tpd.PackageDef)(using Context): Context =
-    pushInBlockTemplatePackageDef(tree)
-
-  override def prepareForValDef(tree: tpd.ValDef)(using Context): Context =
-    unusedDataApply{ud =>
-      // do not register the ValDef generated for `object`
-      traverseAnnotations(tree.symbol)
-      if !tree.symbol.is(Module) then
-        ud.registerDef(tree)
-      if tree.name.startsWith("derived$") && tree.typeOpt != NoType then
-        ud.registerUsed(tree.typeOpt.typeSymbol, None, isDerived = true)
-      ud.addIgnoredUsage(tree.symbol)
-    }
-
-  override def prepareForDefDef(tree: tpd.DefDef)(using Context): Context =
-    unusedDataApply: ud =>
-      if !tree.symbol.is(Private) then
-        tree.termParamss.flatten.foreach { p =>
-          ud.addIgnoredParam(p.symbol)
-        }
-      ud.registerTrivial(tree)
-      traverseAnnotations(tree.symbol)
-      ud.registerDef(tree)
-      ud.addIgnoredUsage(tree.symbol)
-
-  override def prepareForTypeDef(tree: tpd.TypeDef)(using Context): Context =
-    unusedDataApply: ud =>
-      traverseAnnotations(tree.symbol)
-      if !tree.symbol.is(Param) then // Ignore type parameter (as Scala 2)
-        ud.registerDef(tree)
-        ud.addIgnoredUsage(tree.symbol)
-
-  override def prepareForBind(tree: tpd.Bind)(using Context): Context =
-    traverseAnnotations(tree.symbol)
-    unusedDataApply(_.registerPatVar(tree))
+      refUsage(tree.symbol)
+    tree
 
-  override def prepareForTypeTree(tree: tpd.TypeTree)(using Context): Context =
-    if !tree.isInstanceOf[tpd.InferredTypeTree] then typeTraverser(unusedDataApply).traverse(tree.tpe)
-    ctx
+  override def transformLiteral(tree: Literal)(using Context): tree.type =
+    tree.getAttachment(Typer.AdaptedTree).foreach(transformAllDeep)
+    tree
 
-  override def prepareForAssign(tree: tpd.Assign)(using Context): Context =
-    unusedDataApply{ ud =>
-      val sym = tree.lhs.symbol
-      if sym.exists then
-        ud.registerSetVar(sym)
-    }
+  override def prepareForCaseDef(tree: CaseDef)(using Context): Context =
+    nowarner.traverse(tree.pat)
+    ctx
 
-  // ========== MiniPhase Transform ==========
+  override def prepareForApply(tree: Apply)(using Context): Context =
+    // ignore tupling of for assignments, as they are not usages of vars
+    if tree.hasAttachment(ForArtifact) then
+      tree match
+      case Apply(TypeApply(Select(fun, nme.apply), _), args) =>
+        if fun.symbol.is(Module) && defn.isTupleClass(fun.symbol.companionClass) then
+          args.foreach(_.withAttachment(ForArtifact, ()))
+      case _ =>
+    ctx
 
-  override def transformBlock(tree: tpd.Block)(using Context): tpd.Tree =
-    popOutBlockTemplatePackageDef()
+  override def prepareForAssign(tree: Assign)(using Context): Context =
+    tree.lhs.putAttachment(Ignore, ()) // don't take LHS reference as a read
+    ctx
+  override def transformAssign(tree: Assign)(using Context): tree.type =
+    tree.lhs.removeAttachment(Ignore)
+    val sym = tree.lhs.symbol
+    if sym.exists then
+      refInfos.asss.addOne(sym)
     tree
 
-  override def transformTemplate(tree: tpd.Template)(using Context): tpd.Tree =
-    popOutBlockTemplatePackageDef()
+  override def prepareForMatch(tree: Match)(using Context): Context =
+    // exonerate case.pat against tree.selector (simple var pat only for now)
+    tree.selector match
+    case Ident(nm) => tree.cases.foreach(k => allowVariableBindings(List(nm), List(k.pat)))
+    case _ =>
+    ctx
+  override def transformMatch(tree: Match)(using Context): tree.type =
+    if tree.isInstanceOf[InlineMatch] && tree.selector.isEmpty then
+      val sf = defn.Compiletime_summonFrom
+      resolveUsage(sf, sf.name, NoPrefix)
     tree
 
-  override def transformPackageDef(tree: tpd.PackageDef)(using Context): tpd.Tree =
-    popOutBlockTemplatePackageDef()
+  override def transformTypeTree(tree: TypeTree)(using Context): tree.type =
+    tree.tpe match
+    case AnnotatedType(_, annot) => transformAllDeep(annot.tree)
+    case tpt if tpt.typeSymbol.exists => resolveUsage(tpt.typeSymbol, tpt.typeSymbol.name, NoPrefix)
+    case _ =>
     tree
 
-  override def transformValDef(tree: tpd.ValDef)(using Context): tpd.Tree =
-    unusedDataApply(_.removeIgnoredUsage(tree.symbol))
+  override def prepareForInlined(tree: Inlined)(using Context): Context =
+    refInfos.inlined.push(tree.call.srcPos)
+    ctx
+  override def transformInlined(tree: Inlined)(using Context): tree.type =
+    val _ = refInfos.inlined.pop()
+    if !tree.call.isEmpty && phaseMode.eq(PhaseMode.Aggregate) then
+      transformAllDeep(tree.call)
     tree
 
-  override def transformDefDef(tree: tpd.DefDef)(using Context): tpd.Tree =
-    unusedDataApply(_.removeIgnoredUsage(tree.symbol))
+  override def prepareForBind(tree: Bind)(using Context): Context =
+    refInfos.register(tree)
+    ctx
+
+  override def prepareForValDef(tree: ValDef)(using Context): Context =
+    if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
+      refInfos.register(tree)
+    ctx
+  override def transformValDef(tree: ValDef)(using Context): tree.type =
+    traverseAnnotations(tree.symbol)
+    if tree.name.startsWith("derived$") && tree.hasType then
+      def loop(t: Tree): Unit = t match
+        case Ident(name)  =>
+          val target =
+            val ts0 = t.tpe.typeSymbol
+            if ts0.is(ModuleClass) then ts0.companionModule else ts0
+          resolveUsage(target, name, t.tpe.underlyingPrefix.skipPackageObject)
+        case Select(t, _) => loop(t)
+        case _            =>
+      tree.getAttachment(OriginalTypeClass).foreach(loop)
     tree
 
-  override def transformTypeDef(tree: tpd.TypeDef)(using Context): tpd.Tree =
-    unusedDataApply(_.removeIgnoredUsage(tree.symbol))
+  override def prepareForDefDef(tree: DefDef)(using Context): Context =
+    def trivial = tree.symbol.is(Deferred) || isUnconsuming(tree.rhs)
+    def nontrivial = tree.symbol.isConstructor || tree.symbol.isAnonymousFunction
+    if !nontrivial && trivial then refInfos.skip.addOne(tree.symbol)
+    if tree.symbol.is(Inline) then
+      refInfos.inliners += 1
+    else if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
+      refInfos.register(tree)
+    ctx
+  override def transformDefDef(tree: DefDef)(using Context): tree.type =
+    traverseAnnotations(tree.symbol)
+    if tree.symbol.is(Inline) then
+      refInfos.inliners -= 1
     tree
 
+  override def transformTypeDef(tree: TypeDef)(using Context): tree.type =
+    traverseAnnotations(tree.symbol)
+    if !tree.symbol.is(Param) then // type parameter to do?
+      refInfos.register(tree)
+    tree
 
-  // ---------- MiniPhase HELPERS -----------
+  override def prepareForTemplate(tree: Template)(using Context): Context =
+    ctx.fresh.setProperty(resolvedKey, Resolved())
+
+  override def prepareForPackageDef(tree: PackageDef)(using Context): Context =
+    ctx.fresh.setProperty(resolvedKey, Resolved())
+
+  override def prepareForStats(trees: List[Tree])(using Context): Context =
+    ctx.fresh.setProperty(resolvedKey, Resolved())
+
+  override def transformOther(tree: Tree)(using Context): tree.type =
+    tree match
+    case imp: Import =>
+      if phaseMode eq PhaseMode.Aggregate then
+        refInfos.register(imp)
+      transformAllDeep(imp.expr)
+      for selector <- imp.selectors do
+        if selector.isGiven then
+          selector.bound match
+          case untpd.TypedSplice(bound) => transformAllDeep(bound)
+          case _ =>
+    case AppliedTypeTree(tpt, args) =>
+      transformAllDeep(tpt)
+      args.foreach(transformAllDeep)
+    case RefinedTypeTree(tpt, refinements) =>
+      transformAllDeep(tpt)
+      refinements.foreach(transformAllDeep)
+    case LambdaTypeTree(tparams, body) =>
+      tparams.foreach(transformAllDeep)
+      transformAllDeep(body)
+    case SingletonTypeTree(ref) =>
+      // selftype of object is not a usage
+      val moduleSelfRef = ctx.owner.is(Module) && ctx.owner == tree.symbol.companionModule.moduleClass
+      if !moduleSelfRef then
+        transformAllDeep(ref)
+    case TypeBoundsTree(lo, hi, alias) =>
+      transformAllDeep(lo)
+      transformAllDeep(hi)
+      transformAllDeep(alias)
+    case tree: NamedArg => transformAllDeep(tree.arg)
+    case Annotated(arg, annot) =>
+      transformAllDeep(arg)
+      transformAllDeep(annot)
+    case Quote(body, tags) =>
+      transformAllDeep(body)
+      tags.foreach(transformAllDeep)
+    case Splice(expr) =>
+      transformAllDeep(expr)
+    case pat @ SplicePattern(body, args) =>
+      transformAllDeep(body)
+      args.foreach(transformAllDeep)
+    case MatchTypeTree(bound, selector, cases) =>
+      transformAllDeep(bound)
+      transformAllDeep(selector)
+      cases.foreach(transformAllDeep)
+    case ByNameTypeTree(result) =>
+      transformAllDeep(result)
+    //case _: InferredTypeTree => // do nothing
+    //case _: Export => // nothing to do
+    //case _ if tree.isType =>
+    case _ =>
+    tree
 
-  private def pushInBlockTemplatePackageDef(tree: tpd.Block | tpd.Template | tpd.PackageDef)(using Context): Context =
-    unusedDataApply { ud =>
-      ud.pushScope(UnusedData.ScopeType.fromTree(tree))
-    }
-    ctx
+  private def traverseAnnotations(sym: Symbol)(using Context): Unit =
+    for annot <- sym.denot.annotations do
+      transformAllDeep(annot.tree)
 
-  private def popOutBlockTemplatePackageDef()(using Context): Context =
-    unusedDataApply { ud =>
-      ud.popScope()
-    }
-    ctx
+  // if sym is not an enclosing element, record the reference
+  def refUsage(sym: Symbol)(using Context): Unit =
+    if !ctx.outersIterator.exists(cur => cur.owner eq sym) then
+      refInfos.refs.addOne(sym)
 
-  /**
-   * This traverse is the **main** component of this phase
+  /** Look up a reference in enclosing contexts to determine whether it was introduced by a definition or import.
+   *  The binding of highest precedence must then be correct.
    *
-   * It traverses the tree and gathers the data in the
-   * corresponding context property
+   *  Unqualified locals and fully qualified globals are neither imported nor in scope;
+   *  e.g., in `scala.Int`, `scala` is in scope for typer, but here we reverse-engineer the attribution.
+   *  For Select, lint does not look up `<empty>.scala` (so top-level syms look like magic) but records `scala.Int`.
+   *  For Ident, look-up finds the root import as usual. A competing import is OK because higher precedence.
    */
-  private def traverser = new TreeTraverser:
-    import tpd.*
-    import UnusedData.ScopeType
-
-    /* Register every imports, definition and usage */
-    override def traverse(tree: tpd.Tree)(using Context): Unit =
-      val newCtx = if tree.symbol.exists then ctx.withOwner(tree.symbol) else ctx
-      tree match
-        case imp: tpd.Import =>
-          unusedDataApply(_.registerImport(imp))
-          imp.selectors.filter(_.isGiven).map(_.bound).collect {
-            case untpd.TypedSplice(tree1) => tree1
-          }.foreach(traverse(_)(using newCtx))
-          traverseChildren(tree)(using newCtx)
-        case ident: Ident =>
-          prepareForIdent(ident)
-          traverseChildren(tree)(using newCtx)
-        case sel: Select =>
-          prepareForSelect(sel)
-          traverseChildren(tree)(using newCtx)
-        case tree: (tpd.Block | tpd.Template | tpd.PackageDef) =>
-          //! DIFFERS FROM MINIPHASE
-          pushInBlockTemplatePackageDef(tree)
-          traverseChildren(tree)(using newCtx)
-          popOutBlockTemplatePackageDef()
-        case t: tpd.ValDef =>
-          prepareForValDef(t)
-          traverseChildren(tree)(using newCtx)
-          transformValDef(t)
-        case t: tpd.DefDef =>
-          prepareForDefDef(t)
-          traverseChildren(tree)(using newCtx)
-          transformDefDef(t)
-        case t: tpd.TypeDef =>
-          prepareForTypeDef(t)
-          traverseChildren(tree)(using newCtx)
-          transformTypeDef(t)
-        case t: tpd.Bind =>
-          prepareForBind(t)
-          traverseChildren(tree)(using newCtx)
-        case t:tpd.Assign =>
-          prepareForAssign(t)
-          traverseChildren(tree)
-        case _: tpd.InferredTypeTree =>
-        case t@tpd.RefinedTypeTree(tpt, refinements) =>
-          //! DIFFERS FROM MINIPHASE
-          typeTraverser(unusedDataApply).traverse(t.tpe)
-          traverse(tpt)(using newCtx)
-        case t@tpd.TypeTree() =>
-          //! DIFFERS FROM MINIPHASE
-          typeTraverser(unusedDataApply).traverse(t.tpe)
-          traverseChildren(tree)(using newCtx)
-        case _ =>
-          //! DIFFERS FROM MINIPHASE
-          traverseChildren(tree)(using newCtx)
-    end traverse
-  end traverser
-
-  /** This is a type traverser which catch some special Types not traversed by the term traverser above */
-  private def typeTraverser(dt: (UnusedData => Any) => Unit)(using Context) = new TypeTraverser:
-    override def traverse(tp: Type): Unit =
-      if tp.typeSymbol.exists then dt(_.registerUsed(tp.typeSymbol, Some(tp.typeSymbol.name)))
-      tp match
-        case AnnotatedType(_, annot) =>
-          dt(_.registerUsed(annot.symbol, None))
-          traverseChildren(tp)
-        case _ =>
-          traverseChildren(tp)
-
-  /** This traverse the annotations of the symbol */
-  private def traverseAnnotations(sym: Symbol)(using Context): Unit =
-    sym.denot.annotations.foreach(annot => traverser.traverse(annot.tree))
-
-
-  /** Do the actual reporting given the result of the anaylsis */
-  private def reportUnused(res: UnusedData.UnusedResult)(using Context): Unit =
-    res.warnings.toList.sortBy(_.pos.span.point)(using Ordering[Int]).foreach { s =>
-      s match
-        case UnusedSymbol(t, _, WarnTypes.Imports) =>
-          report.warning(UnusedSymbolMessage.imports, t)
-        case UnusedSymbol(t, _, WarnTypes.LocalDefs) =>
-          report.warning(UnusedSymbolMessage.localDefs, t)
-        case UnusedSymbol(t, _, WarnTypes.ExplicitParams) =>
-          report.warning(UnusedSymbolMessage.explicitParams, t)
-        case UnusedSymbol(t, _, WarnTypes.ImplicitParams) =>
-          report.warning(UnusedSymbolMessage.implicitParams, t)
-        case UnusedSymbol(t, _, WarnTypes.PrivateMembers) =>
-          report.warning(UnusedSymbolMessage.privateMembers, t)
-        case UnusedSymbol(t, _, WarnTypes.PatVars) =>
-          report.warning(UnusedSymbolMessage.patVars, t)
-        case UnusedSymbol(t, _, WarnTypes.UnsetLocals) =>
-          report.warning("unset local variable, consider using an immutable val instead", t)
-        case UnusedSymbol(t, _, WarnTypes.UnsetPrivates) =>
-          report.warning("unset private variable, consider using an immutable val instead", t)
-    }
-
+  def resolveUsage(sym: Symbol, name: Name, prefix: Type)(using Context): Unit =
+    import PrecedenceLevels.*
+
+    def matchingSelector(info: ImportInfo): ImportSelector | Null =
+      val qtpe = info.site
+      def hasAltMember(nm: Name) = qtpe.member(nm).hasAltWith(_.symbol == sym)
+      def loop(sels: List[ImportSelector]): ImportSelector | Null = sels match
+        case sel :: sels =>
+          val matches =
+            if sel.isWildcard then
+              // the qualifier must have the target symbol as a member
+              hasAltMember(sym.name) && {
+                if sel.isGiven then // Further check that the symbol is a given or implicit and conforms to the bound
+                     sym.isOneOf(GivenOrImplicit)
+                  && (sel.bound.isEmpty || sym.info.finalResultType <:< sel.boundTpe)
+                  && (prefix.eq(NoPrefix) || qtpe =:= prefix)
+                else
+                  !sym.is(Given) // Normal wildcard, check that the symbol is not a given (but can be implicit)
+              }
+            else
+              // if there is an explicit name, it must match
+                 !name.exists(_.toTermName != sel.rename)
+              && (prefix.eq(NoPrefix) || qtpe =:= prefix)
+              && (hasAltMember(sel.name) || hasAltMember(sel.name.toTypeName))
+          if matches then sel else loop(sels)
+        case nil => null
+      loop(info.selectors)
+
+    def checkMember(ctxsym: Symbol): Boolean =
+      ctxsym.isClass && sym.owner.isClass
+      && ctxsym.thisType.baseClasses.contains(sym.owner)
+      && ctxsym.thisType.member(sym.name).hasAltWith(d => d.containsSym(sym) && !name.exists(_ != d.name))
+
+    // Attempt to cache a result at the given context. Not all contexts bear a cache, including NoContext.
+    // If there is already any result for the name and prefix, do nothing.
+    def addCached(where: Context, result: Precedence): Unit =
+      if where.moreProperties ne null then
+        where.property(resolvedKey) match
+        case Some(resolved) =>
+          resolved.record(sym, name, prefix, result)
+        case none =>
+
+    // Avoid spurious NoSymbol and also primary ctors which are never warned about.
+    if !sym.exists || sym.isPrimaryConstructor then return
+
+    // Find the innermost, highest precedence. Contexts have no nesting levels but assume correctness.
+    // If the sym is an enclosing definition (the owner of a context), it does not count toward usages.
+    val isLocal = sym.isLocalToBlock
+    var candidate: Context = NoContext
+    var cachePoint: Context = NoContext // last context with Resolved cache
+    var importer: ImportSelector | Null = null // non-null for import context
+    var precedence = NoPrecedence // of current resolution
+    var done = false
+    var cached = false
+    val ctxs = ctx.outersIterator
+    while !done && ctxs.hasNext do
+      val cur = ctxs.next()
+      if cur.owner eq sym then
+        addCached(cachePoint, Definition)
+        return // found enclosing definition
+      else if isLocal then
+        if cur.owner eq sym.owner then
+          done = true // for local def, just checking that it is not enclosing
+      else
+        val cachedPrecedence =
+          cur.property(resolvedKey) match
+          case Some(resolved) =>
+            // conservative, cache must be nested below the result context
+            if precedence.isNone then
+              cachePoint = cur // no result yet, and future result could be cached here
+            resolved.hasRecord(sym, name, prefix)
+          case none => NoPrecedence
+        cached = !cachedPrecedence.isNone
+        if cached then
+          // if prefer cached precedence, then discard previous result
+          if precedence.weakerThan(cachedPrecedence) then
+            candidate = NoContext
+            importer = null
+            cachePoint = cur // actual cache context
+            precedence = cachedPrecedence // actual cached precedence
+          done = true
+        else if cur.isImportContext then
+          val sel = matchingSelector(cur.importInfo.nn)
+          if sel != null then
+            if cur.importInfo.nn.isRootImport then
+              if precedence.weakerThan(OtherUnit) then
+                precedence = OtherUnit
+                candidate = cur
+                importer = sel
+              done = true
+            else if sel.isWildcard then
+              if precedence.weakerThan(Wildcard) then
+                precedence = Wildcard
+                candidate = cur
+                importer = sel
+            else
+              if precedence.weakerThan(NamedImport) then
+                precedence = NamedImport
+                candidate = cur
+                importer = sel
+        else if checkMember(cur.owner) then
+          if sym.srcPos.sourcePos.source == ctx.source then
+            precedence = Definition
+            candidate = cur
+            importer = null // ignore import in same scope; we can't check nesting level
+            done = true
+          else if precedence.weakerThan(OtherUnit) then
+            precedence = OtherUnit
+            candidate = cur
+    end while
+    // record usage and possibly an import
+    refInfos.refs.addOne(sym)
+    if candidate != NoContext && candidate.isImportContext && importer != null then
+      refInfos.sels.put(importer, ())
+    // possibly record that we have performed this look-up
+    // if no result was found, take it as Definition (local or rooted head of fully qualified path)
+    val adjusted = if precedence.isNone then Definition else precedence
+    if !cached && (cachePoint ne NoContext) then
+      addCached(cachePoint, adjusted)
+    if cachePoint ne ctx then
+      addCached(ctx, adjusted) // at this ctx, since cachePoint may be far up the outer chain
+  end resolveUsage
 end CheckUnused
 
 object CheckUnused:
-  val phaseNamePrefix: String = "checkUnused"
-  val description: String = "check for unused elements"
 
   enum PhaseMode:
     case Aggregate
     case Report
 
-  private enum WarnTypes:
-    case Imports
-    case LocalDefs
-    case ExplicitParams
-    case ImplicitParams
-    case PrivateMembers
-    case PatVars
-    case UnsetLocals
-    case UnsetPrivates
-
-  /**
-   * The key used to retrieve the "unused entity" analysis metadata,
-   * from the compilation `Context`
-   */
-  private val _key = Property.StickyKey[UnusedData]
+  val refInfosKey = Property.StickyKey[RefInfos]
 
-  val OriginalName = Property.StickyKey[Name]
+  val resolvedKey = Property.Key[Resolved]
 
-  class PostTyper extends CheckUnused(PhaseMode.Aggregate, "PostTyper", _key)
+  inline def refInfos(using Context): RefInfos = ctx.property(refInfosKey).get
 
-  class PostInlining extends CheckUnused(PhaseMode.Report, "PostInlining", _key)
+  inline def resolved(using Context): Resolved =
+    ctx.property(resolvedKey) match
+    case Some(res) => res
+    case _ => throw new MatchError("no Resolved for context")
 
-  /**
-   * A stateful class gathering the infos on :
-   * - imports
-   * - definitions
-   * - usage
-   */
-  private class UnusedData:
-    import collection.mutable.{Set => MutSet, Map => MutMap, Stack => MutStack, ListBuffer => MutList}
-    import UnusedData.*
-
-    /** The current scope during the tree traversal */
-    val currScopeType: MutStack[ScopeType] = MutStack(ScopeType.Other)
-
-    var unusedAggregate: Option[UnusedResult] = None
-
-    /* IMPORTS */
-    private val impInScope = MutStack(MutList[ImportSelectorData]())
-    /**
-     * We store the symbol along with their accessibility without import.
-     * Accessibility to their definition in outer context/scope
-     *
-     * See the `isAccessibleAsIdent` extension method below in the file
-     */
-    private val usedInScope = MutStack(MutSet[(Symbol, Option[Name], Boolean)]())
-    private val usedInPosition = MutMap.empty[Name, MutSet[Symbol]]
-    /* unused import collected during traversal */
-    private val unusedImport = MutList.empty[ImportSelectorData]
-
-    /* LOCAL DEF OR VAL / Private Def or Val / Pattern variables */
-    private val localDefInScope = MutList.empty[tpd.MemberDef]
-    private val privateDefInScope = MutList.empty[tpd.MemberDef]
-    private val explicitParamInScope = MutList.empty[tpd.MemberDef]
-    private val implicitParamInScope = MutList.empty[tpd.MemberDef]
-    private val patVarsInScope = MutList.empty[tpd.Bind]
-
-    /** All variables sets*/
-    private val setVars = MutSet[Symbol]()
-
-    /** All used symbols */
-    private val usedDef = MutSet[Symbol]()
-    /** Do not register as used */
-    private val doNotRegister = MutSet[Symbol]()
-
-    /** Trivial definitions, avoid registering params */
-    private val trivialDefs = MutSet[Symbol]()
-
-    private val paramsToSkip = MutSet[Symbol]()
-
-
-    def finishAggregation(using Context)(): Unit =
-      val unusedInThisStage = this.getUnused
-      this.unusedAggregate match {
-        case None =>
-          this.unusedAggregate = Some(unusedInThisStage)
-        case Some(prevUnused) =>
-          val intersection = unusedInThisStage.warnings.intersect(prevUnused.warnings)
-          this.unusedAggregate = Some(UnusedResult(intersection))
-      }
-
-
-    /**
-     * Register a found (used) symbol along with its name
-     *
-     * The optional name will be used to target the right import
-     * as the same element can be imported with different renaming
-     */
-    def registerUsed(sym: Symbol, name: Option[Name], includeForImport: Boolean = true, isDerived: Boolean = false)(using Context): Unit =
-      if sym.exists && !isConstructorOfSynth(sym) && !doNotRegister(sym) then
-        if sym.isConstructor then
-          registerUsed(sym.owner, None, includeForImport) // constructor are "implicitly" imported with the class
-        else
-          // If the symbol is accessible in this scope without an import, do not register it for unused import analysis
-          val includeForImport1 =
-            includeForImport
-              && (name.exists(_.toTermName != sym.name.toTermName) || !sym.isAccessibleAsIdent)
-
-          def addIfExists(sym: Symbol): Unit =
-            if sym.exists then
-              usedDef += sym
-              if includeForImport1 then
-                usedInScope.top += ((sym, name, isDerived))
-          addIfExists(sym)
-          addIfExists(sym.companionModule)
-          addIfExists(sym.companionClass)
-          if sym.sourcePos.exists then
-            for n <- name do
-              usedInPosition.getOrElseUpdate(n, MutSet.empty) += sym
-
-    /** Register a symbol that should be ignored */
-    def addIgnoredUsage(sym: Symbol)(using Context): Unit =
-      doNotRegister ++= sym.everySymbol
-
-    /** Remove a symbol that shouldn't be ignored anymore */
-    def removeIgnoredUsage(sym: Symbol)(using Context): Unit =
-      doNotRegister --= sym.everySymbol
-
-    def addIgnoredParam(sym: Symbol)(using Context): Unit =
-      paramsToSkip += sym
-
-    /** Register an import */
-    def registerImport(imp: tpd.Import)(using Context): Unit =
-      if
-        !tpd.languageImport(imp.expr).nonEmpty
-          && !imp.isGeneratedByEnum
-          && !isTransparentAndInline(imp)
-          && currScopeType.top != ScopeType.ReplWrapper // #18383 Do not report top-level import's in the repl as unused
-      then
-        val qualTpe = imp.expr.tpe
-
-        // Put wildcard imports at the end, because they have lower priority within one Import
-        val reorderdSelectors =
-          val (wildcardSels, nonWildcardSels) = imp.selectors.partition(_.isWildcard)
-          nonWildcardSels ::: wildcardSels
-
-        val excludedMembers: mutable.Set[TermName] = mutable.Set.empty
-
-        val newDataInScope =
-          for sel <- reorderdSelectors yield
-            val data = new ImportSelectorData(qualTpe, sel)
-            if shouldSelectorBeReported(imp, sel) || isImportExclusion(sel) || isImportIgnored(imp, sel) then
-              // Immediately mark the selector as used
-              data.markUsed()
-              if isImportExclusion(sel) then
-                excludedMembers += sel.name
-            if sel.isWildcard && excludedMembers.nonEmpty then
-              // mark excluded members for the wildcard import
-              data.markExcluded(excludedMembers.toSet)
-            data
-        impInScope.top.appendAll(newDataInScope)
-    end registerImport
-
-    /** Register (or not) some `val` or `def` according to the context, scope and flags */
-    def registerDef(memDef: tpd.MemberDef)(using Context): Unit =
-      if memDef.isValidMemberDef && !isDefIgnored(memDef) then
-        if memDef.isValidParam then
-          if memDef.symbol.isOneOf(GivenOrImplicit) then
-            if !paramsToSkip.contains(memDef.symbol) then
-              implicitParamInScope += memDef
-          else if !paramsToSkip.contains(memDef.symbol) then
-            explicitParamInScope += memDef
-        else if currScopeType.top == ScopeType.Local then
-          localDefInScope += memDef
-        else if memDef.shouldReportPrivateDef then
-          privateDefInScope += memDef
-
-    /** Register pattern variable */
-    def registerPatVar(patvar: tpd.Bind)(using Context): Unit =
-      if !patvar.symbol.isUnusedAnnot then
-        patVarsInScope += patvar
-
-    /** enter a new scope */
-    def pushScope(newScopeType: ScopeType): Unit =
-      // unused imports :
-      currScopeType.push(newScopeType)
-      impInScope.push(MutList())
-      usedInScope.push(MutSet())
-
-    def registerSetVar(sym: Symbol): Unit =
-      setVars += sym
-
-    /**
-     * leave the current scope and do :
-     *
-     * - If there are imports in this scope check for unused ones
-     */
-    def popScope()(using Context): Unit =
-      currScopeType.pop()
-      val usedInfos = usedInScope.pop()
-      val selDatas = impInScope.pop()
-
-      for usedInfo <- usedInfos do
-        val (sym, optName, isDerived) = usedInfo
-        val usedData = selDatas.find { selData =>
-          sym.isInImport(selData, optName, isDerived)
-        }
-        usedData match
-          case Some(data) =>
-            data.markUsed()
-          case None =>
-            // Propagate the symbol one level up
-            if usedInScope.nonEmpty then
-              usedInScope.top += usedInfo
-      end for // each in `used`
-
-      for selData <- selDatas do
-        if !selData.isUsed then
-          unusedImport += selData
-    end popScope
-
-    /**
-     * Leave the scope and return a `List` of unused `ImportSelector`s
-     *
-     * The given `List` is sorted by line and then column of the position
-     */
+  /** Attachment holding the name of an Ident as written by the user. */
+  val OriginalName = Property.StickyKey[Name]
 
-    def getUnused(using Context): UnusedResult =
-      popScope()
+  /** Suppress warning in a tree, such as a patvar name allowed by special convention. */
+  val NoWarn = Property.StickyKey[Unit]
 
-      def isUsedInPosition(name: Name, span: Span): Boolean =
-        usedInPosition.get(name) match
-          case Some(syms) => syms.exists(sym => span.contains(sym.span))
-          case None       => false
+  /** Ignore reference. */
+  val Ignore = Property.StickyKey[Unit]
 
-      val sortedImp =
-        if ctx.settings.WunusedHas.imports || ctx.settings.WunusedHas.strictNoImplicitWarn then
-          unusedImport.toList
-            .map(d => UnusedSymbol(d.selector.srcPos, d.selector.name, WarnTypes.Imports))
-        else
-          Nil
-      // Partition to extract unset local variables from usedLocalDefs
-      val (usedLocalDefs, unusedLocalDefs) =
-        if ctx.settings.WunusedHas.locals then
-          localDefInScope.toList.partition(d => d.symbol.usedDefContains)
-        else
-          (Nil, Nil)
-      val sortedLocalDefs =
-        unusedLocalDefs
-          .filterNot(d => isUsedInPosition(d.symbol.name, d.span))
-          .filterNot(d => containsSyntheticSuffix(d.symbol))
-          .map(d => UnusedSymbol(d.namePos, d.name, WarnTypes.LocalDefs))
-      val unsetLocalDefs = usedLocalDefs.filter(isUnsetVarDef).map(d => UnusedSymbol(d.namePos, d.name, WarnTypes.UnsetLocals)).toList
-
-      val sortedExplicitParams =
-        if ctx.settings.WunusedHas.explicits then
-          explicitParamInScope.toList
-            .filterNot(d => d.symbol.usedDefContains)
-            .filterNot(d => isUsedInPosition(d.symbol.name, d.span))
-            .filterNot(d => containsSyntheticSuffix(d.symbol))
-            .map(d => UnusedSymbol(d.namePos, d.name, WarnTypes.ExplicitParams))
-        else
-          Nil
-      val sortedImplicitParams =
-        if ctx.settings.WunusedHas.implicits then
-          implicitParamInScope.toList
-            .filterNot(d => d.symbol.usedDefContains)
-            .filterNot(d => containsSyntheticSuffix(d.symbol))
-            .map(d => UnusedSymbol(d.namePos, d.name, WarnTypes.ImplicitParams))
-        else
-          Nil
-      // Partition to extract unset private variables from usedPrivates
-      val (usedPrivates, unusedPrivates) =
-        if ctx.settings.WunusedHas.privates then
-          privateDefInScope.toList.partition(d => d.symbol.usedDefContains)
-        else
-          (Nil, Nil)
-      val sortedPrivateDefs = unusedPrivates.filterNot(d => containsSyntheticSuffix(d.symbol)).map(d => UnusedSymbol(d.namePos, d.name, WarnTypes.PrivateMembers))
-      val unsetPrivateDefs = usedPrivates.filter(isUnsetVarDef).map(d => UnusedSymbol(d.namePos, d.name, WarnTypes.UnsetPrivates))
-      val sortedPatVars =
-        if ctx.settings.WunusedHas.patvars then
-          patVarsInScope.toList
-            .filterNot(d => d.symbol.usedDefContains)
-            .filterNot(d => containsSyntheticSuffix(d.symbol))
-            .filterNot(d => isUsedInPosition(d.symbol.name, d.span))
-            .map(d => UnusedSymbol(d.namePos, d.name, WarnTypes.PatVars))
-        else
-          Nil
-      val warnings =
-        sortedImp :::
-        sortedLocalDefs :::
-        sortedExplicitParams :::
-        sortedImplicitParams :::
-        sortedPrivateDefs :::
-        sortedPatVars :::
-        unsetLocalDefs :::
-        unsetPrivateDefs
-      UnusedResult(warnings.toSet)
-    end getUnused
-    //============================ HELPERS ====================================
-
-
-    /**
-     * Checks if import selects a def that is transparent and inline
-     */
-    private def isTransparentAndInline(imp: tpd.Import)(using Context): Boolean =
-      imp.selectors.exists { sel =>
-        val qual = imp.expr
-        val importedMembers = qual.tpe.member(sel.name).alternatives.map(_.symbol)
-        importedMembers.exists(s => s.is(Transparent) && s.is(Inline))
-      }
-
-    /**
-     * Heuristic to detect synthetic suffixes in names of symbols
-     */
-    private def containsSyntheticSuffix(symbol: Symbol)(using Context): Boolean =
-      symbol.name.mangledString.contains("$")
-
-    /**
-     * Is the constructor of synthetic package object
-     * Should be ignored as it is always imported/used in package
-     * Trigger false negative on used import
-     *
-     * Without this check example:
-     *
-     * --- WITH PACKAGE : WRONG ---
-     * {{{
-     * package a:
-     *   val x: Int = 0
-     * package b:
-     *   import a.* // no warning
-     * }}}
-     * --- WITH OBJECT : OK ---
-     * {{{
-     * object a:
-     *   val x: Int = 0
-     * object b:
-     *   import a.* // unused warning
-     * }}}
-     */
-    private def isConstructorOfSynth(sym: Symbol)(using Context): Boolean =
-      sym.exists && sym.isConstructor && sym.owner.isPackageObject && sym.owner.is(Synthetic)
+  class PostTyper extends CheckUnused(PhaseMode.Aggregate, "PostTyper")
 
-    /**
-     * This is used to avoid reporting the parameters of the synthetic main method
-     * generated by `@main`
-     */
-    private def isSyntheticMainParam(sym: Symbol)(using Context): Boolean =
-      sym.exists && ctx.platform.isMainMethod(sym.owner) && sym.owner.is(Synthetic)
+  class PostInlining extends CheckUnused(PhaseMode.Report, "PostInlining")
 
-    /**
-     * This is used to ignore exclusion imports (i.e. import `qual`.{`member` => _})
+  class RefInfos:
+    val defs = mutable.Set.empty[(Symbol, SrcPos)]    // definitions
+    val pats = mutable.Set.empty[(Symbol, SrcPos)]    // pattern variables
+    val refs = mutable.Set.empty[Symbol]              // references
+    val asss = mutable.Set.empty[Symbol]              // targets of assignment
+    val skip = mutable.Set.empty[Symbol]              // methods to skip (don't warn about their params)
+    val imps = new IdentityHashMap[Import, Unit]         // imports
+    val sels = new IdentityHashMap[ImportSelector, Unit] // matched selectors
+    def register(tree: Tree)(using Context): Unit = if inlined.isEmpty then
+      tree match
+      case imp: Import =>
+        if inliners == 0
+          && languageImport(imp.expr).isEmpty
+          && !imp.isGeneratedByEnum
+          && !ctx.outer.owner.name.isReplWrapperName
+        then
+          imps.put(imp, ())
+      case tree: Bind =>
+        if !tree.name.isInstanceOf[DerivedName] && !tree.name.is(WildcardParamName) && !tree.hasAttachment(NoWarn) then
+          pats.addOne((tree.symbol, tree.namePos))
+      case tree: ValDef if tree.hasAttachment(PatternVar) =>
+        if !tree.name.isInstanceOf[DerivedName] then
+          pats.addOne((tree.symbol, tree.namePos))
+      case tree: NamedDefTree =>
+        if (tree.symbol ne NoSymbol) && !tree.name.isWildcard then
+          defs.addOne((tree.symbol, tree.namePos))
+      case _ =>
+        //println(s"OTHER ${tree.symbol}")
+        if tree.symbol ne NoSymbol then
+          defs.addOne((tree.symbol, tree.srcPos))
+
+    val inlined = Stack.empty[SrcPos] // enclosing call.srcPos of inlined code (expansions)
+    var inliners = 0 // depth of inline def (not inlined yet)
+  end RefInfos
+
+  // Symbols already resolved in the given Context (with name and prefix of lookup).
+  class Resolved:
+    import PrecedenceLevels.*
+    private val seen = mutable.Map.empty[Symbol, List[(Name, Type, Precedence)]].withDefaultValue(Nil)
+    // if a result has been recorded, return it; otherwise, NoPrecedence.
+    def hasRecord(symbol: Symbol, name: Name, prefix: Type)(using Context): Precedence =
+      seen(symbol).find((n, p, _) => n == name && p =:= prefix) match
+      case Some((_, _, r)) => r
+      case none => NoPrecedence
+    // "record" the look-up result, if there is not already a result for the name and prefix.
+    def record(symbol: Symbol, name: Name, prefix: Type, result: Precedence)(using Context): Unit =
+      require(NoPrecedence.weakerThan(result))
+      seen.updateWith(symbol):
+        case svs @ Some(vs) =>
+          if vs.exists((n, p, _) => n == name && p =:= prefix) then svs
+          else Some((name, prefix, result) :: vs)
+        case none => Some((name, prefix, result) :: Nil)
+
+  // Names are resolved by definitions and imports, which have four precedence levels:
+  object PrecedenceLevels:
+    opaque type Precedence = Int
+    inline def NoPrecedence: Precedence = 5
+    inline def OtherUnit: Precedence = 4   // root import or def from another compilation unit via enclosing package
+    inline def Wildcard: Precedence = 3    // wildcard import
+    inline def NamedImport: Precedence = 2 // specific import
+    inline def Definition: Precedence = 1  // def from this compilation unit
+    extension (p: Precedence)
+      inline def weakerThan(q: Precedence): Boolean = p > q
+      inline def isNone: Boolean = p == NoPrecedence
+
+  def reportUnused()(using Context): Unit =
+    for (msg, pos, origin) <- warnings do
+      if origin.isEmpty then report.warning(msg, pos)
+      else report.warning(msg, pos, origin)
+      msg.actions.headOption.foreach(Rewrites.applyAction)
+
+  type MessageInfo = (UnusedSymbol, SrcPos, String) // string is origin or empty
+
+  def warnings(using Context): Array[MessageInfo] =
+    val actionable = ctx.settings.rewrite.value.nonEmpty
+    val warnings = ArrayBuilder.make[MessageInfo]
+    def warnAt(pos: SrcPos)(msg: UnusedSymbol, origin: String = ""): Unit = warnings.addOne((msg, pos, origin))
+    val infos = refInfos
+
+    def checkUnassigned(sym: Symbol, pos: SrcPos) =
+      if sym.isLocalToBlock then
+        if ctx.settings.WunusedHas.locals && sym.is(Mutable) && !infos.asss(sym) then
+          warnAt(pos)(UnusedSymbol.unsetLocals)
+      else if ctx.settings.WunusedHas.privates && sym.isAllOf(Private | Mutable) && !infos.asss(sym) then
+        warnAt(pos)(UnusedSymbol.unsetPrivates)
+
+    def checkPrivate(sym: Symbol, pos: SrcPos) =
+      if ctx.settings.WunusedHas.privates
+        && !sym.isPrimaryConstructor
+        && sym.is(Private, butNot = SelfName | Synthetic | CaseAccessor)
+        && !sym.isSerializationSupport
+        && !(sym.is(Mutable) && sym.isSetter && sym.owner.is(Trait)) // tracks sym.underlyingSymbol sibling getter
+      then
+        warnAt(pos)(UnusedSymbol.privateMembers)
+
+    def checkParam(sym: Symbol, pos: SrcPos) =
+      val m = sym.owner
+      def allowed =
+        val dd = defn
+           m.isDeprecated
+        || m.is(Synthetic) && !m.isAnonymousFunction
+        || m.hasAnnotation(defn.UnusedAnnot) // param of unused method
+        || sym.info.isSingleton
+        || m.isConstructor && m.owner.thisType.baseClasses.contains(defn.AnnotationClass)
+      def checkExplicit(): Unit =
+        // A class param is unused if its param accessor is unused.
+        // (The class param is not assigned to a field until constructors.)
+        // A local param accessor warns as a param; a private accessor as a private member.
+        // Avoid warning for case class elements because they are aliased via unapply.
+        if m.isPrimaryConstructor then
+          val alias = m.owner.info.member(sym.name)
+          if alias.exists then
+            val aliasSym = alias.symbol
+            if aliasSym.isAllOf(PrivateParamAccessor, butNot = CaseAccessor) && !infos.refs(alias.symbol) then
+              if aliasSym.is(Local) then
+                if ctx.settings.WunusedHas.explicits then
+                  warnAt(pos)(UnusedSymbol.explicitParams)
+              else
+                if ctx.settings.WunusedHas.privates then
+                  warnAt(pos)(UnusedSymbol.privateMembers)
+        else if ctx.settings.WunusedHas.explicits
+          && !sym.is(Synthetic) // param to setter is unused bc there is no field yet
+          && !(sym.owner.is(ExtensionMethod) && {
+            m.paramSymss.dropWhile(_.exists(_.isTypeParam)) match
+            case (h :: Nil) :: Nil => h == sym // param is the extended receiver
+            case _ => false
+          })
+          && !sym.name.isInstanceOf[DerivedName]
+          && !ctx.platform.isMainMethod(m)
+        then
+          warnAt(pos)(UnusedSymbol.explicitParams)
+      end checkExplicit
+      // begin
+      if !infos.skip(m)
+        && !allowed
+      then
+        checkExplicit()
+    end checkParam
+
+    def checkImplicit(sym: Symbol, pos: SrcPos) =
+      val m = sym.owner
+      def allowed =
+        val dd = defn
+           m.isDeprecated
+        || m.is(Synthetic)
+        || sym.name.is(ContextFunctionParamName)    // a ubiquitous parameter
+        || sym.name.is(ContextBoundParamName) && sym.info.typeSymbol.isMarkerTrait // a ubiquitous parameter
+        || m.hasAnnotation(dd.UnusedAnnot)          // param of unused method
+        || sym.info.typeSymbol.match                // more ubiquity
+           case dd.DummyImplicitClass | dd.SubTypeClass | dd.SameTypeClass => true
+           case _ => false
+        || sym.info.isSingleton // DSL friendly
+        || sym.isCanEqual
+        || sym.info.typeSymbol.hasAnnotation(dd.LanguageFeatureMetaAnnot)
+        || sym.info.isInstanceOf[RefinedType] // can't be expressed as a context bound
+      if ctx.settings.WunusedHas.implicits
+        && !infos.skip(m)
+        && !allowed
+      then
+        if m.isPrimaryConstructor then
+          val alias = m.owner.info.member(sym.name)
+          if alias.exists then
+            val aliasSym = alias.symbol
+            if aliasSym.is(ParamAccessor) && !infos.refs(alias.symbol) then
+              warnAt(pos)(UnusedSymbol.implicitParams)
+        else
+          warnAt(pos)(UnusedSymbol.implicitParams)
+
+    def checkLocal(sym: Symbol, pos: SrcPos) =
+      if ctx.settings.WunusedHas.locals
+        && !sym.is(InlineProxy)
+        && !sym.isCanEqual
+      then
+        warnAt(pos)(UnusedSymbol.localDefs)
+
+    def checkPatvars() =
+      // convert the one non-synthetic span so all are comparable
+      def uniformPos(sym: Symbol, pos: SrcPos): SrcPos =
+        if pos.span.isSynthetic then pos else pos.sourcePos.withSpan(pos.span.toSynthetic)
+      // patvars in for comprehensions share the pos of where the name was introduced
+      val byPos = infos.pats.groupMap(uniformPos(_, _))((sym, pos) => sym)
+      for (pos, syms) <- byPos if !syms.exists(_.hasAnnotation(defn.UnusedAnnot)) do
+        if !syms.exists(infos.refs(_)) then
+          if !syms.exists(v => !v.isLocal && !v.is(Private)) then
+            warnAt(pos)(UnusedSymbol.patVars)
+        else if syms.exists(_.is(Mutable)) then // check unassigned var
+          val sym = // recover the original
+            if syms.size == 1 then syms.head
+            else infos.pats.find((s, p) => syms.contains(s) && !p.span.isSynthetic).map(_._1).getOrElse(syms.head)
+          if sym.is(Mutable) && !infos.asss(sym) then
+            if sym.isLocalToBlock then
+              warnAt(pos)(UnusedSymbol.unsetLocals)
+            else if sym.is(Private) then
+              warnAt(pos)(UnusedSymbol.unsetPrivates)
+
+    def checkImports() =
+      // TODO check for unused masking import
+      import scala.jdk.CollectionConverters.given
+      import Rewrites.ActionPatch
+      type ImpSel = (Import, ImportSelector)
+      def isUsable(imp: Import, sel: ImportSelector): Boolean =
+        sel.isImportExclusion || infos.sels.containsKey(sel) || imp.isLoose(sel)
+      def warnImport(warnable: ImpSel, actions: List[CodeAction] = Nil): Unit =
+        val (imp, sel) = warnable
+        val msg = UnusedSymbol.imports(actions)
+        // example collection.mutable.{Map as MutMap}
+        val origin = cpy.Import(imp)(imp.expr, List(sel)).show(using ctx.withoutColors).stripPrefix("import ")
+        warnAt(sel.srcPos)(msg, origin)
+
+      if !actionable then
+        for imp <- infos.imps.keySet.nn.asScala; sel <- imp.selectors if !isUsable(imp, sel) do
+          warnImport(imp -> sel)
+      else
+        // If the rest of the line is blank, include it in the final edit position. (Delete trailing whitespace.)
+        // If for deletion, and the prefix of the line is also blank, then include that, too. (Del blank line.)
+        def editPosAt(srcPos: SrcPos, forDeletion: Boolean): SrcPos =
+          val start = srcPos.span.start
+          val end = srcPos.span.end
+          val content = srcPos.sourcePos.source.content()
+          val prev = content.lastIndexWhere(c => !isWhitespace(c), end = start - 1)
+          val emptyLeft = prev < 0 || isLineBreakChar(content(prev))
+          val next = content.indexWhere(c => !isWhitespace(c), from = end)
+          val emptyRight = next < 0 || isLineBreakChar(content(next))
+          val deleteLine = emptyLeft && emptyRight && forDeletion
+          val bump = if (deleteLine) 1 else 0 // todo improve to include offset of next line, endline + 1
+          val p0 = srcPos.span
+          val p1 = if (next >= 0 && emptyRight) p0.withEnd(next + bump) else p0
+          val p2 = if (deleteLine) p1.withStart(prev + 1) else p1
+          srcPos.sourcePos.withSpan(p2)
+        def actionsOf(actions: (SrcPos, String)*): List[CodeAction] =
+          val patches = actions.map((srcPos, replacement) => ActionPatch(srcPos.sourcePos, replacement)).toList
+          List(CodeAction(title = "unused import", description = Some("remove import"), patches))
+        def replace(editPos: SrcPos)(replacement: String): List[CodeAction] = actionsOf(editPos -> replacement)
+        def deletion(editPos: SrcPos): List[CodeAction] = actionsOf(editPos -> "")
+        def textFor(impsel: ImpSel): String =
+          val (imp, sel) = impsel
+          val content = imp.srcPos.sourcePos.source.content()
+          def textAt(pos: SrcPos) = String(content.slice(pos.span.start, pos.span.end))
+          val qual = textAt(imp.expr.srcPos) // keep original
+          val selector = textAt(sel.srcPos)  // keep original
+          s"$qual.$selector"                 // don't succumb to vagaries of show
+        // begin actionable
+        val sortedImps = infos.imps.keySet.nn.asScala.toArray.sortBy(_.srcPos.span.point) // sorted by pos
+        var index = 0
+        while index < sortedImps.length do
+          val nextImport = sortedImps.indexSatisfying(from = index + 1)(_.isPrimaryClause) // next import statement
+          if sortedImps.indexSatisfying(from = index, until = nextImport): imp =>
+              imp.selectors.exists(!isUsable(imp, _)) // check if any selector in statement was unused
+          < nextImport then
+            // if no usable selectors in the import statement, delete it entirely.
+            // if there is exactly one usable selector, then replace with just that selector (i.e., format it).
+            // else for each clause, delete it or format one selector or delete unused selectors.
+            // To delete a comma separated item, delete start-to-start, but for last item delete a preceding comma.
+            // Reminder that first clause span includes the keyword, so delete point-to-start instead.
+            val existing = sortedImps.slice(index, nextImport)
+            val (keeping, deleting) = existing.iterator.flatMap(imp => imp.selectors.map(imp -> _)).toList
+                                      .partition(isUsable(_, _))
+            if keeping.isEmpty then
+              val editPos = existing.head.srcPos.sourcePos.withSpan:
+                Span(start = existing.head.srcPos.span.start, end = existing.last.srcPos.span.end)
+              deleting.init.foreach(warnImport(_))
+              warnImport(deleting.last, deletion(editPosAt(editPos, forDeletion = true)))
+            else if keeping.lengthIs == 1 then
+              val editPos = existing.head.srcPos.sourcePos.withSpan:
+                Span(start = existing.head.srcPos.span.start, end = existing.last.srcPos.span.end)
+              deleting.init.foreach(warnImport(_))
+              val text = s"import ${textFor(keeping.head)}"
+              warnImport(deleting.last, replace(editPosAt(editPos, forDeletion = false))(text))
+            else
+              val lostClauses = existing.iterator.filter(imp => !keeping.exists((i, _) => imp eq i)).toList
+              for imp <- lostClauses do
+                val actions =
+                  if imp == existing.last then
+                    val content = imp.srcPos.sourcePos.source.content()
+                    val prev = existing.lastIndexWhere(i0 => keeping.exists((i, _) => i == i0))
+                    val comma = content.indexOf(',', from = existing(prev).srcPos.span.end)
+                    val commaPos = imp.srcPos.sourcePos.withSpan:
+                      Span(start = comma, end = existing(prev + 1).srcPos.span.start)
+                    val srcPos = imp.srcPos
+                    val editPos = srcPos.sourcePos.withSpan: // exclude keyword
+                      srcPos.span.withStart(srcPos.span.point)
+                    actionsOf(commaPos -> "", editPos -> "")
+                  else
+                    val impIndex = existing.indexOf(imp)
+                    val editPos = imp.srcPos.sourcePos.withSpan: // exclude keyword
+                      Span(start = imp.srcPos.span.point, end = existing(impIndex + 1).srcPos.span.start)
+                    deletion(editPos)
+                imp.selectors.init.foreach(sel => warnImport(imp -> sel))
+                warnImport(imp -> imp.selectors.last, actions)
+              val singletons = existing.iterator.filter(imp => keeping.count((i, _) => imp eq i) == 1).toList
+              var seen = List.empty[Import]
+              for impsel <- deleting do
+                val (imp, sel) = impsel
+                if singletons.contains(imp) then
+                  if seen.contains(imp) then
+                    warnImport(impsel)
+                  else
+                    seen ::= imp
+                    val editPos = imp.srcPos.sourcePos.withSpan:
+                      Span(start = imp.srcPos.span.point, end = imp.srcPos.span.end) // exclude keyword
+                    val text = textFor(keeping.find((i, _) => imp eq i).get)
+                    warnImport(impsel, replace(editPosAt(editPos, forDeletion = false))(text))
+                else if !lostClauses.contains(imp) then
+                  val actions =
+                    if sel == imp.selectors.last then
+                      val content = sel.srcPos.sourcePos.source.content()
+                      val prev = imp.selectors.lastIndexWhere(s0 => keeping.exists((_, s) => s == s0))
+                      val comma = content.indexOf(',', from = imp.selectors(prev).srcPos.span.end)
+                      val commaPos = sel.srcPos.sourcePos.withSpan:
+                        Span(start = comma, end = imp.selectors(prev + 1).srcPos.span.start)
+                      val editPos = sel.srcPos
+                      actionsOf(commaPos -> "", editPos -> "")
+                    else
+                      val selIndex = imp.selectors.indexOf(sel)
+                      val editPos = sel.srcPos.sourcePos.withSpan:
+                        sel.srcPos.span.withEnd(imp.selectors(selIndex + 1).srcPos.span.start)
+                      deletion(editPos)
+                  warnImport(impsel, actions)
+          end if
+          index = nextImport
+        end while
+
+    // begin
+    for (sym, pos) <- infos.defs.iterator if !sym.hasAnnotation(defn.UnusedAnnot) do
+      if infos.refs(sym) then
+        checkUnassigned(sym, pos)
+      else if sym.is(Private, butNot = ParamAccessor) then
+        checkPrivate(sym, pos)
+      else if sym.is(Param, butNot = Given | Implicit) then
+        checkParam(sym, pos)
+      else if sym.is(Param) then // Given | Implicit
+        checkImplicit(sym, pos)
+      else if sym.isLocalToBlock then
+        checkLocal(sym, pos)
+
+    if ctx.settings.WunusedHas.patvars then
+      checkPatvars()
+
+    if ctx.settings.WunusedHas.imports || ctx.settings.WunusedHas.strictNoImplicitWarn then
+      checkImports()
+
+    warnings.result().sortBy(_._2.span.point)
+  end warnings
+
+  // Specific exclusions
+  def ignoreTree(tree: Tree): Boolean =
+    tree.hasAttachment(ForArtifact) || tree.hasAttachment(Ignore)
+
+  // The RHS of a def is too trivial to warn about unused params, e.g. def f(x: Int) = ???
+  def isUnconsuming(rhs: Tree)(using Context): Boolean =
+        rhs.symbol == defn.Predef_undefined
+     || rhs.tpe =:= defn.NothingType // compiletime.error
+     || rhs.isInstanceOf[Literal] // 42
+     || rhs.tpe.match
+        case ConstantType(_) => true
+        case tp: TermRef => tp.underlying.classSymbol.is(Module) // Scala 2 SingleType
+        case _ => false
+     //|| isPurePath(rhs) // a bit strong
+     || rhs.match
+        case Block((dd @ DefDef(anonfun, paramss, _, _)) :: Nil, Closure(Nil, Ident(nm), _)) =>
+             anonfun == nm // isAnonymousFunctionName(anonfun)
+          && paramss.match
+             case (ValDef(contextual, _, _) :: Nil) :: Nil =>
+                  contextual.is(ContextFunctionParamName)
+               && isUnconsuming(dd.rhs) // rhs was wrapped in a context function
+             case _ => false
+        case Block(Nil, Literal(u)) => u.tpe =:= defn.UnitType // def f(x: X) = {}
+        case This(_) => true
+        case Ident(_) => rhs.symbol.is(ParamAccessor)
+        case Typed(rhs, _) => isUnconsuming(rhs)
+        case _ => false
+
+  def allowVariableBindings(ok: List[Name], args: List[Tree]): Unit =
+    ok.zip(args).foreach:
+      case (param, arg @ Bind(p, _)) if param == p => arg.withAttachment(NoWarn, ())
+      case _ =>
+
+  // NoWarn Binds if the name matches a "canonical" name, e.g. case element name
+  val nowarner = new TreeTraverser:
+    def traverse(tree: Tree)(using Context) = tree match
+      case UnApply(fun, _, args) =>
+        val unapplied = tree.tpe.finalResultType.dealias.typeSymbol
+        if unapplied.is(CaseClass) then
+          allowVariableBindings(unapplied.primaryConstructor.info.firstParamNames, args)
+        else if fun.symbol == defn.PairClass_unapply then
+          val ok = fun.symbol.info match
+            case PolyType(tycon, MethodTpe(_, _, AppliedType(_, tprefs))) =>
+              tprefs.collect:
+                case ref: TypeParamRef => termName(ref.binder.paramNames(ref.paramNum).toString.toLowerCase.nn)
+            case _ => Nil
+          allowVariableBindings(ok, args)
+        else if fun.symbol == defn.TypeTest_unapply then
+          () // just recurse into args
+        else
+          if unapplied.exists && unapplied.owner == defn.Quotes_reflectModule then
+            // cheapy search for parameter names via java reflection of Trees
+            // in lieu of drilling into requiredClass("scala.quoted.runtime.impl.QuotesImpl")
+            // ...member("reflect")...member(unapplied.name.toTypeName)
+            // with aliases into requiredModule("dotty.tools.dotc.ast.tpd")
+            val implName = s"dotty.tools.dotc.ast.Trees$$${unapplied.name}"
+            try
+              import scala.language.unsafeNulls
+              val clz = Class.forName(implName) // TODO improve to use class path or reflect
+              val ok = clz.getConstructors.head.getParameters.map(p => termName(p.getName)).toList.init
+              allowVariableBindings(ok, args)
+            catch case _: ClassNotFoundException => ()
+        args.foreach(traverse)
+      case tree => traverseChildren(tree)
+
+  extension (nm: Name)
+    inline def exists(p: Name => Boolean): Boolean = nm.ne(nme.NO_NAME) && p(nm)
+    inline def isWildcard: Boolean = nm == nme.WILDCARD || nm.is(WildcardParamName)
+
+  extension (tp: Type)
+    def importPrefix(using Context): Type = tp match
+      case tp: NamedType => tp.prefix
+      case tp: ClassInfo => tp.prefix
+      case tp: TypeProxy => tp.superType.normalizedPrefix
+      case _ => NoType
+    def underlyingPrefix(using Context): Type = tp match
+      case tp: NamedType => tp.prefix
+      case tp: ClassInfo => tp.prefix
+      case tp: TypeProxy => tp.underlying.underlyingPrefix
+      case _ => NoType
+    def skipPackageObject(using Context): Type =
+      if tp.typeSymbol.isPackageObject then tp.underlyingPrefix else tp
+    def underlying(using Context): Type = tp match
+      case tp: TypeProxy => tp.underlying
+      case _ => tp
+
+  private val serializationNames: Set[TermName] =
+    Set("readResolve", "readObject", "readObjectNoData", "writeObject", "writeReplace").map(termName(_))
+
+  extension (sym: Symbol)
+    def isSerializationSupport(using Context): Boolean =
+      sym.is(Method) && serializationNames(sym.name.toTermName) && sym.owner.isClass
+        && sym.owner.derivesFrom(defn.JavaSerializableClass)
+    def isCanEqual(using Context): Boolean =
+      sym.isOneOf(GivenOrImplicit) && sym.info.finalResultType.baseClasses.exists(_.derivesFrom(defn.CanEqualClass))
+    def isMarkerTrait(using Context): Boolean =
+      sym.isClass && sym.info.allMembers.forall: d =>
+        val m = d.symbol
+        !m.isTerm || m.isSelfSym || m.is(Method) && (m.owner == defn.AnyClass || m.owner == defn.ObjectClass)
+
+  extension (sel: ImportSelector)
+    def boundTpe: Type = sel.bound match
+      case untpd.TypedSplice(tree) => tree.tpe
+      case _ => NoType
+    /** This is used to ignore exclusion imports of the form import `qual.member as _`
+     *  because `sel.isUnimport` is too broad for old style `import concurrent._`.
      */
-    private def isImportExclusion(sel: ImportSelector): Boolean = sel.renamed match
-      case untpd.Ident(name) => name == StdNames.nme.WILDCARD
+    def isImportExclusion: Boolean = sel.renamed match
+      case untpd.Ident(nme.WILDCARD) => true
       case _ => false
 
-    /**
-     * If -Wunused:strict-no-implicit-warn import and this import selector could potentially import implicit.
-     * return true
-     */
-    private def shouldSelectorBeReported(imp: tpd.Import, sel: ImportSelector)(using Context): Boolean =
-      ctx.settings.WunusedHas.strictNoImplicitWarn && (
-        sel.isWildcard ||
-        imp.expr.tpe.member(sel.name.toTermName).alternatives.exists(_.symbol.isOneOf(GivenOrImplicit)) ||
-        imp.expr.tpe.member(sel.name.toTypeName).alternatives.exists(_.symbol.isOneOf(GivenOrImplicit))
-      )
-
-    /**
-     * Ignore CanEqual imports
-     */
-    private def isImportIgnored(imp: tpd.Import, sel: ImportSelector)(using Context): Boolean =
-      (sel.isWildcard && sel.isGiven && imp.expr.tpe.allMembers.exists(p => p.symbol.typeRef.baseClasses.exists(_.derivesFrom(defn.CanEqualClass)) && p.symbol.isOneOf(GivenOrImplicit))) ||
-      (imp.expr.tpe.member(sel.name.toTermName).alternatives
-        .exists(p => p.symbol.isOneOf(GivenOrImplicit) && p.symbol.typeRef.baseClasses.exists(_.derivesFrom(defn.CanEqualClass))))
+  extension (imp: Import)
+    /** Is it the first import clause in a statement? `a.x` in `import a.x, b.{y, z}` */
+    def isPrimaryClause(using Context): Boolean =
+      val span = imp.srcPos.span
+      span.start != span.point // primary clause starts at `import` keyword
 
-    /**
-     * Ignore definitions of CanEqual given
-     */
-    private def isDefIgnored(memDef: tpd.MemberDef)(using Context): Boolean =
-      memDef.symbol.isOneOf(GivenOrImplicit) && memDef.symbol.typeRef.baseClasses.exists(_.derivesFrom(defn.CanEqualClass))
-
-    extension (tree: ImportSelector)
-      def boundTpe: Type = tree.bound match {
-        case untpd.TypedSplice(tree1) => tree1.tpe
-        case _ => NoType
-      }
-
-    extension (sym: Symbol)
-      /** is accessible without import in current context */
-      private def isAccessibleAsIdent(using Context): Boolean =
-        ctx.outersIterator.exists{ c =>
-          c.owner == sym.owner
-          || sym.owner.isClass && c.owner.isClass
-              && c.owner.thisType.baseClasses.contains(sym.owner)
-              && c.owner.thisType.member(sym.name).alternatives.contains(sym)
-        }
-
-      /** Given an import and accessibility, return selector that matches import<->symbol */
-      private def isInImport(selData: ImportSelectorData, altName: Option[Name], isDerived: Boolean)(using Context): Boolean =
-        assert(sym.exists, s"Symbol $sym does not exist")
-
-        val selector = selData.selector
-
-        if !selector.isWildcard then
-          if altName.exists(explicitName => selector.rename != explicitName.toTermName) then
-            // if there is an explicit name, it must match
-            false
-          else
-            if isDerived then
-              // See i15503i.scala, grep for "package foo.test.i17156"
-              selData.allSymbolsDealiasedForNamed.contains(dealias(sym))
-            else
-              selData.allSymbolsForNamed.contains(sym)
-        else
-          // Wildcard
-          if selData.excludedMembers.contains(altName.getOrElse(sym.name).toTermName) then
-            // Wildcard with exclusions that match the symbol
-            false
-          else if !selData.qualTpe.member(sym.name).hasAltWith(_.symbol == sym) then
-            // The qualifier does not have the target symbol as a member
-            false
-          else
-            if selector.isGiven then
-              // Further check that the symbol is a given or implicit and conforms to the bound
-              sym.isOneOf(Given | Implicit)
-                && (selector.bound.isEmpty || sym.info.finalResultType <:< selector.boundTpe)
-            else
-              // Normal wildcard, check that the symbol is not a given (but can be implicit)
-              !sym.is(Given)
-        end if
-      end isInImport
-
-      /** Annotated with @unused */
-      private def isUnusedAnnot(using Context): Boolean =
-        sym.annotations.exists(a => a.symbol == ctx.definitions.UnusedAnnot)
-
-      private def shouldNotReportParamOwner(using Context): Boolean =
-        if sym.exists then
-          val owner = sym.owner
-          trivialDefs(owner) || // is a trivial def
-          owner.isPrimaryConstructor ||
-          owner.annotations.exists ( // @depreacated
-            _.symbol == ctx.definitions.DeprecatedAnnot
-          ) ||
-          owner.isAllOf(Synthetic | PrivateLocal) ||
-          owner.is(Accessor) ||
-          owner.isOverriden
-        else
-          false
-
-      private def usedDefContains(using Context): Boolean =
-        sym.everySymbol.exists(usedDef.apply)
-
-      private def everySymbol(using Context): List[Symbol] =
-        List(sym, sym.companionClass, sym.companionModule, sym.moduleClass).filter(_.exists)
-
-      /** A function is overriden. Either has `override flags` or parent has a matching member (type and name) */
-      private def isOverriden(using Context): Boolean =
-        sym.is(Flags.Override) || (sym.exists && sym.owner.thisType.parents.exists(p => sym.matchingMember(p).exists))
-
-    end extension
-
-    extension (defdef: tpd.DefDef)
-      // so trivial that it never consumes params
-      private def isTrivial(using Context): Boolean =
-        val rhs = defdef.rhs
-        rhs.symbol == ctx.definitions.Predef_undefined ||
-        rhs.tpe =:= ctx.definitions.NothingType ||
-        defdef.symbol.is(Deferred) ||
-        (rhs match {
-          case _: tpd.Literal => true
-          case _ => rhs.tpe match
-            case ConstantType(_) => true
-            case tp: TermRef =>
-              // Detect Scala 2 SingleType
-              tp.underlying.classSymbol.is(Flags.Module)
-            case _ =>
-              false
-        })
-      def registerTrivial(using Context): Unit =
-        if defdef.isTrivial then
-          trivialDefs += defdef.symbol
-
-    extension (memDef: tpd.MemberDef)
-      private def isValidMemberDef(using Context): Boolean =
-        memDef.symbol.exists
-          && !memDef.symbol.isUnusedAnnot
-          && !memDef.symbol.isAllOf(Flags.AccessorCreationFlags)
-          && !memDef.name.isWildcard
-          && !memDef.symbol.owner.is(ExtensionMethod)
-
-      private def isValidParam(using Context): Boolean =
-        val sym = memDef.symbol
-        (sym.is(Param) || sym.isAllOf(PrivateParamAccessor | Local, butNot = CaseAccessor)) &&
-        !isSyntheticMainParam(sym) &&
-        !sym.shouldNotReportParamOwner
-
-      private def shouldReportPrivateDef(using Context): Boolean =
-        currScopeType.top == ScopeType.Template && !memDef.symbol.isConstructor && memDef.symbol.is(Private, butNot = SelfName | Synthetic | CaseAccessor)
-
-      private def isUnsetVarDef(using Context): Boolean =
-        val sym = memDef.symbol
-        sym.is(Mutable) && !setVars(sym)
-
-    extension (imp: tpd.Import)
-      /** Enum generate an import for its cases (but outside them), which should be ignored */
-      def isGeneratedByEnum(using Context): Boolean =
-        imp.symbol.exists && imp.symbol.owner.is(Flags.Enum, butNot = Flags.Case)
-
-    extension (thisName: Name)
-      private def isWildcard: Boolean =
-        thisName == StdNames.nme.WILDCARD || thisName.is(WildcardParamName)
-
-  end UnusedData
-
-  private object UnusedData:
-    enum ScopeType:
-      case Local
-      case Template
-      case ReplWrapper
-      case Other
-
-    object ScopeType:
-      /** return the scope corresponding to the enclosing scope of the given tree */
-      def fromTree(tree: tpd.Tree)(using Context): ScopeType = tree match
-        case tree: tpd.Template => if tree.symbol.name.isReplWrapperName then ReplWrapper else Template
-        case _:tpd.Block => Local
-        case _ => Other
-
-    final class ImportSelectorData(val qualTpe: Type, val selector: ImportSelector):
-      private var myUsed: Boolean = false
-      var excludedMembers: Set[TermName] = Set.empty
-
-      def markUsed(): Unit = myUsed = true
-
-      def isUsed: Boolean = myUsed
-
-      def markExcluded(excluded: Set[TermName]): Unit = excludedMembers ++= excluded
-
-      private var myAllSymbols: Set[Symbol] | Null = null
-
-      def allSymbolsForNamed(using Context): Set[Symbol] =
-        if myAllSymbols == null then
-          val allDenots = qualTpe.member(selector.name).alternatives ::: qualTpe.member(selector.name.toTypeName).alternatives
-          myAllSymbols = allDenots.map(_.symbol).toSet
-        myAllSymbols.uncheckedNN
-
-      private var myAllSymbolsDealiased: Set[Symbol] | Null = null
-
-      def allSymbolsDealiasedForNamed(using Context): Set[Symbol] =
-        if myAllSymbolsDealiased == null then
-          myAllSymbolsDealiased = allSymbolsForNamed.map(sym => dealias(sym))
-        myAllSymbolsDealiased.uncheckedNN
-    end ImportSelectorData
-
-    case class UnusedSymbol(pos: SrcPos, name: Name, warnType: WarnTypes)
-    /** A container for the results of the used elements analysis */
-    case class UnusedResult(warnings: Set[UnusedSymbol])
-    object UnusedResult:
-      val Empty = UnusedResult(Set.empty)
-  end UnusedData
-
-  private def dealias(symbol: Symbol)(using Context): Symbol =
-    if symbol.isType && symbol.asType.denot.isAliasType then
-      symbol.asType.typeRef.dealias.typeSymbol
-    else
-      symbol
+    /** Generated import of cases from enum companion. */
+    def isGeneratedByEnum(using Context): Boolean =
+      imp.symbol.exists && imp.symbol.owner.is(Enum, butNot = Case)
 
+    /** Under -Wunused:strict-no-implicit-warn, avoid false positives
+     *  if this selector is a wildcard that might import implicits or
+     *  specifically does import an implicit.
+     *  Similarly, import of CanEqual must not warn, as it is always witness.
+     */
+    def isLoose(sel: ImportSelector)(using Context): Boolean =
+      if ctx.settings.WunusedHas.strictNoImplicitWarn then
+        if sel.isWildcard
+          || imp.expr.tpe.member(sel.name.toTermName).hasAltWith(_.symbol.isOneOf(GivenOrImplicit))
+          || imp.expr.tpe.member(sel.name.toTypeName).hasAltWith(_.symbol.isOneOf(GivenOrImplicit))
+        then return true
+      if sel.isWildcard && sel.isGiven
+      then imp.expr.tpe.allMembers.exists(_.symbol.isCanEqual)
+      else imp.expr.tpe.member(sel.name.toTermName).hasAltWith(_.symbol.isCanEqual)
+
+  extension (pos: SrcPos)
+    def isZeroExtentSynthetic: Boolean = pos.span.isSynthetic && pos.span.start == pos.span.end
+
+  extension [A <: AnyRef](arr: Array[A])
+    // returns `until` if not satisfied
+    def indexSatisfying(from: Int, until: Int = arr.length)(p: A => Boolean): Int =
+      var i = from
+      while i < until && !p(arr(i)) do
+        i += 1
+      i
 end CheckUnused
diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
index 72a3ff7324e8..9134e9736079 100644
--- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
@@ -193,7 +193,9 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
                     ++ sym.annotations)
           else
             if sym.is(Param) then
-              sym.keepAnnotationsCarrying(thisPhase, Set(defn.ParamMetaAnnot), orNoneOf = defn.NonBeanMetaAnnots)
+              // @unused is getter/setter but we want it on ordinary method params
+              if !sym.owner.is(Method) || sym.owner.isConstructor then
+                sym.keepAnnotationsCarrying(thisPhase, Set(defn.ParamMetaAnnot), orNoneOf = defn.NonBeanMetaAnnots)
             else if sym.is(ParamAccessor) then
               sym.keepAnnotationsCarrying(thisPhase, Set(defn.GetterMetaAnnot, defn.FieldMetaAnnot))
             else
diff --git a/compiler/src/dotty/tools/dotc/typer/Deriving.scala b/compiler/src/dotty/tools/dotc/typer/Deriving.scala
index cc940ee38e41..febb12cf1007 100644
--- a/compiler/src/dotty/tools/dotc/typer/Deriving.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Deriving.scala
@@ -10,7 +10,7 @@ import Contexts.*, Symbols.*, Types.*, SymDenotations.*, Names.*, NameOps.*, Fla
 import ProtoTypes.*, ContextOps.*
 import util.Spans.*
 import util.SrcPos
-import collection.mutable
+import collection.mutable.ListBuffer
 import ErrorReporting.errorTree
 
 /** A typer mixin that implements type class derivation functionality */
@@ -25,8 +25,8 @@ trait Deriving {
    */
   class Deriver(cls: ClassSymbol, codePos: SrcPos)(using Context) {
 
-    /** A buffer for synthesized symbols for type class instances */
-    private var synthetics = new mutable.ListBuffer[Symbol]
+    /** A buffer for synthesized symbols for type class instances, with what user asked to synthesize. */
+    private val synthetics = ListBuffer.empty[(tpd.Tree, Symbol)]
 
     /** A version of Type#underlyingClassRef that works also for higher-kinded types */
     private def underlyingClassRef(tp: Type): Type = tp match {
@@ -41,7 +41,7 @@ trait Deriving {
      *  an instance with the same name does not exist already.
      *  @param  reportErrors  Report an error if an instance with the same name exists already
      */
-    private def addDerivedInstance(clsName: Name, info: Type, pos: SrcPos): Unit = {
+    private def addDerivedInstance(derived: tpd.Tree, clsName: Name, info: Type, pos: SrcPos): Unit = {
       val instanceName = "derived$".concat(clsName)
       if (ctx.denotNamed(instanceName).exists)
         report.error(em"duplicate type class derivation for $clsName", pos)
@@ -50,9 +50,8 @@ trait Deriving {
         // derived instance will have too low a priority to be selected over a freshly
         // derived instance at the summoning site.
         val flags = if info.isInstanceOf[MethodOrPoly] then GivenMethod else Given | Lazy
-        synthetics +=
-          newSymbol(ctx.owner, instanceName, flags, info, coord = pos.span)
-            .entered
+        val sym = newSymbol(ctx.owner, instanceName, flags, info, coord = pos.span).entered
+        synthetics += derived -> sym
     }
 
     /** Check derived type tree `derived` for the following well-formedness conditions:
@@ -77,7 +76,8 @@ trait Deriving {
      *  that have the same name but different prefixes through selective aliasing.
      */
     private def processDerivedInstance(derived: untpd.Tree): Unit = {
-      val originalTypeClassType = typedAheadType(derived, AnyTypeConstructorProto).tpe
+      val originalTypeClassTree = typedAheadType(derived, AnyTypeConstructorProto)
+      val originalTypeClassType = originalTypeClassTree.tpe
       val underlyingClassType = underlyingClassRef(originalTypeClassType)
       val typeClassType = checkClassType(
           underlyingClassType.orElse(originalTypeClassType),
@@ -100,7 +100,7 @@ trait Deriving {
         val derivedInfo =
           if derivedParams.isEmpty then monoInfo
           else PolyType.fromParams(derivedParams, monoInfo)
-        addDerivedInstance(originalTypeClassType.typeSymbol.name, derivedInfo, derived.srcPos)
+        addDerivedInstance(originalTypeClassTree, originalTypeClassType.typeSymbol.name, derivedInfo, derived.srcPos)
       }
 
       def deriveSingleParameter: Unit = {
@@ -312,7 +312,7 @@ trait Deriving {
         else tpd.ValDef(sym.asTerm, typeclassInstance(sym)(Nil))
       }
 
-      synthetics.map(syntheticDef).toList
+      synthetics.map((t, s) => syntheticDef(s).withAttachment(Deriving.OriginalTypeClass, t)).toList
     }
 
     def finalize(stat: tpd.TypeDef): tpd.Tree = {
@@ -321,3 +321,8 @@ trait Deriving {
     }
   }
 }
+object Deriving:
+  import dotty.tools.dotc.util.Property
+
+  /** Attachment holding the name of a type class as written by the user. */
+  val OriginalTypeClass = Property.StickyKey[tpd.Tree]
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index d46c85b38e9d..38bc6960e370 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -77,6 +77,9 @@ object Typer {
   /** Indicates that an expression is explicitly ascribed to [[Unit]] type. */
   val AscribedToUnit = new Property.StickyKey[Unit]
 
+  /** Tree adaptation lost fidelity; this attachment preserves the original tree. */
+  val AdaptedTree = new Property.StickyKey[tpd.Tree]
+
   /** An attachment on a Select node with an `apply` field indicating that the `apply`
    *  was inserted by the Typer.
    */
@@ -3057,7 +3060,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
   def typedTuple(tree: untpd.Tuple, pt: Type)(using Context): Tree = {
     val arity = tree.trees.length
     if (arity <= Definitions.MaxTupleArity)
-      typed(desugar.smallTuple(tree).withSpan(tree.span), pt)
+      typed(desugar.smallTuple(tree).withSpan(tree.span).withAttachmentsFrom(tree), pt)
     else {
       val pts =
         pt.tupleElementTypes match
@@ -4204,12 +4207,12 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
     /** Adapt an expression of constant type to a different constant type `tpe`. */
     def adaptConstant(tree: Tree, tpe: ConstantType): Tree = {
-      def lit = Literal(tpe.value).withSpan(tree.span)
+      def lit = Literal(tpe.value).withSpan(tree.span).withAttachment(AdaptedTree, tree)
       tree match {
         case Literal(c) => lit
         case tree @ Block(stats, expr) => tpd.cpy.Block(tree)(stats, adaptConstant(expr, tpe))
         case tree =>
-          if (isIdempotentExpr(tree)) lit // See discussion in phase Literalize why we demand isIdempotentExpr
+          if isIdempotentExpr(tree) then lit // See discussion in phase FirstTransform why we demand isIdempotentExpr
           else Block(tree :: Nil, lit)
       }
     }
diff --git a/compiler/src/dotty/tools/dotc/util/chaining.scala b/compiler/src/dotty/tools/dotc/util/chaining.scala
new file mode 100644
index 000000000000..0c61ab6e73e9
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/util/chaining.scala
@@ -0,0 +1,8 @@
+
+package dotty.tools.dotc.util
+
+object chaining:
+
+  extension [A](x: A)
+    inline def tap(inline f: A => Unit): x.type = { f(x): Unit; x }
+    inline def pipe[B](inline f: A => B): B = f(x)
diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala
index 5c8dcc2616b7..06c81c499e5d 100644
--- a/compiler/src/dotty/tools/repl/ReplCompiler.scala
+++ b/compiler/src/dotty/tools/repl/ReplCompiler.scala
@@ -11,7 +11,7 @@ import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.StdNames.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.reporting.Diagnostic
-import dotty.tools.dotc.transform.PostTyper
+import dotty.tools.dotc.transform.{CheckUnused, CheckShadowing, PostTyper}
 import dotty.tools.dotc.typer.ImportInfo.{withRootImports, RootRef}
 import dotty.tools.dotc.typer.TyperPhase
 import dotty.tools.dotc.util.Spans.*
@@ -36,6 +36,7 @@ class ReplCompiler extends Compiler:
     List(Parser()),
     List(ReplPhase()),
     List(TyperPhase(addRootImports = false)),
+    List(CheckUnused.PostTyper(), CheckShadowing()),
     List(CollectTopLevelImports()),
     List(PostTyper()),
   )
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index 71bf5a7e7844..1b33c52416ea 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -69,6 +69,7 @@ class CompilationTests {
       compileFile("tests/rewrites/i17399.scala", unindentOptions.and("-rewrite")),
       compileFile("tests/rewrites/i20002.scala", defaultOptions.and("-indent", "-rewrite")),
       compileFile("tests/rewrites/i21382.scala", defaultOptions.and("-indent", "-rewrite")),
+      compileFile("tests/rewrites/unused.scala", defaultOptions.and("-rewrite", "-Wunused:all")),
     ).checkRewrites()
   }
 
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index 7d32b3d6c9fa..e15103046fbf 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -746,13 +746,14 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       diffCheckfile(testSource, reporters, logger)
 
     override def maybeFailureMessage(testSource: TestSource, reporters: Seq[TestReporter]): Option[String] =
-      lazy val (map, expCount) = getWarnMapAndExpectedCount(testSource.sourceFiles.toIndexedSeq)
+      lazy val (expected, expCount) = getWarnMapAndExpectedCount(testSource.sourceFiles.toIndexedSeq)
       lazy val obtCount = reporters.foldLeft(0)(_ + _.warningCount)
-      lazy val (expected, unexpected) = getMissingExpectedWarnings(map, reporters.iterator.flatMap(_.diagnostics))
-      lazy val diagnostics = reporters.flatMap(_.diagnostics.toSeq.sortBy(_.pos.line).map(e => s" at ${e.pos.line + 1}: ${e.message}"))
-      def showLines(title: String, lines: Seq[String]) = if lines.isEmpty then "" else title + lines.mkString("\n", "\n", "")
-      def hasMissingAnnotations = expected.nonEmpty || unexpected.nonEmpty
-      def showDiagnostics = showLines("-> following the diagnostics:", diagnostics)
+      lazy val (unfulfilled, unexpected) = getMissingExpectedWarnings(expected, diagnostics.iterator)
+      lazy val diagnostics = reporters.flatMap(_.diagnostics.toSeq.sortBy(_.pos.line))
+      lazy val messages = diagnostics.map(d => s" at ${d.pos.line + 1}: ${d.message}")
+      def showLines(title: String, lines: Seq[String]) = if lines.isEmpty then "" else lines.mkString(s"$title\n", "\n", "")
+      def hasMissingAnnotations = unfulfilled.nonEmpty || unexpected.nonEmpty
+      def showDiagnostics = showLines("-> following the diagnostics:", messages)
       Option:
         if reporters.exists(_.errorCount > 0) then
           s"""Compilation failed for: ${testSource.title}
@@ -761,58 +762,63 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         else if expCount != obtCount then
           s"""|Wrong number of warnings encountered when compiling $testSource
               |expected: $expCount, actual: $obtCount
-              |${showLines("Unfulfilled expectations:", expected)}
+              |${showLines("Unfulfilled expectations:", unfulfilled)}
               |${showLines("Unexpected warnings:", unexpected)}
               |$showDiagnostics
               |""".stripMargin.trim.linesIterator.mkString("\n", "\n", "")
-        else if hasMissingAnnotations then s"\nWarnings found on incorrect row numbers when compiling $testSource\n$showDiagnostics"
-        else if !map.isEmpty then s"\nExpected warnings(s) have {<warning position>=<unreported warning>}: $map"
+        else if hasMissingAnnotations then
+          s"""|Warnings found on incorrect row numbers when compiling $testSource
+              |${showLines("Unfulfilled expectations:", unfulfilled)}
+              |${showLines("Unexpected warnings:", unexpected)}
+              |$showDiagnostics
+              |""".stripMargin.trim.linesIterator.mkString("\n", "\n", "")
+        else if !expected.isEmpty then s"\nExpected warnings(s) have {<warning position>=<unreported warning>}: $expected"
         else null
     end maybeFailureMessage
 
     def getWarnMapAndExpectedCount(files: Seq[JFile]): (HashMap[String, Integer], Int) =
-      val comment = raw"//( *)(nopos-)?warn".r
-      val map = new HashMap[String, Integer]()
+      val comment = raw"//(?: *)(nopos-)?warn".r
+      val map = HashMap[String, Integer]()
       var count = 0
       def bump(key: String): Unit =
         map.get(key) match
           case null => map.put(key, 1)
           case n    => map.put(key, n+1)
         count += 1
-      files.filter(isSourceFile).foreach { file =>
-        Using(Source.fromFile(file, StandardCharsets.UTF_8.name)) { source =>
-          source.getLines.zipWithIndex.foreach { case (line, lineNbr) =>
-            comment.findAllMatchIn(line).foreach { m =>
-              m.group(2) match
-                case "nopos-" =>
-                  bump("nopos")
-                case _ => bump(s"${file.getPath}:${lineNbr+1}")
-            }
-          }
-        }.get
-      }
+      for file <- files if isSourceFile(file) do
+        Using.resource(Source.fromFile(file, StandardCharsets.UTF_8.name)) { source =>
+          source.getLines.zipWithIndex.foreach: (line, lineNbr) =>
+            comment.findAllMatchIn(line).foreach:
+              case comment("nopos-") => bump("nopos")
+              case _                 => bump(s"${file.getPath}:${lineNbr+1}")
+        }
+      end for
       (map, count)
 
-    def getMissingExpectedWarnings(map: HashMap[String, Integer], reporterWarnings: Iterator[Diagnostic]): (List[String], List[String]) =
-      val unexpected, unpositioned = ListBuffer.empty[String]
+    // return unfulfilled expected warnings and unexpected diagnostics
+    def getMissingExpectedWarnings(expected: HashMap[String, Integer], reporterWarnings: Iterator[Diagnostic]): (List[String], List[String]) =
+      val unexpected = ListBuffer.empty[String]
       def relativize(path: String): String = path.split(JFile.separatorChar).dropWhile(_ != "tests").mkString(JFile.separator)
       def seenAt(key: String): Boolean =
-        map.get(key) match
+        expected.get(key) match
           case null => false
-          case 1 => map.remove(key) ; true
-          case n => map.put(key, n - 1) ; true
+          case 1 => expected.remove(key); true
+          case n => expected.put(key, n - 1); true
       def sawDiagnostic(d: Diagnostic): Unit =
         val srcpos = d.pos.nonInlined
         if srcpos.exists then
           val key = s"${relativize(srcpos.source.file.toString())}:${srcpos.line + 1}"
           if !seenAt(key) then unexpected += key
         else
-          if(!seenAt("nopos")) unpositioned += relativize(srcpos.source.file.toString())
+          if !seenAt("nopos") then unexpected += relativize(srcpos.source.file.toString)
 
       reporterWarnings.foreach(sawDiagnostic)
 
-      (map.asScala.keys.toList, (unexpected ++ unpositioned).toList)
+      val splitter = raw"(?:[^:]*):(\d+)".r
+      val unfulfilled = expected.asScala.keys.toList.sortBy { case splitter(n) => n.toInt case _ => -1 }
+      (unfulfilled, unexpected.toList)
     end getMissingExpectedWarnings
+  end WarnTest
 
   private final class RewriteTest(testSources: List[TestSource], checkFiles: Map[JFile, JFile], times: Int, threadLimit: Option[Int], suppressAllOutput: Boolean)(implicit summaryReport: SummaryReporting)
   extends Test(testSources, times, threadLimit, suppressAllOutput) {
@@ -947,8 +953,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       def seenAt(key: String): Boolean =
         errorMap.get(key) match
           case null => false
-          case 1 => errorMap.remove(key) ; true
-          case n => errorMap.put(key, n - 1) ; true
+          case 1 => errorMap.remove(key); true
+          case n => errorMap.put(key, n - 1); true
       def sawDiagnostic(d: Diagnostic): Unit =
         d.pos.nonInlined match
           case srcpos if srcpos.exists =>
diff --git a/library/src/scala/deriving/Mirror.scala b/library/src/scala/deriving/Mirror.scala
index 57453a516567..a7477cf0fb2d 100644
--- a/library/src/scala/deriving/Mirror.scala
+++ b/library/src/scala/deriving/Mirror.scala
@@ -52,7 +52,7 @@ object Mirror {
 
   extension [T](p: ProductOf[T])
     /** Create a new instance of type `T` with elements taken from product `a`. */
-    def fromProductTyped[A <: scala.Product, Elems <: p.MirroredElemTypes](a: A)(using m: ProductOf[A] { type MirroredElemTypes = Elems }): T =
+    def fromProductTyped[A <: scala.Product, Elems <: p.MirroredElemTypes](a: A)(using ProductOf[A] { type MirroredElemTypes = Elems }): T =
       p.fromProduct(a)
 
     /** Create a new instance of type `T` with elements taken from tuple `t`. */
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
index 873d5e1e993e..c5d0022b6cf5 100644
--- a/library/src/scala/quoted/Quotes.scala
+++ b/library/src/scala/quoted/Quotes.scala
@@ -1,7 +1,6 @@
 package scala.quoted
 
-import scala.annotation.experimental
-import scala.annotation.implicitNotFound
+import scala.annotation.{experimental, implicitNotFound, unused}
 import scala.reflect.TypeTest
 
 /** Current Quotes in scope
@@ -4797,7 +4796,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
             foldTree(foldTree(foldTree(x, cond)(owner), thenp)(owner), elsep)(owner)
           case While(cond, body) =>
             foldTree(foldTree(x, cond)(owner), body)(owner)
-          case Closure(meth, tpt) =>
+          case Closure(meth, _) =>
             foldTree(x, meth)(owner)
           case Match(selector, cases) =>
             foldTrees(foldTree(x, selector)(owner), cases)(owner)
@@ -4875,7 +4874,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
       def traverseTree(tree: Tree)(owner: Symbol): Unit = traverseTreeChildren(tree)(owner)
 
-      def foldTree(x: Unit, tree: Tree)(owner: Symbol): Unit = traverseTree(tree)(owner)
+      def foldTree(@unused x: Unit, tree: Tree)(owner: Symbol): Unit = traverseTree(tree)(owner)
 
       protected def traverseTreeChildren(tree: Tree)(owner: Symbol): Unit = foldOverTree((), tree)(owner)
 
diff --git a/library/src/scala/runtime/Arrays.scala b/library/src/scala/runtime/Arrays.scala
index 2d98caea4df8..97ff589c6610 100644
--- a/library/src/scala/runtime/Arrays.scala
+++ b/library/src/scala/runtime/Arrays.scala
@@ -1,5 +1,6 @@
 package scala.runtime
 
+import scala.annotation.unused
 import scala.reflect.ClassTag
 
 import java.lang.{reflect => jlr}
@@ -26,6 +27,6 @@ object Arrays {
 
   /** Create an array of a reference type T.
    */
-  def newArray[Arr](componentType: Class[_], returnType: Class[Arr], dimensions: Array[Int]): Arr =
+  def newArray[Arr](componentType: Class[_], @unused returnType: Class[Arr], dimensions: Array[Int]): Arr =
     jlr.Array.newInstance(componentType, dimensions: _*).asInstanceOf[Arr]
 }
diff --git a/project/Build.scala b/project/Build.scala
index bce4ad9819eb..82d9cb786811 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -240,7 +240,9 @@ object Build {
       "-deprecation",
       "-unchecked",
       //"-Wconf:cat=deprecation&msg=Unsafe:s",    // example usage
-      "-Xfatal-warnings",                         // -Werror in modern usage
+      "-Werror",
+      //"-Wunused:all",
+      //"-rewrite", // requires -Werror:false since no rewrites are applied with errors
       "-encoding", "UTF8",
       "-language:implicitConversions",
     ),
@@ -1068,7 +1070,7 @@ object Build {
         )
       },
       Compile / doc / scalacOptions += "-Ydocument-synthetic-types",
-      scalacOptions -= "-Xfatal-warnings",
+      scalacOptions += "-Werror:false",
       ivyConfigurations += SourceDeps.hide,
       transitiveClassifiers := Seq("sources"),
       libraryDependencies +=
@@ -1351,7 +1353,7 @@ object Build {
     dependsOn(`scala3-library-bootstrappedJS`).
     settings(
       bspEnabled := false,
-      scalacOptions --= Seq("-Xfatal-warnings", "-deprecation"),
+      scalacOptions --= Seq("-Werror", "-deprecation"),
 
       // Required to run Scala.js tests.
       Test / fork := false,
diff --git a/tasty/src/dotty/tools/tasty/TastyReader.scala b/tasty/src/dotty/tools/tasty/TastyReader.scala
index 31407f7a4ab8..18e94867e26e 100644
--- a/tasty/src/dotty/tools/tasty/TastyReader.scala
+++ b/tasty/src/dotty/tools/tasty/TastyReader.scala
@@ -99,7 +99,7 @@ class TastyReader(val bytes: Array[Byte], start: Int, end: Int, val base: Int =
   /** Read an uncompressed Long stored in 8 bytes in big endian format */
   def readUncompressedLong(): Long = {
     var x: Long = 0
-    for (i <- 0 to 7)
+    for (_ <- 0 to 7)
       x = (x << 8) | (readByte() & 0xff)
     x
   }
diff --git a/tests/pos/i11729.scala b/tests/pos/i11729.scala
index e97b285ac6a2..79d3174dc2e9 100644
--- a/tests/pos/i11729.scala
+++ b/tests/pos/i11729.scala
@@ -6,7 +6,7 @@ type Return[X] = X match
 
 object Return:
   def apply[A](a:A):Return[A] = a match
-    case a: List[t] => a
+    case a: List[?] => a
     case a: Any => List(a)
 
 object Test1:
@@ -18,7 +18,7 @@ type Boxed[X] = X match
    case Any => Box[X]
 
 def box[X](x: X): Boxed[X] = x match
-   case b: Box[t] => b
+   case b: Box[?] => b
    case x: Any => Box(x)
 
 case class Box[A](a:A):
diff --git a/tests/pos/i17631.scala b/tests/pos/i17631.scala
index 7b8a064493df..ddcb71354968 100644
--- a/tests/pos/i17631.scala
+++ b/tests/pos/i17631.scala
@@ -1,4 +1,4 @@
-//> using options -Xfatal-warnings -Wunused:all -deprecation -feature
+//> using options -Werror -Wunused:all -deprecation -feature
 
 object foo {
   type Bar
@@ -32,3 +32,23 @@ object Main {
     (bad1, bad2)
   }
 }
+
+def `i18388`: Unit =
+  def func(pred: [A] => A => Boolean): Unit =
+    val _ = pred
+    ()
+  val _ = func
+
+trait L[T]:
+  type E
+
+def `i19748` =
+  type Warn1 = [T] => (l: L[T]) => T => l.E
+  type Warn2 = [T] => L[T] => T
+  type Warn3 = [T] => T => T
+  def use(x: (Warn1, Warn2, Warn3)) = x
+  use
+
+type NoWarning1 = [T] => (l: L[T]) => T => l.E
+type NoWarning2 = [T] => L[T] => T
+type NoWarning3 = [T] => T => T
diff --git a/tests/pos/i18366.scala b/tests/pos/i18366.scala
deleted file mode 100644
index 698510ad13a2..000000000000
--- a/tests/pos/i18366.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-//> using options -Xfatal-warnings -Wunused:all
-
-trait Builder {
-  def foo(): Unit
-}
-
-def repro =
-  val builder: Builder = ???
-  import builder.{foo => bar}
-  bar()
\ No newline at end of file
diff --git a/tests/pos/i3323.scala b/tests/pos/i3323.scala
deleted file mode 100644
index 94d072d4a2fc..000000000000
--- a/tests/pos/i3323.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-//> using options -Xfatal-warnings -deprecation -feature
-
-class Foo {
-  def foo[A](lss: List[List[A]]): Unit = {
-    lss match {
-      case xss: List[List[A]] =>
-    }
-  }
-}
diff --git a/tests/pos/tuple-exaustivity.scala b/tests/pos/tuple-exaustivity.scala
deleted file mode 100644
index a27267fc89e5..000000000000
--- a/tests/pos/tuple-exaustivity.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-//> using options -Xfatal-warnings -deprecation -feature
-
-def test(t: Tuple)  =
-  t match
-    case Tuple() =>
-    case head *: tail =>
diff --git a/tests/rewrites/ambiguous-named-tuple-assignment.check b/tests/rewrites/ambiguous-named-tuple-assignment.check
new file mode 100644
index 000000000000..00e6cc4112f1
--- /dev/null
+++ b/tests/rewrites/ambiguous-named-tuple-assignment.check
@@ -0,0 +1,19 @@
+import scala.language.experimental.namedTuples
+
+object i21770:
+  def f(g: Int  => Unit) = g(0)
+  var cache: Option[Int] = None
+  f(i => {cache = Some(i)})
+  
+object i21861:
+  var age: Int = 28
+  {
+    age = 29
+  }
+  
+  
+object i21861c:
+  def age: Int = ???
+  def age_=(x: Int): Unit = ()
+  age = 29
+  { age = 29 }
diff --git a/tests/rewrites/ambiguous-named-tuple-assignment.scala b/tests/rewrites/ambiguous-named-tuple-assignment.scala
new file mode 100644
index 000000000000..e9685b7b58cf
--- /dev/null
+++ b/tests/rewrites/ambiguous-named-tuple-assignment.scala
@@ -0,0 +1,19 @@
+import scala.language.experimental.namedTuples
+
+object i21770:
+  def f(g: Int  => Unit) = g(0)
+  var cache: Option[Int] = None
+  f(i => (cache = Some(i)))
+  
+object i21861:
+  var age: Int = 28
+  (
+    age = 29
+  )
+  
+  
+object i21861c:
+  def age: Int = ???
+  def age_=(x: Int): Unit = ()
+  age = 29
+  ( age = 29 )
diff --git a/tests/rewrites/unused.check b/tests/rewrites/unused.check
new file mode 100644
index 000000000000..1ff93bfb6ef2
--- /dev/null
+++ b/tests/rewrites/unused.check
@@ -0,0 +1,55 @@
+
+//> using options -Wunused:all
+
+package p1:
+  import java.lang.Runnable
+  class C extends Runnable { def run() = () }
+
+package p2:
+  import java.lang.Runnable
+  class C extends Runnable { def run() = () }
+
+package p3:
+  import java.lang.Runnable
+  class C extends Runnable { def run() = () }
+
+package p4:
+  import java.lang.{Runnable, System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p5:
+  import java.lang.{Runnable, System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p6:
+  import java.lang.{Runnable, System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p7:
+  import java.lang.{Runnable,
+                    System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p8:
+  import java.lang.{Runnable as R, System}, System.out
+  class C extends R { def run() = out.println() }
+
+package p9:
+  import java.lang.{Runnable as R, System,
+                    Thread}
+  class C extends R { def run() = Thread(() => System.out.println()).start() }
+
+package p10:
+  object X:
+    def x = 42
+  class C:
+    import X.* // preserve text, don't rewrite to p10.X.*
+    def c = x
+
+package p11:
+  import collection.mutable, mutable.ListBuffer // warn // warn // not checked :(
+  def buf = ListBuffer.empty[String]
+
+package p12:
+  import java.lang.System, java.lang.Runnable
+  class C extends Runnable { def run() = System.out.println() }
diff --git a/tests/rewrites/unused.scala b/tests/rewrites/unused.scala
new file mode 100644
index 000000000000..85a83c7c0015
--- /dev/null
+++ b/tests/rewrites/unused.scala
@@ -0,0 +1,61 @@
+
+//> using options -Wunused:all
+
+package p1:
+  import java.lang.Runnable
+  import java.lang.{Thread, String}, java.lang.Integer
+  class C extends Runnable { def run() = () }
+
+package p2:
+  import java.lang.Thread
+  import java.lang.String
+  import java.lang.Runnable
+  import java.lang.Integer
+  class C extends Runnable { def run() = () }
+
+package p3:
+  import java.lang.{Runnable, Thread, String}
+  class C extends Runnable { def run() = () }
+
+package p4:
+  import java.lang.{Runnable, System, Thread}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p5:
+  import java.lang.{Thread, Runnable, System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p6:
+  import java.lang.{Runnable, System}, java.lang.Thread, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p7:
+  import java.lang.{Runnable,
+                    Thread,
+                    System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p8:
+  import java.lang.{Runnable as R, System,
+                    Thread}, System.out
+  class C extends R { def run() = out.println() }
+
+package p9:
+  import java.lang.{Runnable as R, System,
+                    Thread}, System.out
+  class C extends R { def run() = Thread(() => System.out.println()).start() }
+
+package p10:
+  object X:
+    def x = 42
+  class C:
+    import X.*, java.util.HashMap // preserve text, don't rewrite to p10.X.*
+    def c = x
+
+package p11:
+  import collection.mutable, mutable.ListBuffer, java.lang.{Runnable, Thread} // warn // warn // not checked :(
+  def buf = ListBuffer.empty[String]
+
+package p12:
+  import collection.mutable, java.lang.System, java.lang.Runnable
+  class C extends Runnable { def run() = System.out.println() }
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 7153edac00ab..31a08dbb9e60 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -61,23 +61,23 @@ Synthetics => 3 entries
 
 Symbols:
 advanced/C# => class C [typeparam T ] extends Object { self: C[T] => +3 decls }
-advanced/C#[T] => typeparam T 
+advanced/C#[T] => typeparam T
 advanced/C#`<init>`(). => primary ctor <init> [typeparam T ](): C[T]
 advanced/C#t(). => method t => T
 advanced/HKClass# => class HKClass [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]] extends Object { self: HKClass[F] => +3 decls }
 advanced/HKClass#[F] => typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]
-advanced/HKClass#[F][T] => typeparam T 
-advanced/HKClass#[F][U] => typeparam U 
+advanced/HKClass#[F][T] => typeparam T
+advanced/HKClass#[F][U] => typeparam U
 advanced/HKClass#`<init>`(). => primary ctor <init> [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]](): HKClass[F]
-advanced/HKClass#`<init>`().[F][T] => typeparam T 
-advanced/HKClass#`<init>`().[F][U] => typeparam U 
+advanced/HKClass#`<init>`().[F][T] => typeparam T
+advanced/HKClass#`<init>`().[F][U] => typeparam U
 advanced/HKClass#foo(). => method foo [typeparam T , typeparam U ](param x: F[T, U]): String
 advanced/HKClass#foo().(x) => param x: F[T, U]
-advanced/HKClass#foo().[T] => typeparam T 
-advanced/HKClass#foo().[U] => typeparam U 
+advanced/HKClass#foo().[T] => typeparam T
+advanced/HKClass#foo().[U] => typeparam U
 advanced/Structural# => class Structural extends Object { self: Structural => +6 decls }
 advanced/Structural#T# => trait T [typeparam A ] extends Object { self: T[A] => +4 decls }
-advanced/Structural#T#[A] => typeparam A 
+advanced/Structural#T#[A] => typeparam A
 advanced/Structural#T#`<init>`(). => primary ctor <init> [typeparam A ](): T[A]
 advanced/Structural#T#bar(). => method bar (param b: foo.B): Unit
 advanced/Structural#T#bar().(b) => param b: foo.B
@@ -291,8 +291,8 @@ Symbols:
 annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls }
 annot/Alias.A# => type A  = ClassAnnotation @param
 annot/Annotations# => @ClassAnnotation class Annotations [@TypeParameterAnnotation typeparam T ] extends Object { self: AnyRef & Annotations[T] => +6 decls }
-annot/Annotations#S# => @TypeAnnotation type S 
-annot/Annotations#[T] => @TypeParameterAnnotation typeparam T 
+annot/Annotations#S# => @TypeAnnotation type S
+annot/Annotations#[T] => @TypeParameterAnnotation typeparam T
 annot/Annotations#`<init>`(). => primary ctor <init> [@TypeParameterAnnotation typeparam T ](@ParameterAnnotation param x: T): Annotations[T]
 annot/Annotations#`<init>`().(x) => @ParameterAnnotation param x: T
 annot/Annotations#field. => @FieldAnnotation val method field Int
@@ -306,7 +306,7 @@ annot/B#throwing(). => @throws[Exception] method throwing => Nothing
 annot/B#x. => private[this] val method x Int
 annot/M. => @ObjectAnnotation final object M extends Object { self: M.type => +1 decls }
 annot/M.m(). => @MacroAnnotation macro m [typeparam TT ]: Int
-annot/M.m().[TT] => typeparam TT 
+annot/M.m().[TT] => typeparam TT
 annot/T# => @TraitAnnotation trait T extends Object { self: T => +1 decls }
 annot/T#`<init>`(). => primary ctor <init> (): T
 local0 => selfparam self: AnyRef
@@ -399,10 +399,10 @@ example/Anonymous#bar2. => val method bar2 Bar
 example/Anonymous#foo. => val method foo Foo
 example/Anonymous#locally(). => method locally [typeparam A ](param x: A): A
 example/Anonymous#locally().(x) => param x: A
-example/Anonymous#locally().[A] => typeparam A 
+example/Anonymous#locally().[A] => typeparam A
 example/Anonymous#m1(). => method m1 [typeparam T [type _ ]]: Nothing
 example/Anonymous#m1().[T] => typeparam T [type _ ]
-example/Anonymous#m1().[T][_] => type _ 
+example/Anonymous#m1().[T][_] => type _
 example/Anonymous#m2(). => method m2 => Map[_, List[_] forSome { type _  }] forSome { type _  }
 local0 => val local x: Function1[Int, Int]
 local1 => final class $anon extends Object with Foo { self: $anon => +1 decls }
@@ -637,7 +637,7 @@ classes/C11#foo(). => inline macro foo => Int
 classes/C12# => class C12 extends Object { self: C12 => +8 decls }
 classes/C12#Context# => class Context extends Object { self: Context => +2 decls }
 classes/C12#Context#Expr# => type Expr [typeparam T ]
-classes/C12#Context#Expr#[T] => typeparam T 
+classes/C12#Context#Expr#[T] => typeparam T
 classes/C12#Context#`<init>`(). => primary ctor <init> (): Context
 classes/C12#`<init>`(). => primary ctor <init> (): C12
 classes/C12#foo1(). => macro foo1 (param x: Int): Int
@@ -802,10 +802,15 @@ Occurrences:
 [53:10..53:11): + -> scala/Int#`+`(+4).
 
 Diagnostics:
+[13:20..13:21): [warning] unused explicit parameter
 [18:9..18:10): [warning] unused explicit parameter
 [20:27..20:28): [warning] unused explicit parameter
 [22:27..22:28): [warning] unused explicit parameter
 [24:10..24:11): [warning] unused explicit parameter
+[36:11..36:12): [warning] unused explicit parameter
+[39:11..39:12): [warning] unused explicit parameter
+[39:19..39:20): [warning] unused explicit parameter
+[51:30..51:31): [warning] unused explicit parameter
 
 Synthetics:
 [51:16..51:27):List(1).map => *[Int]
@@ -923,7 +928,7 @@ endmarkers/MultiCtor#`<init>`().(i) => val param i: Int
 endmarkers/MultiCtor#`<init>`(+1). => ctor <init> (): MultiCtor
 endmarkers/MultiCtor#i. => val method i Int
 endmarkers/Stuff# => trait Stuff [typeparam A ] extends Object { self: Stuff[A] => +3 decls }
-endmarkers/Stuff#[A] => typeparam A 
+endmarkers/Stuff#[A] => typeparam A
 endmarkers/Stuff#`<init>`(). => primary ctor <init> [typeparam A ](): Stuff[A]
 endmarkers/Stuff#do(). => abstract method do => A
 endmarkers/TestObj. => final object TestObj extends Object { self: TestObj.type => +2 decls }
@@ -1122,29 +1127,29 @@ _empty_/Enums.Directions.valueOf(). => method valueOf (param $name: String): Dir
 _empty_/Enums.Directions.valueOf().($name) => param $name: String
 _empty_/Enums.Directions.values(). => method values => Array[Directions]
 _empty_/Enums.Maybe# => abstract sealed enum class Maybe [covariant typeparam A ] extends Object with Enum { self: Maybe[A] => +2 decls }
-_empty_/Enums.Maybe#[A] => covariant typeparam A 
+_empty_/Enums.Maybe#[A] => covariant typeparam A
 _empty_/Enums.Maybe#`<init>`(). => primary ctor <init> [covariant typeparam A ](): Maybe[A]
 _empty_/Enums.Maybe. => final object Maybe extends Object { self: Maybe.type => +6 decls }
 _empty_/Enums.Maybe.Just# => final case enum class Just [covariant typeparam A ] extends Maybe[A] { self: Just[A] => +7 decls }
-_empty_/Enums.Maybe.Just#[A] => covariant typeparam A 
+_empty_/Enums.Maybe.Just#[A] => covariant typeparam A
 _empty_/Enums.Maybe.Just#_1(). => method _1 => A
 _empty_/Enums.Maybe.Just#`<init>`(). => primary ctor <init> [covariant typeparam A ](val param value: A): Just[A]
 _empty_/Enums.Maybe.Just#`<init>`().(value) => val param value: A
 _empty_/Enums.Maybe.Just#copy$default$1(). => method copy$default$1 [covariant typeparam A ]: A
-_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A 
+_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A
 _empty_/Enums.Maybe.Just#copy(). => method copy [covariant typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just#copy().(value) => param value: A
-_empty_/Enums.Maybe.Just#copy().[A] => typeparam A 
+_empty_/Enums.Maybe.Just#copy().[A] => typeparam A
 _empty_/Enums.Maybe.Just#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.Maybe.Just#value. => val method value A
 _empty_/Enums.Maybe.Just. => final object Just extends Object { self: Just.type => +4 decls }
 _empty_/Enums.Maybe.Just.apply(). => method apply [typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just.apply().(value) => param value: A
-_empty_/Enums.Maybe.Just.apply().[A] => typeparam A 
+_empty_/Enums.Maybe.Just.apply().[A] => typeparam A
 _empty_/Enums.Maybe.Just.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.Maybe.Just.unapply(). => method unapply [typeparam A ](param x$1: Just[A]): Just[A]
 _empty_/Enums.Maybe.Just.unapply().(x$1) => param x$1: Just[A]
-_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A 
+_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A
 _empty_/Enums.Maybe.None. => case val static enum method None Maybe[Nothing]
 _empty_/Enums.Maybe.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Maybe[_] forSome { type _  }
 _empty_/Enums.Maybe.fromOrdinal().(ordinal) => param ordinal: Int
@@ -1195,7 +1200,7 @@ _empty_/Enums.Suits.valueOf(). => method valueOf (param $name: String): Suits
 _empty_/Enums.Suits.valueOf().($name) => param $name: String
 _empty_/Enums.Suits.values(). => method values => Array[Suits]
 _empty_/Enums.Tag# => abstract sealed enum class Tag [typeparam A ] extends Object with Enum { self: Tag[A] => +2 decls }
-_empty_/Enums.Tag#[A] => typeparam A 
+_empty_/Enums.Tag#[A] => typeparam A
 _empty_/Enums.Tag#`<init>`(). => primary ctor <init> [typeparam A ](): Tag[A]
 _empty_/Enums.Tag. => final object Tag extends Object { self: Tag.type => +7 decls }
 _empty_/Enums.Tag.$values. => private[this] val method $values Array[Tag[_] forSome { type _  }]
@@ -1226,33 +1231,33 @@ _empty_/Enums.WeekDays.valueOf(). => method valueOf (param $name: String): WeekD
 _empty_/Enums.WeekDays.valueOf().($name) => param $name: String
 _empty_/Enums.WeekDays.values(). => method values => Array[WeekDays]
 _empty_/Enums.`<:<`# => abstract sealed enum class <:< [contravariant typeparam A , typeparam B ] extends Object with Enum { self: <:<[A, B] => +3 decls }
-_empty_/Enums.`<:<`#[A] => contravariant typeparam A 
-_empty_/Enums.`<:<`#[B] => typeparam B 
+_empty_/Enums.`<:<`#[A] => contravariant typeparam A
+_empty_/Enums.`<:<`#[B] => typeparam B
 _empty_/Enums.`<:<`#`<init>`(). => primary ctor <init> [contravariant typeparam A , typeparam B ](): <:<[A, B]
 _empty_/Enums.`<:<`. => final object <:< extends Object { self: <:<.type => +6 decls }
 _empty_/Enums.`<:<`.Refl# => final case enum class Refl [typeparam C ] extends <:<[C, C] { self: Refl[C] => +4 decls }
-_empty_/Enums.`<:<`.Refl#[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl#[C] => typeparam C
 _empty_/Enums.`<:<`.Refl#`<init>`(). => primary ctor <init> [typeparam C ](): Refl[C]
 _empty_/Enums.`<:<`.Refl#copy(). => method copy [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C
 _empty_/Enums.`<:<`.Refl#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.`<:<`.Refl. => final object Refl extends Object { self: Refl.type => +4 decls }
 _empty_/Enums.`<:<`.Refl.apply(). => method apply [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C
 _empty_/Enums.`<:<`.Refl.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.`<:<`.Refl.unapply(). => method unapply [typeparam C ](param x$1: Refl[C]): true
 _empty_/Enums.`<:<`.Refl.unapply().(x$1) => param x$1: Refl[C]
-_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C
 _empty_/Enums.`<:<`.`given_<:<_T_T`(). => final implicit given method given_<:<_T_T [typeparam T ]: <:<[T, T]
-_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T 
+_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T
 _empty_/Enums.`<:<`.fromOrdinal(). => method fromOrdinal (param ordinal: Int): <:<[_, _] forSome { type _ ; type _  }
 _empty_/Enums.`<:<`.fromOrdinal().(ordinal) => param ordinal: Int
 _empty_/Enums.some1. => val method some1 Option[Int]
 _empty_/Enums.unwrap(). => method unwrap [typeparam A , typeparam B ](param opt: Option[A])(implicit given param ev: <:<[A, Option[B]]): Option[B]
 _empty_/Enums.unwrap().(ev) => implicit given param ev: <:<[A, Option[B]]
 _empty_/Enums.unwrap().(opt) => param opt: Option[A]
-_empty_/Enums.unwrap().[A] => typeparam A 
-_empty_/Enums.unwrap().[B] => typeparam B 
+_empty_/Enums.unwrap().[A] => typeparam A
+_empty_/Enums.unwrap().[B] => typeparam B
 local0 => param x: Option[B]
 
 Occurrences:
@@ -1525,7 +1530,7 @@ Symbols:
 ext/DeckUsage. => final object DeckUsage extends Object { self: DeckUsage.type => +2 decls }
 ext/DeckUsage.deck. => val method deck Deck
 ext/Extension$package. => final package object ext extends Object { self: ext.type { opaque type Deck  } => +9 decls }
-ext/Extension$package.Deck# => opaque type Deck 
+ext/Extension$package.Deck# => opaque type Deck
 ext/Extension$package.Deck. => final object Deck extends Object { self: Deck.type => +2 decls }
 ext/Extension$package.Deck.fooSize(). => method fooSize (param data: Deck): Int
 ext/Extension$package.Deck.fooSize().(data) => param data: Deck
@@ -1539,18 +1544,18 @@ ext/Extension$package.foo().(s) => param s: String
 ext/Extension$package.readInto(). => method readInto [typeparam T ](param s: String)(implicit given param x$2: Read[T]): Option[T]
 ext/Extension$package.readInto().(s) => param s: String
 ext/Extension$package.readInto().(x$2) => implicit given param x$2: Read[T]
-ext/Extension$package.readInto().[T] => typeparam T 
+ext/Extension$package.readInto().[T] => typeparam T
 ext/Functor# => trait Functor [typeparam F [type _ ]] extends Object { self: Functor[F] => +3 decls }
 ext/Functor#[F] => typeparam F [type _ ]
-ext/Functor#[F][_] => type _ 
+ext/Functor#[F][_] => type _
 ext/Functor#`<init>`(). => primary ctor <init> [typeparam F [type _ ]](): Functor[F]
 ext/Functor#map(). => abstract method map [typeparam T , typeparam U ](param t: F[T])(param f: Function1[T, U]): F[U]
 ext/Functor#map().(f) => param f: Function1[T, U]
 ext/Functor#map().(t) => param t: F[T]
-ext/Functor#map().[T] => typeparam T 
-ext/Functor#map().[U] => typeparam U 
+ext/Functor#map().[T] => typeparam T
+ext/Functor#map().[U] => typeparam U
 ext/Read# => trait Read [covariant typeparam T ] extends Object { self: Read[T] => +3 decls }
-ext/Read#[T] => covariant typeparam T 
+ext/Read#[T] => covariant typeparam T
 ext/Read#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Read[T]
 ext/Read#fromString(). => abstract method fromString (param s: String): Option[T]
 ext/Read#fromString().(s) => param s: String
@@ -1731,7 +1736,7 @@ Synthetics => 3 entries
 Symbols:
 a/b/Givens. => final object Givens extends Object { self: Givens.type => +13 decls }
 a/b/Givens.Monoid# => trait Monoid [typeparam A ] extends Object { self: Monoid[A] => +4 decls }
-a/b/Givens.Monoid#[A] => typeparam A 
+a/b/Givens.Monoid#[A] => typeparam A
 a/b/Givens.Monoid#`<init>`(). => primary ctor <init> [typeparam A ](): Monoid[A]
 a/b/Givens.Monoid#combine(). => abstract method combine (param x: A)(param y: A): A
 a/b/Givens.Monoid#combine().(x) => param x: A
@@ -1739,7 +1744,7 @@ a/b/Givens.Monoid#combine().(y) => param y: A
 a/b/Givens.Monoid#empty(). => abstract method empty => A
 a/b/Givens.foo(). => method foo [typeparam A ](implicit given param A: Monoid[A]): A
 a/b/Givens.foo().(A) => implicit given param A: Monoid[A]
-a/b/Givens.foo().[A] => typeparam A 
+a/b/Givens.foo().[A] => typeparam A
 a/b/Givens.given_Monoid_String. => final implicit given object given_Monoid_String extends Object with Monoid[String] { self: given_Monoid_String.type => +3 decls }
 a/b/Givens.given_Monoid_String.combine(). => method combine (param x: String)(param y: String): String <: a/b/Givens.Monoid#combine().
 a/b/Givens.given_Monoid_String.combine().(x) => param x: String
@@ -1754,13 +1759,13 @@ a/b/Givens.int2String#apply().(x) => param x: Int
 a/b/Givens.int2String(). => final implicit given inline macro int2String => int2String
 a/b/Givens.sayGoodbye(). => method sayGoodbye [typeparam B ](param any: B): String
 a/b/Givens.sayGoodbye().(any) => param any: B
-a/b/Givens.sayGoodbye().[B] => typeparam B 
+a/b/Givens.sayGoodbye().[B] => typeparam B
 a/b/Givens.sayHello(). => method sayHello [typeparam A ](param any: A): String
 a/b/Givens.sayHello().(any) => param any: A
-a/b/Givens.sayHello().[A] => typeparam A 
+a/b/Givens.sayHello().[A] => typeparam A
 a/b/Givens.saySoLong(). => method saySoLong [typeparam B ](param any: B): String
 a/b/Givens.saySoLong().(any) => param any: B
-a/b/Givens.saySoLong().[B] => typeparam B 
+a/b/Givens.saySoLong().[B] => typeparam B
 a/b/Givens.soLong1. => val method soLong1 String
 
 Occurrences:
@@ -1868,7 +1873,7 @@ example/ImplicitConversion#tuple. => val method tuple Tuple2[Int, Int]
 example/ImplicitConversion#x. => val method x Int
 example/ImplicitConversion. => final object ImplicitConversion extends Object { self: ImplicitConversion.type => +6 decls }
 example/ImplicitConversion.newAny2stringadd# => final implicit class newAny2stringadd [typeparam A ] extends AnyVal { self: newAny2stringadd[A] => +4 decls }
-example/ImplicitConversion.newAny2stringadd#[A] => typeparam A 
+example/ImplicitConversion.newAny2stringadd#[A] => typeparam A
 example/ImplicitConversion.newAny2stringadd#`+`(). => method + (param other: String): String
 example/ImplicitConversion.newAny2stringadd#`+`().(other) => param other: String
 example/ImplicitConversion.newAny2stringadd#`<init>`(). => primary ctor <init> [typeparam A ](param self: A): newAny2stringadd[A]
@@ -1876,7 +1881,7 @@ example/ImplicitConversion.newAny2stringadd#`<init>`().(self) => param self: A
 example/ImplicitConversion.newAny2stringadd#self. => private val method self A
 example/ImplicitConversion.newAny2stringadd(). => final implicit method newAny2stringadd [typeparam A ](param self: A): newAny2stringadd[A]
 example/ImplicitConversion.newAny2stringadd().(self) => param self: A
-example/ImplicitConversion.newAny2stringadd().[A] => typeparam A 
+example/ImplicitConversion.newAny2stringadd().[A] => typeparam A
 example/ImplicitConversion.newAny2stringadd. => final object newAny2stringadd extends Object { self: newAny2stringadd.type => +2 decls }
 
 Occurrences:
@@ -2071,6 +2076,7 @@ Text => empty
 Language => Scala
 Symbols => 45 entries
 Occurrences => 66 entries
+Diagnostics => 1 entries
 Synthetics => 3 entries
 
 Symbols:
@@ -2088,7 +2094,7 @@ givens/InventedNames$package.given_Double(). => final implicit given method give
 givens/InventedNames$package.given_Double().(x$1) => implicit given param x$1: Int
 givens/InventedNames$package.given_Float. => final implicit lazy val given method given_Float Float
 givens/InventedNames$package.given_List_T(). => final implicit given method given_List_T [typeparam T ]: List[T]
-givens/InventedNames$package.given_List_T().[T] => typeparam T 
+givens/InventedNames$package.given_List_T().[T] => typeparam T
 givens/InventedNames$package.given_String. => final implicit lazy val given method given_String String
 givens/InventedNames$package.given_X. => final implicit given object given_X extends Object with X { self: given_X.type => +2 decls }
 givens/InventedNames$package.given_X.doX(). => method doX => Int <: givens/X#doX().
@@ -2100,11 +2106,11 @@ givens/InventedNames$package.given_Y#x$1. => protected implicit val given method
 givens/InventedNames$package.given_Y(). => final implicit given method given_Y (implicit given param x$1: X): given_Y
 givens/InventedNames$package.given_Y().(x$1) => implicit given param x$1: X
 givens/InventedNames$package.given_Z_T# => implicit given class given_Z_T [typeparam T ] extends Object with Z[T] { self: given_Z_T[T] => +3 decls }
-givens/InventedNames$package.given_Z_T#[T] => typeparam T 
+givens/InventedNames$package.given_Z_T#[T] => typeparam T
 givens/InventedNames$package.given_Z_T#`<init>`(). => primary ctor <init> [typeparam T ](): given_Z_T[T]
 givens/InventedNames$package.given_Z_T#doZ(). => method doZ => List[T] <: givens/Z#doZ().
 givens/InventedNames$package.given_Z_T(). => final implicit given method given_Z_T [typeparam T ]: given_Z_T[T]
-givens/InventedNames$package.given_Z_T().[T] => typeparam T 
+givens/InventedNames$package.given_Z_T().[T] => typeparam T
 givens/InventedNames$package.intValue. => final implicit lazy val given method intValue Int
 givens/InventedNames$package.x. => val method x given_X.type
 givens/InventedNames$package.y. => val method y given_Y
@@ -2116,7 +2122,7 @@ givens/Y# => trait Y extends Object { self: Y => +2 decls }
 givens/Y#`<init>`(). => primary ctor <init> (): Y
 givens/Y#doY(). => abstract method doY => String
 givens/Z# => trait Z [typeparam T ] extends Object { self: Z[T] => +3 decls }
-givens/Z#[T] => typeparam T 
+givens/Z#[T] => typeparam T
 givens/Z#`<init>`(). => primary ctor <init> [typeparam T ](): Z[T]
 givens/Z#doZ(). => abstract method doZ => List[T]
 
@@ -2188,6 +2194,9 @@ Occurrences:
 [41:8..41:17): given_Z_T -> givens/InventedNames$package.given_Z_T().
 [41:18..41:24): String -> scala/Predef.String#
 
+Diagnostics:
+[24:13..24:13): [warning] unused implicit parameter
+
 Synthetics:
 [24:0..24:0): => *(x$1)
 [34:8..34:20):given_Double => *(intValue)
@@ -2261,7 +2270,7 @@ Symbols:
 example/Local# => class Local extends Object { self: Local => +2 decls }
 example/Local#`<init>`(). => primary ctor <init> (): Local
 example/Local#a(). => method a (): Int
-local0 => typeparam A 
+local0 => typeparam A
 local1 => param a: A
 local2 => local id: [typeparam A ](param a: A): A
 
@@ -2326,10 +2335,10 @@ example/MatchType$package.Concat# => type Concat [typeparam Xs  <: Tuple, covari
 example/MatchType$package.Concat#[Xs] => typeparam Xs  <: Tuple
 example/MatchType$package.Concat#[Ys] => covariant typeparam Ys  <: Tuple
 example/MatchType$package.Elem# => type Elem [typeparam X ] = X match { String => Char, Array[t] => t, Iterable[t] => t }
-example/MatchType$package.Elem#[X] => typeparam X 
-local0 => type t 
-local1 => type t 
-local2 => type x 
+example/MatchType$package.Elem#[X] => typeparam X
+local0 => type t
+local1 => type t
+local2 => type x
 local3 => type xs  <: Tuple
 
 Occurrences:
@@ -2569,11 +2578,11 @@ Occurrences => 156 entries
 Symbols:
 example/Methods# => class Methods [typeparam T ] extends Object { self: Methods[T] => +44 decls }
 example/Methods#AList# => type AList [typeparam T ] = List[T]
-example/Methods#AList#[T] => typeparam T 
+example/Methods#AList#[T] => typeparam T
 example/Methods#List# => class List [typeparam T ] extends Object { self: List[T] => +2 decls }
-example/Methods#List#[T] => typeparam T 
+example/Methods#List#[T] => typeparam T
 example/Methods#List#`<init>`(). => primary ctor <init> [typeparam T ](): List[T]
-example/Methods#[T] => typeparam T 
+example/Methods#[T] => typeparam T
 example/Methods#`<init>`(). => primary ctor <init> [typeparam T ](): Methods[T]
 example/Methods#`m8().`(). => method m8(). (): Nothing
 example/Methods#`m9().`# => class m9(). extends Object { self: m9(). => +1 decls }
@@ -2601,7 +2610,7 @@ example/Methods#m7(). => method m7 [typeparam U ](param c: Methods[T], param l:
 example/Methods#m7().(c) => param c: Methods[T]
 example/Methods#m7().(evidence$1) => implicit param evidence$1: Ordering[U]
 example/Methods#m7().(l) => param l: List[U]
-example/Methods#m7().[U] => typeparam U 
+example/Methods#m7().[U] => typeparam U
 example/Methods#m9(). => method m9 (param x: m9().): Nothing
 example/Methods#m9().(x) => param x: m9().
 example/Methods#m10(). => method m10 (param x: List[T]): Nothing
@@ -2961,18 +2970,18 @@ Occurrences => 18 entries
 
 Symbols:
 _empty_/NewModifiers$package. => final package object _empty_ extends Object { self: _empty_.type { opaque type OpaqueB  } => +2 decls }
-_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB 
+_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB
 _empty_/NewModifiers. => final object NewModifiers extends Object { self: NewModifiers.type { opaque type A  } => +3 decls }
-_empty_/NewModifiers.A# => opaque type A 
+_empty_/NewModifiers.A# => opaque type A
 _empty_/NewModifiers.foo. => val inline method foo "foo"
 _empty_/NewModifiersClass# => opaque class NewModifiersClass extends Object { self: Any { opaque type C  } & NewModifiersClass => +5 decls }
-_empty_/NewModifiersClass#C# => opaque type C 
+_empty_/NewModifiersClass#C# => opaque type C
 _empty_/NewModifiersClass#Nested# => opaque class Nested extends Object { self: Any { opaque type NestedOpaque  } & Nested => +2 decls }
-_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque 
+_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque
 _empty_/NewModifiersClass#Nested#`<init>`(). => primary ctor <init> (): Nested
 _empty_/NewModifiersClass#`<init>`(). => primary ctor <init> (): NewModifiersClass
 _empty_/NewModifiersTrait# => opaque trait NewModifiersTrait extends Object { self: Any { opaque type D  } & NewModifiersTrait => +2 decls }
-_empty_/NewModifiersTrait#D# => opaque type D 
+_empty_/NewModifiersTrait#D# => opaque type D
 _empty_/NewModifiersTrait#`<init>`(). => primary ctor <init> (): NewModifiersTrait
 
 Occurrences:
@@ -3060,13 +3069,13 @@ Occurrences => 49 entries
 Symbols:
 prefixes/C# => class C extends Object { self: C => +6 decls }
 prefixes/C#N. => final object N extends Object { self: N.type => +2 decls }
-prefixes/C#N.U# => type U 
-prefixes/C#T# => type T 
+prefixes/C#N.U# => type U
+prefixes/C#T# => type T
 prefixes/C#`<init>`(). => primary ctor <init> (): C
 prefixes/C#k1(). => method k1 => U
 prefixes/C#m1(). => method m1 => T
 prefixes/M. => final object M extends Object { self: M.type => +3 decls }
-prefixes/M.T# => type T 
+prefixes/M.T# => type T
 prefixes/M.n1(). => method n1 => T
 prefixes/O. => final object O extends C { self: O.type => +2 decls }
 prefixes/O.o1(). => method o1 => O.this.T
@@ -3143,13 +3152,13 @@ Synthetics => 3 entries
 
 Symbols:
 example/C# => class C extends Object { self: C => +3 decls }
-example/C#T1# => type T1 
-example/C#T2# => type T2 
+example/C#T1# => type T1
+example/C#T2# => type T2
 example/C#`<init>`(). => primary ctor <init> (): C
 example/PickOneRefinement_1# => class PickOneRefinement_1 [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }] extends Object { self: PickOneRefinement_1[S] => +3 decls }
 example/PickOneRefinement_1#[S] => typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }
 example/PickOneRefinement_1#[S](as) => param as: T*
-example/PickOneRefinement_1#[S][T] => typeparam T 
+example/PickOneRefinement_1#[S][T] => typeparam T
 example/PickOneRefinement_1#`<init>`(). => primary ctor <init> [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }](): PickOneRefinement_1[S]
 example/PickOneRefinement_1#run(). => method run (param s: S, param as: String*): Option[String]
 example/PickOneRefinement_1#run().(as) => param as: String*
@@ -3158,7 +3167,7 @@ example/PolyHolder# => trait PolyHolder extends Object { self: PolyHolder => +2
 example/PolyHolder#`<init>`(). => primary ctor <init> (): PolyHolder
 example/PolyHolder#foo(). => abstract method foo [typeparam T ](param t: T): Any
 example/PolyHolder#foo().(t) => param t: T
-example/PolyHolder#foo().[T] => typeparam T 
+example/PolyHolder#foo().[T] => typeparam T
 example/RecOrRefined$package. => final package object example extends Object { self: example.type => +9 decls }
 example/RecOrRefined$package.C2# => type C2  = C { type T2  = T1 <: example/C#T2#; type T1  <: example/C#T1# }
 example/RecOrRefined$package.Person# => type Person  = Record { abstract val method age Int; abstract val method name String }
@@ -3172,9 +3181,9 @@ example/RecOrRefined$package.m4(). => method m4 (param x: PolyHolder { abstract
 example/RecOrRefined$package.m4().(x) => param x: PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5(). => method m5 [typeparam Z ](param x: Int): PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5().(x) => param x: Int
-example/RecOrRefined$package.m5().[Z] => typeparam Z 
+example/RecOrRefined$package.m5().[Z] => typeparam Z
 example/RecOrRefined$package.m6# => type m6 [typeparam X ] = PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
-example/RecOrRefined$package.m6#[X] => typeparam X 
+example/RecOrRefined$package.m6#[X] => typeparam X
 example/Record# => class Record extends Object with Selectable { self: Record => +4 decls }
 example/Record#`<init>`(). => primary ctor <init> (param elems: Tuple2[String, Any]*): Record
 example/Record#`<init>`().(elems) => param elems: Tuple2[String, Any]*
@@ -3186,9 +3195,9 @@ example/SpecialRefinement# => trait SpecialRefinement extends Object { self: Spe
 example/SpecialRefinement#`<init>`(). => primary ctor <init> (): SpecialRefinement
 example/SpecialRefinement#pickOne(). => abstract method pickOne [typeparam T ](param as: T*): Option[Any]
 example/SpecialRefinement#pickOne().(as) => param as: T*
-example/SpecialRefinement#pickOne().[T] => typeparam T 
+example/SpecialRefinement#pickOne().[T] => typeparam T
 local0 => abstract method pickOne [typeparam T ](param as: T*): Option[String]
-local1 => typeparam T 
+local1 => typeparam T
 local2 => param as: T*
 local3 => abstract method pickOne [typeparam T ](param as: T*): Option[String] <: example/SpecialRefinement#pickOne().
 local4 => abstract val method x Int
@@ -3196,14 +3205,14 @@ local5 => abstract val method x Int
 local6 => abstract method y => Int
 local7 => abstract val method x Int
 local8 => abstract method y => Int
-local9 => type z 
-local10 => typeparam T 
+local9 => type z
+local10 => typeparam T
 local11 => param t: T
 local12 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local13 => typeparam T 
+local13 => typeparam T
 local14 => param t: T
 local15 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local16 => typeparam T 
+local16 => typeparam T
 local17 => param t: T
 local18 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
 local19 => abstract val method name String
@@ -3509,7 +3518,7 @@ example/Synthetic#Contexts.m4(). => method m4 => Nothing
 example/Synthetic#F# => class F extends Object { self: F => +1 decls }
 example/Synthetic#F#`<init>`(). => primary ctor <init> (): F
 example/Synthetic#J# => class J [typeparam T ] extends Object { self: J[T] => +4 decls }
-example/Synthetic#J#[T] => typeparam T 
+example/Synthetic#J#[T] => typeparam T
 example/Synthetic#J#`<init>`(). => primary ctor <init> [typeparam T ]()(implicit param evidence$1: Manifest[T]): J[T]
 example/Synthetic#J#`<init>`().(evidence$1) => implicit param evidence$1: Manifest[T]
 example/Synthetic#J#arr. => val method arr Array[T]
@@ -3724,6 +3733,11 @@ Occurrences:
 [68:18..68:24): impure -> local20
 [68:30..68:31): s -> local16
 
+Diagnostics:
+[19:21..19:22): [warning] unused pattern variable
+[41:4..41:5): [warning] unused pattern variable
+[63:10..63:11): [warning] unused explicit parameter
+
 Synthetics:
 [5:2..5:13):List(1).map => *[Int]
 [5:2..5:6):List => *.apply[Int]
@@ -4209,16 +4223,15 @@ Text => empty
 Language => Scala
 Symbols => 8 entries
 Occurrences => 18 entries
-Diagnostics => 1 entries
 
 Symbols:
 _empty_/Test_depmatch. => final object Test_depmatch extends Object { self: Test_depmatch.type => +4 decls }
 _empty_/Test_depmatch.Bar# => type Bar [typeparam T ] = T match { Unit => Unit }
-_empty_/Test_depmatch.Bar#[T] => typeparam T 
+_empty_/Test_depmatch.Bar#[T] => typeparam T
 _empty_/Test_depmatch.Foo# => type Foo  = Int { type U  }
 _empty_/Test_depmatch.baz(). => inline macro baz (param foo: Foo): Unit
 _empty_/Test_depmatch.baz().(foo) => param foo: Foo
-local0 => type U 
+local0 => type U
 local1 => val local v: Bar[foo.U]
 
 Occurrences:
@@ -4241,9 +4254,6 @@ Occurrences:
 [6:19..6:20): U -> local0
 [6:24..6:27): ??? -> scala/Predef.`???`().
 
-Diagnostics:
-[6:8..6:9): [warning] unused local definition
-
 expect/example-dir/FileInDir.scala
 ----------------------------------
 
@@ -4277,7 +4287,7 @@ Occurrences => 33 entries
 
 Symbols:
 exports/example/Codec# => trait Codec [typeparam T ] extends Object with Decoder[T] with Encoder[T] { self: Codec[T] => +6 decls }
-exports/example/Codec#[T] => typeparam T 
+exports/example/Codec#[T] => typeparam T
 exports/example/Codec#`<init>`(). => primary ctor <init> [typeparam T ](param decode: Decoder[T], param encode: Encoder[T]): Codec[T]
 exports/example/Codec#`<init>`().(decode) => param decode: Decoder[T]
 exports/example/Codec#`<init>`().(encode) => param encode: Encoder[T]
@@ -4288,12 +4298,12 @@ exports/example/Codec#encode(). => final method encode (param t: T): Array[Byte]
 exports/example/Codec#encode().(t) => param t: T
 exports/example/Codec#encode. => private[this] val method encode Encoder[T]
 exports/example/Decoder# => trait Decoder [covariant typeparam T ] extends Object { self: Decoder[T] => +3 decls }
-exports/example/Decoder#[T] => covariant typeparam T 
+exports/example/Decoder#[T] => covariant typeparam T
 exports/example/Decoder#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Decoder[T]
 exports/example/Decoder#decode(). => abstract method decode (param a: Array[Byte]): T
 exports/example/Decoder#decode().(a) => param a: Array[Byte]
 exports/example/Encoder# => trait Encoder [contravariant typeparam T ] extends Object { self: Encoder[T] => +3 decls }
-exports/example/Encoder#[T] => contravariant typeparam T 
+exports/example/Encoder#[T] => contravariant typeparam T
 exports/example/Encoder#`<init>`(). => primary ctor <init> [contravariant typeparam T ](): Encoder[T]
 exports/example/Encoder#encode(). => abstract method encode (param t: T): Array[Byte]
 exports/example/Encoder#encode().(t) => param t: T
@@ -4347,11 +4357,11 @@ Occurrences => 5 entries
 Symbols:
 exports/`exports-package$package`. => final package object exports extends Object { self: exports.type => +4 decls }
 exports/`exports-package$package`.Codec# => final type Codec [typeparam T ] = Codec[T]
-exports/`exports-package$package`.Codec#[T] => typeparam T 
+exports/`exports-package$package`.Codec#[T] => typeparam T
 exports/`exports-package$package`.Decoder# => final type Decoder [typeparam T ] = Decoder[T]
-exports/`exports-package$package`.Decoder#[T] => typeparam T 
+exports/`exports-package$package`.Decoder#[T] => typeparam T
 exports/`exports-package$package`.Encoder# => final type Encoder [typeparam T ] = Encoder[T]
-exports/`exports-package$package`.Encoder#[T] => typeparam T 
+exports/`exports-package$package`.Encoder#[T] => typeparam T
 
 Occurrences:
 [0:8..0:15): exports <- exports/
@@ -4393,35 +4403,35 @@ Occurrences => 54 entries
 
 Symbols:
 hk/EitherMonad# => class EitherMonad [typeparam T ] extends Object with Monad[[E] =>> Either[T, E]] { self: EitherMonad[T] => +2 decls }
-hk/EitherMonad#[E] => typeparam E 
-hk/EitherMonad#[T] => typeparam T 
+hk/EitherMonad#[E] => typeparam E
+hk/EitherMonad#[T] => typeparam T
 hk/EitherMonad#`<init>`(). => primary ctor <init> [typeparam T ](): EitherMonad[T]
-hk/EitherMonad#`<init>`().[E] => typeparam E 
+hk/EitherMonad#`<init>`().[E] => typeparam E
 hk/Monad# => trait Monad [typeparam M [type _ ]] extends Object { self: Monad[M] => +4 decls }
 hk/Monad#[M] => typeparam M [type _ ]
-hk/Monad#[M][_] => type _ 
+hk/Monad#[M][_] => type _
 hk/Monad#`<init>`(). => primary ctor <init> [typeparam M [type _ ]](): Monad[M]
 hk/Monad#flatMap(). => method flatMap [typeparam A , typeparam B ](param m: M[A])(param f: Function1[A, M[B]]): M[B]
 hk/Monad#flatMap().(f) => param f: Function1[A, M[B]]
 hk/Monad#flatMap().(m) => param m: M[A]
-hk/Monad#flatMap().[A] => typeparam A 
-hk/Monad#flatMap().[B] => typeparam B 
+hk/Monad#flatMap().[A] => typeparam A
+hk/Monad#flatMap().[B] => typeparam B
 hk/Monad#pure(). => method pure [typeparam A ](param a: A): M[A]
 hk/Monad#pure().(a) => param a: A
-hk/Monad#pure().[A] => typeparam A 
+hk/Monad#pure().[A] => typeparam A
 hk/hk$package. => final package object hk extends Object { self: hk.type => +5 decls }
 hk/hk$package.Id# => type Id [typeparam A ] = A
-hk/hk$package.Id#[A] => typeparam A 
+hk/hk$package.Id#[A] => typeparam A
 hk/hk$package.MapEither# => type MapEither [typeparam K ] = [L] =>> [R] =>> Map[K, Either[L, R]]
-hk/hk$package.MapEither#[K] => typeparam K 
-hk/hk$package.MapEither#[L] => typeparam L 
-hk/hk$package.MapEither#[R] => typeparam R 
+hk/hk$package.MapEither#[K] => typeparam K
+hk/hk$package.MapEither#[L] => typeparam L
+hk/hk$package.MapEither#[R] => typeparam R
 hk/hk$package.MapKV# => type MapKV [typeparam K ] = [V] =>> Map[K, V]
-hk/hk$package.MapKV#[K] => typeparam K 
-hk/hk$package.MapKV#[V] => typeparam V 
+hk/hk$package.MapKV#[K] => typeparam K
+hk/hk$package.MapKV#[V] => typeparam V
 hk/hk$package.MapV# => type MapV [type _ ] = [V] =>> Map[String, V]
-hk/hk$package.MapV#[V] => typeparam V 
-hk/hk$package.MapV#[_] => type _ 
+hk/hk$package.MapV#[V] => typeparam V
+hk/hk$package.MapV#[_] => type _
 
 Occurrences:
 [0:8..0:10): hk <- hk/
@@ -4562,6 +4572,7 @@ Text => empty
 Language => Scala
 Symbols => 24 entries
 Occurrences => 63 entries
+Diagnostics => 2 entries
 
 Symbols:
 _empty_/Copy# => trait Copy [typeparam In  <: Txn[In], typeparam Out  <: Txn[Out]] extends Object { self: Copy[In, Out] => +5 decls }
@@ -4654,6 +4665,10 @@ Occurrences:
 [14:8..14:15): println -> scala/Predef.println(+1).
 [17:4..17:7): out -> local0
 
+Diagnostics:
+[13:12..13:17): [warning] unused pattern variable
+[13:28..13:34): [warning] unused pattern variable
+
 expect/inlineconsume.scala
 --------------------------
 
@@ -4756,11 +4771,11 @@ _empty_/Concrete#`<init>`(). => primary ctor <init> (): Concrete
 _empty_/Concrete#nullary2(). => method nullary2 => Int <: _empty_/NullaryTest#nullary2().
 _empty_/Concrete#nullary3(). => method nullary3 => List[Int] <: _empty_/NullaryTest#nullary3().
 _empty_/NullaryTest# => abstract class NullaryTest [typeparam T , typeparam m [typeparam s ]] extends Object { self: NullaryTest[T, m] => +9 decls }
-_empty_/NullaryTest#[T] => typeparam T 
+_empty_/NullaryTest#[T] => typeparam T
 _empty_/NullaryTest#[m] => typeparam m [typeparam s ]
-_empty_/NullaryTest#[m][s] => typeparam s 
+_empty_/NullaryTest#[m][s] => typeparam s
 _empty_/NullaryTest#`<init>`(). => primary ctor <init> [typeparam T , typeparam m [typeparam s ]](): NullaryTest[T, m]
-_empty_/NullaryTest#`<init>`().[m][s] => typeparam s 
+_empty_/NullaryTest#`<init>`().[m][s] => typeparam s
 _empty_/NullaryTest#nullary(). => method nullary => String
 _empty_/NullaryTest#nullary2(). => abstract method nullary2 => T
 _empty_/NullaryTest#nullary3(). => abstract method nullary3 => m[T]
@@ -4948,7 +4963,7 @@ Text => empty
 Language => Scala
 Symbols => 50 entries
 Occurrences => 78 entries
-Diagnostics => 4 entries
+Diagnostics => 6 entries
 Synthetics => 2 entries
 
 Symbols:
@@ -4964,9 +4979,9 @@ flags/p/package.AA#x. => private[this] val method x Int
 flags/p/package.AA#y. => val method y Int
 flags/p/package.AA#z(). => var method z Int
 flags/p/package.C# => abstract class C [covariant typeparam T , contravariant typeparam U , typeparam V ] extends Object { self: C[T, U, V] => +10 decls }
-flags/p/package.C#[T] => covariant typeparam T 
-flags/p/package.C#[U] => contravariant typeparam U 
-flags/p/package.C#[V] => typeparam V 
+flags/p/package.C#[T] => covariant typeparam T
+flags/p/package.C#[U] => contravariant typeparam U
+flags/p/package.C#[V] => typeparam V
 flags/p/package.C#`<init>`(). => primary ctor <init> [covariant typeparam T , contravariant typeparam U , typeparam V ](param x: T, param y: U, param z: V): C[T, U, V]
 flags/p/package.C#`<init>`().(x) => param x: T
 flags/p/package.C#`<init>`().(y) => param y: U
@@ -4979,11 +4994,11 @@ flags/p/package.C#x. => private[this] val method x T
 flags/p/package.C#y. => private[this] val method y U
 flags/p/package.C#z. => private[this] val method z V
 flags/p/package.S# => class S [@specialized typeparam T ] extends Object { self: S[T] => +2 decls }
-flags/p/package.S#[T] => @specialized typeparam T 
+flags/p/package.S#[T] => @specialized typeparam T
 flags/p/package.S#`<init>`(). => primary ctor <init> [@specialized typeparam T ](): S[T]
 flags/p/package.T1# => type T1  = Int
 flags/p/package.T2# => type T2 [typeparam T ] = S[T]
-flags/p/package.T2#[T] => typeparam T 
+flags/p/package.T2#[T] => typeparam T
 flags/p/package.U# => type U  <: Int
 flags/p/package.V# => type V  >: Int
 flags/p/package.X. => final case object X extends Object with Product with Serializable { self: X.type => +1 decls }
@@ -4994,14 +5009,14 @@ flags/p/package.Z#`<init>`(). => primary ctor <init> (): Z
 flags/p/package.`y_=`(). => protected var method y_= (param x$1: Int): Unit
 flags/p/package.`y_=`().(x$1) => param x$1: Int
 flags/p/package.m(). => macro m [typeparam TT ]: Int
-flags/p/package.m().[TT] => typeparam TT 
+flags/p/package.m().[TT] => typeparam TT
 flags/p/package.x. => private[flags/p/] lazy val method x Int
 flags/p/package.xs1. => val method xs1 Nothing
 flags/p/package.y(). => protected implicit var method y Int
 flags/p/package.z(). => method z (param pp: Int): Int
 flags/p/package.z().(pp) => param pp: Int
 local0 => val local xs2: Nothing
-local1 => type t 
+local1 => type t
 
 Occurrences:
 [0:8..0:13): flags <- flags/
@@ -5088,6 +5103,8 @@ Diagnostics:
 [9:36..9:37): [warning] unused explicit parameter
 [9:42..9:43): [warning] unused explicit parameter
 [21:11..21:12): [warning] unused explicit parameter
+[24:24..24:27): [warning] unused pattern variable
+[25:27..25:28): [warning] unused pattern variable
 
 Synthetics:
 [23:6..23:10):List => *.unapplySeq[Nothing]
@@ -5114,7 +5131,7 @@ local3 => final class $anon extends Object { self: $anon => +2 decls }
 local5 => final class $anon extends M with N { self: $anon => +1 decls }
 local7 => method k => Int
 local8 => final class $anon extends M with N { self: $anon => +2 decls }
-local10 => typeparam T 
+local10 => typeparam T
 local11 => type L [typeparam T ] = List[T]
 types/B# => class B extends Object { self: B => +1 decls }
 types/B#`<init>`(). => primary ctor <init> (): B
@@ -5159,7 +5176,7 @@ types/Test.C#ClassInfoType2# => class ClassInfoType2 extends B { self: ClassInfo
 types/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init> (): ClassInfoType2
 types/Test.C#ClassInfoType2#x(). => method x => Int
 types/Test.C#ClassInfoType3# => trait ClassInfoType3 [typeparam T ] extends Object { self: ClassInfoType3[T] => +2 decls }
-types/Test.C#ClassInfoType3#[T] => typeparam T 
+types/Test.C#ClassInfoType3#[T] => typeparam T
 types/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init> [typeparam T ](): ClassInfoType3[T]
 types/Test.C#Either. => val method Either Either.type
 types/Test.C#MethodType. => final object MethodType extends Object { self: MethodType.type => +7 decls }
@@ -5169,7 +5186,7 @@ types/Test.C#MethodType.m5(). => method m5 (param x: Int): Int
 types/Test.C#MethodType.m5().(x) => param x: Int
 types/Test.C#MethodType.m6(). => method m6 [typeparam T ](param x: T): T
 types/Test.C#MethodType.m6().(x) => param x: T
-types/Test.C#MethodType.m6().[T] => typeparam T 
+types/Test.C#MethodType.m6().[T] => typeparam T
 types/Test.C#MethodType.x1(). => method x1 => Int
 types/Test.C#MethodType.x2(). => method x2 => Int
 types/Test.C#RepeatedType# => case class RepeatedType extends Object with Product with Serializable { self: RepeatedType => +4 decls }
@@ -5186,15 +5203,15 @@ types/Test.C#RepeatedType.toString(). => method toString => String <: scala/Any#
 types/Test.C#RepeatedType.unapplySeq(). => method unapplySeq (param x$1: RepeatedType): RepeatedType
 types/Test.C#RepeatedType.unapplySeq().(x$1) => param x$1: RepeatedType
 types/Test.C#TypeType. => final object TypeType extends Object { self: TypeType.type => +6 decls }
-types/Test.C#TypeType.T1# => type T1 
+types/Test.C#TypeType.T1# => type T1
 types/Test.C#TypeType.T4# => type T4  = C
 types/Test.C#TypeType.T5# => type T5 [typeparam U ] = U
-types/Test.C#TypeType.T5#[U] => typeparam U 
+types/Test.C#TypeType.T5#[U] => typeparam U
 types/Test.C#TypeType.m2(). => method m2 [typeparam T2  = C]: Nothing
 types/Test.C#TypeType.m2().[T2] => typeparam T2  = C
 types/Test.C#TypeType.m3(). => method m3 [typeparam M3 [type _ ]]: Nothing
 types/Test.C#TypeType.m3().[M3] => typeparam M3 [type _ ]
-types/Test.C#TypeType.m3().[M3][_] => type _ 
+types/Test.C#TypeType.m3().[M3][_] => type _
 types/Test.C#`<init>`(). => primary ctor <init> (): C
 types/Test.C#annType1. => val method annType1 T @ann[T]
 types/Test.C#annType2. => val method annType2 T @ann1 @ann2
@@ -5217,7 +5234,7 @@ types/Test.C#thisType1. => val method thisType1 C.this.type
 types/Test.C#thisType2. => val method thisType2 C.this.type
 types/Test.C#typeLambda1(). => method typeLambda1 [typeparam M [type _ ]]: Nothing
 types/Test.C#typeLambda1().[M] => typeparam M [type _ ]
-types/Test.C#typeLambda1().[M][_] => type _ 
+types/Test.C#typeLambda1().[M][_] => type _
 types/Test.C#typeRef1. => val method typeRef1 C
 types/Test.C#typeRef2. => val method typeRef2 p.C
 types/Test.C#typeRef3. => val method typeRef3 T#C
@@ -5242,7 +5259,7 @@ types/Test.N# => trait N extends Object { self: N => +2 decls }
 types/Test.N#`<init>`(). => primary ctor <init> (): N
 types/Test.N#n(). => method n => Int
 types/ann# => class ann [typeparam T ] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
-types/ann#[T] => typeparam T 
+types/ann#[T] => typeparam T
 types/ann#`<init>`(). => primary ctor <init> [typeparam T ](param x: T): ann[T]
 types/ann#`<init>`().(x) => param x: T
 types/ann#x. => private[this] val method x T
diff --git a/tests/untried/neg/warn-unused-privates.scala b/tests/untried/neg/warn-unused-privates.scala
deleted file mode 100644
index 64e7679f37ac..000000000000
--- a/tests/untried/neg/warn-unused-privates.scala
+++ /dev/null
@@ -1,105 +0,0 @@
-class Bippy(a: Int, b: Int) {
-  private def this(c: Int) = this(c, c)           // warn
-  private def bippy(x: Int): Int      = bippy(x)  // TODO: could warn
-  private def boop(x: Int)            = x + a + b     // warn
-  final private val MILLIS1           = 2000      // no warn, might have been inlined
-  final private val MILLIS2: Int      = 1000      // warn
-  final private val HI_COMPANION: Int = 500       // no warn, accessed from companion
-  def hi() = Bippy.HI_INSTANCE
-}
-object Bippy {
-  def hi(x: Bippy) = x.HI_COMPANION
-  private val HI_INSTANCE: Int = 500      // no warn, accessed from instance
-  private val HEY_INSTANCE: Int = 1000    // warn
-}
-
-class A(val msg: String)
-class B1(msg: String) extends A(msg)
-class B2(msg0: String) extends A(msg0)
-class B3(msg0: String) extends A("msg")
-
-/*** Early defs warnings disabled primarily due to SI-6595.
- *   The test case is here to assure we aren't issuing false positives;
- *   the ones labeled "warn" don't warn.
- ***/
-class Boppy extends {
-  private val hmm: String = "abc"       // no warn, used in early defs
-  private val hom: String = "def"       // no warn, used in body
-  private final val him   = "ghi"       // no warn, might have been (was) inlined
-  final val him2          = "ghi"       // no warn, same
-  final val himinline     = him
-  private val hum: String = "jkl"       // warn
-  final val ding = hmm.length
-} with Mutable {
-  val dinger = hom
-  private val hummer = "def" // warn
-
-  private final val bum   = "ghi"       // no warn, might have been (was) inlined
-  final val bum2          = "ghi"       // no warn, same
-}
-
-trait Accessors {
-  private var v1: Int = 0 // warn
-  private var v2: Int = 0 // warn, never set
-  private var v3: Int = 0 // warn, never got
-  private var v4: Int = 0 // no warn
-
-  def bippy(): Int = {
-    v3 = 5
-    v4 = 6
-    v2 + v4
-  }
-}
-
-trait DefaultArgs {
-  // warn about default getters for x2 and x3
-  private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3
-
-  def boppy() = bippy(5, 100, 200)
-}
-
-class Outer {
-  class Inner
-}
-
-trait Locals {
-  def f0 = {
-    var x = 1 // warn
-    var y = 2
-    y = 3
-    y + y
-  }
-  def f1 = {
-    val a = new Outer // no warn
-    val b = new Outer // warn
-    new a.Inner
-  }
-  def f2 = {
-    var x = 100 // warn about it being a var
-    x
-  }
-}
-
-object Types {
-  private object Dongo { def f = this } // warn
-  private class Bar1 // warn
-  private class Bar2 // no warn
-  private type Alias1 = String // warn
-  private type Alias2 = String // no warn
-  def bippo = (new Bar2).toString
-
-  def f(x: Alias2) = x.length
-
-  def l1() = {
-    object HiObject { def f = this } // warn
-    class Hi { // warn
-      def f1: Hi = new Hi
-      def f2(x: Hi) = x
-    }
-    class DingDongDoobie // warn
-    class Bippy // no warn
-    type Something = Bippy // no warn
-    type OtherThing = String // warn
-    (new Bippy): Something
-  }
-}
diff --git a/tests/pos/i15226.scala b/tests/warn/i15226.scala
similarity index 100%
rename from tests/pos/i15226.scala
rename to tests/warn/i15226.scala
diff --git a/tests/warn/i15503a.scala b/tests/warn/i15503a.scala
index df8691c21a13..40b6c75983bf 100644
--- a/tests/warn/i15503a.scala
+++ b/tests/warn/i15503a.scala
@@ -1,5 +1,4 @@
-//> using options  -Wunused:imports
-
+//> using options -Wunused:imports -Wconf:origin=Suppressed.*:s
 
 object FooUnused:
   import collection.mutable.Set // warn
@@ -68,7 +67,7 @@ object InlineChecks:
     inline def getSet = Set(1)
 
   object InlinedBar:
-    import collection.mutable.Set // ok
+    import collection.mutable.Set // warn (don't be fooled by inline expansion)
     import collection.mutable.Map // warn
     val a = InlineFoo.getSet
 
@@ -100,20 +99,28 @@ object SomeGivenImports:
   given String = "foo"
 
 /* BEGIN : Check on packages*/
-package testsamepackageimport:
-  package p {
+package nestedpackageimport:
+  package p:
     class C
-  }
-
-  package p {
-    import p._ // warn
-    package q {
-      class U {
+  package p:
+    package q:
+      import p.* // warn
+      class U:
         def f = new C
-      }
-    }
-  }
-// -----------------------
+package unnestedpackageimport:
+  package p:
+    class C
+  package p.q:
+    import p.* // nowarn
+    class U:
+      def f = new C
+
+package redundancy:
+  object redundant:
+    def f = 42
+  import redundancy.* // warn superseded by def in scope
+  class R:
+    def g = redundant.f
 
 package testpackageimport:
   package a:
@@ -213,7 +220,8 @@ package testImportsInImports:
   package c:
     import a.b // OK
     import b.x // OK
-    val y = x
+    import b.x as z // OK
+    val y = x + z
 
 //-------------------------------------
 package testOnOverloadedMethodsImports:
@@ -265,4 +273,51 @@ package foo.test.typeapply.hklamdba.i16680:
     import foo.IO // OK
 
     def f[F[_]]: String = "hello"
-    def go = f[IO]
\ No newline at end of file
+    def go = f[IO]
+
+object Selections:
+  def f(list: List[Int]): Int =
+    import list.{head => first} // OK
+    first
+
+  def f2(list: List[Int]): Int =
+    import list.head // OK
+    head
+
+  def f3(list: List[Int]): Int =
+    import list.head // warn
+    list.head
+
+  object N:
+    val ns: List[Int] = Nil
+
+  def g(): Int =
+    import N.ns // OK
+    ns.head
+end Selections
+
+object `more nestings`:
+  object Outer:
+    object Inner:
+      val thing = 42
+      def j() =
+        import Inner.thing // warn
+        thing
+      def k() =
+        import Inner.thing // warn
+        Inner.thing
+
+  object Thing:
+    object Inner:
+      val thing = 42
+      import Inner.thing // warn
+      def j() =
+        thing
+      def k() =
+        Inner.thing
+
+object Suppressed:
+  val suppressed = 42
+object Suppressing:
+  import Suppressed.* // no warn, see options
+  def f = 42
diff --git a/tests/warn/i15503b.scala b/tests/warn/i15503b.scala
index 7ab86026ff00..0ea110f833f1 100644
--- a/tests/warn/i15503b.scala
+++ b/tests/warn/i15503b.scala
@@ -117,7 +117,7 @@ package foo.scala2.tests:
 
   object Types {
     def l1() = {
-      object HiObject { def f = this } // OK
+      object HiObject { def f = this } // warn
       class Hi { // warn
         def f1: Hi = new Hi
         def f2(x: Hi) = x
@@ -141,4 +141,4 @@ package test.foo.twisted.i16682:
     }
     isInt
 
-  def f = myPackage("42")
\ No newline at end of file
+  def f = myPackage("42")
diff --git a/tests/warn/i15503c.scala b/tests/warn/i15503c.scala
index a813329da89b..86b972487e17 100644
--- a/tests/warn/i15503c.scala
+++ b/tests/warn/i15503c.scala
@@ -1,4 +1,4 @@
-//> using options  -Wunused:privates -source:3.3
+//> using options -Wunused:privates -source:3.3
 
 trait C
 class A:
@@ -33,17 +33,22 @@ class A:
     var w = 2 // OK
 
 package foo.test.constructors:
-  case class A private (x:Int) // OK
+  case class A private (x: Int) // OK
   class B private (val x: Int) // OK
-  class C private (private val x: Int) // warn
+  object B { def default = B(42) }
+  class C private (private val xy: Int) // warn
+  object C { def default = C(42) }
   class D private (private val x: Int): // OK
     def y = x
+  object D { def default = D(42) }
   class E private (private var x: Int): // warn not set
     def y = x
+  object E { def default = E(42) }
   class F private (private var x: Int): // OK
     def y =
       x = 3
       x
+  object F { def default = F(42) }
 
 package test.foo.i16682:
   object myPackage:
@@ -55,4 +60,13 @@ package test.foo.i16682:
         case _ => println("NaN")
     }
 
-  def f = myPackage.isInt("42")
\ No newline at end of file
+  def f = myPackage.isInt("42")
+
+object LazyVals:
+  import java.util.concurrent.CountDownLatch
+
+  // This trait extends Serializable to fix #16806 that caused a race condition
+  sealed trait LazyValControlState extends Serializable
+
+  final class Waiting extends CountDownLatch(1), LazyValControlState:
+    private def writeReplace(): Any = null
diff --git a/tests/warn/i15503d.scala b/tests/warn/i15503d.scala
index 9a0ba9b2f8dc..494952e2e4b0 100644
--- a/tests/warn/i15503d.scala
+++ b/tests/warn/i15503d.scala
@@ -1,5 +1,6 @@
-//> using options  -Wunused:unsafe-warn-patvars
-// todo : change to :patvars
+//> using options -Wunused:patvars
+
+import scala.reflect.Typeable
 
 sealed trait Calc
 sealed trait Const extends Calc
@@ -8,23 +9,118 @@ case class S(pred: Const) extends Const
 case object Z extends Const
 
 val a = Sum(S(S(Z)),Z) match {
-  case Sum(a,Z) => Z // warn
+  case Sum(x,Z) => Z // warn
   // case Sum(a @ _,Z) => Z // todo : this should pass in the future
-  case Sum(a@S(_),Z) => Z // warn
-  case Sum(a@S(_),Z) => a // warn unreachable
-  case Sum(a@S(b@S(_)), Z) => a // warn
-  case Sum(a@S(b@S(_)), Z) => a // warn
-  case Sum(a@S(b@(S(_))), Z) => Sum(a,b) // warn unreachable
+  case Sum(x@S(_),Z) => Z // warn
+  case Sum(x@S(_),Z) => x // warn unreachable
+  case Sum(x@S(y@S(_)), Z) => x // warn
+  case Sum(x@S(y@S(_)), Z) => x // warn
+  case Sum(x@S(y@(S(_))), Z) => Sum(x,y) // warn unreachable
   case Sum(_,_) => Z // OK
   case _ => Z // warn unreachable
 }
 
-// todo : This should pass in the future
-// val b = for {
-//   case Some(x) <- Option(Option(1))
-// } println(s"$x")
+case class K(i: Int, j: Int)
+
+class C(c0: Option[Int], k0: K):
+  private val Some(c) = c0: @unchecked  // warn valdef from pattern
+  private val K(i, j) = k0              // warn // warn valdefs from pattern (RHS patvars are NoWarn)
+  val K(v, w) = k0                      // nowarn nonprivate
+  private val K(r, s) = k0              // warn // warn valdefs from pattern
+  def f(x: Option[Int]) = x match
+    case Some(y) => true                // warn Bind in pattern
+    case _       => false
+  def g(ns: List[Int]) =
+    for x <- ns do println()            // warn valdef function param from for
+  def g1(ns: List[Int]) =
+    for x <- ns do println(x)           // x => println(x)
+  def h(ns: List[Int]) =
+    for x <- ns; y = x + 1              // warn tupling from for; x is used, y is unused
+    do println()
+  def k(x: Option[K]) =
+    x match
+    case Some(K(i, j)) =>               // nowarn canonical names
+    case _ =>
+
+  val m = Map(
+    "first" -> Map((true, 1), (false, 2), (true, 3)),
+    "second" -> Map((true, 1), (false, 2), (true, 3)),
+  )
+  def guardedUse =
+    m.map: (a, m1) =>
+      for (status, lag) <- m1 if status
+      yield (a, status, lag)
+  def guardedUseOnly =
+    m.map: (a, m1) =>
+      for (status, lag) <- m1 if status
+      yield (a, lag)
+  def guardedUseMissing =
+    m.map: (a, m1) =>
+      for (status, lag) <- m1           // warn
+      yield (a, lag)
+  def flatGuardedUse =
+    for (a, m1) <- m; (status, lag) <- m1 if status
+    yield (a, status, lag)
+  def leading =
+    for _ <- List("42"); i = 1; _ <- List("0", "27")(i)
+    yield ()
+  def optional =
+    for case Some(x) <- List(Option(42))
+    yield x
+  def nonoptional =
+    for case Some(x) <- List(Option(42))  // warn
+    yield 27
+  def optionalName =
+    for case Some(value) <- List(Option(42))
+    yield 27
+
+    /*
+  def tester[A](a: A)(using Typeable[K]) =
+    a match
+    case S(i, j) => i + j
+    case _ => 0
+    */
+
+class Wild:
+  def f(x: Any) =
+    x match
+    case _: Option[?] => true
+    case _ => false
+
+def untuple(t: Tuple) =
+  t match
+  case Tuple() =>
+  case h *: t => // no warn canonical names taken from tuple element types, (Head, Tail) -> (head, tail)
+  //case head *: tail => // no warn canonical names taken from tuple element types, (Head, Tail) -> (head, tail)
+
+// empty case class:
+// def equals(other) = other match { case other => true } // exonerated name
+object i15967:
+  sealed trait A[-Z]
+  final case class B[Y]() extends A[Y]
+
+object `patvar is assignable`:
+  var (i, j) = (42, 27) // no warn nonprivate
+  j += 1
+  println((i, j))
+
+object `privy patvar is assignable`:
+  private var (i, j) = (42, 27) // warn
+  j += 1
+  println((i, j))
+
+object `local patvar is assignable`:
+  def f() =
+    var (i, j) = (42, 27) // warn
+    j += 1
+    println((i, j))
+
+object `mutable patvar in for`:
+  def f(xs: List[Int]) =
+    for x <- xs; y = x + 1 if y > 10 yield
+      var z :: Nil = y :: Nil: @unchecked // warn
+      z + 10
 
-// todo : This should *NOT* pass in the future
-// val c = for {
-//   case Some(x) <- Option(Option(1))
-// } println(s"hello world")
\ No newline at end of file
+class `unset var requires -Wunused`:
+  private var i = 0 // no warn as we didn't ask for it
+  def f = println(i)
diff --git a/tests/warn/i15503e.scala b/tests/warn/i15503e.scala
index 46d73a4945cd..2fafec339ac1 100644
--- a/tests/warn/i15503e.scala
+++ b/tests/warn/i15503e.scala
@@ -1,4 +1,6 @@
-//> using options  -Wunused:explicits
+//> using options -Wunused:explicits
+
+import annotation.*
 
 object Foo {
   /* This goes around the "trivial method" detection */
@@ -31,16 +33,17 @@ package scala3main:
 package foo.test.lambda.param:
   val default_val = 1
   val a = (i: Int) => i // OK
-  val b = (i: Int) => default_val // OK
+  val b = (i: Int) => default_val // warn
   val c = (_: Int) => default_val // OK
 
 package foo.test.trivial:
   /* A twisted test from Scala 2 */
-  class C {
+  class C(val value: Int) {
     def answer: 42 = 42
     object X
     private def g0(x: Int) = ??? // OK
     private def f0(x: Int) = () // OK
+    private def f00(x: Int) = {} // OK
     private def f1(x: Int) = throw new RuntimeException // OK
     private def f2(x: Int) = 42 // OK
     private def f3(x: Int): Option[Int] = None // OK
@@ -50,13 +53,16 @@ package foo.test.trivial:
     private def f7(x: Int) = Y // OK
     private def f8(x: Int): List[C] = Nil // OK
     private def f9(x: Int): List[Int] = List(1,2,3,4) // warn
-    private def foo:Int = 32  // OK
+    private def foo: Int = 32  // OK
     private def f77(x: Int) = foo // warn
+    private def self(x: Int): C = this // no warn
+    private def unwrap(x: Int): Int = value // no warn
   }
   object Y
 
 package foo.test.i16955:
-  class S(var r: String) // OK
+  class S(var rrr: String) // OK
+  class T(rrr: String) // warn
 
 package foo.test.i16865:
   trait Foo:
@@ -64,7 +70,26 @@ package foo.test.i16865:
   trait Bar extends Foo
 
   object Ex extends Bar:
-    def fn(a: Int, b: Int): Int = b + 3 // OK
+    def fn(a: Int, b: Int): Int = b + 3 // warn
 
   object Ex2 extends Bar:
-    override def fn(a: Int, b: Int): Int = b + 3 // OK
\ No newline at end of file
+    override def fn(a: Int, b: Int): Int = b + 3 // warn
+
+final class alpha(externalName: String) extends StaticAnnotation // no warn annotation arg
+
+object Unimplemented:
+  import compiletime.*
+  inline def f(inline x: Int | Double): Unit = error("unimplemented") // no warn param of trivial method
+
+def `trivially wrapped`(x: String): String ?=> String = "hello, world" // no warn param of trivial method
+
+object UnwrapTyped:
+  import compiletime.error
+  inline def requireConst(inline x: Boolean | Byte | Short | Int | Long | Float | Double | Char | String): Unit =
+    error("Compiler bug: `requireConst` was not evaluated by the compiler")
+
+  transparent inline def codeOf(arg: Any): String =
+    error("Compiler bug: `codeOf` was not evaluated by the compiler")
+
+object `default usage`:
+  def f(i: Int)(j: Int = i * 2) = j // warn I guess
diff --git a/tests/warn/i15503f.scala b/tests/warn/i15503f.scala
index ccf0b7e74065..0550f82d9398 100644
--- a/tests/warn/i15503f.scala
+++ b/tests/warn/i15503f.scala
@@ -6,9 +6,49 @@ val default_int = 1
 object Xd {
   private def f1(a: Int) = a // OK
   private def f2(a: Int) = 1 // OK
-  private def f3(a: Int)(using Int) = a // OK
-  private def f4(a: Int)(using Int) = default_int // OK
+  private def f3(a: Int)(using Int) = a // warn
+  private def f4(a: Int)(using Int) = default_int // warn
   private def f6(a: Int)(using Int) = summon[Int] // OK
   private def f7(a: Int)(using Int) = summon[Int] + a // OK
   private def f8(a: Int)(using foo: Int) = a // warn
+  private def f9(a: Int)(using Int) = ??? // OK trivial
+  private def g1(a: Int)(implicit foo: Int) = a // warn
 }
+
+trait T
+object T:
+  def hole(using T) = ()
+
+class C(using T) // warn
+
+class D(using T):
+  def t = T.hole // nowarn
+
+object Example:
+  import scala.quoted.*
+  given OptionFromExpr[T](using Type[T], FromExpr[T]): FromExpr[Option[T]] with
+    def unapply(x: Expr[Option[T]])(using Quotes) = x match
+      case '{ Option[T](${Expr(y)}) } => Some(Option(y))
+      case '{ None } => Some(None)
+      case '{ ${Expr(opt)} : Some[T] } => Some(opt)
+      case _ => None
+
+object ExampleWithoutWith:
+  import scala.quoted.*
+  given [T] => (Type[T], FromExpr[T]) => FromExpr[Option[T]]:
+    def unapply(x: Expr[Option[T]])(using Quotes) = x match
+      case '{ Option[T](${Expr(y)}) } => Some(Option(y))
+      case '{ None } => Some(None)
+      case '{ ${Expr(opt)} : Some[T] } => Some(opt)
+      case _ => None
+
+//absolving names on matches of quote trees requires consulting non-abstract types in QuotesImpl
+object Unmatched:
+  import scala.quoted.*
+  def transform[T](e: Expr[T])(using Quotes): Expr[T] =
+    import quotes.reflect.*
+    def f(tree: Tree) =
+      tree match
+      case Ident(name) =>
+      case _ =>
+    e
diff --git a/tests/warn/i15503g.scala b/tests/warn/i15503g.scala
index fbd9f3c1352c..cfbfcdb04d1e 100644
--- a/tests/warn/i15503g.scala
+++ b/tests/warn/i15503g.scala
@@ -6,8 +6,8 @@ object Foo {
 
   private def f1(a: Int) = a // OK
   private def f2(a: Int) = default_int // warn
-  private def f3(a: Int)(using Int) = a // OK
-  private def f4(a: Int)(using Int) = default_int // warn
+  private def f3(a: Int)(using Int) = a // warn
+  private def f4(a: Int)(using Int) = default_int // warn // warn
   private def f6(a: Int)(using Int) = summon[Int] // warn
   private def f7(a: Int)(using Int) = summon[Int] + a // OK
   /* --- Trivial method check --- */
@@ -20,4 +20,5 @@ package foo.test.i17101:
   extension[A] (x: Test[A]) { // OK
     def value: A = x
     def causesIssue: Unit = println("oh no")
-  }
\ No newline at end of file
+    def isAnIssue(y: A): Boolean = x == x // warn
+  }
diff --git a/tests/warn/i15503h.scala b/tests/warn/i15503h.scala
index 854693981488..a2bf47c843dd 100644
--- a/tests/warn/i15503h.scala
+++ b/tests/warn/i15503h.scala
@@ -1,4 +1,4 @@
-//> using options  -Wunused:linted
+//> using options -Wunused:linted
 
 import collection.mutable.Set // warn
 
@@ -7,7 +7,7 @@ class A {
   val b = 2 // OK
 
   private def c = 2 // warn
-  def d(using x:Int): Int = b // ok
+  def d(using x: Int): Int = b // warn
   def e(x: Int) = 1 // OK
   def f =
     val x = 1 // warn
@@ -15,6 +15,6 @@ class A {
     3
 
   def g(x: Int): Int = x match
-    case x:1 => 0 // OK
+    case x: 1 => 0 // OK
     case _ => 1
-}
\ No newline at end of file
+}
diff --git a/tests/warn/i15503i.scala b/tests/warn/i15503i.scala
index b7981e0e4206..89ff382eb68c 100644
--- a/tests/warn/i15503i.scala
+++ b/tests/warn/i15503i.scala
@@ -1,4 +1,4 @@
-//> using options  -Wunused:all
+//> using options -Wunused:all -Ystop-after:checkUnusedPostInlining
 
 import collection.mutable.{Map => MutMap} // warn
 import collection.mutable.Set // warn
@@ -17,10 +17,12 @@ class A {
   private def c2 = 2 // OK
   def c3 = c2
 
-  def d1(using x:Int): Int = default_int // ok
-  def d2(using x:Int): Int = x // OK
+  def d1(using x: Int): Int = default_int // warn param
+  def d2(using x: Int): Int = x // OK
+  def d3(using Int): Int = summon[Int] // OK
+  def d4(using Int): Int = default_int // warn
 
-  def e1(x: Int) = default_int // ok
+  def e1(x: Int) = default_int // warn param
   def e2(x: Int) = x // OK
   def f =
     val x = 1 // warn
@@ -29,11 +31,15 @@ class A {
     def g = 4 // OK
     y + g
 
-  // todo : uncomment once patvars is fixed
-  // def g(x: Int): Int = x match
-  //   case x:1 => 0 // ?error
-  //   case x:2 => x // ?OK
-  //   case _ => 1 // ?OK
+  def g(x: Int): Int = x match
+    case x: 1 => 0 // no warn same name as selector (for shadowing or unused)
+    case x: 2 => x // OK
+    case _    => 1 // OK
+
+  def h(x: Int): Int = x match
+    case y: 1 => 0 // warn unused despite trivial type and RHS
+    case y: 2 => y // OK
+    case _    => 1 // OK
 }
 
 /* ---- CHECK scala.annotation.unused ---- */
@@ -44,7 +50,7 @@ package foo.test.scala.annotation:
   val default_int = 12
 
   def a1(a: Int) = a // OK
-  def a2(a: Int) = default_int // ok
+  def a2(a: Int) = default_int // warn
 
   def a3(@unused a: Int) = default_int //OK
 
@@ -82,8 +88,8 @@ package foo.test.i16678:
   def run =
     println(foo(number => number.toString, value = 5)) // OK
     println(foo(number => "<number>", value = 5)) // warn
-    println(foo(func = number => "<number>", value = 5)) // warn
     println(foo(func = number => number.toString, value = 5)) // OK
+    println(foo(func = number => "<number>", value = 5)) // warn
     println(foo(func = _.toString, value = 5)) // OK
 
 package foo.test.possibleclasses:
@@ -91,7 +97,7 @@ package foo.test.possibleclasses:
     k: Int, // OK
     private val y: Int // OK /* Kept as it can be taken from pattern */
   )(
-    s: Int,
+    s: Int, // warn
     val t: Int, // OK
     private val z: Int // warn
   )
@@ -130,22 +136,22 @@ package foo.test.possibleclasses:
 package foo.test.possibleclasses.withvar:
   case class AllCaseClass(
     k: Int, // OK
-    private var y: Int // OK /* Kept as it can be taken from pattern */
+    private var y: Int // warn unset
   )(
-    s: Int,
-    var t: Int, // OK
-    private var z: Int // warn
+    s: Int, // warn
+    var ttt: Int, // OK
+    private var zzz: Int // warn
   )
 
   case class AllCaseUsed(
     k: Int, // OK
-    private var y: Int // OK
+    private var y: Int // warn unset
   )(
     s: Int, // OK
-    var t: Int, // OK global scope can be set somewhere else
-    private var z: Int // warn not set
+    var tt: Int, // OK global scope can be set somewhere else
+    private var zz: Int // warn not set
   ) {
-    def a = k + y + s + t + z
+    def a = k + y + s + tt + zz
   }
 
   class AllClass(
@@ -199,14 +205,14 @@ package foo.test.i16877:
 package foo.test.i16926:
   def hello(): Unit =
     for {
-      i <- (0 to 10).toList
+      i <- (0 to 10).toList // warn patvar
       (a, b) = "hello" -> "world" // OK
     } yield println(s"$a $b")
 
 package foo.test.i16925:
   def hello =
     for {
-      i <- 1 to 2 if true
+      i <- 1 to 2 if true // OK
       _ = println(i) // OK
     } yield ()
 
@@ -247,7 +253,7 @@ package foo.test.i16679a:
       import scala.deriving.Mirror
       object CaseClassByStringName:
         inline final def derived[A](using inline A: Mirror.Of[A]): CaseClassByStringName[A] =
-          new CaseClassByStringName[A]: // warn
+          new CaseClassByStringName[A]:
             def name: String = A.toString
 
   object secondPackage:
@@ -263,7 +269,7 @@ package foo.test.i16679b:
     object CaseClassName:
       import scala.deriving.Mirror
       inline final def derived[A](using inline A: Mirror.Of[A]): CaseClassName[A] =
-        new CaseClassName[A]: // warn
+        new CaseClassName[A]:
           def name: String = A.toString
 
   object Foo:
@@ -279,7 +285,7 @@ package foo.test.i17156:
   package a:
     trait Foo[A]
     object Foo:
-      inline def derived[T]: Foo[T] = new Foo{} // warn
+      inline def derived[T]: Foo[T] = new Foo {}
 
   package b:
     import a.Foo
@@ -313,3 +319,52 @@ package foo.test.i17117:
       val test = t1.test
     }
   }
+
+// manual testing of cached look-ups
+package deeply:
+  object Deep:
+    def f(): Unit =
+      def g(): Unit =
+        def h(): Unit =
+          println(Deep)
+          println(Deep)
+          println(Deep)
+        h()
+      g()
+    override def toString = "man, that is deep!"
+/* result cache saves before context traversal and import/member look-up
+CHK object Deep
+recur * 10 = context depth is 10 between reference and definition
+CHK method println
+recur = was 19 at predef where max root is 21
+CHK object Deep
+recur = cached result
+CHK method println
+recur
+CHK object Deep
+recur
+*/
+
+package constructors:
+  class C private (i: Int): // warn param
+    def this() = this(27)
+    private def this(s: String) = this(s.toInt) // warn ctor
+    def c = new C(42)
+    private def f(i: Int) = i // warn overloaded member
+    private def f(s: String) = s
+    def g = f("hello") // use one of overloaded member
+
+  class D private (i: Int):
+    private def this() = this(42) // no warn used by companion
+    def d = i
+  object D:
+    def apply(): D = new D()
+
+package reversed: // reverse-engineered
+  class C:
+    def c: scala.Int = 42 // Int marked used; lint does not look up <empty>.scala
+  class D:
+    def d: Int = 27 // Int is found in root import scala.*
+  class E:
+    import scala.* // no warn because root import (which is cached! by previous lookup) is lower precedence
+    def e: Int = 27
diff --git a/tests/warn/i15503k.scala b/tests/warn/i15503k.scala
new file mode 100644
index 000000000000..8148de44c588
--- /dev/null
+++ b/tests/warn/i15503k.scala
@@ -0,0 +1,43 @@
+
+//> using options -Wunused:imports
+
+import scala.compiletime.ops.int.* // no warn
+
+object TupleOps:
+  /** Type of the element at position N in the tuple X */
+  type Elem[X <: Tuple, N <: Int] = X match {
+    case x *: xs =>
+      N match {
+        case 0 => x
+        case S[n1] => Elem[xs, n1]
+      }
+  }
+
+  /** Literal constant Int size of a tuple */
+  type Size[X <: Tuple] <: Int = X match {
+    case EmptyTuple => 0
+    case x *: xs => S[Size[xs]]
+  }
+
+object Summoner:
+  transparent inline def summoner[T](using x: T): x.type = x
+
+object `Summoner's Tale`:
+  import compiletime.summonFrom // no warn
+  inline def valueOf[T]: T = summonFrom: // implicit match
+    case ev: ValueOf[T] => ev.value
+  import Summoner.* // no warn
+  def f[T](using T): T = summoner[T] // Inlined
+
+class C:
+  private def m: Int = 42 // no warn
+object C:
+  class D:
+    private val c: C = C() // no warn
+    export c.m // no work to do, expanded member is non-private and uses the select expr
+
+object UsefulTypes:
+  trait T
+object TypeUser:
+  import UsefulTypes.*
+  def f(x: => T) = x
diff --git a/tests/warn/i15503kb/power.scala b/tests/warn/i15503kb/power.scala
new file mode 100644
index 000000000000..f7e5ccce6d58
--- /dev/null
+++ b/tests/warn/i15503kb/power.scala
@@ -0,0 +1,14 @@
+
+object Power:
+  import scala.math.pow as power
+  import scala.quoted.*
+  inline def powerMacro(x: Double, inline n: Int): Double = ${ powerCode('x, 'n) }
+  def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
+    n match
+    case Expr(m) => unrolledPowerCode(x, m)
+    case _ => '{ power($x, $n.toDouble) }
+  def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
+    n match
+    case 0 => '{ 1.0 }
+    case 1 => x
+    case _ => '{ $x * ${ unrolledPowerCode(x, n - 1) } }
diff --git a/tests/warn/i15503kb/square.scala b/tests/warn/i15503kb/square.scala
new file mode 100644
index 000000000000..2a5f76e9be83
--- /dev/null
+++ b/tests/warn/i15503kb/square.scala
@@ -0,0 +1,5 @@
+//> using options -Werror -Wunused:all
+
+object PowerUser:
+  import Power.*
+  def square(x: Double): Double = powerMacro(x, 2)
diff --git a/tests/pos/i15967.scala b/tests/warn/i15967.scala
similarity index 100%
rename from tests/pos/i15967.scala
rename to tests/warn/i15967.scala
diff --git a/tests/warn/i16639a.scala b/tests/warn/i16639a.scala
index 9fe4efe57d7b..ca7798297aea 100644
--- a/tests/warn/i16639a.scala
+++ b/tests/warn/i16639a.scala
@@ -1,7 +1,7 @@
 //> using options  -Wunused:all -source:3.3
 
 class Bippy(a: Int, b: Int) {
-  private def this(c: Int) = this(c, c)
+  private def this(c: Int) = this(c, c) // warn
   private def boop(x: Int)            = x+a+b     // warn
     private def bippy(x: Int): Int      = bippy(x)  // warn TODO: could warn
   final private val MILLIS1           = 2000      // warn no warn, /Dotty:Warn
@@ -24,13 +24,13 @@ class B3(msg0: String) extends A("msg") // warn /Dotty: unused explicit paramete
 trait Bing
 
 trait Accessors {
-  private var v1: Int = 0 // warn warn
-  private var v2: Int = 0 // warn warn, never set
-  private var v3: Int = 0
+  private var v1: Int = 0 // warn
+  private var v2: Int = 0 // warn, never set
+  private var v3: Int = 0 // warn, never got
   private var v4: Int = 0 // no warn
 
-  private[this] var v5 = 0 // warn warn, never set
-  private[this] var v6 = 0
+  private[this] var v5 = 0 // warn, never set
+  private[this] var v6 = 0 // warn, never got
   private[this] var v7 = 0 // no warn
 
   def bippy(): Int = {
@@ -43,13 +43,13 @@ trait Accessors {
 }
 
 class StableAccessors {
-  private var s1: Int = 0 // warn warn
-  private var s2: Int = 0 // warn warn, never set
-  private var s3: Int = 0
+  private var s1: Int = 0 // warn
+  private var s2: Int = 0 // warn, never set
+  private var s3: Int = 0 // warn, never got
   private var s4: Int = 0 // no warn
 
-  private[this] var s5 = 0 // warn warn, never set
-  private[this] var s6 = 0 // no warn, limitation /Dotty: Why limitation ?
+  private[this] var s5 = 0 // warn, never set
+  private[this] var s6 = 0 // warn, never got
   private[this] var s7 = 0 // no warn
 
   def bippy(): Int = {
@@ -62,7 +62,7 @@ class StableAccessors {
 }
 
 trait DefaultArgs {
-  private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3 // no more warn warn since #17061
+  private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3 // warn // warn
 
   def boppy() = bippy(5, 100, 200)
 }
@@ -91,7 +91,7 @@ trait Locals {
 }
 
 object Types {
-  private object Dongo { def f = this } // no more warn since #17061
+  private object Dongo { def f = this } // warn
   private class Bar1 // warn warn
   private class Bar2 // no warn
   private type Alias1 = String // warn warn
@@ -101,7 +101,7 @@ object Types {
   def f(x: Alias2) = x.length
 
   def l1() = {
-    object HiObject { def f = this } // no more warn since #17061
+    object HiObject { def f = this } // warn
     class Hi { // warn warn
       def f1: Hi = new Hi
       def f2(x: Hi) = x
@@ -124,9 +124,9 @@ trait Underwarn {
 }
 
 class OtherNames {
-  private def x_=(i: Int): Unit = () // no more warn since #17061
-  private def x: Int = 42 // warn Dotty triggers unused private member : To investigate
-  private def y_=(i: Int): Unit = () // // no more warn since #17061
+  private def x_=(i: Int): Unit = () // warn
+  private def x: Int = 42 // warn
+  private def y_=(i: Int): Unit = () // warn
   private def y: Int = 42
 
   def f = y
@@ -145,7 +145,7 @@ trait Forever {
     val t = Option((17, 42))
     for {
       ns <- t
-      (i, j) = ns                        // no warn
+      (i, j) = ns                        // warn // warn -Wunused:patvars is in -Wunused:all
     } yield 42                           // val emitted only if needed, hence nothing unused
   }
 }
@@ -158,14 +158,14 @@ trait CaseyKasem {
   def f = 42 match {
     case x if x < 25 => "no warn"
     case y if toString.nonEmpty => "no warn" + y
-    case z => "warn"
+    case z => "warn" // warn patvar
   }
 }
 trait CaseyAtTheBat {
   def f = Option(42) match {
     case Some(x) if x < 25 => "no warn"
-    case Some(y @ _) if toString.nonEmpty => "no warn"
-    case Some(z) => "warn"
+    case Some(y @ _) if toString.nonEmpty => "no warn" // warn todo whether to use name @ _ to suppress
+    case Some(z) => "warn" // warn patvar
     case None => "no warn"
   }
 }
@@ -173,7 +173,7 @@ trait CaseyAtTheBat {
 class `not even using companion privates`
 
 object `not even using companion privates` {
-  private implicit class `for your eyes only`(i: Int) {  // no more warn since #17061
+  private implicit class `for your eyes only`(i: Int) {  // warn
     def f = i
   }
 }
@@ -202,4 +202,4 @@ trait `short comings` {
     val x = 42 // warn /Dotty only triggers in dotty
     17
   }
-}
\ No newline at end of file
+}
diff --git a/tests/pos/i17230.min1.scala b/tests/warn/i17230.min1.scala
similarity index 100%
rename from tests/pos/i17230.min1.scala
rename to tests/warn/i17230.min1.scala
diff --git a/tests/pos/i17230.orig.scala b/tests/warn/i17230.orig.scala
similarity index 100%
rename from tests/pos/i17230.orig.scala
rename to tests/warn/i17230.orig.scala
diff --git a/tests/pos/i17314.scala b/tests/warn/i17314.scala
similarity index 84%
rename from tests/pos/i17314.scala
rename to tests/warn/i17314.scala
index 8ece4a3bd7ac..cff90d843c38 100644
--- a/tests/pos/i17314.scala
+++ b/tests/warn/i17314.scala
@@ -1,4 +1,4 @@
-//> using options -Xfatal-warnings -Wunused:all -deprecation -feature
+//> using options -Wunused:all -deprecation -feature
 
 import java.net.URI
 
@@ -10,9 +10,7 @@ object circelike {
   type Configuration
   trait ConfiguredCodec[T]
   object ConfiguredCodec:
-    inline final def derived[A](using conf: Configuration)(using
-      inline mirror: Mirror.Of[A]
-    ): ConfiguredCodec[A] =
+    inline final def derived[A](using conf: Configuration)(using inline mirror: Mirror.Of[A]): ConfiguredCodec[A] = // warn // warn
       class InlinedConfiguredCodec extends ConfiguredCodec[A]:
         val codec = summonInline[Codec[URI]] // simplification
       new InlinedConfiguredCodec
diff --git a/tests/pos/i17314a.scala b/tests/warn/i17314a.scala
similarity index 70%
rename from tests/pos/i17314a.scala
rename to tests/warn/i17314a.scala
index 4bce56d8bbed..14ae96848d63 100644
--- a/tests/pos/i17314a.scala
+++ b/tests/warn/i17314a.scala
@@ -1,4 +1,4 @@
-//> using options -Xfatal-warnings -Wunused:all -deprecation -feature
+//> using options -Werror -Wunused:all -deprecation -feature
 
 package foo:
   class Foo[T]
diff --git a/tests/warn/i17314b.scala b/tests/warn/i17314b.scala
index e1500028ca93..ad4c8f1e4a31 100644
--- a/tests/warn/i17314b.scala
+++ b/tests/warn/i17314b.scala
@@ -1,4 +1,4 @@
-//> using options  -Wunused:all
+//> using options -Wunused:all
 
 package foo:
   class Foo[T]
diff --git a/tests/warn/i17318.scala b/tests/warn/i17318.scala
new file mode 100644
index 000000000000..d242c96484a7
--- /dev/null
+++ b/tests/warn/i17318.scala
@@ -0,0 +1,33 @@
+
+//> using options -Werror -Wunused:all
+
+object events {
+  final val PollOut = 0x002
+  transparent inline def POLLIN = 0x001
+}
+
+def withShort(v: Short): Unit = ???
+def withInt(v: Int): Unit = ???
+
+def usage() =
+  import events.POLLIN // reports unused
+  def v: Short = POLLIN
+  println(v)
+
+def usage2() =
+  import events.POLLIN // reports unused
+  withShort(POLLIN)
+
+def usage3() =
+  import events.POLLIN // does not report unused
+  withInt(POLLIN)
+
+def usage4() =
+  import events.POLLIN // reports unused
+  withShort(POLLIN)
+
+def value = 42
+def withDouble(v: Double): Unit = ???
+def usage5() = withDouble(value)
+def usage6() = withShort(events.POLLIN)
+def usage7() = withShort(events.PollOut)
diff --git a/tests/warn/i17371.scala b/tests/warn/i17371.scala
new file mode 100644
index 000000000000..f9be76bfed07
--- /dev/null
+++ b/tests/warn/i17371.scala
@@ -0,0 +1,39 @@
+//> using options -Wunused:all
+
+class A
+class B
+
+def Test() =
+  val ordA: Ordering[A] = ???
+  val ordB: Ordering[B] = ???
+  val a: A = ???
+  val b: B = ???
+
+  import ordA.given
+  val _ = a > a
+
+  import ordB.given
+  val _ = b < b
+
+// unminimized OP
+trait Circular[T] extends Ordering[T]
+trait Turns[C: Circular, T] extends Ordering[T]: // warn Circular is not a marker interface
+  extension (turns: T) def extract: C
+
+def f[K, T](start: T, end: T)(using circular: Circular[K], turns: Turns[K, T]): Boolean =
+  import turns.given
+  if start > end then throw new IllegalArgumentException("start must be <= end")
+
+  import circular.given
+  start.extract < end.extract
+
+// -Wunused:implicits warns for unused implicit evidence unless it is an empty interface (only universal members).
+// scala 2 also offers -Wunused:synthetics for whether to warn for synthetic implicit params.
+object ContextBounds:
+  class C[A: Ordered](a: A): // warn
+    def f = a
+
+  trait T[A]
+
+  class D[A: T](a: A): // no warn
+    def f = a
diff --git a/tests/warn/i17667.scala b/tests/warn/i17667.scala
new file mode 100644
index 000000000000..cc3f6bfc8472
--- /dev/null
+++ b/tests/warn/i17667.scala
@@ -0,0 +1,10 @@
+
+//> using options -Wunused:imports
+
+object MyImplicits:
+  extension (a: Int) def print: Unit = println(s"Hello, I am $a")
+
+import MyImplicits.print //Global import of extension
+object Foo:
+  def printInt(a: Int): Unit = a.print
+  import MyImplicits.* // warn //Local import of extension
diff --git a/tests/warn/i17667b.scala b/tests/warn/i17667b.scala
new file mode 100644
index 000000000000..ba8fc7219945
--- /dev/null
+++ b/tests/warn/i17667b.scala
@@ -0,0 +1,22 @@
+
+//> using options -Wunused:all
+
+import scala.util.Try
+import scala.concurrent.* // warn
+import scala.collection.Set
+class C {
+  def ss[A](using Set[A]) = println() // warn
+  private def f = Try(42).get
+  private def z: Int =  // warn
+    Try(27 + z).get
+  def g = f + f
+  def k =
+    val i = g + g
+    val j = i + 2 // warn
+    i + 1
+  def c = C()
+  import scala.util.Try // warn
+}
+class D {
+  def d = C().g
+}
diff --git a/tests/warn/i17753.scala b/tests/warn/i17753.scala
new file mode 100644
index 000000000000..66e4fdb8727b
--- /dev/null
+++ b/tests/warn/i17753.scala
@@ -0,0 +1,10 @@
+//> using options -Wunused:all
+
+class PartiallyApplied[A] {
+  transparent inline def func[B](): Nothing = ???
+}
+
+def call[A] = new PartiallyApplied[A]
+
+def good = call[Int].func[String]() // no warn inline proxy
+def bad = { call[Int].func[String]() } // no warn inline proxy
diff --git a/tests/warn/i18313.scala b/tests/warn/i18313.scala
new file mode 100644
index 000000000000..44b005b313e4
--- /dev/null
+++ b/tests/warn/i18313.scala
@@ -0,0 +1,14 @@
+//> using options -Werror -Wunused:imports
+
+import scala.deriving.Mirror
+
+case class Test(i: Int, d: Double)
+case class Decoder(d: Product => Test)
+
+// OK, no warning returned
+//val ok = Decoder(summon[Mirror.Of[Test]].fromProduct)
+//
+// returns warning:
+// [warn] unused import
+// [warn] import scala.deriving.Mirror
+val d = Decoder(d = summon[Mirror.Of[Test]].fromProduct) // no warn
diff --git a/tests/warn/i18366.scala b/tests/warn/i18366.scala
new file mode 100644
index 000000000000..b6385b5bbb59
--- /dev/null
+++ b/tests/warn/i18366.scala
@@ -0,0 +1,19 @@
+//> using options -Werror -Wunused:all
+
+trait Builder {
+  def foo(): Unit
+}
+
+def `i18366` =
+  val builder: Builder = ???
+  import builder.{foo => bar}
+  bar()
+
+import java.io.DataOutputStream
+
+val buffer: DataOutputStream = ???
+
+import buffer.{write => put}
+
+def `i17315` =
+  put(0: Byte)
diff --git a/tests/warn/i18564.scala b/tests/warn/i18564.scala
new file mode 100644
index 000000000000..3da41265015c
--- /dev/null
+++ b/tests/warn/i18564.scala
@@ -0,0 +1,39 @@
+
+//> using option -Wunused:imports
+
+import scala.compiletime.*
+import scala.deriving.*
+
+trait Foo
+
+trait HasFoo[A]:
+  /** true if A contains a Foo */
+  val hasFoo: Boolean
+
+// given instances that need to be imported to be in scope
+object HasFooInstances:
+  given defaultHasFoo[A]: HasFoo[A] with
+    val hasFoo: Boolean = false
+  given HasFoo[Foo] with
+    val hasFoo: Boolean = true
+
+object HasFooDeriving:
+
+  inline private def tupleHasFoo[T <: Tuple]: Boolean =
+    inline erasedValue[T] match
+    case _: EmptyTuple => false
+    case _: (t *: ts)  => summonInline[HasFoo[t]].hasFoo || tupleHasFoo[ts]
+
+  inline def deriveHasFoo[T](using p: Mirror.ProductOf[T]): HasFoo[T] =
+    // falsely reported as unused even though it has influence on this code
+    import HasFooInstances.given // no warn at inline method
+    val pHasFoo = tupleHasFoo[p.MirroredElemTypes]
+    new HasFoo[T]: // warn New anonymous class definition will be duplicated at each inline site
+      val hasFoo: Boolean = pHasFoo
+
+/* the import is used upon inline elaboration
+object Test:
+  import HasFooDeriving.*
+  case class C(x: Foo, y: Int)
+  def f: HasFoo[C] = deriveHasFoo[C]
+*/
diff --git a/tests/warn/i19252.scala b/tests/warn/i19252.scala
new file mode 100644
index 000000000000..42ca99208299
--- /dev/null
+++ b/tests/warn/i19252.scala
@@ -0,0 +1,13 @@
+//> using options -Werror -Wunused:all
+object Deps:
+  trait D1
+  object D2
+end Deps
+
+object Bug:
+  import Deps.D1 // no warn
+
+  class Cl(d1: D1):
+    import Deps.*
+    def f = (d1, D2)
+end Bug
diff --git a/tests/warn/i19657-mega.scala b/tests/warn/i19657-mega.scala
new file mode 100644
index 000000000000..07411ee73fb1
--- /dev/null
+++ b/tests/warn/i19657-mega.scala
@@ -0,0 +1,4 @@
+//> using options -Wshadow:type-parameter-shadow -Wunused:all
+
+class F[X, M[N[X]]]: // warn
+  private def x[X] = toString // warn // warn
diff --git a/tests/warn/i19657.scala b/tests/warn/i19657.scala
new file mode 100644
index 000000000000..2caa1c832abe
--- /dev/null
+++ b/tests/warn/i19657.scala
@@ -0,0 +1,117 @@
+//> using options -Wunused:imports -Ystop-after:checkUnusedPostInlining
+
+trait Schema[A]
+
+case class Foo()
+case class Bar()
+
+trait SchemaGenerator[A] {
+  given Schema[A] = new Schema[A]{}
+}
+
+object FooCodec extends SchemaGenerator[Foo]
+object BarCodec extends SchemaGenerator[Bar]
+
+def summonSchemas(using Schema[Foo], Schema[Bar]) = ()
+
+def summonSchema(using Schema[Foo]) = ()
+
+def `i19657 check prefix to pick selector`: Unit =
+  import FooCodec.given
+  import BarCodec.given
+  summonSchemas
+
+def `i19657 regression test`: Unit =
+  import FooCodec.given
+  import BarCodec.given // warn
+  summonSchema
+
+def `i19657 check prefix to pick specific selector`: Unit =
+  import FooCodec.given_Schema_A
+  import BarCodec.given_Schema_A
+  summonSchemas
+
+def `same symbol different names`: Unit =
+  import FooCodec.given_Schema_A
+  import FooCodec.given_Schema_A as AThing
+  summonSchema(using given_Schema_A)
+  summonSchema(using AThing)
+
+package i17156:
+  package a:
+    trait Foo[A]
+    object Foo:
+      class Food[A] extends Foo[A]
+      inline def derived[T]: Foo[T] = Food()
+
+  package b:
+    import a.Foo
+    type Xd[A] = Foo[A]
+
+  package c:
+    import b.Xd
+    trait Z derives Xd // checks if dealiased import is prefix a.Foo
+    class Bar extends Xd[Int] // checks if import qual b is prefix of b.Xd
+
+object Coll:
+  class C:
+    type HM[K, V] = scala.collection.mutable.HashMap[K, V]
+object CC extends Coll.C
+import CC.*
+
+def `param type is imported`(map: HM[String, String]): Unit = println(map("hello, world"))
+
+object Constants:
+  final val i = 42
+  def extra = 3
+def `old-style constants are usages`: Unit =
+  object Local:
+    final val j = 27
+  import Constants.i
+  println(i + Local.j)
+
+object Constantinople:
+  val k = 42
+class `scope of super`:
+  import Constants.i // was bad warn
+  class C(x: Int):
+    def y = x
+  class D(j: Int) extends C(i + j):
+    import Constants.* // does not resolve i in C(i) and does not shadow named import
+    def m = i // actually picks the higher-precedence import
+    def f =
+      import Constantinople.*
+      class E(e: Int) extends C(i + k):
+        def g = e + y + k + 1
+      E(0).g
+    def consume = extra // use the wildcard import from Constants
+
+import scala.annotation.meta.*
+object Alias {
+  type A = Deprecated @param
+}
+
+// avoid reporting on runtime (nothing to do with transparent inline)
+import scala.runtime.EnumValue
+
+trait Lime
+
+enum Color(val rgb: Int):
+  case Red   extends Color(0xFF0000) with EnumValue
+  case Green extends Color(0x00FF00) with Lime
+  case Blue  extends Color(0x0000FF)
+
+object prefixes:
+  class C:
+    object N:
+      type U
+  object Test:
+    val c: C = ???
+    def k2: c.N.U = ???
+    import c.N.*
+    def k3: U = ??? // TypeTree if not a select
+  object Alt:
+    val c: C = ???
+    import c.N
+    def k4: N.U = ???
+end prefixes
diff --git a/tests/warn/i20520.scala b/tests/warn/i20520.scala
new file mode 100644
index 000000000000..e09d16c27af2
--- /dev/null
+++ b/tests/warn/i20520.scala
@@ -0,0 +1,11 @@
+
+//> using options -Wunused:all
+
+@main def run =
+  val veryUnusedVariable: Int = value // warn local
+
+package i20520:
+  private def veryUnusedMethod(x: Int): Unit = println() // warn param
+  private val veryUnusedVariableToplevel: Unit = println() // package members are accessible under separate compilation
+
+def value = 42
diff --git a/tests/pos/i20860.scala b/tests/warn/i20860.scala
similarity index 74%
rename from tests/pos/i20860.scala
rename to tests/warn/i20860.scala
index 1e1ddea11b75..b318d861fce0 100644
--- a/tests/pos/i20860.scala
+++ b/tests/warn/i20860.scala
@@ -1,3 +1,5 @@
+//> using options -Werror -Wunused:imports
+
 def `i20860 use result to check selector bound`: Unit =
   import Ordering.Implicits.given Ordering[?]
   summon[Ordering[Seq[Int]]]
diff --git a/tests/warn/i20951.scala b/tests/warn/i20951.scala
new file mode 100644
index 000000000000..0ca82e1b8d66
--- /dev/null
+++ b/tests/warn/i20951.scala
@@ -0,0 +1,7 @@
+//> using options -Wunused:all
+object Foo {
+  val dummy = 42
+  def f(): Unit = Option(1).map((x: Int) => dummy) // warn
+  def g(): Unit = Option(1).map((x: Int) => ???) // warn
+  def main(args: Array[String]): Unit = {}
+}
diff --git a/tests/warn/i21420.scala b/tests/warn/i21420.scala
index 0ee4aa3f28f6..65a288c7ae5b 100644
--- a/tests/warn/i21420.scala
+++ b/tests/warn/i21420.scala
@@ -1,4 +1,4 @@
-//> using options -Wunused:imports
+//> using options -Werror -Wunused:imports
 
 object decisions4s{
   trait HKD
@@ -7,7 +7,7 @@ object decisions4s{
 
 object DiagnosticsExample {
   import decisions4s.HKD
-  val _ = new HKD {}
+  case class Input[F[_]]() extends HKD
   import decisions4s.*
-  val _ = new DecisionTable {}
+  val decisionTable: DecisionTable = ???
 }
diff --git a/tests/warn/i21525.scala b/tests/warn/i21525.scala
new file mode 100644
index 000000000000..aa156dc3960e
--- /dev/null
+++ b/tests/warn/i21525.scala
@@ -0,0 +1,20 @@
+//> using options -Werror -Wunused:imports
+
+import scala.reflect.TypeTest
+
+trait A {
+  type B
+  type C <: B
+
+  given instance: TypeTest[B, C]
+}
+
+def f(a: A, b: a.B): Boolean = {
+  import a.C
+  b match {
+    case _: C =>
+      true
+    case _ =>
+      false
+  }
+}
diff --git a/tests/warn/i21809.scala b/tests/warn/i21809.scala
new file mode 100644
index 000000000000..91e7a334b13b
--- /dev/null
+++ b/tests/warn/i21809.scala
@@ -0,0 +1,17 @@
+//> using options -Wunused:imports
+
+package p {
+  package q {
+    import q.* // warn so long as we pass typer
+    class Test {
+      //override def toString = new C().toString + " for Test"
+      def d = D()
+    }
+    class D
+  }
+}
+package q {
+  class C {
+    override def toString = "q.C"
+  }
+}
diff --git a/tests/warn/i21917.scala b/tests/warn/i21917.scala
new file mode 100644
index 000000000000..cade4e90db3d
--- /dev/null
+++ b/tests/warn/i21917.scala
@@ -0,0 +1,27 @@
+//> using options -Wunused:imports
+
+import Pet.Owner
+
+class Dog(owner: Owner) extends Pet(owner) {
+  import Pet.* // warn although unambiguous (i.e., it was disambiguated)
+  //import Car.* // ambiguous
+
+  def bark(): String = "bite"
+
+  def this(owner: Owner, goodDog: Boolean) = {
+    this(owner)
+    if (goodDog) println(s"$owner's dog is a good boy")
+  }
+
+  val getOwner: Owner = owner
+}
+
+class Pet(val owner: Owner)
+
+object Pet {
+  class Owner
+}
+
+object Car {
+  class Owner
+}
diff --git a/tests/warn/i22371.scala b/tests/warn/i22371.scala
new file mode 100644
index 000000000000..00f5b66695e0
--- /dev/null
+++ b/tests/warn/i22371.scala
@@ -0,0 +1,8 @@
+//> using options -Werror -Wunused:all
+import scala.compiletime.deferred
+
+class Context
+
+trait Foo:
+  given context: Context = deferred
+  given () => Context = deferred
diff --git a/tests/warn/i3323.scala b/tests/warn/i3323.scala
new file mode 100644
index 000000000000..e409134ff0ba
--- /dev/null
+++ b/tests/warn/i3323.scala
@@ -0,0 +1,8 @@
+//> using options -Werror
+class Foo {
+  def foo[A](lss: List[List[A]]): Unit = {
+    lss match {
+      case xss: List[List[A]] => // no warn erasure
+    }
+  }
+}
diff --git a/tests/pos/patmat-exhaustive.scala b/tests/warn/patmat-exhaustive.scala
similarity index 56%
rename from tests/pos/patmat-exhaustive.scala
rename to tests/warn/patmat-exhaustive.scala
index 9e3cb7d8f615..a8f057664829 100644
--- a/tests/pos/patmat-exhaustive.scala
+++ b/tests/warn/patmat-exhaustive.scala
@@ -1,4 +1,4 @@
-//> using options -Xfatal-warnings -deprecation -feature
+//> using options -Werror -deprecation -feature
 
 def foo: Unit =
   object O:
@@ -8,5 +8,5 @@ def foo: Unit =
 
   val x: O.A = ???
   x match
-    case x: B => ???
-    case x: C => ???
+  case _: B => ???
+  case _: C => ???
diff --git a/tests/warn/scala2-t11681.scala b/tests/warn/scala2-t11681.scala
index ae2187181ceb..5d752777f64c 100644
--- a/tests/warn/scala2-t11681.scala
+++ b/tests/warn/scala2-t11681.scala
@@ -23,7 +23,7 @@ trait BadAPI extends InterFace {
     a
   }
   override def call(a: Int,
-                    b: String,               // OK
+                    b: String, // warn now
                     c: Double): Int = {
     println(c)
     a
@@ -33,7 +33,7 @@ trait BadAPI extends InterFace {
 
   override def equals(other: Any): Boolean = true  // OK
 
-  def i(implicit s: String) = answer           // ok
+  def i(implicit s: String) = answer // warn now
 
   /*
   def future(x: Int): Int = {
@@ -59,10 +59,10 @@ class Revaluing(u: Int) { def f = u } // OK
 
 case class CaseyKasem(k: Int)        // OK
 
-case class CaseyAtTheBat(k: Int)(s: String)        // ok
+case class CaseyAtTheBat(k: Int)(s: String)        // warn unused s
 
 trait Ignorance {
-  def f(readResolve: Int) = answer           // ok
+  def f(readResolve: Int) = answer  // warn now
 }
 
 class Reusing(u: Int) extends Unusing(u)   // OK
@@ -78,30 +78,30 @@ trait Unimplementation {
 
 trait DumbStuff {
   def f(implicit dummy: DummyImplicit) = answer // ok
-  def g(dummy: DummyImplicit) = answer // ok
+  def g(dummy: DummyImplicit) = answer // warn now
 }
 trait Proofs {
   def f[A, B](implicit ev: A =:= B) = answer // ok
   def g[A, B](implicit ev: A <:< B) = answer // ok
-  def f2[A, B](ev: A =:= B) = answer // ok
-  def g2[A, B](ev: A <:< B) = answer // ok
+  def f2[A, B](ev: A =:= B) = answer // warn now
+  def g2[A, B](ev: A <:< B) = answer // warn now
 }
 
 trait Anonymous {
-  def f = (i: Int) => answer      // ok
+  def f = (i: Int) => answer      // warn now
 
   def f1 = (_: Int) => answer     // OK
 
   def f2: Int => Int = _ + 1  // OK
 
-  def g = for (i <- List(1)) yield answer    // ok
+  def g = for (i <- List(1)) yield answer    // no warn (that is a patvar)
 }
 trait Context[A]
 trait Implicits {
-  def f[A](implicit ctx: Context[A]) = answer // ok
-  def g[A: Context] = answer // OK
+  def f[A](implicit ctx: Context[A]) = answer // warn implicit param even though only marker
+  def g[A: Context] = answer // no warn bound that is marker only
 }
-class Bound[A: Context] // OK
+class Bound[A: Context] // no warn bound that is marker only
 object Answers {
   def answer: Int = 42
 }
diff --git a/tests/warn/tuple-exhaustivity.scala b/tests/warn/tuple-exhaustivity.scala
new file mode 100644
index 000000000000..9060d112b197
--- /dev/null
+++ b/tests/warn/tuple-exhaustivity.scala
@@ -0,0 +1,6 @@
+//> using options -Werror -deprecation -feature
+
+def test(t: Tuple)  =
+  t match
+    case Tuple() =>
+    case h *: t =>
diff --git a/tests/warn/unused-can-equal.scala b/tests/warn/unused-can-equal.scala
new file mode 100644
index 000000000000..6e38591ccef1
--- /dev/null
+++ b/tests/warn/unused-can-equal.scala
@@ -0,0 +1,16 @@
+
+//> using options -Werror -Wunused:all
+
+import scala.language.strictEquality
+
+class Box[T](x: T) derives CanEqual:
+  def y = x
+
+def f[A, B](a: A, b: B)(using CanEqual[A, B]) = a == b // no warn
+
+def g =
+  import Box.given // no warn
+  "42".length
+
+@main def test() = println:
+  Box(1) == Box(1L)
diff --git a/tests/warn/unused-locals.scala b/tests/warn/unused-locals.scala
new file mode 100644
index 000000000000..10bf160fb717
--- /dev/null
+++ b/tests/warn/unused-locals.scala
@@ -0,0 +1,43 @@
+//> using options -Wunused:locals
+
+class Outer {
+  class Inner
+}
+
+trait Locals {
+  def f0 = {
+    var x = 1 // warn
+    var y = 2 // no warn
+    y = 3
+    y + y
+  }
+  def f1 = {
+    val a = new Outer // no warn
+    val b = new Outer // warn
+    new a.Inner
+  }
+  def f2 = {
+    var x = 100 // warn about it being a var
+    x
+  }
+}
+
+object Types {
+  def l1() = {
+    object HiObject { def f = this } // warn
+    class Hi { // warn
+      def f1: Hi = new Hi
+      def f2(x: Hi) = x
+    }
+    class DingDongDoobie // warn
+    class Bippy // no warn
+    type Something = Bippy // no warn
+    type OtherThing = String // warn
+    (new Bippy): Something
+  }
+}
+
+// breakage: local val x$1 in method skolemize is never used
+case class SymbolKind(accurate: String, sanitized: String, abbreviation: String) {
+  def skolemize: SymbolKind = copy(accurate = s"$accurate skolem", abbreviation = s"$abbreviation#SKO")
+}
diff --git a/tests/warn/unused-params.scala b/tests/warn/unused-params.scala
new file mode 100644
index 000000000000..5ef339c942ac
--- /dev/null
+++ b/tests/warn/unused-params.scala
@@ -0,0 +1,159 @@
+//> using options -Wunused:params
+//
+
+import Answers._
+
+trait InterFace {
+  /** Call something. */
+  def call(a: Int, b: String, c: Double): Int
+}
+
+trait BadAPI extends InterFace {
+  def f(a: Int,
+        b: String,               // warn
+        c: Double): Int = {
+    println(c)
+    a
+  }
+  @deprecated("no warn in deprecated API", since="yesterday")
+  def g(a: Int,
+        b: String,               // no warn
+        c: Double): Int = {
+    println(c)
+    a
+  }
+  override def call(a: Int,
+                    b: String, // warn
+                    c: Double): Int = {
+    println(c)
+    a
+  }
+
+  def meth(x: Int) = x
+
+  override def equals(other: Any): Boolean = true  // no warn
+
+  def i(implicit s: String) = answer           // warn
+
+  /*
+  def future(x: Int): Int = {
+    val y = 42
+    val x = y               // maybe option to warn only if shadowed
+    x
+  }
+  */
+}
+
+// mustn't alter warnings in super
+trait PoorClient extends BadAPI {
+  override def meth(x: Int) = ???       // no warn
+  override def f(a: Int, b: String, c: Double): Int = a + b.toInt + c.toInt
+}
+
+class Unusing(u: Int) {       // warn
+  def f = ???
+}
+
+class Valuing(val u: Int)        // no warn
+
+class Revaluing(u: Int) { def f = u } // no warn
+
+case class CaseyKasem(k: Int)        // no warn
+
+case class CaseyAtTheBat(k: Int)(s: String)  // warn
+
+trait Ignorance {
+  def f(readResolve: Int) = answer           // warn
+}
+
+class Reusing(u: Int) extends Unusing(u)   // no warn
+
+class Main {
+  def main(args: Array[String]): Unit = println("hello, args")  // no warn
+}
+
+trait Unimplementation {
+  def f(u: Int): Int = ???        // no warn for param in unimplementation
+}
+
+trait DumbStuff {
+  def f(implicit dummy: DummyImplicit) = answer
+  def g(dummy: DummyImplicit) = answer // warn
+}
+trait Proofs {
+  def f[A, B](implicit ev: A =:= B) = answer
+  def g[A, B](implicit ev: A <:< B) = answer
+  def f2[A, B](ev: A =:= B) = answer // warn
+  def g2[A, B](ev: A <:< B) = answer // warn
+}
+
+trait Anonymous {
+  def f = (i: Int) => answer      // warn
+
+  def f1 = (_: Int) => answer     // no warn underscore parameter (a fresh name)
+
+  def f2: Int => Int = _ + 1  // no warn placeholder syntax (a fresh name and synthetic parameter)
+
+  def g = for (i <- List(1)) yield answer    // no warn patvar elaborated as map.(i => 42)
+}
+trait Context[A] { def m(a: A): A = a }
+trait Implicits {
+  def f[A](implicit ctx: Context[A]) = answer // warn
+  def g[A: Context] = answer // warn
+  def h[A](using Context[A]) = answer // warn
+}
+class Bound[A: Context] // warn
+object Answers {
+  def answer: Int = 42
+}
+
+trait BadMix { self: InterFace =>
+  def f(a: Int,
+        b: String,               // warn
+        c: Double): Int = {
+    println(c)
+    a
+  }
+  @deprecated("no warn in deprecated API", since="yesterday")
+  def g(a: Int,
+        b: String,               // no warn
+        c: Double): Int = {
+    println(c)
+    a
+  }
+  override def call(a: Int,
+                    XXXX: String,               // warn no longer excused because required by superclass
+                    c: Double): Int = {
+    println(c)
+    a
+  }
+
+  def meth(x: Int) = x
+
+  override def equals(other: Any): Boolean = true  // no warn
+
+  def i(implicit s: String) = answer           // warn
+}
+
+class Unequal {
+  override def equals(other: Any) = toString.nonEmpty   // warn
+}
+
+class Seriously {
+  def f(s: Serializable) = toString.nonEmpty  // warn explicit param of marker trait
+}
+
+class TryStart(start: String) {
+  def FINALLY(end: END.type) = start // no warn for DSL taking a singleton
+}
+
+object END
+
+object Optional:
+  extension (opt: Option.type) // no warn for extension of module
+    @annotation.experimental
+    inline def fromNullable[T](t: T | Null): Option[T] = Option(t).asInstanceOf[Option[T]]
+
+class Nested {
+  @annotation.unused private def actuallyNotUsed(fresh: Int, stale: Int) = fresh // no warn if owner is unused
+}
diff --git a/tests/warn/unused-privates.scala b/tests/warn/unused-privates.scala
new file mode 100644
index 000000000000..8864bc16de2b
--- /dev/null
+++ b/tests/warn/unused-privates.scala
@@ -0,0 +1,310 @@
+//
+//> using options -deprecation -Wunused:privates,locals
+//
+class Bippy(a: Int, b: Int) {
+  private def this(c: Int) = this(c, c)           // warn (DO warn, was NO)
+  private def bippy(x: Int): Int      = bippy(x)  // warn
+  private def boop(x: Int)            = x+a+b     // warn
+  final private val MILLIS1           = 2000      // warn, scala2: no warn, might have been inlined
+  final private val MILLIS2: Int      = 1000      // warn
+  final private val HI_COMPANION: Int = 500       // no warn, accessed from companion
+  def hi() = Bippy.HI_INSTANCE
+}
+object Bippy {
+  def hi(x: Bippy) = x.HI_COMPANION
+  private val HI_INSTANCE: Int = 500      // no warn, accessed from instance
+  private val HEY_INSTANCE: Int = 1000    // warn
+  private lazy val BOOL: Boolean = true   // warn
+}
+
+class A(val msg: String)
+class B1(msg: String) extends A(msg)
+class B2(msg0: String) extends A(msg0)
+class B3(msg0: String) extends A("msg")
+
+trait Accessors {
+  private var v1: Int = 0 // warn
+  private var v2: Int = 0 // warn, never set
+  private var v3: Int = 0 // warn, never got
+  private var v4: Int = 0 // no warn
+
+  private var v5 = 0 // warn, never set
+  private var v6 = 0 // warn, never got
+  private var v7 = 0 // no warn
+
+  def bippy(): Int = {
+    v3 = 3
+    v4 = 4
+    v6 = 6
+    v7 = 7
+    v2 + v4 + v5 + v7
+  }
+}
+
+class StableAccessors {
+  private var s1: Int = 0 // warn
+  private var s2: Int = 0 // warn, never set
+  private var s3: Int = 0 // warn, never got
+  private var s4: Int = 0 // no warn
+
+  private var s5 = 0 // warn, never set
+  private var s6 = 0 // warn, never got
+  private var s7 = 0 // no warn
+
+  def bippy(): Int = {
+    s3 = 3
+    s4 = 4
+    s6 = 6
+    s7 = 7
+    s2 + s4 + s5 + s7
+  }
+}
+
+trait DefaultArgs {
+  // DO warn about default getters for x2 and x3
+  private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3 // warn // warn
+
+  def boppy() = bippy(5, 100, 200)
+}
+
+/* scala/bug#7707 Both usages warn default arg because using PrivateRyan.apply, not new.
+case class PrivateRyan private (ryan: Int = 42) { def f = PrivateRyan() }
+object PrivateRyan { def f = PrivateRyan() }
+*/
+
+class Outer {
+  class Inner
+}
+
+trait Locals {
+  def f0 = {
+    var x = 1 // warn
+    var y = 2
+    y = 3
+    y + y
+  }
+  def f1 = {
+    val a = new Outer // no warn
+    val b = new Outer // warn
+    new a.Inner
+  }
+  def f2 = {
+    var x = 100 // warn about it being a var
+    x
+  }
+}
+
+object Types {
+  private object Dongo { def f = this } // warn
+  private class Bar1 // warn
+  private class Bar2 // no warn
+  private type Alias1 = String // warn
+  private type Alias2 = String // no warn
+  def bippo = (new Bar2).toString
+
+  def f(x: Alias2) = x.length
+
+  def l1() = {
+    object HiObject { def f = this } // warn
+    class Hi { // warn
+      def f1: Hi = new Hi
+      def f2(x: Hi) = x
+    }
+    class DingDongDoobie // warn
+    class Bippy // no warn
+    type Something = Bippy // no warn
+    type OtherThing = String // warn
+    (new Bippy): Something
+  }
+}
+
+trait Underwarn {
+  def f(): Seq[Int]
+
+  def g() = {
+    val Seq(_, _) = f()  // no warn
+    true
+  }
+}
+
+class OtherNames {
+  private def x_=(i: Int): Unit = () // warn
+  private def x: Int = 42 // warn
+  private def y_=(i: Int): Unit = () // warn
+  private def y: Int = 42
+
+  def f = y
+}
+
+case class C(a: Int, b: String, c: Option[String])
+case class D(a: Int)
+
+// patvars which used to warn as vals in older scala 2
+trait Boundings {
+
+  def c = C(42, "hello", Some("world"))
+  def d = D(42)
+
+  def f() = {
+    val C(x, y, Some(z)) = c: @unchecked              // no warn
+    17
+  }
+  def g() = {
+    val C(x @ _, y @ _, Some(z @ _)) = c: @unchecked  // no warn
+    17
+  }
+  def h() = {
+    val C(x @ _, y @ _, z @ Some(_)) = c: @unchecked  // no warn for z?
+    17
+  }
+
+  def v() = {
+    val D(x) = d                          // no warn
+    17
+  }
+  def w() = {
+    val D(x @ _) = d                      // no warn
+    17
+  }
+
+}
+
+trait Forever {
+  def f = {
+    val t = Option((17, 42))
+    for {
+      ns <- t
+      (i, j) = ns                        // no warn
+    } yield (i + j)
+  }
+  def g = {
+    val t = Option((17, 42))
+    for {
+      ns <- t
+      (i, j) = ns                        // no warn
+    } yield 42                           // val emitted only if needed, hence nothing unused
+  }
+}
+
+trait Ignorance {
+  private val readResolve = 42      // warn wrong signatured for special members
+}
+
+trait CaseyKasem {
+  def f = 42 match {
+    case x if x < 25 => "no warn"
+    case y if toString.nonEmpty => "no warn" + y
+    case z => "warn"
+  }
+}
+trait CaseyAtTheBat {
+  def f = Option(42) match {
+    case Some(x) if x < 25 => "no warn"
+    case Some(y @ _) if toString.nonEmpty => "no warn"
+    case Some(z) => "warn"
+    case None => "no warn"
+  }
+}
+
+class `not even using companion privates`
+
+object `not even using companion privates` {
+  private implicit class `for your eyes only`(i: Int) {  // warn
+    def f = i
+  }
+}
+
+class `no warn in patmat anonfun isDefinedAt` {
+  def f(pf: PartialFunction[String, Int]) = pf("42")
+  def g = f {
+    case s => s.length        // no warn (used to warn case s => true in isDefinedAt)
+  }
+}
+
+// this is the ordinary case, as AnyRef is an alias of Object
+class `nonprivate alias is enclosing` {
+  class C
+  type C2 = C
+  private class D extends C2   // warn
+}
+
+object `classof something` {
+  private class intrinsically
+  def f = classOf[intrinsically].toString()
+}
+
+trait `scala 2 short comings` {
+  def f: Int = {
+    val x = 42 // warn
+    17
+  }
+}
+
+class `issue 12600 ignore abstract types` {
+  type Abs
+}
+
+class `t12992 enclosing def is unused` {
+  private val n = 42
+  @annotation.unused def f() = n + 2 // unused code uses n
+}
+
+class `recursive reference is not a usage` {
+  private def f(i: Int): Int = // warn
+    if (i <= 0) i
+    else f(i-1)
+  private class P { // warn
+    def f() = new P()
+  }
+}
+
+class `absolve serial framework` extends Serializable:
+  import java.io.{IOException, ObjectInputStream, ObjectOutputStream, ObjectStreamException}
+  @throws(classOf[IOException])
+  private def writeObject(stream: ObjectOutputStream): Unit = ()
+  @throws(classOf[ObjectStreamException])
+  private def writeReplace(): Object = ???
+  @throws(classOf[ClassNotFoundException])
+  @throws(classOf[IOException])
+  private def readObject(stream: ObjectInputStream): Unit = ()
+  @throws(classOf[ObjectStreamException])
+  private def readObjectNoData(): Unit = ()
+  @throws(classOf[ObjectStreamException])
+  private def readResolve(): Object = ???
+
+class `absolve ONLY serial framework`:
+  import java.io.{IOException, ObjectInputStream, ObjectOutputStream, ObjectStreamException}
+  @throws(classOf[IOException])
+  private def writeObject(stream: ObjectOutputStream): Unit = () // warn
+  @throws(classOf[ObjectStreamException])
+  private def writeReplace(): Object = new Object // warn
+  @throws(classOf[ClassNotFoundException])
+  @throws(classOf[IOException])
+  private def readObject(stream: ObjectInputStream): Unit = () // warn
+  @throws(classOf[ObjectStreamException])
+  private def readObjectNoData(): Unit = () // warn
+  @throws(classOf[ObjectStreamException])
+  private def readResolve(): Object = new Object // warn
+
+@throws(classOf[java.io.ObjectStreamException])
+private def readResolve(): Object = ??? // TODO warn
+private def print() = println() // TODO warn
+private val printed = false // TODO warn
+
+package locked:
+  private[locked] def locker(): Unit = () // TODO warn as we cannot distinguish unqualified private at top level
+  package basement:
+    private[locked] def shackle(): Unit = () // no warn as it is not top level at boundary
+
+object `i19998 refinement`:
+  trait Foo {
+    type X[a]
+  }
+  trait Bar[X[_]] {
+    private final type SelfX[a] = X[a] // was false positive
+    val foo: Foo { type X[a] = SelfX[a] }
+  }
+
+object `patvar is assignable`:
+  private var (i, j) = (42, 27) // no warn patvars under -Wunused:privates
+  println((i, j))

From 0983d9cbb5716ebab345bdb2777133e8eff3d448 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 10 Apr 2025 17:05:19 +0200
Subject: [PATCH 039/505] Respect prefix when checking if selector selects

Use miniphase api instead of traversing.

Share a megaphase with CheckShadowing.

Perform more expensive checks last. Avoid intermediate collections.

Tighten allowance for serialization methods.

Don't ignore params of public methods.

Show misplaced warn comment, unfulfilled expectations.

Warn for unused patvars.
Don't warn about canonical names (case class element names).
Warn unassigned mutable patvars

No transparent inline exclusion. Handle match types.
No warn inline proxy. Detect summon inline.

Unused import diagnostics have an origin.

Original of literal.

Typos in build. Handle aliased boolean settings.

Resolve imports post inlining.

Excuse only empty interfaces as unused bound.

Use result of TypeTest.

[Cherry-picked c65d45d6a9eb665cf81359a0f0d5d1f1bc716398][modified]

From 03327d5dce82c50e3118befb0173778335732b8f Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 15 Jan 2025 17:41:11 -0800
Subject: [PATCH 040/505] Prefer dotc.util.chaining

---
 compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala   | 4 ++--
 compiler/src/dotty/tools/dotc/config/CliCommand.scala         | 2 +-
 compiler/src/dotty/tools/dotc/config/ScalaSettings.scala      | 2 +-
 compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala      | 2 +-
 compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala            | 2 +-
 compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala        | 2 +-
 .../dotty/tools/dotc/transform/localopt/FormatChecker.scala   | 3 +--
 compiler/src/dotty/tools/dotc/util/ReusableInstance.scala     | 2 +-
 compiler/src/dotty/tools/dotc/util/SourceFile.scala           | 2 +-
 compiler/src/dotty/tools/dotc/util/StackTraceOps.scala        | 2 +-
 compiler/src/dotty/tools/repl/ReplCompiler.scala              | 2 +-
 11 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala b/compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala
index 536ab887a740..5dcafbef750f 100644
--- a/compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala
+++ b/compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala
@@ -12,10 +12,10 @@ import java.util.zip.{CRC32, Deflater, ZipEntry, ZipOutputStream}
 
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
+import dotty.tools.dotc.util.chaining.*
 import dotty.tools.io.{AbstractFile, PlainFile, VirtualFile}
 import dotty.tools.io.PlainFile.toPlainFile
 import BTypes.InternalName
-import scala.util.chaining._
 import dotty.tools.io.JarArchive
 
 import scala.language.unsafeNulls
@@ -180,7 +180,7 @@ class ClassfileWriters(frontendAccess: PostProcessorFrontendAccess) {
       // important detail here, even on Windows, Zinc expects the separator within the jar
       // to be the system default, (even if in the actual jar file the entry always uses '/').
       // see https://github.com/sbt/zinc/blob/dcddc1f9cfe542d738582c43f4840e17c053ce81/internal/compiler-bridge/src/main/scala/xsbt/JarUtils.scala#L47
-      val pathInJar = 
+      val pathInJar =
         if File.separatorChar == '/' then relativePath
         else relativePath.replace('/', File.separatorChar)
       PlainFile.toPlainFile(Paths.get(s"${file.absolutePath}!$pathInJar"))
diff --git a/compiler/src/dotty/tools/dotc/config/CliCommand.scala b/compiler/src/dotty/tools/dotc/config/CliCommand.scala
index b76af885765c..5ec51c1b5b0f 100644
--- a/compiler/src/dotty/tools/dotc/config/CliCommand.scala
+++ b/compiler/src/dotty/tools/dotc/config/CliCommand.scala
@@ -7,7 +7,7 @@ import Settings.*
 import core.Contexts.*
 import printing.Highlighting
 
-import scala.util.chaining.given
+import dotty.tools.dotc.util.chaining.*
 import scala.PartialFunction.cond
 
 trait CliCommand:
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index b864446f19d5..8dfe72cf85d4 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -12,7 +12,7 @@ import dotty.tools.io.{AbstractFile, Directory, JDK9Reflectors, PlainDirectory}
 import dotty.tools.backend.jvm.BackendUtils.classfileVersionMap
 import Setting.ChoiceWithHelp
 
-import scala.util.chaining.*
+import dotty.tools.dotc.util.chaining.*
 
 import java.util.zip.Deflater
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala b/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
index 102572b82bbc..20be33716831 100644
--- a/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
@@ -8,9 +8,9 @@ import dotty.tools.dotc.config.Settings.Setting
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.interfaces.Diagnostic.{ERROR, INFO, WARNING}
 import dotty.tools.dotc.util.SourcePosition
+import dotty.tools.dotc.util.chaining.*
 
 import java.util.{Collections, Optional, List => JList}
-import scala.util.chaining.*
 import core.Decorators.toMessage
 
 object Diagnostic:
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
index 73f69dd6f2ad..59697796b76d 100644
--- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
+++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
@@ -24,7 +24,7 @@ import java.io.PrintWriter
 
 import scala.collection.mutable
 import scala.util.hashing.MurmurHash3
-import scala.util.chaining.*
+import dotty.tools.dotc.util.chaining.*
 
 /** This phase sends a representation of the API of classes to sbt via callbacks.
  *
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
index 4293ecd6ca43..2d98535657a2 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
@@ -9,13 +9,13 @@ import core.Annotations.Annotation
 import core.Flags
 import core.Names.Name
 import core.StdNames.tpnme
-import scala.util.chaining.scalaUtilChainingOps
 
 import collection.mutable
 
 import dotty.tools.dotc.{semanticdb => s}
 import Scala3.{FakeSymbol, SemanticSymbol, WildcardTypeSymbol, TypeParamRefSymbol, TermParamRefSymbol, RefinementSymbol}
 import dotty.tools.dotc.core.Names.Designator
+import dotty.tools.dotc.util.chaining.*
 
 class TypeOps:
   import SymbolScopeOps.*
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
index 9e40792895c0..4922024b6c35 100644
--- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
@@ -3,10 +3,8 @@ package transform.localopt
 
 import scala.annotation.tailrec
 import scala.collection.mutable.ListBuffer
-import scala.util.chaining.*
 import scala.util.matching.Regex.Match
 
-
 import PartialFunction.cond
 
 import dotty.tools.dotc.ast.tpd.{Match => _, *}
@@ -15,6 +13,7 @@ import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.core.Phases.typerPhase
 import dotty.tools.dotc.util.Spans.Span
+import dotty.tools.dotc.util.chaining.*
 
 /** Formatter string checker. */
 class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List[Tree])(using Context):
diff --git a/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala b/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala
index ec88b5880745..cca7af0d2fa3 100644
--- a/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala
+++ b/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala
@@ -1,7 +1,7 @@
 package dotty.tools.dotc.util
 
 import scala.collection.mutable.ArrayBuffer
-import scala.util.chaining.*
+import dotty.tools.dotc.util.chaining.*
 
 /** A wrapper for a list of cached instances of a type `T`.
   * The wrapper is recursion-reentrant: several instances are kept, so
diff --git a/compiler/src/dotty/tools/dotc/util/SourceFile.scala b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
index 246255ae3802..939690bb2ee0 100644
--- a/compiler/src/dotty/tools/dotc/util/SourceFile.scala
+++ b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
@@ -13,7 +13,7 @@ import Chars.*
 import scala.annotation.internal.sharable
 import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
-import scala.util.chaining.given
+import dotty.tools.dotc.util.chaining.*
 
 import java.io.File.separator
 import java.net.URI
diff --git a/compiler/src/dotty/tools/dotc/util/StackTraceOps.scala b/compiler/src/dotty/tools/dotc/util/StackTraceOps.scala
index f991005f0c43..bd5c031a65e0 100644
--- a/compiler/src/dotty/tools/dotc/util/StackTraceOps.scala
+++ b/compiler/src/dotty/tools/dotc/util/StackTraceOps.scala
@@ -15,7 +15,7 @@ package dotty.tools.dotc.util
 import scala.language.unsafeNulls
 
 import collection.mutable, mutable.ListBuffer
-import scala.util.chaining.given
+import dotty.tools.dotc.util.chaining.*
 import java.lang.System.lineSeparator
 
 object StackTraceOps:
diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala
index 06c81c499e5d..e34bb229a727 100644
--- a/compiler/src/dotty/tools/repl/ReplCompiler.scala
+++ b/compiler/src/dotty/tools/repl/ReplCompiler.scala
@@ -18,9 +18,9 @@ import dotty.tools.dotc.util.Spans.*
 import dotty.tools.dotc.util.{ParsedComment, Property, SourceFile}
 import dotty.tools.dotc.{CompilationUnit, Compiler, Run}
 import dotty.tools.repl.results.*
+import dotty.tools.dotc.util.chaining.*
 
 import scala.collection.mutable
-import scala.util.chaining.given
 
 /** This subclass of `Compiler` is adapted for use in the REPL.
  *

From 054d7401eaf2a4eb351d4767e3fbef691315ed7e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 10 Apr 2025 17:07:49 +0200
Subject: [PATCH 041/505] Prefer dotc.util.chaining

[Cherry-picked a5d9e25ff2892b19899efa7ad207cd155e87219c][modified]

From cdafa86cc28c7398025434688af10784dc614847 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 27 Jan 2025 08:54:21 -0800
Subject: [PATCH 042/505] Nowarn LazyVals

[Cherry-picked 6c2c5c549cc2c08364bffb034bb27de321b5a16f]
---
 library/src/scala/runtime/LazyVals.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala
index 33ccea4325a5..f3225a4acbd6 100644
--- a/library/src/scala/runtime/LazyVals.scala
+++ b/library/src/scala/runtime/LazyVals.scala
@@ -96,13 +96,13 @@ object LazyVals {
       println(s"CAS($t, $offset, $e, $v, $ord)")
     val mask = ~(LAZY_VAL_MASK << ord * BITS_PER_LAZY_VAL)
     val n = (e & mask) | (v.toLong << (ord * BITS_PER_LAZY_VAL))
-    unsafe.compareAndSwapLong(t, offset, e, n)
+    unsafe.compareAndSwapLong(t, offset, e, n): @nowarn("cat=deprecation")
   }
 
   def objCAS(t: Object, offset: Long, exp: Object, n: Object): Boolean = {
     if (debug)
       println(s"objCAS($t, $exp, $n)")
-    unsafe.compareAndSwapObject(t, offset, exp, n)
+    unsafe.compareAndSwapObject(t, offset, exp, n): @nowarn("cat=deprecation")
   }
 
   def setFlag(t: Object, offset: Long, v: Int, ord: Int): Unit = {
@@ -147,7 +147,7 @@ object LazyVals {
   def get(t: Object, off: Long): Long = {
     if (debug)
       println(s"get($t, $off)")
-    unsafe.getLongVolatile(t, off)
+    unsafe.getLongVolatile(t, off): @nowarn("cat=deprecation")
   }
 
   // kept for backward compatibility

From 245072ff182cc6321bc4bc207c0ab4caf5ef9c83 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 28 Jan 2025 09:23:07 -0800
Subject: [PATCH 043/505] Fix test

---
 compiler/test/dotty/tools/utils.scala | 4 ++--
 tests/warn/i18564.scala               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala
index a8c480088e08..49ea2d4d3873 100644
--- a/compiler/test/dotty/tools/utils.scala
+++ b/compiler/test/dotty/tools/utils.scala
@@ -101,10 +101,10 @@ def toolArgsParse(lines: List[String], filename: Option[String]): List[(String,S
     case toolArg(name, args) => List((name, args))
     case _ => Nil
   } ++
-  lines.flatMap { 
+  lines.flatMap {
     case directiveOptionsArg(args) => List(("scalac", args))
     case directiveJavacOptions(args) => List(("javac", args))
-    case _ => Nil 
+    case _ => Nil
   }
 
 import org.junit.Test
diff --git a/tests/warn/i18564.scala b/tests/warn/i18564.scala
index 3da41265015c..19682b7955f9 100644
--- a/tests/warn/i18564.scala
+++ b/tests/warn/i18564.scala
@@ -1,5 +1,5 @@
 
-//> using option -Wunused:imports
+//> using options -Wunused:imports
 
 import scala.compiletime.*
 import scala.deriving.*

From f2519e4c7f1cd76e1ed77e509ae32e7d4cc5458c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 10 Apr 2025 17:09:19 +0200
Subject: [PATCH 044/505] Fix test

[Cherry-picked 152a8cdc9a62f058d05185e48734a126b65137b3][modified]
---
 compiler/src/dotty/tools/dotc/ast/Trees.scala |   4 +-
 .../tools/dotc/transform/CheckUnused.scala    |  31 ++-
 tests/semanticdb/metac.expect                 | 248 +++++++++---------
 tests/warn/i15503f.scala                      |   9 -
 tests/warn/i19657-mega.scala                  |   2 +-
 tests/warn/i22371.scala                       |   8 -
 6 files changed, 147 insertions(+), 155 deletions(-)
 delete mode 100644 tests/warn/i22371.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala
index 7652dcfc9928..dc8c2add27be 100644
--- a/compiler/src/dotty/tools/dotc/ast/Trees.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala
@@ -31,7 +31,7 @@ object Trees {
 
   /** Property key for backquoted identifiers and definitions */
   val Backquoted: Property.StickyKey[Unit] = Property.StickyKey()
-  
+
   val SyntheticUnit: Property.StickyKey[Unit] = Property.StickyKey()
 
   /** Trees take a parameter indicating what the type of their `tpe` field
@@ -765,6 +765,7 @@ object Trees {
     override def isEmpty: Boolean = !hasType
     override def toString: String =
       s"TypeTree${if (hasType) s"[$typeOpt]" else ""}"
+    def isInferred = false
   }
 
   /** Tree that replaces a level 1 splices in pickled (level 0) quotes.
@@ -787,6 +788,7 @@ object Trees {
    */
   class InferredTypeTree[+T <: Untyped](implicit @constructorOnly src: SourceFile) extends TypeTree[T]:
     type ThisTree[+T <: Untyped] <: InferredTypeTree[T]
+    override def isInferred = true
 
   /** ref.type */
   case class SingletonTypeTree[+T <: Untyped] private[ast] (ref: Tree[T])(implicit @constructorOnly src: SourceFile)
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index dc15bb80cbb6..bb5878737083 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -7,7 +7,7 @@ import dotty.tools.dotc.config.ScalaSettings
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.{Name, SimpleName, DerivedName, TermName, termName}
-import dotty.tools.dotc.core.NameOps.{isAnonymousFunctionName, isReplWrapperName}
+import dotty.tools.dotc.core.NameOps.{isAnonymousFunctionName, isReplWrapperName, isContextFunction}
 import dotty.tools.dotc.core.NameKinds.{ContextBoundParamName, ContextFunctionParamName, WildcardParamName}
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols.{ClassSymbol, NoSymbol, Symbol, defn, isDeprecated, requiredClass, requiredModule}
@@ -123,7 +123,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   override def transformTypeTree(tree: TypeTree)(using Context): tree.type =
     tree.tpe match
     case AnnotatedType(_, annot) => transformAllDeep(annot.tree)
-    case tpt if tpt.typeSymbol.exists => resolveUsage(tpt.typeSymbol, tpt.typeSymbol.name, NoPrefix)
+    case tpt if !tree.isInferred && tpt.typeSymbol.exists => resolveUsage(tpt.typeSymbol, tpt.typeSymbol.name, NoPrefix)
     case _ =>
     tree
 
@@ -557,7 +557,7 @@ object CheckUnused:
         val dd = defn
            m.isDeprecated
         || m.is(Synthetic)
-        || sym.name.is(ContextFunctionParamName)    // a ubiquitous parameter
+        || sym.owner.name.isContextFunction    // a ubiquitous parameter
         || sym.name.is(ContextBoundParamName) && sym.info.typeSymbol.isMarkerTrait // a ubiquitous parameter
         || m.hasAnnotation(dd.UnusedAnnot)          // param of unused method
         || sym.info.typeSymbol.match                // more ubiquity
@@ -569,13 +569,17 @@ object CheckUnused:
         || sym.info.isInstanceOf[RefinedType] // can't be expressed as a context bound
       if ctx.settings.WunusedHas.implicits
         && !infos.skip(m)
+        && !m.isEffectivelyOverride
         && !allowed
       then
         if m.isPrimaryConstructor then
           val alias = m.owner.info.member(sym.name)
           if alias.exists then
             val aliasSym = alias.symbol
-            if aliasSym.is(ParamAccessor) && !infos.refs(alias.symbol) then
+            val checking =
+                 aliasSym.isAllOf(PrivateParamAccessor, butNot = CaseAccessor)
+              || aliasSym.isAllOf(Protected | ParamAccessor, butNot = CaseAccessor) && m.owner.is(Given)
+            if checking && !infos.refs(alias.symbol) then
               warnAt(pos)(UnusedSymbol.implicitParams)
         else
           warnAt(pos)(UnusedSymbol.implicitParams)
@@ -845,17 +849,24 @@ object CheckUnused:
   private val serializationNames: Set[TermName] =
     Set("readResolve", "readObject", "readObjectNoData", "writeObject", "writeReplace").map(termName(_))
 
-  extension (sym: Symbol)
-    def isSerializationSupport(using Context): Boolean =
+  extension (sym: Symbol)(using Context)
+    def isSerializationSupport: Boolean =
       sym.is(Method) && serializationNames(sym.name.toTermName) && sym.owner.isClass
         && sym.owner.derivesFrom(defn.JavaSerializableClass)
-    def isCanEqual(using Context): Boolean =
+    def isCanEqual: Boolean =
       sym.isOneOf(GivenOrImplicit) && sym.info.finalResultType.baseClasses.exists(_.derivesFrom(defn.CanEqualClass))
-    def isMarkerTrait(using Context): Boolean =
+    def isMarkerTrait: Boolean =
       sym.isClass && sym.info.allMembers.forall: d =>
         val m = d.symbol
         !m.isTerm || m.isSelfSym || m.is(Method) && (m.owner == defn.AnyClass || m.owner == defn.ObjectClass)
-
+    def isEffectivelyOverride: Boolean =
+      sym.is(Override)
+      ||
+      sym.canMatchInheritedSymbols && { // inline allOverriddenSymbols using owner.info or thisType
+        val owner = sym.owner.asClass
+        val base = if owner.classInfo.selfInfo != NoType then owner.thisType else owner.info
+        base.baseClasses.drop(1).iterator.exists(sym.overriddenSymbol(_).exists)
+      }
   extension (sel: ImportSelector)
     def boundTpe: Type = sel.bound match
       case untpd.TypedSplice(tree) => tree.tpe
@@ -893,7 +904,7 @@ object CheckUnused:
       else imp.expr.tpe.member(sel.name.toTermName).hasAltWith(_.symbol.isCanEqual)
 
   extension (pos: SrcPos)
-    def isZeroExtentSynthetic: Boolean = pos.span.isSynthetic && pos.span.start == pos.span.end
+    def isZeroExtentSynthetic: Boolean = pos.span.isSynthetic && pos.span.isZeroExtent
 
   extension [A <: AnyRef](arr: Array[A])
     // returns `until` if not satisfied
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 31a08dbb9e60..a89da0fb8aec 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -8,7 +8,6 @@ Text => empty
 Language => Scala
 Symbols => 9 entries
 Occurrences => 19 entries
-Diagnostics => 2 entries
 
 Symbols:
 example/Access# => class Access extends Object { self: Access => +8 decls }
@@ -42,10 +41,6 @@ Occurrences:
 [9:6..9:8): m7 <- example/Access#m7().
 [9:11..9:14): ??? -> scala/Predef.`???`().
 
-Diagnostics:
-[3:14..3:16): [warning] unused private member
-[4:20..4:22): [warning] unused private member
-
 expect/Advanced.scala
 ---------------------
 
@@ -61,23 +56,23 @@ Synthetics => 3 entries
 
 Symbols:
 advanced/C# => class C [typeparam T ] extends Object { self: C[T] => +3 decls }
-advanced/C#[T] => typeparam T
+advanced/C#[T] => typeparam T 
 advanced/C#`<init>`(). => primary ctor <init> [typeparam T ](): C[T]
 advanced/C#t(). => method t => T
 advanced/HKClass# => class HKClass [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]] extends Object { self: HKClass[F] => +3 decls }
 advanced/HKClass#[F] => typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]
-advanced/HKClass#[F][T] => typeparam T
-advanced/HKClass#[F][U] => typeparam U
+advanced/HKClass#[F][T] => typeparam T 
+advanced/HKClass#[F][U] => typeparam U 
 advanced/HKClass#`<init>`(). => primary ctor <init> [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]](): HKClass[F]
-advanced/HKClass#`<init>`().[F][T] => typeparam T
-advanced/HKClass#`<init>`().[F][U] => typeparam U
+advanced/HKClass#`<init>`().[F][T] => typeparam T 
+advanced/HKClass#`<init>`().[F][U] => typeparam U 
 advanced/HKClass#foo(). => method foo [typeparam T , typeparam U ](param x: F[T, U]): String
 advanced/HKClass#foo().(x) => param x: F[T, U]
-advanced/HKClass#foo().[T] => typeparam T
-advanced/HKClass#foo().[U] => typeparam U
+advanced/HKClass#foo().[T] => typeparam T 
+advanced/HKClass#foo().[U] => typeparam U 
 advanced/Structural# => class Structural extends Object { self: Structural => +6 decls }
 advanced/Structural#T# => trait T [typeparam A ] extends Object { self: T[A] => +4 decls }
-advanced/Structural#T#[A] => typeparam A
+advanced/Structural#T#[A] => typeparam A 
 advanced/Structural#T#`<init>`(). => primary ctor <init> [typeparam A ](): T[A]
 advanced/Structural#T#bar(). => method bar (param b: foo.B): Unit
 advanced/Structural#T#bar().(b) => param b: foo.B
@@ -291,8 +286,8 @@ Symbols:
 annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls }
 annot/Alias.A# => type A  = ClassAnnotation @param
 annot/Annotations# => @ClassAnnotation class Annotations [@TypeParameterAnnotation typeparam T ] extends Object { self: AnyRef & Annotations[T] => +6 decls }
-annot/Annotations#S# => @TypeAnnotation type S
-annot/Annotations#[T] => @TypeParameterAnnotation typeparam T
+annot/Annotations#S# => @TypeAnnotation type S 
+annot/Annotations#[T] => @TypeParameterAnnotation typeparam T 
 annot/Annotations#`<init>`(). => primary ctor <init> [@TypeParameterAnnotation typeparam T ](@ParameterAnnotation param x: T): Annotations[T]
 annot/Annotations#`<init>`().(x) => @ParameterAnnotation param x: T
 annot/Annotations#field. => @FieldAnnotation val method field Int
@@ -306,7 +301,7 @@ annot/B#throwing(). => @throws[Exception] method throwing => Nothing
 annot/B#x. => private[this] val method x Int
 annot/M. => @ObjectAnnotation final object M extends Object { self: M.type => +1 decls }
 annot/M.m(). => @MacroAnnotation macro m [typeparam TT ]: Int
-annot/M.m().[TT] => typeparam TT
+annot/M.m().[TT] => typeparam TT 
 annot/T# => @TraitAnnotation trait T extends Object { self: T => +1 decls }
 annot/T#`<init>`(). => primary ctor <init> (): T
 local0 => selfparam self: AnyRef
@@ -399,10 +394,10 @@ example/Anonymous#bar2. => val method bar2 Bar
 example/Anonymous#foo. => val method foo Foo
 example/Anonymous#locally(). => method locally [typeparam A ](param x: A): A
 example/Anonymous#locally().(x) => param x: A
-example/Anonymous#locally().[A] => typeparam A
+example/Anonymous#locally().[A] => typeparam A 
 example/Anonymous#m1(). => method m1 [typeparam T [type _ ]]: Nothing
 example/Anonymous#m1().[T] => typeparam T [type _ ]
-example/Anonymous#m1().[T][_] => type _
+example/Anonymous#m1().[T][_] => type _ 
 example/Anonymous#m2(). => method m2 => Map[_, List[_] forSome { type _  }] forSome { type _  }
 local0 => val local x: Function1[Int, Int]
 local1 => final class $anon extends Object with Foo { self: $anon => +1 decls }
@@ -559,7 +554,7 @@ Text => empty
 Language => Scala
 Symbols => 108 entries
 Occurrences => 127 entries
-Diagnostics => 4 entries
+Diagnostics => 9 entries
 Synthetics => 2 entries
 
 Symbols:
@@ -637,7 +632,7 @@ classes/C11#foo(). => inline macro foo => Int
 classes/C12# => class C12 extends Object { self: C12 => +8 decls }
 classes/C12#Context# => class Context extends Object { self: Context => +2 decls }
 classes/C12#Context#Expr# => type Expr [typeparam T ]
-classes/C12#Context#Expr#[T] => typeparam T
+classes/C12#Context#Expr#[T] => typeparam T 
 classes/C12#Context#`<init>`(). => primary ctor <init> (): Context
 classes/C12#`<init>`(). => primary ctor <init> (): C12
 classes/C12#foo1(). => macro foo1 (param x: Int): Int
@@ -928,7 +923,7 @@ endmarkers/MultiCtor#`<init>`().(i) => val param i: Int
 endmarkers/MultiCtor#`<init>`(+1). => ctor <init> (): MultiCtor
 endmarkers/MultiCtor#i. => val method i Int
 endmarkers/Stuff# => trait Stuff [typeparam A ] extends Object { self: Stuff[A] => +3 decls }
-endmarkers/Stuff#[A] => typeparam A
+endmarkers/Stuff#[A] => typeparam A 
 endmarkers/Stuff#`<init>`(). => primary ctor <init> [typeparam A ](): Stuff[A]
 endmarkers/Stuff#do(). => abstract method do => A
 endmarkers/TestObj. => final object TestObj extends Object { self: TestObj.type => +2 decls }
@@ -1127,29 +1122,29 @@ _empty_/Enums.Directions.valueOf(). => method valueOf (param $name: String): Dir
 _empty_/Enums.Directions.valueOf().($name) => param $name: String
 _empty_/Enums.Directions.values(). => method values => Array[Directions]
 _empty_/Enums.Maybe# => abstract sealed enum class Maybe [covariant typeparam A ] extends Object with Enum { self: Maybe[A] => +2 decls }
-_empty_/Enums.Maybe#[A] => covariant typeparam A
+_empty_/Enums.Maybe#[A] => covariant typeparam A 
 _empty_/Enums.Maybe#`<init>`(). => primary ctor <init> [covariant typeparam A ](): Maybe[A]
 _empty_/Enums.Maybe. => final object Maybe extends Object { self: Maybe.type => +6 decls }
 _empty_/Enums.Maybe.Just# => final case enum class Just [covariant typeparam A ] extends Maybe[A] { self: Just[A] => +7 decls }
-_empty_/Enums.Maybe.Just#[A] => covariant typeparam A
+_empty_/Enums.Maybe.Just#[A] => covariant typeparam A 
 _empty_/Enums.Maybe.Just#_1(). => method _1 => A
 _empty_/Enums.Maybe.Just#`<init>`(). => primary ctor <init> [covariant typeparam A ](val param value: A): Just[A]
 _empty_/Enums.Maybe.Just#`<init>`().(value) => val param value: A
 _empty_/Enums.Maybe.Just#copy$default$1(). => method copy$default$1 [covariant typeparam A ]: A
-_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A
+_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A 
 _empty_/Enums.Maybe.Just#copy(). => method copy [covariant typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just#copy().(value) => param value: A
-_empty_/Enums.Maybe.Just#copy().[A] => typeparam A
+_empty_/Enums.Maybe.Just#copy().[A] => typeparam A 
 _empty_/Enums.Maybe.Just#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.Maybe.Just#value. => val method value A
 _empty_/Enums.Maybe.Just. => final object Just extends Object { self: Just.type => +4 decls }
 _empty_/Enums.Maybe.Just.apply(). => method apply [typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just.apply().(value) => param value: A
-_empty_/Enums.Maybe.Just.apply().[A] => typeparam A
+_empty_/Enums.Maybe.Just.apply().[A] => typeparam A 
 _empty_/Enums.Maybe.Just.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.Maybe.Just.unapply(). => method unapply [typeparam A ](param x$1: Just[A]): Just[A]
 _empty_/Enums.Maybe.Just.unapply().(x$1) => param x$1: Just[A]
-_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A
+_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A 
 _empty_/Enums.Maybe.None. => case val static enum method None Maybe[Nothing]
 _empty_/Enums.Maybe.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Maybe[_] forSome { type _  }
 _empty_/Enums.Maybe.fromOrdinal().(ordinal) => param ordinal: Int
@@ -1200,7 +1195,7 @@ _empty_/Enums.Suits.valueOf(). => method valueOf (param $name: String): Suits
 _empty_/Enums.Suits.valueOf().($name) => param $name: String
 _empty_/Enums.Suits.values(). => method values => Array[Suits]
 _empty_/Enums.Tag# => abstract sealed enum class Tag [typeparam A ] extends Object with Enum { self: Tag[A] => +2 decls }
-_empty_/Enums.Tag#[A] => typeparam A
+_empty_/Enums.Tag#[A] => typeparam A 
 _empty_/Enums.Tag#`<init>`(). => primary ctor <init> [typeparam A ](): Tag[A]
 _empty_/Enums.Tag. => final object Tag extends Object { self: Tag.type => +7 decls }
 _empty_/Enums.Tag.$values. => private[this] val method $values Array[Tag[_] forSome { type _  }]
@@ -1231,33 +1226,33 @@ _empty_/Enums.WeekDays.valueOf(). => method valueOf (param $name: String): WeekD
 _empty_/Enums.WeekDays.valueOf().($name) => param $name: String
 _empty_/Enums.WeekDays.values(). => method values => Array[WeekDays]
 _empty_/Enums.`<:<`# => abstract sealed enum class <:< [contravariant typeparam A , typeparam B ] extends Object with Enum { self: <:<[A, B] => +3 decls }
-_empty_/Enums.`<:<`#[A] => contravariant typeparam A
-_empty_/Enums.`<:<`#[B] => typeparam B
+_empty_/Enums.`<:<`#[A] => contravariant typeparam A 
+_empty_/Enums.`<:<`#[B] => typeparam B 
 _empty_/Enums.`<:<`#`<init>`(). => primary ctor <init> [contravariant typeparam A , typeparam B ](): <:<[A, B]
 _empty_/Enums.`<:<`. => final object <:< extends Object { self: <:<.type => +6 decls }
 _empty_/Enums.`<:<`.Refl# => final case enum class Refl [typeparam C ] extends <:<[C, C] { self: Refl[C] => +4 decls }
-_empty_/Enums.`<:<`.Refl#[C] => typeparam C
+_empty_/Enums.`<:<`.Refl#[C] => typeparam C 
 _empty_/Enums.`<:<`.Refl#`<init>`(). => primary ctor <init> [typeparam C ](): Refl[C]
 _empty_/Enums.`<:<`.Refl#copy(). => method copy [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C
+_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C 
 _empty_/Enums.`<:<`.Refl#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.`<:<`.Refl. => final object Refl extends Object { self: Refl.type => +4 decls }
 _empty_/Enums.`<:<`.Refl.apply(). => method apply [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C
+_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C 
 _empty_/Enums.`<:<`.Refl.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.`<:<`.Refl.unapply(). => method unapply [typeparam C ](param x$1: Refl[C]): true
 _empty_/Enums.`<:<`.Refl.unapply().(x$1) => param x$1: Refl[C]
-_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C
+_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C 
 _empty_/Enums.`<:<`.`given_<:<_T_T`(). => final implicit given method given_<:<_T_T [typeparam T ]: <:<[T, T]
-_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T
+_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T 
 _empty_/Enums.`<:<`.fromOrdinal(). => method fromOrdinal (param ordinal: Int): <:<[_, _] forSome { type _ ; type _  }
 _empty_/Enums.`<:<`.fromOrdinal().(ordinal) => param ordinal: Int
 _empty_/Enums.some1. => val method some1 Option[Int]
 _empty_/Enums.unwrap(). => method unwrap [typeparam A , typeparam B ](param opt: Option[A])(implicit given param ev: <:<[A, Option[B]]): Option[B]
 _empty_/Enums.unwrap().(ev) => implicit given param ev: <:<[A, Option[B]]
 _empty_/Enums.unwrap().(opt) => param opt: Option[A]
-_empty_/Enums.unwrap().[A] => typeparam A
-_empty_/Enums.unwrap().[B] => typeparam B
+_empty_/Enums.unwrap().[A] => typeparam A 
+_empty_/Enums.unwrap().[B] => typeparam B 
 local0 => param x: Option[B]
 
 Occurrences:
@@ -1530,7 +1525,7 @@ Symbols:
 ext/DeckUsage. => final object DeckUsage extends Object { self: DeckUsage.type => +2 decls }
 ext/DeckUsage.deck. => val method deck Deck
 ext/Extension$package. => final package object ext extends Object { self: ext.type { opaque type Deck  } => +9 decls }
-ext/Extension$package.Deck# => opaque type Deck
+ext/Extension$package.Deck# => opaque type Deck 
 ext/Extension$package.Deck. => final object Deck extends Object { self: Deck.type => +2 decls }
 ext/Extension$package.Deck.fooSize(). => method fooSize (param data: Deck): Int
 ext/Extension$package.Deck.fooSize().(data) => param data: Deck
@@ -1544,18 +1539,18 @@ ext/Extension$package.foo().(s) => param s: String
 ext/Extension$package.readInto(). => method readInto [typeparam T ](param s: String)(implicit given param x$2: Read[T]): Option[T]
 ext/Extension$package.readInto().(s) => param s: String
 ext/Extension$package.readInto().(x$2) => implicit given param x$2: Read[T]
-ext/Extension$package.readInto().[T] => typeparam T
+ext/Extension$package.readInto().[T] => typeparam T 
 ext/Functor# => trait Functor [typeparam F [type _ ]] extends Object { self: Functor[F] => +3 decls }
 ext/Functor#[F] => typeparam F [type _ ]
-ext/Functor#[F][_] => type _
+ext/Functor#[F][_] => type _ 
 ext/Functor#`<init>`(). => primary ctor <init> [typeparam F [type _ ]](): Functor[F]
 ext/Functor#map(). => abstract method map [typeparam T , typeparam U ](param t: F[T])(param f: Function1[T, U]): F[U]
 ext/Functor#map().(f) => param f: Function1[T, U]
 ext/Functor#map().(t) => param t: F[T]
-ext/Functor#map().[T] => typeparam T
-ext/Functor#map().[U] => typeparam U
+ext/Functor#map().[T] => typeparam T 
+ext/Functor#map().[U] => typeparam U 
 ext/Read# => trait Read [covariant typeparam T ] extends Object { self: Read[T] => +3 decls }
-ext/Read#[T] => covariant typeparam T
+ext/Read#[T] => covariant typeparam T 
 ext/Read#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Read[T]
 ext/Read#fromString(). => abstract method fromString (param s: String): Option[T]
 ext/Read#fromString().(s) => param s: String
@@ -1736,7 +1731,7 @@ Synthetics => 3 entries
 Symbols:
 a/b/Givens. => final object Givens extends Object { self: Givens.type => +13 decls }
 a/b/Givens.Monoid# => trait Monoid [typeparam A ] extends Object { self: Monoid[A] => +4 decls }
-a/b/Givens.Monoid#[A] => typeparam A
+a/b/Givens.Monoid#[A] => typeparam A 
 a/b/Givens.Monoid#`<init>`(). => primary ctor <init> [typeparam A ](): Monoid[A]
 a/b/Givens.Monoid#combine(). => abstract method combine (param x: A)(param y: A): A
 a/b/Givens.Monoid#combine().(x) => param x: A
@@ -1744,7 +1739,7 @@ a/b/Givens.Monoid#combine().(y) => param y: A
 a/b/Givens.Monoid#empty(). => abstract method empty => A
 a/b/Givens.foo(). => method foo [typeparam A ](implicit given param A: Monoid[A]): A
 a/b/Givens.foo().(A) => implicit given param A: Monoid[A]
-a/b/Givens.foo().[A] => typeparam A
+a/b/Givens.foo().[A] => typeparam A 
 a/b/Givens.given_Monoid_String. => final implicit given object given_Monoid_String extends Object with Monoid[String] { self: given_Monoid_String.type => +3 decls }
 a/b/Givens.given_Monoid_String.combine(). => method combine (param x: String)(param y: String): String <: a/b/Givens.Monoid#combine().
 a/b/Givens.given_Monoid_String.combine().(x) => param x: String
@@ -1759,13 +1754,13 @@ a/b/Givens.int2String#apply().(x) => param x: Int
 a/b/Givens.int2String(). => final implicit given inline macro int2String => int2String
 a/b/Givens.sayGoodbye(). => method sayGoodbye [typeparam B ](param any: B): String
 a/b/Givens.sayGoodbye().(any) => param any: B
-a/b/Givens.sayGoodbye().[B] => typeparam B
+a/b/Givens.sayGoodbye().[B] => typeparam B 
 a/b/Givens.sayHello(). => method sayHello [typeparam A ](param any: A): String
 a/b/Givens.sayHello().(any) => param any: A
-a/b/Givens.sayHello().[A] => typeparam A
+a/b/Givens.sayHello().[A] => typeparam A 
 a/b/Givens.saySoLong(). => method saySoLong [typeparam B ](param any: B): String
 a/b/Givens.saySoLong().(any) => param any: B
-a/b/Givens.saySoLong().[B] => typeparam B
+a/b/Givens.saySoLong().[B] => typeparam B 
 a/b/Givens.soLong1. => val method soLong1 String
 
 Occurrences:
@@ -1873,7 +1868,7 @@ example/ImplicitConversion#tuple. => val method tuple Tuple2[Int, Int]
 example/ImplicitConversion#x. => val method x Int
 example/ImplicitConversion. => final object ImplicitConversion extends Object { self: ImplicitConversion.type => +6 decls }
 example/ImplicitConversion.newAny2stringadd# => final implicit class newAny2stringadd [typeparam A ] extends AnyVal { self: newAny2stringadd[A] => +4 decls }
-example/ImplicitConversion.newAny2stringadd#[A] => typeparam A
+example/ImplicitConversion.newAny2stringadd#[A] => typeparam A 
 example/ImplicitConversion.newAny2stringadd#`+`(). => method + (param other: String): String
 example/ImplicitConversion.newAny2stringadd#`+`().(other) => param other: String
 example/ImplicitConversion.newAny2stringadd#`<init>`(). => primary ctor <init> [typeparam A ](param self: A): newAny2stringadd[A]
@@ -1881,7 +1876,7 @@ example/ImplicitConversion.newAny2stringadd#`<init>`().(self) => param self: A
 example/ImplicitConversion.newAny2stringadd#self. => private val method self A
 example/ImplicitConversion.newAny2stringadd(). => final implicit method newAny2stringadd [typeparam A ](param self: A): newAny2stringadd[A]
 example/ImplicitConversion.newAny2stringadd().(self) => param self: A
-example/ImplicitConversion.newAny2stringadd().[A] => typeparam A
+example/ImplicitConversion.newAny2stringadd().[A] => typeparam A 
 example/ImplicitConversion.newAny2stringadd. => final object newAny2stringadd extends Object { self: newAny2stringadd.type => +2 decls }
 
 Occurrences:
@@ -2094,7 +2089,7 @@ givens/InventedNames$package.given_Double(). => final implicit given method give
 givens/InventedNames$package.given_Double().(x$1) => implicit given param x$1: Int
 givens/InventedNames$package.given_Float. => final implicit lazy val given method given_Float Float
 givens/InventedNames$package.given_List_T(). => final implicit given method given_List_T [typeparam T ]: List[T]
-givens/InventedNames$package.given_List_T().[T] => typeparam T
+givens/InventedNames$package.given_List_T().[T] => typeparam T 
 givens/InventedNames$package.given_String. => final implicit lazy val given method given_String String
 givens/InventedNames$package.given_X. => final implicit given object given_X extends Object with X { self: given_X.type => +2 decls }
 givens/InventedNames$package.given_X.doX(). => method doX => Int <: givens/X#doX().
@@ -2106,11 +2101,11 @@ givens/InventedNames$package.given_Y#x$1. => protected implicit val given method
 givens/InventedNames$package.given_Y(). => final implicit given method given_Y (implicit given param x$1: X): given_Y
 givens/InventedNames$package.given_Y().(x$1) => implicit given param x$1: X
 givens/InventedNames$package.given_Z_T# => implicit given class given_Z_T [typeparam T ] extends Object with Z[T] { self: given_Z_T[T] => +3 decls }
-givens/InventedNames$package.given_Z_T#[T] => typeparam T
+givens/InventedNames$package.given_Z_T#[T] => typeparam T 
 givens/InventedNames$package.given_Z_T#`<init>`(). => primary ctor <init> [typeparam T ](): given_Z_T[T]
 givens/InventedNames$package.given_Z_T#doZ(). => method doZ => List[T] <: givens/Z#doZ().
 givens/InventedNames$package.given_Z_T(). => final implicit given method given_Z_T [typeparam T ]: given_Z_T[T]
-givens/InventedNames$package.given_Z_T().[T] => typeparam T
+givens/InventedNames$package.given_Z_T().[T] => typeparam T 
 givens/InventedNames$package.intValue. => final implicit lazy val given method intValue Int
 givens/InventedNames$package.x. => val method x given_X.type
 givens/InventedNames$package.y. => val method y given_Y
@@ -2122,7 +2117,7 @@ givens/Y# => trait Y extends Object { self: Y => +2 decls }
 givens/Y#`<init>`(). => primary ctor <init> (): Y
 givens/Y#doY(). => abstract method doY => String
 givens/Z# => trait Z [typeparam T ] extends Object { self: Z[T] => +3 decls }
-givens/Z#[T] => typeparam T
+givens/Z#[T] => typeparam T 
 givens/Z#`<init>`(). => primary ctor <init> [typeparam T ](): Z[T]
 givens/Z#doZ(). => abstract method doZ => List[T]
 
@@ -2270,7 +2265,7 @@ Symbols:
 example/Local# => class Local extends Object { self: Local => +2 decls }
 example/Local#`<init>`(). => primary ctor <init> (): Local
 example/Local#a(). => method a (): Int
-local0 => typeparam A
+local0 => typeparam A 
 local1 => param a: A
 local2 => local id: [typeparam A ](param a: A): A
 
@@ -2335,10 +2330,10 @@ example/MatchType$package.Concat# => type Concat [typeparam Xs  <: Tuple, covari
 example/MatchType$package.Concat#[Xs] => typeparam Xs  <: Tuple
 example/MatchType$package.Concat#[Ys] => covariant typeparam Ys  <: Tuple
 example/MatchType$package.Elem# => type Elem [typeparam X ] = X match { String => Char, Array[t] => t, Iterable[t] => t }
-example/MatchType$package.Elem#[X] => typeparam X
-local0 => type t
-local1 => type t
-local2 => type x
+example/MatchType$package.Elem#[X] => typeparam X 
+local0 => type t 
+local1 => type t 
+local2 => type x 
 local3 => type xs  <: Tuple
 
 Occurrences:
@@ -2578,11 +2573,11 @@ Occurrences => 156 entries
 Symbols:
 example/Methods# => class Methods [typeparam T ] extends Object { self: Methods[T] => +44 decls }
 example/Methods#AList# => type AList [typeparam T ] = List[T]
-example/Methods#AList#[T] => typeparam T
+example/Methods#AList#[T] => typeparam T 
 example/Methods#List# => class List [typeparam T ] extends Object { self: List[T] => +2 decls }
-example/Methods#List#[T] => typeparam T
+example/Methods#List#[T] => typeparam T 
 example/Methods#List#`<init>`(). => primary ctor <init> [typeparam T ](): List[T]
-example/Methods#[T] => typeparam T
+example/Methods#[T] => typeparam T 
 example/Methods#`<init>`(). => primary ctor <init> [typeparam T ](): Methods[T]
 example/Methods#`m8().`(). => method m8(). (): Nothing
 example/Methods#`m9().`# => class m9(). extends Object { self: m9(). => +1 decls }
@@ -2610,7 +2605,7 @@ example/Methods#m7(). => method m7 [typeparam U ](param c: Methods[T], param l:
 example/Methods#m7().(c) => param c: Methods[T]
 example/Methods#m7().(evidence$1) => implicit param evidence$1: Ordering[U]
 example/Methods#m7().(l) => param l: List[U]
-example/Methods#m7().[U] => typeparam U
+example/Methods#m7().[U] => typeparam U 
 example/Methods#m9(). => method m9 (param x: m9().): Nothing
 example/Methods#m9().(x) => param x: m9().
 example/Methods#m10(). => method m10 (param x: List[T]): Nothing
@@ -2970,18 +2965,18 @@ Occurrences => 18 entries
 
 Symbols:
 _empty_/NewModifiers$package. => final package object _empty_ extends Object { self: _empty_.type { opaque type OpaqueB  } => +2 decls }
-_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB
+_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB 
 _empty_/NewModifiers. => final object NewModifiers extends Object { self: NewModifiers.type { opaque type A  } => +3 decls }
-_empty_/NewModifiers.A# => opaque type A
+_empty_/NewModifiers.A# => opaque type A 
 _empty_/NewModifiers.foo. => val inline method foo "foo"
 _empty_/NewModifiersClass# => opaque class NewModifiersClass extends Object { self: Any { opaque type C  } & NewModifiersClass => +5 decls }
-_empty_/NewModifiersClass#C# => opaque type C
+_empty_/NewModifiersClass#C# => opaque type C 
 _empty_/NewModifiersClass#Nested# => opaque class Nested extends Object { self: Any { opaque type NestedOpaque  } & Nested => +2 decls }
-_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque
+_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque 
 _empty_/NewModifiersClass#Nested#`<init>`(). => primary ctor <init> (): Nested
 _empty_/NewModifiersClass#`<init>`(). => primary ctor <init> (): NewModifiersClass
 _empty_/NewModifiersTrait# => opaque trait NewModifiersTrait extends Object { self: Any { opaque type D  } & NewModifiersTrait => +2 decls }
-_empty_/NewModifiersTrait#D# => opaque type D
+_empty_/NewModifiersTrait#D# => opaque type D 
 _empty_/NewModifiersTrait#`<init>`(). => primary ctor <init> (): NewModifiersTrait
 
 Occurrences:
@@ -3069,13 +3064,13 @@ Occurrences => 49 entries
 Symbols:
 prefixes/C# => class C extends Object { self: C => +6 decls }
 prefixes/C#N. => final object N extends Object { self: N.type => +2 decls }
-prefixes/C#N.U# => type U
-prefixes/C#T# => type T
+prefixes/C#N.U# => type U 
+prefixes/C#T# => type T 
 prefixes/C#`<init>`(). => primary ctor <init> (): C
 prefixes/C#k1(). => method k1 => U
 prefixes/C#m1(). => method m1 => T
 prefixes/M. => final object M extends Object { self: M.type => +3 decls }
-prefixes/M.T# => type T
+prefixes/M.T# => type T 
 prefixes/M.n1(). => method n1 => T
 prefixes/O. => final object O extends C { self: O.type => +2 decls }
 prefixes/O.o1(). => method o1 => O.this.T
@@ -3152,13 +3147,13 @@ Synthetics => 3 entries
 
 Symbols:
 example/C# => class C extends Object { self: C => +3 decls }
-example/C#T1# => type T1
-example/C#T2# => type T2
+example/C#T1# => type T1 
+example/C#T2# => type T2 
 example/C#`<init>`(). => primary ctor <init> (): C
 example/PickOneRefinement_1# => class PickOneRefinement_1 [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }] extends Object { self: PickOneRefinement_1[S] => +3 decls }
 example/PickOneRefinement_1#[S] => typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }
 example/PickOneRefinement_1#[S](as) => param as: T*
-example/PickOneRefinement_1#[S][T] => typeparam T
+example/PickOneRefinement_1#[S][T] => typeparam T 
 example/PickOneRefinement_1#`<init>`(). => primary ctor <init> [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }](): PickOneRefinement_1[S]
 example/PickOneRefinement_1#run(). => method run (param s: S, param as: String*): Option[String]
 example/PickOneRefinement_1#run().(as) => param as: String*
@@ -3167,7 +3162,7 @@ example/PolyHolder# => trait PolyHolder extends Object { self: PolyHolder => +2
 example/PolyHolder#`<init>`(). => primary ctor <init> (): PolyHolder
 example/PolyHolder#foo(). => abstract method foo [typeparam T ](param t: T): Any
 example/PolyHolder#foo().(t) => param t: T
-example/PolyHolder#foo().[T] => typeparam T
+example/PolyHolder#foo().[T] => typeparam T 
 example/RecOrRefined$package. => final package object example extends Object { self: example.type => +9 decls }
 example/RecOrRefined$package.C2# => type C2  = C { type T2  = T1 <: example/C#T2#; type T1  <: example/C#T1# }
 example/RecOrRefined$package.Person# => type Person  = Record { abstract val method age Int; abstract val method name String }
@@ -3181,9 +3176,9 @@ example/RecOrRefined$package.m4(). => method m4 (param x: PolyHolder { abstract
 example/RecOrRefined$package.m4().(x) => param x: PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5(). => method m5 [typeparam Z ](param x: Int): PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5().(x) => param x: Int
-example/RecOrRefined$package.m5().[Z] => typeparam Z
+example/RecOrRefined$package.m5().[Z] => typeparam Z 
 example/RecOrRefined$package.m6# => type m6 [typeparam X ] = PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
-example/RecOrRefined$package.m6#[X] => typeparam X
+example/RecOrRefined$package.m6#[X] => typeparam X 
 example/Record# => class Record extends Object with Selectable { self: Record => +4 decls }
 example/Record#`<init>`(). => primary ctor <init> (param elems: Tuple2[String, Any]*): Record
 example/Record#`<init>`().(elems) => param elems: Tuple2[String, Any]*
@@ -3195,9 +3190,9 @@ example/SpecialRefinement# => trait SpecialRefinement extends Object { self: Spe
 example/SpecialRefinement#`<init>`(). => primary ctor <init> (): SpecialRefinement
 example/SpecialRefinement#pickOne(). => abstract method pickOne [typeparam T ](param as: T*): Option[Any]
 example/SpecialRefinement#pickOne().(as) => param as: T*
-example/SpecialRefinement#pickOne().[T] => typeparam T
+example/SpecialRefinement#pickOne().[T] => typeparam T 
 local0 => abstract method pickOne [typeparam T ](param as: T*): Option[String]
-local1 => typeparam T
+local1 => typeparam T 
 local2 => param as: T*
 local3 => abstract method pickOne [typeparam T ](param as: T*): Option[String] <: example/SpecialRefinement#pickOne().
 local4 => abstract val method x Int
@@ -3205,14 +3200,14 @@ local5 => abstract val method x Int
 local6 => abstract method y => Int
 local7 => abstract val method x Int
 local8 => abstract method y => Int
-local9 => type z
-local10 => typeparam T
+local9 => type z 
+local10 => typeparam T 
 local11 => param t: T
 local12 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local13 => typeparam T
+local13 => typeparam T 
 local14 => param t: T
 local15 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local16 => typeparam T
+local16 => typeparam T 
 local17 => param t: T
 local18 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
 local19 => abstract val method name String
@@ -3501,6 +3496,7 @@ Text => empty
 Language => Scala
 Symbols => 62 entries
 Occurrences => 164 entries
+Diagnostics => 3 entries
 Synthetics => 39 entries
 
 Symbols:
@@ -3518,7 +3514,7 @@ example/Synthetic#Contexts.m4(). => method m4 => Nothing
 example/Synthetic#F# => class F extends Object { self: F => +1 decls }
 example/Synthetic#F#`<init>`(). => primary ctor <init> (): F
 example/Synthetic#J# => class J [typeparam T ] extends Object { self: J[T] => +4 decls }
-example/Synthetic#J#[T] => typeparam T
+example/Synthetic#J#[T] => typeparam T 
 example/Synthetic#J#`<init>`(). => primary ctor <init> [typeparam T ]()(implicit param evidence$1: Manifest[T]): J[T]
 example/Synthetic#J#`<init>`().(evidence$1) => implicit param evidence$1: Manifest[T]
 example/Synthetic#J#arr. => val method arr Array[T]
@@ -4227,11 +4223,11 @@ Occurrences => 18 entries
 Symbols:
 _empty_/Test_depmatch. => final object Test_depmatch extends Object { self: Test_depmatch.type => +4 decls }
 _empty_/Test_depmatch.Bar# => type Bar [typeparam T ] = T match { Unit => Unit }
-_empty_/Test_depmatch.Bar#[T] => typeparam T
+_empty_/Test_depmatch.Bar#[T] => typeparam T 
 _empty_/Test_depmatch.Foo# => type Foo  = Int { type U  }
 _empty_/Test_depmatch.baz(). => inline macro baz (param foo: Foo): Unit
 _empty_/Test_depmatch.baz().(foo) => param foo: Foo
-local0 => type U
+local0 => type U 
 local1 => val local v: Bar[foo.U]
 
 Occurrences:
@@ -4287,7 +4283,7 @@ Occurrences => 33 entries
 
 Symbols:
 exports/example/Codec# => trait Codec [typeparam T ] extends Object with Decoder[T] with Encoder[T] { self: Codec[T] => +6 decls }
-exports/example/Codec#[T] => typeparam T
+exports/example/Codec#[T] => typeparam T 
 exports/example/Codec#`<init>`(). => primary ctor <init> [typeparam T ](param decode: Decoder[T], param encode: Encoder[T]): Codec[T]
 exports/example/Codec#`<init>`().(decode) => param decode: Decoder[T]
 exports/example/Codec#`<init>`().(encode) => param encode: Encoder[T]
@@ -4298,12 +4294,12 @@ exports/example/Codec#encode(). => final method encode (param t: T): Array[Byte]
 exports/example/Codec#encode().(t) => param t: T
 exports/example/Codec#encode. => private[this] val method encode Encoder[T]
 exports/example/Decoder# => trait Decoder [covariant typeparam T ] extends Object { self: Decoder[T] => +3 decls }
-exports/example/Decoder#[T] => covariant typeparam T
+exports/example/Decoder#[T] => covariant typeparam T 
 exports/example/Decoder#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Decoder[T]
 exports/example/Decoder#decode(). => abstract method decode (param a: Array[Byte]): T
 exports/example/Decoder#decode().(a) => param a: Array[Byte]
 exports/example/Encoder# => trait Encoder [contravariant typeparam T ] extends Object { self: Encoder[T] => +3 decls }
-exports/example/Encoder#[T] => contravariant typeparam T
+exports/example/Encoder#[T] => contravariant typeparam T 
 exports/example/Encoder#`<init>`(). => primary ctor <init> [contravariant typeparam T ](): Encoder[T]
 exports/example/Encoder#encode(). => abstract method encode (param t: T): Array[Byte]
 exports/example/Encoder#encode().(t) => param t: T
@@ -4357,11 +4353,11 @@ Occurrences => 5 entries
 Symbols:
 exports/`exports-package$package`. => final package object exports extends Object { self: exports.type => +4 decls }
 exports/`exports-package$package`.Codec# => final type Codec [typeparam T ] = Codec[T]
-exports/`exports-package$package`.Codec#[T] => typeparam T
+exports/`exports-package$package`.Codec#[T] => typeparam T 
 exports/`exports-package$package`.Decoder# => final type Decoder [typeparam T ] = Decoder[T]
-exports/`exports-package$package`.Decoder#[T] => typeparam T
+exports/`exports-package$package`.Decoder#[T] => typeparam T 
 exports/`exports-package$package`.Encoder# => final type Encoder [typeparam T ] = Encoder[T]
-exports/`exports-package$package`.Encoder#[T] => typeparam T
+exports/`exports-package$package`.Encoder#[T] => typeparam T 
 
 Occurrences:
 [0:8..0:15): exports <- exports/
@@ -4403,35 +4399,35 @@ Occurrences => 54 entries
 
 Symbols:
 hk/EitherMonad# => class EitherMonad [typeparam T ] extends Object with Monad[[E] =>> Either[T, E]] { self: EitherMonad[T] => +2 decls }
-hk/EitherMonad#[E] => typeparam E
-hk/EitherMonad#[T] => typeparam T
+hk/EitherMonad#[E] => typeparam E 
+hk/EitherMonad#[T] => typeparam T 
 hk/EitherMonad#`<init>`(). => primary ctor <init> [typeparam T ](): EitherMonad[T]
-hk/EitherMonad#`<init>`().[E] => typeparam E
+hk/EitherMonad#`<init>`().[E] => typeparam E 
 hk/Monad# => trait Monad [typeparam M [type _ ]] extends Object { self: Monad[M] => +4 decls }
 hk/Monad#[M] => typeparam M [type _ ]
-hk/Monad#[M][_] => type _
+hk/Monad#[M][_] => type _ 
 hk/Monad#`<init>`(). => primary ctor <init> [typeparam M [type _ ]](): Monad[M]
 hk/Monad#flatMap(). => method flatMap [typeparam A , typeparam B ](param m: M[A])(param f: Function1[A, M[B]]): M[B]
 hk/Monad#flatMap().(f) => param f: Function1[A, M[B]]
 hk/Monad#flatMap().(m) => param m: M[A]
-hk/Monad#flatMap().[A] => typeparam A
-hk/Monad#flatMap().[B] => typeparam B
+hk/Monad#flatMap().[A] => typeparam A 
+hk/Monad#flatMap().[B] => typeparam B 
 hk/Monad#pure(). => method pure [typeparam A ](param a: A): M[A]
 hk/Monad#pure().(a) => param a: A
-hk/Monad#pure().[A] => typeparam A
+hk/Monad#pure().[A] => typeparam A 
 hk/hk$package. => final package object hk extends Object { self: hk.type => +5 decls }
 hk/hk$package.Id# => type Id [typeparam A ] = A
-hk/hk$package.Id#[A] => typeparam A
+hk/hk$package.Id#[A] => typeparam A 
 hk/hk$package.MapEither# => type MapEither [typeparam K ] = [L] =>> [R] =>> Map[K, Either[L, R]]
-hk/hk$package.MapEither#[K] => typeparam K
-hk/hk$package.MapEither#[L] => typeparam L
-hk/hk$package.MapEither#[R] => typeparam R
+hk/hk$package.MapEither#[K] => typeparam K 
+hk/hk$package.MapEither#[L] => typeparam L 
+hk/hk$package.MapEither#[R] => typeparam R 
 hk/hk$package.MapKV# => type MapKV [typeparam K ] = [V] =>> Map[K, V]
-hk/hk$package.MapKV#[K] => typeparam K
-hk/hk$package.MapKV#[V] => typeparam V
+hk/hk$package.MapKV#[K] => typeparam K 
+hk/hk$package.MapKV#[V] => typeparam V 
 hk/hk$package.MapV# => type MapV [type _ ] = [V] =>> Map[String, V]
-hk/hk$package.MapV#[V] => typeparam V
-hk/hk$package.MapV#[_] => type _
+hk/hk$package.MapV#[V] => typeparam V 
+hk/hk$package.MapV#[_] => type _ 
 
 Occurrences:
 [0:8..0:10): hk <- hk/
@@ -4771,11 +4767,11 @@ _empty_/Concrete#`<init>`(). => primary ctor <init> (): Concrete
 _empty_/Concrete#nullary2(). => method nullary2 => Int <: _empty_/NullaryTest#nullary2().
 _empty_/Concrete#nullary3(). => method nullary3 => List[Int] <: _empty_/NullaryTest#nullary3().
 _empty_/NullaryTest# => abstract class NullaryTest [typeparam T , typeparam m [typeparam s ]] extends Object { self: NullaryTest[T, m] => +9 decls }
-_empty_/NullaryTest#[T] => typeparam T
+_empty_/NullaryTest#[T] => typeparam T 
 _empty_/NullaryTest#[m] => typeparam m [typeparam s ]
-_empty_/NullaryTest#[m][s] => typeparam s
+_empty_/NullaryTest#[m][s] => typeparam s 
 _empty_/NullaryTest#`<init>`(). => primary ctor <init> [typeparam T , typeparam m [typeparam s ]](): NullaryTest[T, m]
-_empty_/NullaryTest#`<init>`().[m][s] => typeparam s
+_empty_/NullaryTest#`<init>`().[m][s] => typeparam s 
 _empty_/NullaryTest#nullary(). => method nullary => String
 _empty_/NullaryTest#nullary2(). => abstract method nullary2 => T
 _empty_/NullaryTest#nullary3(). => abstract method nullary3 => m[T]
@@ -4979,9 +4975,9 @@ flags/p/package.AA#x. => private[this] val method x Int
 flags/p/package.AA#y. => val method y Int
 flags/p/package.AA#z(). => var method z Int
 flags/p/package.C# => abstract class C [covariant typeparam T , contravariant typeparam U , typeparam V ] extends Object { self: C[T, U, V] => +10 decls }
-flags/p/package.C#[T] => covariant typeparam T
-flags/p/package.C#[U] => contravariant typeparam U
-flags/p/package.C#[V] => typeparam V
+flags/p/package.C#[T] => covariant typeparam T 
+flags/p/package.C#[U] => contravariant typeparam U 
+flags/p/package.C#[V] => typeparam V 
 flags/p/package.C#`<init>`(). => primary ctor <init> [covariant typeparam T , contravariant typeparam U , typeparam V ](param x: T, param y: U, param z: V): C[T, U, V]
 flags/p/package.C#`<init>`().(x) => param x: T
 flags/p/package.C#`<init>`().(y) => param y: U
@@ -4994,11 +4990,11 @@ flags/p/package.C#x. => private[this] val method x T
 flags/p/package.C#y. => private[this] val method y U
 flags/p/package.C#z. => private[this] val method z V
 flags/p/package.S# => class S [@specialized typeparam T ] extends Object { self: S[T] => +2 decls }
-flags/p/package.S#[T] => @specialized typeparam T
+flags/p/package.S#[T] => @specialized typeparam T 
 flags/p/package.S#`<init>`(). => primary ctor <init> [@specialized typeparam T ](): S[T]
 flags/p/package.T1# => type T1  = Int
 flags/p/package.T2# => type T2 [typeparam T ] = S[T]
-flags/p/package.T2#[T] => typeparam T
+flags/p/package.T2#[T] => typeparam T 
 flags/p/package.U# => type U  <: Int
 flags/p/package.V# => type V  >: Int
 flags/p/package.X. => final case object X extends Object with Product with Serializable { self: X.type => +1 decls }
@@ -5009,14 +5005,14 @@ flags/p/package.Z#`<init>`(). => primary ctor <init> (): Z
 flags/p/package.`y_=`(). => protected var method y_= (param x$1: Int): Unit
 flags/p/package.`y_=`().(x$1) => param x$1: Int
 flags/p/package.m(). => macro m [typeparam TT ]: Int
-flags/p/package.m().[TT] => typeparam TT
+flags/p/package.m().[TT] => typeparam TT 
 flags/p/package.x. => private[flags/p/] lazy val method x Int
 flags/p/package.xs1. => val method xs1 Nothing
 flags/p/package.y(). => protected implicit var method y Int
 flags/p/package.z(). => method z (param pp: Int): Int
 flags/p/package.z().(pp) => param pp: Int
 local0 => val local xs2: Nothing
-local1 => type t
+local1 => type t 
 
 Occurrences:
 [0:8..0:13): flags <- flags/
@@ -5131,7 +5127,7 @@ local3 => final class $anon extends Object { self: $anon => +2 decls }
 local5 => final class $anon extends M with N { self: $anon => +1 decls }
 local7 => method k => Int
 local8 => final class $anon extends M with N { self: $anon => +2 decls }
-local10 => typeparam T
+local10 => typeparam T 
 local11 => type L [typeparam T ] = List[T]
 types/B# => class B extends Object { self: B => +1 decls }
 types/B#`<init>`(). => primary ctor <init> (): B
@@ -5176,7 +5172,7 @@ types/Test.C#ClassInfoType2# => class ClassInfoType2 extends B { self: ClassInfo
 types/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init> (): ClassInfoType2
 types/Test.C#ClassInfoType2#x(). => method x => Int
 types/Test.C#ClassInfoType3# => trait ClassInfoType3 [typeparam T ] extends Object { self: ClassInfoType3[T] => +2 decls }
-types/Test.C#ClassInfoType3#[T] => typeparam T
+types/Test.C#ClassInfoType3#[T] => typeparam T 
 types/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init> [typeparam T ](): ClassInfoType3[T]
 types/Test.C#Either. => val method Either Either.type
 types/Test.C#MethodType. => final object MethodType extends Object { self: MethodType.type => +7 decls }
@@ -5186,7 +5182,7 @@ types/Test.C#MethodType.m5(). => method m5 (param x: Int): Int
 types/Test.C#MethodType.m5().(x) => param x: Int
 types/Test.C#MethodType.m6(). => method m6 [typeparam T ](param x: T): T
 types/Test.C#MethodType.m6().(x) => param x: T
-types/Test.C#MethodType.m6().[T] => typeparam T
+types/Test.C#MethodType.m6().[T] => typeparam T 
 types/Test.C#MethodType.x1(). => method x1 => Int
 types/Test.C#MethodType.x2(). => method x2 => Int
 types/Test.C#RepeatedType# => case class RepeatedType extends Object with Product with Serializable { self: RepeatedType => +4 decls }
@@ -5203,15 +5199,15 @@ types/Test.C#RepeatedType.toString(). => method toString => String <: scala/Any#
 types/Test.C#RepeatedType.unapplySeq(). => method unapplySeq (param x$1: RepeatedType): RepeatedType
 types/Test.C#RepeatedType.unapplySeq().(x$1) => param x$1: RepeatedType
 types/Test.C#TypeType. => final object TypeType extends Object { self: TypeType.type => +6 decls }
-types/Test.C#TypeType.T1# => type T1
+types/Test.C#TypeType.T1# => type T1 
 types/Test.C#TypeType.T4# => type T4  = C
 types/Test.C#TypeType.T5# => type T5 [typeparam U ] = U
-types/Test.C#TypeType.T5#[U] => typeparam U
+types/Test.C#TypeType.T5#[U] => typeparam U 
 types/Test.C#TypeType.m2(). => method m2 [typeparam T2  = C]: Nothing
 types/Test.C#TypeType.m2().[T2] => typeparam T2  = C
 types/Test.C#TypeType.m3(). => method m3 [typeparam M3 [type _ ]]: Nothing
 types/Test.C#TypeType.m3().[M3] => typeparam M3 [type _ ]
-types/Test.C#TypeType.m3().[M3][_] => type _
+types/Test.C#TypeType.m3().[M3][_] => type _ 
 types/Test.C#`<init>`(). => primary ctor <init> (): C
 types/Test.C#annType1. => val method annType1 T @ann[T]
 types/Test.C#annType2. => val method annType2 T @ann1 @ann2
@@ -5234,7 +5230,7 @@ types/Test.C#thisType1. => val method thisType1 C.this.type
 types/Test.C#thisType2. => val method thisType2 C.this.type
 types/Test.C#typeLambda1(). => method typeLambda1 [typeparam M [type _ ]]: Nothing
 types/Test.C#typeLambda1().[M] => typeparam M [type _ ]
-types/Test.C#typeLambda1().[M][_] => type _
+types/Test.C#typeLambda1().[M][_] => type _ 
 types/Test.C#typeRef1. => val method typeRef1 C
 types/Test.C#typeRef2. => val method typeRef2 p.C
 types/Test.C#typeRef3. => val method typeRef3 T#C
@@ -5259,7 +5255,7 @@ types/Test.N# => trait N extends Object { self: N => +2 decls }
 types/Test.N#`<init>`(). => primary ctor <init> (): N
 types/Test.N#n(). => method n => Int
 types/ann# => class ann [typeparam T ] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
-types/ann#[T] => typeparam T
+types/ann#[T] => typeparam T 
 types/ann#`<init>`(). => primary ctor <init> [typeparam T ](param x: T): ann[T]
 types/ann#`<init>`().(x) => param x: T
 types/ann#x. => private[this] val method x T
@@ -5517,7 +5513,7 @@ Occurrences:
 [119:39..119:42): Int -> scala/Int#
 
 Diagnostics:
-[5:13..5:14): [warning] unused explicit parameter
+[96:13..96:14): [warning] unused explicit parameter
 
 Synthetics:
 [68:20..68:24):@ann => *[Int]
diff --git a/tests/warn/i15503f.scala b/tests/warn/i15503f.scala
index 0550f82d9398..9d464bbc1973 100644
--- a/tests/warn/i15503f.scala
+++ b/tests/warn/i15503f.scala
@@ -33,15 +33,6 @@ object Example:
       case '{ ${Expr(opt)} : Some[T] } => Some(opt)
       case _ => None
 
-object ExampleWithoutWith:
-  import scala.quoted.*
-  given [T] => (Type[T], FromExpr[T]) => FromExpr[Option[T]]:
-    def unapply(x: Expr[Option[T]])(using Quotes) = x match
-      case '{ Option[T](${Expr(y)}) } => Some(Option(y))
-      case '{ None } => Some(None)
-      case '{ ${Expr(opt)} : Some[T] } => Some(opt)
-      case _ => None
-
 //absolving names on matches of quote trees requires consulting non-abstract types in QuotesImpl
 object Unmatched:
   import scala.quoted.*
diff --git a/tests/warn/i19657-mega.scala b/tests/warn/i19657-mega.scala
index 07411ee73fb1..eeeb33ab3da7 100644
--- a/tests/warn/i19657-mega.scala
+++ b/tests/warn/i19657-mega.scala
@@ -1,4 +1,4 @@
-//> using options -Wshadow:type-parameter-shadow -Wunused:all
+//> using options -Xlint:type-parameter-shadow -Wunused:all
 
 class F[X, M[N[X]]]: // warn
   private def x[X] = toString // warn // warn
diff --git a/tests/warn/i22371.scala b/tests/warn/i22371.scala
deleted file mode 100644
index 00f5b66695e0..000000000000
--- a/tests/warn/i22371.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-//> using options -Werror -Wunused:all
-import scala.compiletime.deferred
-
-class Context
-
-trait Foo:
-  given context: Context = deferred
-  given () => Context = deferred

From 9f53f2d6f1fc6b3ea93b558c614bd90e44dcfdd0 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 3 Feb 2025 10:53:24 -0800
Subject: [PATCH 045/505] Check span.exists where necessary

---
 .../tools/dotc/transform/CheckUnused.scala    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index bb5878737083..29fef0843902 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -66,14 +66,14 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   // import x.y; y may be rewritten x.y, also import x.z as y
   override def transformSelect(tree: Select)(using Context): tree.type =
     val name = tree.removeAttachment(OriginalName).getOrElse(nme.NO_NAME)
-    if tree.span.isSynthetic && tree.symbol == defn.TypeTest_unapply then
+    if tree.srcPos.isSynthetic && tree.symbol == defn.TypeTest_unapply then
       tree.qualifier.tpe.underlying.finalResultType match
       case AppliedType(_, args) => // tycon.typeSymbol == defn.TypeTestClass
         val res = args(1) // T in TypeTest[-S, T]
         val target = res.dealias.typeSymbol
         resolveUsage(target, target.name, res.importPrefix.skipPackageObject) // case _: T =>
       case _ =>
-    else if tree.qualifier.span.isSynthetic || name.exists(_ != tree.symbol.name) then
+    else if tree.qualifier.srcPos.isSynthetic || name.exists(_ != tree.symbol.name) then
       if !ignoreTree(tree) then
         resolveUsage(tree.symbol, name, tree.qualifier.tpe)
     else
@@ -592,12 +592,12 @@ object CheckUnused:
         warnAt(pos)(UnusedSymbol.localDefs)
 
     def checkPatvars() =
-      // convert the one non-synthetic span so all are comparable
+      // convert the one non-synthetic span so all are comparable; filter NoSpan below
       def uniformPos(sym: Symbol, pos: SrcPos): SrcPos =
         if pos.span.isSynthetic then pos else pos.sourcePos.withSpan(pos.span.toSynthetic)
       // patvars in for comprehensions share the pos of where the name was introduced
       val byPos = infos.pats.groupMap(uniformPos(_, _))((sym, pos) => sym)
-      for (pos, syms) <- byPos if !syms.exists(_.hasAnnotation(defn.UnusedAnnot)) do
+      for (pos, syms) <- byPos if pos.span.exists && !syms.exists(_.hasAnnotation(defn.UnusedAnnot)) do
         if !syms.exists(infos.refs(_)) then
           if !syms.exists(v => !v.isLocal && !v.is(Private)) then
             warnAt(pos)(UnusedSymbol.patVars)
@@ -658,7 +658,10 @@ object CheckUnused:
           val selector = textAt(sel.srcPos)  // keep original
           s"$qual.$selector"                 // don't succumb to vagaries of show
         // begin actionable
-        val sortedImps = infos.imps.keySet.nn.asScala.toArray.sortBy(_.srcPos.span.point) // sorted by pos
+        val sortedImps = infos.imps.keySet.nn.asScala
+                         .filter(_.srcPos.span.exists) // extra caution
+                         .toArray
+                         .sortBy(_.srcPos.span.point) // sorted by pos, not sort in place
         var index = 0
         while index < sortedImps.length do
           val nextImport = sortedImps.indexSatisfying(from = index + 1)(_.isPrimaryClause) // next import statement
@@ -757,7 +760,11 @@ object CheckUnused:
     if ctx.settings.WunusedHas.imports || ctx.settings.WunusedHas.strictNoImplicitWarn then
       checkImports()
 
-    warnings.result().sortBy(_._2.span.point)
+    def sortOrder(msgInfo: MessageInfo): Int =
+      val srcPos = msgInfo._2
+      if srcPos.span.exists then srcPos.span.point else 0
+
+    warnings.result().sortBy(sortOrder)
   end warnings
 
   // Specific exclusions
@@ -881,8 +888,7 @@ object CheckUnused:
   extension (imp: Import)
     /** Is it the first import clause in a statement? `a.x` in `import a.x, b.{y, z}` */
     def isPrimaryClause(using Context): Boolean =
-      val span = imp.srcPos.span
-      span.start != span.point // primary clause starts at `import` keyword
+      imp.srcPos.span.pointDelta > 0 // primary clause starts at `import` keyword with point at clause proper
 
     /** Generated import of cases from enum companion. */
     def isGeneratedByEnum(using Context): Boolean =
@@ -905,6 +911,7 @@ object CheckUnused:
 
   extension (pos: SrcPos)
     def isZeroExtentSynthetic: Boolean = pos.span.isSynthetic && pos.span.isZeroExtent
+    def isSynthetic: Boolean = pos.span.isSynthetic && pos.span.exists
 
   extension [A <: AnyRef](arr: Array[A])
     // returns `until` if not satisfied

From 975f776d731a9621aec7940e8b41377af923fe3c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sat, 19 Apr 2025 13:01:43 +0200
Subject: [PATCH 046/505] Check span.exists where necessary

[Cherry-picked 7ad8418c6cc53a6003b8962bc8e09bbbb9861547][modified]

From 9093057800f206a178e0b229f52c8fe33ab3557f Mon Sep 17 00:00:00 2001
From: Joel Wilsson <joel.wilsson@gmail.com>
Date: Fri, 30 Aug 2024 16:02:39 +0200
Subject: [PATCH 047/505] Handle NoType in TypeComparer.disjointnessBoundary

Closes #20265
---
 tests/neg/i20265.check | 28 ++++++++++++++++++++++++++++
 tests/neg/i20265.scala | 23 +++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 tests/neg/i20265.check
 create mode 100644 tests/neg/i20265.scala

diff --git a/tests/neg/i20265.check b/tests/neg/i20265.check
new file mode 100644
index 000000000000..a55e4eba7c45
--- /dev/null
+++ b/tests/neg/i20265.check
@@ -0,0 +1,28 @@
+-- [E172] Type Error: tests/neg/i20265.scala:22:95 ---------------------------------------------------------------------
+22 |  println(summon[((String --> Unit) * (String --> Unit)) =:= Hinze[(String + String) --> Unit]]) // error
+   |                                                                                               ^
+   |                    Cannot prove that (String --> Unit) * (String --> Unit) =:= Hinze[String + String --> Unit].
+   |
+   |                    Note: a match type could not be fully reduced:
+   |
+   |                      trying to reduce  Hinze[String + String --> Unit]
+   |                      failed since selector (String + String --> Unit)#unfix
+   |                      does not match  case k1 + k2 --> v => Hinze[k1 --> v] * Hinze[k2 --> v]
+   |                      and cannot be shown to be disjoint from it either.
+   |                      Therefore, reduction cannot advance to the remaining case
+   |
+   |                        case k1 * k2 --> v => k1 --> Hinze[k2 --> v]
+-- [E172] Type Error: tests/neg/i20265.scala:23:66 ---------------------------------------------------------------------
+23 |  println(summon[String =:= Hinze[Fix[Lambda[String]#L] --> Unit]]) // error
+   |                                                                  ^
+   |                                       Cannot prove that String =:= Hinze[Fix[Lambda[String]#L] --> Unit].
+   |
+   |                                       Note: a match type could not be fully reduced:
+   |
+   |                                         trying to reduce  Hinze[Fix[Lambda[String]#L] --> Unit]
+   |                                         failed since selector (Fix[Lambda[String]#L] --> Unit)#unfix
+   |                                         does not match  case k1 + k2 --> v => Hinze[k1 --> v] * Hinze[k2 --> v]
+   |                                         and cannot be shown to be disjoint from it either.
+   |                                         Therefore, reduction cannot advance to the remaining case
+   |
+   |                                           case k1 * k2 --> v => k1 --> Hinze[k2 --> v]
diff --git a/tests/neg/i20265.scala b/tests/neg/i20265.scala
new file mode 100644
index 000000000000..1d312188ae99
--- /dev/null
+++ b/tests/neg/i20265.scala
@@ -0,0 +1,23 @@
+//> using options -source:3.3
+
+trait Poly
+trait -->[X, Y] extends Poly
+trait +[X, Y] extends Poly
+trait *[X, Y] extends Poly
+
+type Hinze[X <: Fix[?]] = X#unfix match
+  case (k1 + k2) --> v => Hinze[(k1 --> v)] * Hinze[(k2 --> v)]
+  case (k1 * k2) --> v => k1 --> Hinze[(k2 --> v)]
+
+trait Lambda[V]:
+  type Abs[X] = V * X
+  type App[X] = X * X
+  type L[X] = V + Abs[X] + App[X]
+
+trait Fix[F[X]]:
+  type unfix = F[Fix[F]]
+
+@main
+def m =
+  println(summon[((String --> Unit) * (String --> Unit)) =:= Hinze[(String + String) --> Unit]]) // error
+  println(summon[String =:= Hinze[Fix[Lambda[String]#L] --> Unit]]) // error

From 4b3ac8bd4adfbb5e8e6da1cd4501b5c2f008d221 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 13:51:54 +0200
Subject: [PATCH 048/505] Handle NoType in TypeComparer.disjointnessBoundary

Closes #20265

[Cherry-picked c00f2146504ff1c15b15230f067d09750de1a618][modified]

From 16aaa27178dcc39ae844fb655cb8023ab4141c86 Mon Sep 17 00:00:00 2001
From: Joel Wilsson <joel.wilsson@gmail.com>
Date: Sun, 26 Jan 2025 17:51:29 +0100
Subject: [PATCH 049/505] Add test that crashes without -source 3.3

[Cherry-picked 3d8a70fe81381b873236529401f6a0740c12bf41]
---
 tests/neg/i20265-1.check | 5 +++++
 tests/neg/i20265-1.scala | 9 +++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/neg/i20265-1.check
 create mode 100644 tests/neg/i20265-1.scala

diff --git a/tests/neg/i20265-1.check b/tests/neg/i20265-1.check
new file mode 100644
index 000000000000..6eb9f4cfe5c6
--- /dev/null
+++ b/tests/neg/i20265-1.check
@@ -0,0 +1,5 @@
+-- Error: tests/neg/i20265-1.scala:4:6 ---------------------------------------------------------------------------------
+4 |  def apply(args: Tuple.Map[m.MirroredElemTypes, Expr]): Expr[T] = ??? // error
+  |      ^
+  |      non-private method apply in trait Ops refers to private given instance m
+  |      in its type signature (args: Tuple.Map[Ops.this.m.MirroredElemTypes, Expr]): Expr[T]
diff --git a/tests/neg/i20265-1.scala b/tests/neg/i20265-1.scala
new file mode 100644
index 000000000000..085d387ae901
--- /dev/null
+++ b/tests/neg/i20265-1.scala
@@ -0,0 +1,9 @@
+trait Expr[T]
+
+trait Ops[T](using m: scala.deriving.Mirror.ProductOf[T]) {
+  def apply(args: Tuple.Map[m.MirroredElemTypes, Expr]): Expr[T] = ??? // error
+}
+
+case class P(a: Int)
+object P extends Ops[P]
+

From 2bd0e2d3d276b2d21042737c9cf2d083c1cd6b77 Mon Sep 17 00:00:00 2001
From: Rocco Mathijn Andela <rm.andela@gmail.com>
Date: Wed, 29 Jan 2025 11:43:10 +0100
Subject: [PATCH 050/505] Warn on bad extensions of aliases (#22362)

Fixes https://github.com/scala/scala3/issues/22233
---
 compiler/src/dotty/tools/dotc/typer/RefChecks.scala | 2 +-
 tests/{pos => warn}/ext-override.scala              | 2 +-
 tests/warn/i16743.check                             | 7 +++++++
 tests/warn/i16743.scala                             | 2 +-
 tests/warn/i22233.scala                             | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)
 rename tests/{pos => warn}/ext-override.scala (89%)
 create mode 100644 tests/warn/i22233.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
index 87768e8a2026..bb58bb05fadf 100644
--- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
@@ -1089,7 +1089,7 @@ object RefChecks {
             }
           }
         .exists
-      if !target.typeSymbol.denot.isAliasType && !target.typeSymbol.denot.isOpaqueAlias && hidden
+      if !target.typeSymbol.isOpaqueAlias && hidden
       then report.warning(ExtensionNullifiedByMember(sym, target.typeSymbol), sym.srcPos)
   end checkExtensionMethods
 
diff --git a/tests/pos/ext-override.scala b/tests/warn/ext-override.scala
similarity index 89%
rename from tests/pos/ext-override.scala
rename to tests/warn/ext-override.scala
index d08439e13c9a..7c082695cbaa 100644
--- a/tests/pos/ext-override.scala
+++ b/tests/warn/ext-override.scala
@@ -7,6 +7,6 @@ trait Foo[T]:
 class Bla:
   def hi: String = "hi"
 object Bla:
-  given Foo[Bla] with
+  given Foo[Bla]:
     extension (x: Bla)
       def hi: String = x.hi
diff --git a/tests/warn/i16743.check b/tests/warn/i16743.check
index 6fa1f2c83357..9fdf80e71f2b 100644
--- a/tests/warn/i16743.check
+++ b/tests/warn/i16743.check
@@ -1,3 +1,10 @@
+-- [E194] Potential Issue Warning: tests/warn/i16743.scala:90:8 --------------------------------------------------------
+90 |    def length() = 42 // warn This extension method will be shadowed by .length() on String.
+   |        ^
+   |        Extension method length will never be selected from type String
+   |        because String already has a member with the same name and compatible parameter types.
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E194] Potential Issue Warning: tests/warn/i16743.scala:30:6 --------------------------------------------------------
 30 |  def t = 27 // warn
    |      ^
diff --git a/tests/warn/i16743.scala b/tests/warn/i16743.scala
index 4c9c99cf30d0..e8860aeabaae 100644
--- a/tests/warn/i16743.scala
+++ b/tests/warn/i16743.scala
@@ -87,7 +87,7 @@ class Depends:
 object Depending:
   extension (using depends: Depends)(x: depends.Thing)
     def y = 42
-    def length() = 42 // nowarn see Quote above
+    def length() = 42 // warn This extension method will be shadowed by .length() on String.
   def f(using d: Depends) = d.thing.y
   def g(using d: Depends) = d.thing.length()
 
diff --git a/tests/warn/i22233.scala b/tests/warn/i22233.scala
new file mode 100644
index 000000000000..08caea1c25fb
--- /dev/null
+++ b/tests/warn/i22233.scala
@@ -0,0 +1 @@
+extension (s: String) def length = 42 // warn

From 68e6ec2d1737189f056697e3711d469060546f42 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 13:52:55 +0200
Subject: [PATCH 051/505] Warn on bad extensions of aliases (#22362)

Fixes https://github.com/scala/scala3/issues/22233
[Cherry-picked 5fe57c299b68c52f4596e707904513bffa14848f][modified]

From 9e05dba93785bedcfc3b43c5aae0e7c6412a34ab Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Wed, 29 Jan 2025 02:45:59 -0800
Subject: [PATCH 052/505] No outdent at eof (#22435)

Fixes #22332

The reference does not mention `<eof>`. `<outdent>` insertion does not
require a particular next token, though some next tokens affect it (that
is, leading infix or tokens that close an indentation region). It does
require a "first token on the next line", for which we may take `<eof>`
as the lack of a token.

Of course, ordinary error messages say `eof`.

The same text with an opening brace is unchanged:
```
5 |
  | ^
  | '}' expected, but eof found
```
[Cherry-picked 81e057a8d4bcde2d8cee628b8b02f90fbfb05954]
---
 compiler/src/dotty/tools/dotc/parsing/Scanners.scala | 1 +
 tests/pos/i22332.scala                               | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 tests/pos/i22332.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
index aadedde612f7..57a7ff1c4a9b 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -615,6 +615,7 @@ object Scanners {
             if nextWidth < lastWidth then currentRegion = topLevelRegion(nextWidth)
           else if !isLeadingInfixOperator(nextWidth) && !statCtdTokens.contains(lastToken) && lastToken != INDENT then
             currentRegion match
+              case _ if token == EOF => // no OUTDENT at EOF
               case r: Indented =>
                 insert(OUTDENT, offset)
                 handleNewIndentWidth(r.enclosing, ir =>
diff --git a/tests/pos/i22332.scala b/tests/pos/i22332.scala
new file mode 100644
index 000000000000..1b0b6a370329
--- /dev/null
+++ b/tests/pos/i22332.scala
@@ -0,0 +1,5 @@
+
+object Foo:
+  val foo = 42
+ // one space
+ 
\ No newline at end of file

From 6b2ac6fffe1eba32130d802fa2d9e3bc790bbdad Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Thu, 30 Jan 2025 17:18:12 +0000
Subject: [PATCH 053/505] Fix inferredTypeEdits for symbols
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jędrzej Rochala <rochala@tutanota.com>

[Cherry-picked f6234e768cd02be88e06b62bae50a2a67ce9f48f]
---
 .../dotty/tools/pc/InferredTypeProvider.scala | 22 +++--
 .../tests/edit/InsertInferredTypeSuite.scala  | 87 +++++++++++++++++++
 2 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
index d8cdbcd8fe69..a0d726d5f382 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
@@ -112,8 +112,8 @@ final class InferredTypeProvider(
     def imports: List[TextEdit] =
       printer.imports(autoImportsGen)
 
-    def printType(tpe: Type): String =
-      printer.tpe(tpe)
+    def printTypeAscription(tpe: Type, spaceBefore: Boolean = false): String =
+      (if spaceBefore then " : " else ": ") + printer.tpe(tpe)
 
     path.headOption match
       /* `val a = 1` or `var b = 2`
@@ -124,7 +124,7 @@ final class InferredTypeProvider(
        *     turns into
        * `.map((a: Int) => a + a)`
        */
-      case Some(vl @ ValDef(sym, tpt, rhs)) =>
+      case Some(vl @ ValDef(name, tpt, rhs)) =>
         val isParam = path match
           case head :: next :: _ if next.symbol.isAnonymousFunction => true
           case head :: (b @ Block(stats, expr)) :: next :: _
@@ -136,9 +136,11 @@ final class InferredTypeProvider(
           val endPos =
             findNamePos(sourceText, vl, keywordOffset).endPos.toLsp
           adjustOpt.foreach(adjust => endPos.setEnd(adjust.adjustedEndPos))
+          val spaceBefore = name.isOperatorName
+
           new TextEdit(
             endPos,
-            ": " + printType(optDealias(tpt.typeOpt)) + {
+            printTypeAscription(optDealias(tpt.typeOpt), spaceBefore) + {
               if withParens then ")" else ""
             }
           )
@@ -197,7 +199,7 @@ final class InferredTypeProvider(
        *     turns into
        * `def a[T](param : Int): Int = param`
        */
-      case Some(df @ DefDef(name, _, tpt, rhs)) =>
+      case Some(df @ DefDef(name, paramss, tpt, rhs)) =>
         def typeNameEdit =
           /* NOTE: In Scala 3.1.3, `List((1,2)).map((<<a>>,b) => ...)`
            * turns into `List((1,2)).map((:Inta,b) => ...)`,
@@ -208,10 +210,12 @@ final class InferredTypeProvider(
             if tpt.endPos.end > df.namePos.end then tpt.endPos.toLsp
             else df.namePos.endPos.toLsp
 
+          val spaceBefore = name.isOperatorName && paramss.isEmpty
+
           adjustOpt.foreach(adjust => end.setEnd(adjust.adjustedEndPos))
           new TextEdit(
             end,
-            ": " + printType(optDealias(tpt.typeOpt))
+            printTypeAscription(optDealias(tpt.typeOpt), spaceBefore)
           )
         end typeNameEdit
 
@@ -239,9 +243,10 @@ final class InferredTypeProvider(
        */
       case Some(bind @ Bind(name, body)) =>
         def baseEdit(withParens: Boolean) =
+          val spaceBefore = name.isOperatorName
           new TextEdit(
             bind.endPos.toLsp,
-            ": " + printType(optDealias(body.typeOpt)) + {
+            printTypeAscription(optDealias(body.typeOpt), spaceBefore) + {
               if withParens then ")" else ""
             }
           )
@@ -272,9 +277,10 @@ final class InferredTypeProvider(
        * `for(t: Int <- 0 to 10)`
        */
       case Some(i @ Ident(name)) =>
+        val spaceBefore = name.isOperatorName
         val typeNameEdit = new TextEdit(
           i.endPos.toLsp,
-          ": " + printType(optDealias(i.typeOpt.widen))
+          printTypeAscription(optDealias(i.typeOpt.widen), spaceBefore)
         )
         typeNameEdit :: imports
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
index a96dd78be138..c1a84d6abb79 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
@@ -883,6 +883,93 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite:
         |""".stripMargin
     )
 
+  @Test def `operator-val` =
+    checkEdit(
+      """|object A {
+         |  val <<!>> = 1
+         |}
+         |""".stripMargin,
+      """|object A {
+         |  val ! : Int = 1
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `operator-def` =
+    checkEdit(
+      """|object A {
+         |  def <<!>> = 1
+         |}
+         |""".stripMargin,
+      """|object A {
+         |  def ! : Int = 1
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `operator-def-param` =
+    checkEdit(
+      """|object A {
+         |  def <<!>>[T] = 1
+         |}
+         |""".stripMargin,
+      """|object A {
+         |  def ![T]: Int = 1
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `operator-def-type-param` =
+    checkEdit(
+      """|object A {
+         |  def <<!>>(x: Int) = 1
+         |}
+         |""".stripMargin,
+      """|object A {
+         |  def !(x: Int): Int = 1
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `operator-for` =
+    checkEdit(
+      """|object A {
+         |  def foo = for(<<!>> <- List(1)) yield !
+         |}
+         |""".stripMargin,
+      """|object A {
+         |  def foo = for(! : Int <- List(1)) yield !
+         |}
+         |""".stripMargin
+    )
+  @Test def `operator-lambda` =
+    checkEdit(
+      """|object A {
+         |  val foo: Int => Int = (<<!>>) => ! + 1
+         |}
+         |""".stripMargin,
+      """|object A {
+         |  val foo: Int => Int = (! : Int) => ! + 1
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `operator-ident` =
+    checkEdit(
+      """|object A {
+         |  def foo =
+         |    val ! = 1
+         |    <<!>>
+         |}
+         |""".stripMargin,
+      """|object A {
+         |  def foo =
+         |    val ! = 1
+         |    ! : Int
+         |}
+         |""".stripMargin
+    )
+
   def checkEdit(
       original: String,
       expected: String

From 1a9e6e460d95fc8951efa4fac8547be44b1fbc20 Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Fri, 31 Jan 2025 11:23:13 +0100
Subject: [PATCH 054/505] Remove DRI from Scaladoc warnings (#22330)

partial fix for #20028
[Cherry-picked f88f92ea5b491f118b925edf427066446f9e48ff]
---
 scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala  | 4 ++--
 .../src/dotty/tools/scaladoc/tasty/comments/Comments.scala  | 2 +-
 .../dotty/tools/scaladoc/tasty/comments/MemberLookup.scala  | 6 +++---
 .../dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
index 35cf1cb6eec3..774e775f4e53 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
@@ -75,7 +75,7 @@ trait TypesSupport:
         else inner(tpe) ++ plain(".").l ++ suffix
       case tpe => inner(tpe)
 
-  // TODO #23 add support for all types signatures that makes sense
+  // TODO #23 add support for all types signatures that make sense
   private def inner(
     using Quotes,
   )(
@@ -87,7 +87,7 @@ trait TypesSupport:
   ): SSignature =
     import reflect._
     def noSupported(name: String): SSignature =
-      println(s"WARN: Unsupported type: $name: ${tp.show}")
+      report.warning(s"Unsupported type: $name: ${tp.show}")
       plain(s"Unsupported[$name]").l
     tp match
       case OrType(left, right) =>
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala
index ff4405d3ec71..44a1c3630a5f 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala
@@ -112,7 +112,7 @@ abstract class MarkupConversion[T](val repr: Repr)(using dctx: DocContext) {
               case None => sym.dri
             DocLink.ToDRI(dri, targetText)
           case None =>
-            val txt = s"No DRI found for query"
+            val txt = s"Couldn't resolve a member for the given link query"
             val msg = s"$txt: $queryStr"
 
             if (!summon[DocContext].args.noLinkWarnings) then
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala
index b2c4e1bdcac4..303722f8b2df 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala
@@ -31,8 +31,8 @@ trait MemberLookup {
       def nearestPackage(sym: Symbol): Symbol =
         if sym.flags.is(Flags.Package) then sym else nearestPackage(sym.owner)
 
-      def nearestMembered(sym: Symbol): Symbol =
-        if sym.isClassDef || sym.flags.is(Flags.Package) then sym else nearestMembered(sym.owner)
+      def nearestMember(sym: Symbol): Symbol =
+        if sym.isClassDef || sym.flags.is(Flags.Package) then sym else nearestMember(sym.owner)
 
       val res: Option[(Symbol, String, Option[Symbol])] = {
         def toplevelLookup(querystrings: List[String]) =
@@ -43,7 +43,7 @@ trait MemberLookup {
 
         ownerOpt match {
           case Some(owner) =>
-            val nearest = nearestMembered(owner)
+            val nearest = nearestMember(owner)
             val nearestCls = nearestClass(owner)
             val nearestPkg = nearestPackage(owner)
             def relativeLookup(querystrings: List[String], owner: Symbol): Option[(Symbol, Option[Symbol])] = {
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala
index f11e8095afe7..86e7298226ea 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala
@@ -5,8 +5,7 @@ import scala.collection.{Seq => _, _}
 // import representations._
 
 /** A body of text. A comment has a single body, which is composed of
-  * at least one block. Inside every body is exactly one summary (see
-  * [[scala.tools.nsc.doc.model.comment.Summary]]). */
+  * at least one block. Inside every body is exactly one summary. */
 final case class Body(blocks: Seq[Block]) {
 
   /** The summary text of the comment body. */

From 644099390a6957bec0ee62dacbbae3e012a6668a Mon Sep 17 00:00:00 2001
From: Joel Wilsson <wjoel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:42:33 +0100
Subject: [PATCH 055/505] Handle type aliases in contextFunctionResultTypeAfter
 (#21517)

Closes #21433
---
 .../dotty/tools/dotc/transform/ContextFunctionResults.scala | 2 +-
 tests/pos/i21433.scala                                      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i21433.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala
index 0bb54f8c9345..463bb68718ef 100644
--- a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala
@@ -104,7 +104,7 @@ object ContextFunctionResults:
   def contextFunctionResultTypeAfter(meth: Symbol, depth: Int)(using Context) =
     def recur(tp: Type, n: Int): Type =
       if n == 0 then tp
-      else tp match
+      else tp.dealias match
         case defn.ContextFunctionType(_, resTpe) => recur(resTpe, n - 1)
     recur(meth.info.finalResultType, depth)
 
diff --git a/tests/pos/i21433.scala b/tests/pos/i21433.scala
new file mode 100644
index 000000000000..0efc4ac197ae
--- /dev/null
+++ b/tests/pos/i21433.scala
@@ -0,0 +1,6 @@
+trait A[T]:
+  type R = T ?=> Unit
+  def f: R = ()
+
+class B extends A[Int]:
+  override def f: R = ()

From e2ee55f095b9c1cea107f0a9e38b30ff2495313e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 13:54:29 +0200
Subject: [PATCH 056/505] Handle type aliases in contextFunctionResultTypeAfter
 (#21517)

Closes #21433
[Cherry-picked 590691b09bb8554dd312a4e942f91dcd43ba6b44][modified]

From 80fdbb882a7dce7f5bf1c8f8924154dba3c58dab Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 31 Jan 2025 14:18:56 +0000
Subject: [PATCH 057/505] Avoid inf recursion in provablyDisjointClasses

---
 tests/pos/i22266.scala | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/pos/i22266.scala

diff --git a/tests/pos/i22266.scala b/tests/pos/i22266.scala
new file mode 100644
index 000000000000..2ecdf9492a93
--- /dev/null
+++ b/tests/pos/i22266.scala
@@ -0,0 +1,22 @@
+sealed trait NonPolygon
+sealed trait Polygon
+
+sealed trait SymmetryAspect
+sealed trait RotationalSymmetry      extends SymmetryAspect
+sealed trait MaybeRotationalSymmetry extends SymmetryAspect
+
+enum Shape:
+  case Circle   extends Shape with NonPolygon with RotationalSymmetry
+  case Triangle extends Shape with Polygon with MaybeRotationalSymmetry
+  case Square   extends Shape with Polygon with RotationalSymmetry
+
+object Shape:
+
+  def hasPolygon(
+    rotationalSyms: Vector[Shape & RotationalSymmetry],
+    maybeSyms: Vector[Shape & MaybeRotationalSymmetry]
+  ): Boolean =
+    val all = rotationalSyms.concat(maybeSyms)
+    all.exists:
+      case _: Polygon => true
+      case _          => false

From 0adb4871211b70a87e11022047c4d427a2b36ad8 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 14:10:23 +0200
Subject: [PATCH 058/505] Avoid inf recursion in provablyDisjointClasses

[Cherry-picked 3cd94b4049d84d32464d695c753e1b1770a34c89][modified]

From 596c11fa7a1eb2f3d7fb61d81348ec7502a7dab6 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 31 Jan 2025 15:19:02 +0000
Subject: [PATCH 059/505] Avoid early widening enum val symbols in
 provablyDisjointClasses

---
 tests/pos/i22266.unenum.scala  | 22 ++++++++++++++++++++++
 tests/warn/ext-override.scala  |  2 +-
 tests/warn/i21860.unenum.scala |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/i22266.unenum.scala

diff --git a/tests/pos/i22266.unenum.scala b/tests/pos/i22266.unenum.scala
new file mode 100644
index 000000000000..e7529b7edabe
--- /dev/null
+++ b/tests/pos/i22266.unenum.scala
@@ -0,0 +1,22 @@
+sealed trait NonPolygon
+sealed trait Polygon
+
+sealed trait SymmetryAspect
+sealed trait RotationalSymmetry      extends SymmetryAspect
+sealed trait MaybeRotationalSymmetry extends SymmetryAspect
+
+sealed abstract class Shape
+
+object Shape:
+  case object Circle   extends Shape with NonPolygon with RotationalSymmetry
+  case object Triangle extends Shape with Polygon with MaybeRotationalSymmetry
+  case object Square   extends Shape with Polygon with RotationalSymmetry
+
+  def hasPolygon(
+    rotationalSyms: Vector[Shape & RotationalSymmetry],
+    maybeSyms: Vector[Shape & MaybeRotationalSymmetry]
+  ): Boolean =
+    val all = rotationalSyms.concat(maybeSyms)
+    all.exists:
+      case _: Polygon => true
+      case _          => false
diff --git a/tests/warn/ext-override.scala b/tests/warn/ext-override.scala
index 7c082695cbaa..d08439e13c9a 100644
--- a/tests/warn/ext-override.scala
+++ b/tests/warn/ext-override.scala
@@ -7,6 +7,6 @@ trait Foo[T]:
 class Bla:
   def hi: String = "hi"
 object Bla:
-  given Foo[Bla]:
+  given Foo[Bla] with
     extension (x: Bla)
       def hi: String = x.hi
diff --git a/tests/warn/i21860.unenum.scala b/tests/warn/i21860.unenum.scala
index 7335e1b6851d..e4b282e35e76 100644
--- a/tests/warn/i21860.unenum.scala
+++ b/tests/warn/i21860.unenum.scala
@@ -3,7 +3,7 @@ sealed trait Corners { self: Figure => }
 
 sealed abstract class Shape extends Figure
 object Shape:
-  case object Triange  extends Shape with Corners
+  case object Triangle extends Shape with Corners
   case object Square   extends Shape with Corners
   case object Circle   extends Shape
   case object Ellipsis extends Shape

From 6b2eca34c1978cc9fa53ead7c8f4f868148a5455 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 14:14:44 +0200
Subject: [PATCH 060/505] Avoid early widening enum val symbols in
 provablyDisjointClasses

[Cherry-picked 04f6fc3893404bfc8c87395d2daa5601b7672fe9][modified]

From 04e9c0a4f1dfbcecec15570b91604d58560f8d98 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 3 Feb 2025 11:40:29 +0000
Subject: [PATCH 061/505] Document enum value changes in
 provablyDisjointClasses

---
 compiler/src/dotty/tools/dotc/core/TypeComparer.scala | 6 +++---
 docs/_spec/03-types.md                                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
index 5e0d9a98aa74..48274e0561ef 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -2772,11 +2772,11 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
    *
    *  1. Single inheritance of classes
    *  2. Final classes cannot be extended
-   *  3. ConstantTypes with distinct values are non intersecting
-   *  4. TermRefs with distinct values are non intersecting
+   *  3. ConstantTypes with distinct values are non-intersecting
+   *  4. TermRefs with distinct values are non-intersecting
    *  5. There is no value of type Nothing
    *
-   *  Note on soundness: the correctness of match types relies on on the
+   *  Note on soundness: the correctness of match types relies on the
    *  property that in all possible contexts, the same match type expression
    *  is either stuck or reduces to the same case.
    */
diff --git a/docs/_spec/03-types.md b/docs/_spec/03-types.md
index 4b1293258495..5d4e205aace9 100644
--- a/docs/_spec/03-types.md
+++ b/docs/_spec/03-types.md
@@ -1071,7 +1071,7 @@ The following properties hold about ´⌈X⌉´ (we have paper proofs for those)
 The "lower-bound rule" states that ´S <: T´ if ´T = q.X´ and ´q.X´ is a non-class type designator and ´S <: L´ where ´L´ is the lower bound of the underlying type definition of ´q.X´".
 That rule is known to break transitivy of subtyping in Scala already.
 
-Second, we define the relation ´⋔´ on *classes* (including traits and hidden classes of objects) as:
+Second, we define the relation ´⋔´ on *classes* (including traits, hidden classes of objects, and enum terms) as:
 
 - ´C ⋔ D´ if `´C ∉´ baseClasses´(D)´` and ´D´ is `final`
 - ´C ⋔ D´ if `´D ∉´ baseClasses´(C)´` and ´C´ is `final`

From c9fe273dc603e343133997ff5a67c5a0bc365955 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 14:15:07 +0200
Subject: [PATCH 062/505] Document enum value changes in
 provablyDisjointClasses

[Cherry-picked 4cd2a97a1c74a1eb3408e128fa4166eb1d0899f7][modified]

From ddea7c73cc35e9ec6aa3eb1870941eaa8e602360 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 3 Feb 2025 16:24:56 -0800
Subject: [PATCH 063/505] Don't warn retainedBody

---
 .../dotty/tools/dotc/transform/CheckUnused.scala   |  3 ++-
 tests/warn/t22507.scala                            | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/warn/t22507.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 29fef0843902..a454c59eea7b 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -8,7 +8,7 @@ import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.{Name, SimpleName, DerivedName, TermName, termName}
 import dotty.tools.dotc.core.NameOps.{isAnonymousFunctionName, isReplWrapperName, isContextFunction}
-import dotty.tools.dotc.core.NameKinds.{ContextBoundParamName, ContextFunctionParamName, WildcardParamName}
+import dotty.tools.dotc.core.NameKinds.{BodyRetainerName, ContextBoundParamName, ContextFunctionParamName, WildcardParamName}
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols.{ClassSymbol, NoSymbol, Symbol, defn, isDeprecated, requiredClass, requiredModule}
 import dotty.tools.dotc.core.Types.*
@@ -502,6 +502,7 @@ object CheckUnused:
       if ctx.settings.WunusedHas.privates
         && !sym.isPrimaryConstructor
         && sym.is(Private, butNot = SelfName | Synthetic | CaseAccessor)
+        && !sym.name.is(BodyRetainerName)
         && !sym.isSerializationSupport
         && !(sym.is(Mutable) && sym.isSetter && sym.owner.is(Trait)) // tracks sym.underlyingSymbol sibling getter
       then
diff --git a/tests/warn/t22507.scala b/tests/warn/t22507.scala
new file mode 100644
index 000000000000..76ae9a2b9a8b
--- /dev/null
+++ b/tests/warn/t22507.scala
@@ -0,0 +1,14 @@
+
+//> using options -Werror -Wunused:privates
+
+case class BinaryFen(value: Array[Byte]) extends AnyVal:
+
+  def read: Unit =
+    val reader = new Iterator[Byte]:
+      val inner                            = value.iterator
+      override inline def hasNext: Boolean = inner.hasNext // nowarn
+      override inline def next: Byte       = if hasNext then inner.next else 0.toByte // nowarn
+
+    if reader.hasNext then
+      val b: Byte = reader.next
+      println(b)

From 7a5415b6b989a023340687e4fcd9fd78d35fcb63 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 14:16:31 +0200
Subject: [PATCH 064/505] Don't warn retainedBody

[Cherry-picked 8d3954f8095a6705c0aaaf103245f071943c48a3][modified]

From 221c36922f24c1d7fdaf6971caa2208e2925eef0 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Fri, 31 Jan 2025 17:17:42 +0100
Subject: [PATCH 065/505] chore: update mtags to `1.5.1`

[Cherry-picked 19690b4a1bf13e19da3441f2a1cad52ad4d5dfc2]
---
 .../dotty/tools/pc/PcInlayHintsProvider.scala |   2 +-
 .../tools/pc/ScalaPresentationCompiler.scala  | 109 ++++++++++--------
 project/Build.scala                           |   2 +-
 3 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 4b1b3f5fe7ba..cf4929dfc91d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -57,7 +57,7 @@ class PcInlayHintsProvider(
       .headOption
       .getOrElse(unit.tpdTree)
       .enclosedChildren(pos.span)
-      .flatMap(tpdTree => deepFolder(InlayHints.empty, tpdTree).result())
+      .flatMap(tpdTree => deepFolder(InlayHints.empty(params.uri()), tpdTree).result())
 
   private def adjustPos(pos: SourcePosition): SourcePosition =
     pos.adjust(text)._1
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index a44c16ecc748..dc53525480c3 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -16,6 +16,7 @@ import scala.language.unsafeNulls
 import scala.meta.internal.metals.CompilerVirtualFileParams
 import scala.meta.internal.metals.EmptyCancelToken
 import scala.meta.internal.metals.EmptyReportContext
+import scala.meta.internal.metals.PcQueryContext
 import scala.meta.internal.metals.ReportContext
 import scala.meta.internal.metals.ReportLevel
 import scala.meta.internal.metals.StdReportContext
@@ -143,18 +144,18 @@ case class ScalaPresentationCompiler(
   override def semanticTokens(
       params: VirtualFileParams
   ): CompletableFuture[ju.List[Node]] =
-    compilerAccess.withInterruptableCompiler(Some(params))(
+    compilerAccess.withInterruptableCompiler(
       new ju.ArrayList[Node](),
       params.token()
     ) { access =>
       val driver = access.compiler()
       new PcSemanticTokensProvider(driver, params).provide().asJava
-    }
+    }(params.toQueryContext)
 
   override def inlayHints(
       params: InlayHintsParams
   ): ju.concurrent.CompletableFuture[ju.List[l.InlayHint]] =
-    compilerAccess.withInterruptableCompiler(Some(params))(
+    compilerAccess.withInterruptableCompiler(
       new ju.ArrayList[l.InlayHint](),
       params.token(),
     ) { access =>
@@ -162,7 +163,7 @@ case class ScalaPresentationCompiler(
       new PcInlayHintsProvider(driver, params, search)
         .provide()
         .asJava
-    }
+    }(params.toQueryContext)
 
   override def getTasty(
       targetUri: URI,
@@ -173,7 +174,7 @@ case class ScalaPresentationCompiler(
     }
 
   def complete(params: OffsetParams): CompletableFuture[l.CompletionList] =
-    compilerAccess.withInterruptableCompiler(Some(params))(
+    compilerAccess.withInterruptableCompiler(
       EmptyCompletionList(),
       params.token()
     ) { access =>
@@ -188,44 +189,43 @@ case class ScalaPresentationCompiler(
         folderPath,
         completionItemPriority
       ).completions()
-
-    }
+    }(params.toQueryContext)
 
   def definition(params: OffsetParams): CompletableFuture[DefinitionResult] =
-    compilerAccess.withInterruptableCompiler(Some(params))(
+    compilerAccess.withInterruptableCompiler(
       DefinitionResultImpl.empty,
       params.token()
     ) { access =>
       val driver = access.compiler()
       PcDefinitionProvider(driver, params, search).definitions()
-    }
+    }(params.toQueryContext)
 
   override def typeDefinition(
       params: OffsetParams
   ): CompletableFuture[DefinitionResult] =
-    compilerAccess.withInterruptableCompiler(Some(params))(
+    compilerAccess.withInterruptableCompiler(
       DefinitionResultImpl.empty,
       params.token()
     ) { access =>
       val driver = access.compiler()
       PcDefinitionProvider(driver, params, search).typeDefinitions()
-    }
+    }(params.toQueryContext)
 
   def documentHighlight(
       params: OffsetParams
   ): CompletableFuture[ju.List[DocumentHighlight]] =
-    compilerAccess.withInterruptableCompiler(Some(params))(
+    compilerAccess.withInterruptableCompiler(
       List.empty[DocumentHighlight].asJava,
       params.token()
     ) { access =>
       val driver = access.compiler()
       PcDocumentHighlightProvider(driver, params).highlights.asJava
-    }
+    }(params.toQueryContext)
 
   override def references(
       params: ReferencesRequest
   ): CompletableFuture[ju.List[ReferencesResult]] =
-    compilerAccess.withNonInterruptableCompiler(Some(params.file()))(
+    compilerAccess.withNonInterruptableCompiler(
       List.empty[ReferencesResult].asJava,
       params.file().token,
     ) { access =>
@@ -233,16 +233,16 @@ case class ScalaPresentationCompiler(
       PcReferencesProvider(driver, params)
         .references()
         .asJava
-    }
+    }(params.file().toQueryContext)
 
   def inferExpectedType(params: OffsetParams): CompletableFuture[ju.Optional[String]] =
-    compilerAccess.withInterruptableCompiler(Some(params))(
+    compilerAccess.withInterruptableCompiler(
       Optional.empty(),
       params.token,
     ) { access =>
       val driver = access.compiler()
       new InferExpectedType(search, driver, params).infer().asJava
-    }
+    }(params.toQueryContext)
 
   def shutdown(): Unit =
     compilerAccess.shutdown()
@@ -257,8 +257,6 @@ case class ScalaPresentationCompiler(
       symbol: String
   ): CompletableFuture[Optional[IPcSymbolInformation]] =
     compilerAccess.withNonInterruptableCompiler[Optional[IPcSymbolInformation]](
-      None
-    )(
       Optional.empty(),
       EmptyCancelToken,
     ) { access =>
@@ -266,27 +264,27 @@ case class ScalaPresentationCompiler(
         .info(symbol)
         .map(_.asJava)
         .asJava
-    }
+    }(emptyQueryContext)
 
   def semanticdbTextDocument(
       filename: URI,
       code: String
   ): CompletableFuture[Array[Byte]] =
     val virtualFile = CompilerVirtualFileParams(filename, code)
-    compilerAccess.withNonInterruptableCompiler(Some(virtualFile))(
+    compilerAccess.withNonInterruptableCompiler(
       Array.empty[Byte],
       EmptyCancelToken
     ) { access =>
       val driver = access.compiler()
       val provider = SemanticdbTextDocumentProvider(driver, folderPath)
       provider.textDocument(filename, code)
-    }
+    }(virtualFile.toQueryContext)
 
   def completionItemResolve(
       item: l.CompletionItem,
       symbol: String
   ): CompletableFuture[l.CompletionItem] =
-    compilerAccess.withNonInterruptableCompiler(None)(
+    compilerAccess.withNonInterruptableCompiler(
       item,
       EmptyCancelToken
     ) { access =>
@@ -294,7 +292,7 @@ case class ScalaPresentationCompiler(
       CompletionItemResolver.resolve(item, symbol, search, config)(using
         driver.currentCtx
       )
-    }
+    }(emptyQueryContext)
 
   def autoImports(
       name: String,
@@ -303,7 +301,7 @@ case class ScalaPresentationCompiler(
   ): CompletableFuture[
     ju.List[scala.meta.pc.AutoImportsResult]
   ] =
-    compilerAccess.withNonInterruptableCompiler(Some(params))(
+    compilerAccess.withNonInterruptableCompiler(
       List.empty[scala.meta.pc.AutoImportsResult].asJava,
       params.token()
     ) { access =>
@@ -318,13 +316,13 @@ case class ScalaPresentationCompiler(
       )
         .autoImports(isExtension)
         .asJava
-    }
+    }(params.toQueryContext)
 
   def implementAbstractMembers(
       params: OffsetParams
   ): CompletableFuture[ju.List[l.TextEdit]] =
     val empty: ju.List[l.TextEdit] = new ju.ArrayList[l.TextEdit]()
-    compilerAccess.withNonInterruptableCompiler(Some(params))(
+    compilerAccess.withNonInterruptableCompiler(
       empty,
       params.token()
     ) { pc =>
@@ -335,31 +333,31 @@ case class ScalaPresentationCompiler(
         search,
         config
       )
-    }
+    }(params.toQueryContext)
   end implementAbstractMembers
 
   override def insertInferredType(
       params: OffsetParams
   ): CompletableFuture[ju.List[l.TextEdit]] =
     val empty: ju.List[l.TextEdit] = new ju.ArrayList[l.TextEdit]()
-    compilerAccess.withNonInterruptableCompiler(Some(params))(
+    compilerAccess.withNonInterruptableCompiler(
       empty,
       params.token()
     ) { pc =>
       new InferredTypeProvider(params, pc.compiler(), config, search)
         .inferredTypeEdits()
         .asJava
-    }
+    }(params.toQueryContext)
 
   override def inlineValue(
       params: OffsetParams
   ): CompletableFuture[ju.List[l.TextEdit]] =
     val empty: Either[String, List[l.TextEdit]] = Right(List())
     (compilerAccess
-      .withInterruptableCompiler(Some(params))(empty, params.token()) { pc =>
+      .withInterruptableCompiler(empty, params.token()) { pc =>
         new PcInlineValueProviderImpl(pc.compiler(), params)
           .getInlineTextEdits()
-      })
+      }(params.toQueryContext))
       .thenApply {
         case Right(edits: List[TextEdit]) => edits.asJava
         case Left(error: String) => throw new DisplayableException(error)
@@ -371,7 +369,7 @@ case class ScalaPresentationCompiler(
       extractionPos: OffsetParams
   ): CompletableFuture[ju.List[l.TextEdit]] =
     val empty: ju.List[l.TextEdit] = new ju.ArrayList[l.TextEdit]()
-    compilerAccess.withInterruptableCompiler(Some(range))(empty, range.token()) {
+    compilerAccess.withInterruptableCompiler(empty, range.token()) {
       pc =>
         new ExtractMethodProvider(
           range,
@@ -382,7 +380,7 @@ case class ScalaPresentationCompiler(
         )
           .extractMethod()
           .asJava
-    }
+    }(range.toQueryContext)
   end extractMethod
 
   override def convertToNamedArguments(
@@ -397,13 +395,13 @@ case class ScalaPresentationCompiler(
   ): CompletableFuture[ju.List[l.TextEdit]] =
     val empty: Either[String, List[l.TextEdit]] = Right(List())
     (compilerAccess
-      .withNonInterruptableCompiler(Some(params))(empty, params.token()) { pc =>
+      .withNonInterruptableCompiler(empty, params.token()) { pc =>
         new ConvertToNamedArgumentsProvider(
           pc.compiler(),
           params,
           argIndices
         ).convertToNamedArguments
-      })
+      }(params.toQueryContext))
       .thenApplyAsync {
         case Left(error: String) => throw new DisplayableException(error)
         case Right(edits: List[l.TextEdit]) => edits.asJava
@@ -413,33 +411,33 @@ case class ScalaPresentationCompiler(
       params: ju.List[OffsetParams]
   ): CompletableFuture[ju.List[l.SelectionRange]] =
     CompletableFuture.completedFuture {
-      compilerAccess.withSharedCompiler(params.asScala.headOption)(
+      compilerAccess.withSharedCompiler(
         List.empty[l.SelectionRange].asJava
       ) { pc =>
         new SelectionRangeProvider(
           pc.compiler(),
           params,
         ).selectionRange().asJava
-      }
+      }(params.asScala.headOption.map(_.toQueryContext).getOrElse(emptyQueryContext))
     }
   end selectionRange
 
   def hover(
       params: OffsetParams
   ): CompletableFuture[ju.Optional[HoverSignature]] =
-    compilerAccess.withNonInterruptableCompiler(Some(params))(
+    compilerAccess.withNonInterruptableCompiler(
       ju.Optional.empty[HoverSignature](),
       params.token()
     ) { access =>
       val driver = access.compiler()
       HoverProvider.hover(params, driver, search, config.hoverContentType())
-    }
+    }(params.toQueryContext)
   end hover
 
   def prepareRename(
       params: OffsetParams
   ): CompletableFuture[ju.Optional[l.Range]] =
-    compilerAccess.withNonInterruptableCompiler(Some(params))(
+    compilerAccess.withNonInterruptableCompiler(
       Optional.empty[l.Range](),
       params.token()
     ) { access =>
@@ -447,19 +445,19 @@ case class ScalaPresentationCompiler(
       Optional.ofNullable(
         PcRenameProvider(driver, params, None).prepareRename().orNull
       )
-    }
+    }(params.toQueryContext)
 
   def rename(
       params: OffsetParams,
       name: String
   ): CompletableFuture[ju.List[l.TextEdit]] =
-    compilerAccess.withNonInterruptableCompiler(Some(params))(
+    compilerAccess.withNonInterruptableCompiler(
       List[l.TextEdit]().asJava,
       params.token()
     ) { access =>
       val driver = access.compiler()
       PcRenameProvider(driver, params, Some(name)).rename().asJava
-    }
+    }(params.toQueryContext)
 
   def newInstance(
       buildTargetIdentifier: String,
@@ -473,13 +471,13 @@ case class ScalaPresentationCompiler(
     )
 
   def signatureHelp(params: OffsetParams): CompletableFuture[l.SignatureHelp] =
-    compilerAccess.withNonInterruptableCompiler(Some(params))(
+    compilerAccess.withNonInterruptableCompiler(
       new l.SignatureHelp(),
       params.token()
     ) { access =>
       val driver = access.compiler()
       SignatureHelpProvider.signatureHelp(driver, params, search)
-    }
+    }(params.toQueryContext)
 
   override def didChange(
       params: VirtualFileParams
@@ -487,10 +485,10 @@ case class ScalaPresentationCompiler(
     CompletableFuture.completedFuture(Nil.asJava)
 
   override def didClose(uri: URI): Unit =
-    compilerAccess.withNonInterruptableCompiler(None)(
+    compilerAccess.withNonInterruptableCompiler(
       (),
       EmptyCancelToken
-    ) { access => access.compiler().close(uri) }
+    ) { access => access.compiler().close(uri) }(emptyQueryContext)
 
   override def withExecutorService(
       executorService: ExecutorService
@@ -515,4 +513,19 @@ case class ScalaPresentationCompiler(
 
   override def isLoaded() = compilerAccess.isLoaded()
 
+  def additionalReportData() =
+    s"""|Scala version: $scalaVersion
+        |Classpath:
+        |${classpath
+          .map(path => s"$path [${if path.exists then "exists" else "missing"} ]")
+          .mkString(", ")}
+        |Options:
+        |${options.mkString(" ")}
+        |""".stripMargin
+
+  extension (params: VirtualFileParams)
+    def toQueryContext = PcQueryContext(Some(params), additionalReportData)
+
+  def emptyQueryContext = PcQueryContext(None, additionalReportData)
+
 end ScalaPresentationCompiler
diff --git a/project/Build.scala b/project/Build.scala
index 82d9cb786811..2da2345e28fd 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -1236,7 +1236,7 @@ object Build {
       BuildInfoPlugin.buildInfoDefaultSettings
 
   lazy val presentationCompilerSettings = {
-    val mtagsVersion = "1.4.2"
+    val mtagsVersion = "1.5.1"
     Seq(
       libraryDependencies ++= Seq(
         "org.lz4" % "lz4-java" % "1.8.0",

From cfaba1b6af1e0cbbcd024b54dff61c389e12ea39 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Fri, 31 Jan 2025 17:48:31 +0100
Subject: [PATCH 066/505] improvement: look for definition in pc only for local
 symbols in the current tree

[Cherry-picked 559edd49631715d3135000cfb183e292759ea9ae]
---
 .../dotty/tools/pc/PcDefinitionProvider.scala | 28 +++++++++++--------
 .../tools/pc/tests/CompilerCachingSuite.scala | 14 ++++++----
 .../dotty/tools/pc/utils/TestInlayHints.scala | 16 +++++------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
index 7d8e4dfad081..8ff43ba07358 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
@@ -1,5 +1,6 @@
 package dotty.tools.pc
 
+import java.net.URI
 import java.nio.file.Paths
 import java.util.ArrayList
 
@@ -16,6 +17,7 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags.{Exported, ModuleClass}
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.interactive.Interactive
+import dotty.tools.dotc.interactive.Interactive.Include
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
@@ -51,10 +53,10 @@ class PcDefinitionProvider(
     given ctx: Context = driver.localContext(params)
     val indexedContext = IndexedContext(ctx)
     val result =
-      if findTypeDef then findTypeDefinitions(path, pos, indexedContext)
-      else findDefinitions(path, pos, indexedContext)
+      if findTypeDef then findTypeDefinitions(path, pos, indexedContext, uri)
+      else findDefinitions(path, pos, indexedContext, uri)
 
-    if result.locations().nn.isEmpty() then fallbackToUntyped(pos)(using ctx)
+    if result.locations().nn.isEmpty() then fallbackToUntyped(pos, uri)(using ctx)
     else result
   end definitions
 
@@ -70,24 +72,26 @@ class PcDefinitionProvider(
    * @param pos cursor position
    * @return definition result
    */
-  private def fallbackToUntyped(pos: SourcePosition)(
+  private def fallbackToUntyped(pos: SourcePosition, uri: URI)(
     using ctx: Context
   ) =
     lazy val untpdPath = NavigateAST
       .untypedPath(pos.span)
       .collect { case t: untpd.Tree => t }
 
-    definitionsForSymbol(untpdPath.headOption.map(_.symbol).toList, pos)
+    definitionsForSymbol(untpdPath.headOption.map(_.symbol).toList, uri, pos)
   end fallbackToUntyped
 
   private def findDefinitions(
       path: List[Tree],
       pos: SourcePosition,
-      indexed: IndexedContext
+      indexed: IndexedContext,
+      uri: URI,
   ): DefinitionResult =
     import indexed.ctx
     definitionsForSymbol(
       MetalsInteractive.enclosingSymbols(path, pos, indexed),
+      uri,
       pos
     )
   end findDefinitions
@@ -95,7 +99,8 @@ class PcDefinitionProvider(
   private def findTypeDefinitions(
       path: List[Tree],
       pos: SourcePosition,
-      indexed: IndexedContext
+      indexed: IndexedContext,
+      uri: URI,
   ): DefinitionResult =
     import indexed.ctx
     val enclosing = path.expandRangeToEnclosingApply(pos)
@@ -108,24 +113,25 @@ class PcDefinitionProvider(
       case Nil =>
         path.headOption match
           case Some(value: Literal) =>
-            definitionsForSymbol(List(value.typeOpt.widen.typeSymbol), pos)
+            definitionsForSymbol(List(value.typeOpt.widen.typeSymbol), uri, pos)
           case _ => DefinitionResultImpl.empty
       case _ =>
-        definitionsForSymbol(typeSymbols, pos)
+        definitionsForSymbol(typeSymbols, uri, pos)
 
   end findTypeDefinitions
 
   private def definitionsForSymbol(
       symbols: List[Symbol],
+      uri: URI,
       pos: SourcePosition
   )(using ctx: Context): DefinitionResult =
     symbols match
       case symbols @ (sym :: other) =>
         val isLocal = sym.source == pos.source
         if isLocal then
+          val include = Include.definitions | Include.local
           val (exportedDefs, otherDefs) =
-            Interactive.findDefinitions(List(sym), driver, false, false)
-              .filter(_.source == sym.source)
+            Interactive.findTreesMatching(driver.openedTrees(uri), include, sym)
               .partition(_.tree.symbol.is(Exported))
 
           otherDefs.headOption.orElse(exportedDefs.headOption)  match
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
index 5e13c07b9e5f..b2d837e2ff50 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
@@ -6,8 +6,10 @@ import dotty.tools.pc.ScalaPresentationCompiler
 import org.junit.{Before, Test}
 
 import scala.language.unsafeNulls
-import scala.meta.internal.metals.EmptyCancelToken
 import scala.meta.internal.metals.CompilerOffsetParams
+import scala.meta.internal.metals.EmptyCancelToken
+import scala.meta.internal.metals.EmptyReportContext
+import scala.meta.internal.metals.PcQueryContext
 import scala.meta.pc.OffsetParams
 import scala.concurrent.Future
 import scala.concurrent.Await
@@ -26,20 +28,22 @@ class CompilerCachingSuite extends BasePCSuite:
   private def checkCompilationCount(expected: Int): Unit =
     presentationCompiler match
       case pc: ScalaPresentationCompiler =>
-        val compilations = pc.compilerAccess.withNonInterruptableCompiler(None)(-1, EmptyCancelToken) { driver =>
+        val compilations = pc.compilerAccess.withNonInterruptableCompiler(-1, EmptyCancelToken) { driver =>
           driver.compiler().currentCtx.runId
-        }.get(timeout.length, timeout.unit)
+        }(emptyQueryContext).get(timeout.length, timeout.unit)
         assertEquals(expected, compilations, s"Expected $expected compilations but got $compilations")
       case _ => throw IllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
 
   private def getContext(): Context =
     presentationCompiler match
       case pc: ScalaPresentationCompiler =>
-        pc.compilerAccess.withNonInterruptableCompiler(None)(null, EmptyCancelToken) { driver =>
+        pc.compilerAccess.withNonInterruptableCompiler(null, EmptyCancelToken) { driver =>
           driver.compiler().currentCtx
-        }.get(timeout.length, timeout.unit)
+        }(emptyQueryContext).get(timeout.length, timeout.unit)
       case _ => throw IllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
 
+  private def emptyQueryContext = PcQueryContext(None, () => "")(using EmptyReportContext)
+
   @Before
   def beforeEach: Unit =
     presentationCompiler.restart()
diff --git a/presentation-compiler/test/dotty/tools/pc/utils/TestInlayHints.scala b/presentation-compiler/test/dotty/tools/pc/utils/TestInlayHints.scala
index b9d3fd411dcc..5fb38ad88e19 100644
--- a/presentation-compiler/test/dotty/tools/pc/utils/TestInlayHints.scala
+++ b/presentation-compiler/test/dotty/tools/pc/utils/TestInlayHints.scala
@@ -3,8 +3,10 @@ package dotty.tools.pc.utils
 import scala.collection.mutable.ListBuffer
 
 import scala.meta.internal.jdk.CollectionConverters._
+import scala.meta.internal.pc.InlayHints
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 
+import com.google.gson.JsonElement
 import org.eclipse.lsp4j.InlayHint
 import org.eclipse.lsp4j.TextEdit
 import org.eclipse.{lsp4j => l}
@@ -31,7 +33,7 @@ object TestInlayHints {
       case Right(labelParts) => labelParts.asScala.map(_.getValue()).toList
     }
     val data =
-      inlayHint.getData().asInstanceOf[Array[Any]]
+      InlayHints.fromData(inlayHint.getData().asInstanceOf[JsonElement])._2
     buffer += "/*"
     labels.zip(data).foreach { case (label, data) =>
       buffer += label.nn
@@ -41,15 +43,13 @@ object TestInlayHints {
     buffer.toList.mkString
   }
 
-  private def readData(data: Any): List[String] = {
-    data match {
-      case data: String if data.isEmpty => Nil
-      case data: String => List("<<", data, ">>")
-      case data: l.Position =>
+  private def readData(data: Either[String, l.Position]): List[String] =
+    data match
+      case Left("") => Nil
+      case Left(data) => List("<<", data, ">>")
+      case Right(data) =>
         val str = s"(${data.getLine()}:${data.getCharacter()})"
         List("<<", str, ">>")
-    }
-  }
 
   def applyInlayHints(text: String, inlayHints: List[InlayHint]): String = {
     val textEdits = inlayHints.map { hint =>

From dd8caef05cef91c7e60c8c5fa3b2d2d03bda70ac Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Tue, 4 Feb 2025 21:04:54 +0100
Subject: [PATCH 067/505] fix: align erasure of Array[Nothing] and Array[Null]
 with Scala 2

[Cherry-picked c197afb0d7b2b17a081f7742d8f20118815447d4]
---
 .../src/dotty/tools/dotc/core/TypeErasure.scala    | 14 ++++++++------
 sbt-test/scala2-compat/erasure/dottyApp/Api.scala  |  6 ++++++
 sbt-test/scala2-compat/erasure/dottyApp/Main.scala |  4 ++++
 sbt-test/scala2-compat/erasure/scala2Lib/Api.scala |  6 ++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
index 17ddc93a10f2..85fcaae350dd 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
@@ -597,8 +597,8 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
    *   will be returned.
    *
    *  In all other situations, |T| will be computed as follow:
-   *   - For a refined type scala.Array+[T]:
-   *      - if T is Nothing or Null, []Object
+   *   - For a refined type scala.Array[T]:
+   *      - {Scala 2} if T is Nothing or Null, []Object
    *      - otherwise, if T <: Object, []|T|
    *      - otherwise, if T is a type parameter coming from Java, []Object
    *      - otherwise, Object
@@ -781,10 +781,12 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
     val defn.ArrayOf(elemtp) = tp: @unchecked
     if (isGenericArrayElement(elemtp, isScala2 = sourceLanguage.isScala2)) defn.ObjectType
     else
-      try
-        val eElem = erasureFn(sourceLanguage, semiEraseVCs = false, isConstructor, isSymbol, inSigName)(elemtp)
-        if eElem.isInstanceOf[WildcardType] then WildcardType
-        else JavaArrayType(eElem)
+      try 
+        if sourceLanguage.isScala2 && (elemtp.isNullType || elemtp.isNothingType) then
+          JavaArrayType(defn.ObjectType)
+        else erasureFn(sourceLanguage, semiEraseVCs = false, isConstructor, isSymbol, inSigName)(elemtp) match
+          case _: WildcardType => WildcardType
+          case elem => JavaArrayType(elem)
       catch case ex: Throwable =>
         handleRecursive("erase array type", tp.show, ex)
   }
diff --git a/sbt-test/scala2-compat/erasure/dottyApp/Api.scala b/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
index 7ce908820390..25fc4f6a0692 100644
--- a/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
+++ b/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
@@ -195,4 +195,10 @@ class Z {
   def objectARRAY_88(x: Array[Any]): Unit = {}
   def objectARRAY_89(x: Array[AnyRef]): Unit = {}
   def objectARRAY_90(x: Array[AnyVal]): Unit = {}
+
+  def objectARRAY_91(x: Array[Nothing]): Unit = {}
+  def objectARRAY_92(x: Array[Null]): Unit = {}
+  def objectARRAY_93(x: Array[_ <: Nothing]): Unit = {}
+  def objectARRAY_94(x: Array[_ <: Null]): Unit = {}
+
 }
diff --git a/sbt-test/scala2-compat/erasure/dottyApp/Main.scala b/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
index be2c6c737316..a0f2df0c4e8c 100644
--- a/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
+++ b/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
@@ -101,6 +101,10 @@ object Main {
     z.objectARRAY_88(dummy)
     z.objectARRAY_89(dummy)
     z.objectARRAY_90(dummy)
+    z.objectARRAY_91(dummy)
+    z.objectARRAY_92(dummy)
+    z.objectARRAY_93(dummy)
+    z.objectARRAY_94(dummy)
 
     val methods = classOf[scala2Lib.Z].getDeclaredMethods.toList ++ classOf[dottyApp.Z].getDeclaredMethods.toList
     methods.foreach { m =>
diff --git a/sbt-test/scala2-compat/erasure/scala2Lib/Api.scala b/sbt-test/scala2-compat/erasure/scala2Lib/Api.scala
index 2578f0556ecb..14a96b8e4004 100644
--- a/sbt-test/scala2-compat/erasure/scala2Lib/Api.scala
+++ b/sbt-test/scala2-compat/erasure/scala2Lib/Api.scala
@@ -186,4 +186,10 @@ class Z {
   def objectARRAY_88(x: Array[Any]): Unit = {}
   def objectARRAY_89(x: Array[AnyRef]): Unit = {}
   def objectARRAY_90(x: Array[AnyVal]): Unit = {}
+
+  def objectARRAY_91(x: Array[Nothing]): Unit = {}
+  def objectARRAY_92(x: Array[Null]): Unit = {}
+  def objectARRAY_93(x: Array[_ <: Nothing]): Unit = {}
+  def objectARRAY_94(x: Array[_ <: Null]): Unit = {}
+
 }

From bf2884dae49ff0a3b0c8b309817ea3a2f96909b5 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Wed, 5 Feb 2025 14:57:01 +0100
Subject: [PATCH 068/505] fix: reliably run sbt-test scala2-compat/erasure

[Cherry-picked da06de5a445892a06a7f661b3ce715a94cd13e5e]
---
 sbt-test/scala2-compat/erasure/build.sbt           | 2 ++
 sbt-test/scala2-compat/erasure/dottyApp/Api.scala  | 8 ++++----
 sbt-test/scala2-compat/erasure/dottyApp/Main.scala | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sbt-test/scala2-compat/erasure/build.sbt b/sbt-test/scala2-compat/erasure/build.sbt
index 694101e79388..f705299f549d 100644
--- a/sbt-test/scala2-compat/erasure/build.sbt
+++ b/sbt-test/scala2-compat/erasure/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / fork := true
+
 lazy val scala2Lib = project.in(file("scala2Lib"))
   .settings(
     scalaVersion := sys.props("plugin.scala2Version")
diff --git a/sbt-test/scala2-compat/erasure/dottyApp/Api.scala b/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
index 25fc4f6a0692..154e5027d2d1 100644
--- a/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
+++ b/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
@@ -196,9 +196,9 @@ class Z {
   def objectARRAY_89(x: Array[AnyRef]): Unit = {}
   def objectARRAY_90(x: Array[AnyVal]): Unit = {}
 
-  def objectARRAY_91(x: Array[Nothing]): Unit = {}
-  def objectARRAY_92(x: Array[Null]): Unit = {}
-  def objectARRAY_93(x: Array[_ <: Nothing]): Unit = {}
-  def objectARRAY_94(x: Array[_ <: Null]): Unit = {}
+  def nothing$ARRAY_91(x: Array[Nothing]): Unit = {}
+  def null$ARRAY_92(x: Array[Null]): Unit = {}
+  def nothing$ARRAY_93(x: Array[_ <: Nothing]): Unit = {}
+  def null$ARRAY_94(x: Array[_ <: Null]): Unit = {}
 
 }
diff --git a/sbt-test/scala2-compat/erasure/dottyApp/Main.scala b/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
index a0f2df0c4e8c..ea359408692a 100644
--- a/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
+++ b/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
@@ -53,10 +53,10 @@ object Main {
     z.c_40(dummy)
     z.c_41(dummy)
     z.c_42(dummy)
-    z.b_43(dummy)
+    //z.b_43(dummy)
     z.c_44(dummy)
     z.c_45(dummy)
-    z.b_46(dummy)
+    //z.b_46(dummy)
     z.c_47(dummy)
     // z.a_48(dummy)
     // z.c_49(dummy)
@@ -103,8 +103,8 @@ object Main {
     z.objectARRAY_90(dummy)
     z.objectARRAY_91(dummy)
     z.objectARRAY_92(dummy)
-    z.objectARRAY_93(dummy)
-    z.objectARRAY_94(dummy)
+    //z.objectARRAY_93(dummy)
+    //z.objectARRAY_94(dummy)
 
     val methods = classOf[scala2Lib.Z].getDeclaredMethods.toList ++ classOf[dottyApp.Z].getDeclaredMethods.toList
     methods.foreach { m =>

From 59ea93ebab2c6cd7ff93b30644e75fe365850b77 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Wed, 5 Feb 2025 15:53:15 +0100
Subject: [PATCH 069/505] fix: align Scala 2's erasure of Array[? <: Null] and
 Array[? <: Nothing] with Scala 2

[Cherry-picked f77b1f9ec59bb2c48f892d077dbfcf3d09d98698]
---
 .../dotty/tools/dotc/core/TypeErasure.scala    | 18 +++++++++---------
 .../scala2-compat/erasure/dottyApp/Main.scala  |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
index 85fcaae350dd..87672e18744b 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
@@ -327,7 +327,7 @@ object TypeErasure {
         val sym = t.symbol
         // Only a few classes have both primitives and references as subclasses.
         if (sym eq defn.AnyClass) || (sym eq defn.AnyValClass) || (sym eq defn.MatchableClass) || (sym eq defn.SingletonClass)
-           || isScala2 && !(t.derivesFrom(defn.ObjectClass) || t.isNullType) then
+           || isScala2 && !(t.derivesFrom(defn.ObjectClass) || t.isNullType | t.isNothingType) then
           NoSymbol
         // We only need to check for primitives because derived value classes in arrays are always boxed.
         else if sym.isPrimitiveValueClass then
@@ -779,14 +779,14 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
 
   private def eraseArray(tp: Type)(using Context) = {
     val defn.ArrayOf(elemtp) = tp: @unchecked
-    if (isGenericArrayElement(elemtp, isScala2 = sourceLanguage.isScala2)) defn.ObjectType
-    else
-      try 
-        if sourceLanguage.isScala2 && (elemtp.isNullType || elemtp.isNothingType) then
-          JavaArrayType(defn.ObjectType)
-        else erasureFn(sourceLanguage, semiEraseVCs = false, isConstructor, isSymbol, inSigName)(elemtp) match
-          case _: WildcardType => WildcardType
-          case elem => JavaArrayType(elem)
+    if isGenericArrayElement(elemtp, isScala2 = sourceLanguage.isScala2) then 
+      defn.ObjectType
+    else if sourceLanguage.isScala2 && (elemtp.hiBound.isNullType || elemtp.hiBound.isNothingType) then
+      JavaArrayType(defn.ObjectType)
+    else 
+      try erasureFn(sourceLanguage, semiEraseVCs = false, isConstructor, isSymbol, inSigName)(elemtp) match
+        case _: WildcardType => WildcardType
+        case elem => JavaArrayType(elem)
       catch case ex: Throwable =>
         handleRecursive("erase array type", tp.show, ex)
   }
diff --git a/sbt-test/scala2-compat/erasure/dottyApp/Main.scala b/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
index ea359408692a..48b9575302a0 100644
--- a/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
+++ b/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
@@ -103,8 +103,8 @@ object Main {
     z.objectARRAY_90(dummy)
     z.objectARRAY_91(dummy)
     z.objectARRAY_92(dummy)
-    //z.objectARRAY_93(dummy)
-    //z.objectARRAY_94(dummy)
+    z.objectARRAY_93(dummy)
+    z.objectARRAY_94(dummy)
 
     val methods = classOf[scala2Lib.Z].getDeclaredMethods.toList ++ classOf[dottyApp.Z].getDeclaredMethods.toList
     methods.foreach { m =>

From bae72d89a4ee8566d08987aebbb9cb4f2ef2b903 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 21 Apr 2025 14:25:50 +0200
Subject: [PATCH 070/505] bugfix: Fix compilation after backport

---
 .../src/main/dotty/tools/pc/PcInlayHintsProvider.scala          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index cf4929dfc91d..5d8739fb3343 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -57,7 +57,7 @@ class PcInlayHintsProvider(
       .headOption
       .getOrElse(unit.tpdTree)
       .enclosedChildren(pos.span)
-      .flatMap(tpdTree => deepFolder(InlayHints.empty(params.uri()), tpdTree).result())
+      .flatMap(tpdTree => deepFolder(InlayHints.empty(params.uri().nn), tpdTree).result())
 
   private def adjustPos(pos: SourcePosition): SourcePosition =
     pos.adjust(text)._1

From 7ce264bf1378255c41a8bc4ea05beeb4a4580353 Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Thu, 6 Feb 2025 11:00:55 +0100
Subject: [PATCH 071/505] Check if a prefix is valid before selecting from a
 type (#22368)

closes #22357

---------

Co-authored-by: Katarzyna Marek <26606662+kasiaMarek@users.noreply.github.com>
---
 compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala | 2 +-
 tests/neg/i22357.check                                 | 4 ++++
 tests/neg/i22357.scala                                 | 2 ++
 tests/neg/i22357a.check                                | 4 ++++
 tests/neg/i22357a.scala                                | 2 ++
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tests/neg/i22357.check
 create mode 100644 tests/neg/i22357.scala
 create mode 100644 tests/neg/i22357a.check
 create mode 100644 tests/neg/i22357a.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
index ba9975923df0..f7edc82270bf 100644
--- a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
+++ b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
@@ -157,7 +157,7 @@ trait TypeAssigner {
           else
             qualType.findMember(name, pre)
 
-        if reallyExists(mbr) then qualType.select(name, mbr)
+        if reallyExists(mbr) && NamedType.validPrefix(qualType) then qualType.select(name, mbr)
         else if qualType.isErroneous || name.toTermName == nme.ERROR then UnspecifiedErrorType
         else NoType
   end selectionType
diff --git a/tests/neg/i22357.check b/tests/neg/i22357.check
new file mode 100644
index 000000000000..213782a7fc6c
--- /dev/null
+++ b/tests/neg/i22357.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/i22357.scala:1:0 -----------------------------------------------------------------------------------
+1 |@([A] =>> Int) // error
+  |^^^^^^^^^^^^^^
+  |[A] =>> Int does not have a constructor
diff --git a/tests/neg/i22357.scala b/tests/neg/i22357.scala
new file mode 100644
index 000000000000..d572c150fb81
--- /dev/null
+++ b/tests/neg/i22357.scala
@@ -0,0 +1,2 @@
+@([A] =>> Int) // error
+def i = 1
diff --git a/tests/neg/i22357a.check b/tests/neg/i22357a.check
new file mode 100644
index 000000000000..9b2bcd2510d4
--- /dev/null
+++ b/tests/neg/i22357a.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/i22357a.scala:2:6 ----------------------------------------------------------------------------------
+2 |  new ([A] =>> Int)(2) // error
+  |      ^^^^^^^^^^^^^
+  |      [A] =>> Int does not have a constructor
diff --git a/tests/neg/i22357a.scala b/tests/neg/i22357a.scala
new file mode 100644
index 000000000000..b6c9c04fb268
--- /dev/null
+++ b/tests/neg/i22357a.scala
@@ -0,0 +1,2 @@
+def main =
+  new ([A] =>> Int)(2) // error

From 68ccd8aec54c539b8e8533af7ce264776260d42a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 10:11:42 +0200
Subject: [PATCH 072/505] Check if a prefix is valid before selecting from a
 type (#22368)

closes #22357

---------

Co-authored-by: Katarzyna Marek <26606662+kasiaMarek@users.noreply.github.com>
[Cherry-picked a56c622af94f4131d5477b33f9a15745f2bd883e][modified]

From db194a8f3fc3ba653f8b21fb8edcc8ffa9490617 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Thu, 30 Jan 2025 14:05:27 +0100
Subject: [PATCH 073/505] improvement: use heuristic to figure out `nameSpan`
 if `pointDelta` to big

[Cherry-picked 9ef55796d7f72085657b014bbef25aa1bb77478d]
---
 compiler/src/dotty/tools/dotc/ast/Trees.scala |   7 +-
 .../src/dotty/tools/dotc/util/Spans.scala     |   3 +
 .../highlight/DocumentHighlightSuite.scala    | 101 ++++++++++++++++++
 3 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala
index dc8c2add27be..9cfacf3b42fa 100644
--- a/compiler/src/dotty/tools/dotc/ast/Trees.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala
@@ -460,8 +460,11 @@ object Trees {
         else if qualifier.span.exists && qualifier.span.start > span.point then // right associative
           val realName = name.stripModuleClassSuffix.lastPart
           Span(span.start, span.start + realName.length, point)
-        else
-          Span(point, span.end, point)
+        else if span.pointMayBeIncorrect then
+          val realName = name.stripModuleClassSuffix.lastPart
+          val probablyPoint = span.end - realName.length
+          Span(probablyPoint, span.end, probablyPoint)
+        else Span(point, span.end, point)
       else span
   }
 
diff --git a/compiler/src/dotty/tools/dotc/util/Spans.scala b/compiler/src/dotty/tools/dotc/util/Spans.scala
index e1487408f36b..7d4bbe0e8180 100644
--- a/compiler/src/dotty/tools/dotc/util/Spans.scala
+++ b/compiler/src/dotty/tools/dotc/util/Spans.scala
@@ -59,6 +59,9 @@ object Spans {
       if (poff == SyntheticPointDelta) start else start + poff
     }
 
+    def pointMayBeIncorrect =
+      pointDelta == 0 && end - start >= SyntheticPointDelta
+
     /** The difference between point and start in this span */
     def pointDelta: Int =
       (coords >>> (StartEndBits * 2)).toInt
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
index 5d9893f6a1c1..0586a0648ac3 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
@@ -1462,5 +1462,106 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite:
         |""".stripMargin
     )
 
+  @Test def i3053 =
+    check(
+      """import Aaaa.*
+        |
+        |def classDef2(cdef: List[Int]): Int = {
+        |  def aaa(ddef: Thicket2): List[Int] = ddef match {
+        |    case Thicket2(_) => ???
+        |  }
+        |
+        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
+        |    * inline classes
+        |    */
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |
+        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
+        |    * inline classes
+        |    */
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |
+        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
+        |    * inline classes
+        |    */
+        |  // Annotations on class _type_ parameters are set on the derived parameters
+        |  // but not on the constructor parameters. The reverse is true for
+        |  // annotations on class _value_ parameters.
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |
+        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
+        |    * inline classes
+        |    */
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |
+        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
+        |    * inline classes
+        |    */
+        |
+        |  // Annotations on class _type_ parameters are set on the derived parameters
+        |  // but not on the constructor parameters. The reverse is true for
+        |  // annotations on class _value_ parameters.
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |
+        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
+        |    * inline classes
+        |    */
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |
+        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
+        |    * inline classes
+        |    */
+        |  // Annotations on class _type_ parameters are set on the derived parameters
+        |  // but not on the constructor parameters. The reverse is true for
+        |  // annotations on class _value_ parameters.
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |  // The original type and value parameters in the constructor already have the flags
+        |  // needed to be type members (i.e. param, and possibly also private and local unless
+        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
+        |  // go in `constr`, the constructor after desugaring.
+        |  1
+        |}.<<showing2>>("aaa")
+        |
+        |case class Thicket2(trees: List[Int]) {}
+        |
+        |object Aaaa {
+        |  extension [T](x: T)
+        |    def <<show@@ing2>>[U](aaa: String): T = {
+        |      x
+        |    }
+        |}
+        |
+        |""".stripMargin
+    )
+
 
 end DocumentHighlightSuite

From 07bea7e2bf77daeef0d6bbb0ff27c36eb6afc27a Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Thu, 6 Feb 2025 15:20:08 +0100
Subject: [PATCH 074/505] test: shorten test

[Cherry-picked a6252544116df0a6f80f8937d9f52532760b8001]
---
 .../highlight/DocumentHighlightSuite.scala    | 81 +------------------
 1 file changed, 2 insertions(+), 79 deletions(-)

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
index 0586a0648ac3..4809bc5cd5b8 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
@@ -1464,90 +1464,13 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite:
 
   @Test def i3053 =
     check(
-      """import Aaaa.*
+      s"""import Aaaa.*
         |
         |def classDef2(cdef: List[Int]): Int = {
         |  def aaa(ddef: Thicket2): List[Int] = ddef match {
         |    case Thicket2(_) => ???
         |  }
-        |
-        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
-        |    * inline classes
-        |    */
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |
-        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
-        |    * inline classes
-        |    */
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |
-        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
-        |    * inline classes
-        |    */
-        |  // Annotations on class _type_ parameters are set on the derived parameters
-        |  // but not on the constructor parameters. The reverse is true for
-        |  // annotations on class _value_ parameters.
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |
-        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
-        |    * inline classes
-        |    */
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |
-        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
-        |    * inline classes
-        |    */
-        |
-        |  // Annotations on class _type_ parameters are set on the derived parameters
-        |  // but not on the constructor parameters. The reverse is true for
-        |  // annotations on class _value_ parameters.
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |
-        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
-        |    * inline classes
-        |    */
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |
-        |  /** Does `tree' look like a reference to AnyVal? Temporary test before we have
-        |    * inline classes
-        |    */
-        |  // Annotations on class _type_ parameters are set on the derived parameters
-        |  // but not on the constructor parameters. The reverse is true for
-        |  // annotations on class _value_ parameters.
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
-        |  // The original type and value parameters in the constructor already have the flags
-        |  // needed to be type members (i.e. param, and possibly also private and local unless
-        |  // prefixed by type or val). `tparams` and `vparamss` are the type parameters that
-        |  // go in `constr`, the constructor after desugaring.
+        |${("//" + "x" * 64 + "\n") * 64}
         |  1
         |}.<<showing2>>("aaa")
         |

From 2372eda97e29cccb6a70bba8c6b97f21af0c5185 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Fri, 7 Feb 2025 15:18:49 +0100
Subject: [PATCH 075/505] fix: allow private members when computing the
 denotation of a NamedType

[Cherry-picked 6d003056e083386218889f8a132b6ee72ce32b61]
---
 compiler/src/dotty/tools/dotc/core/Types.scala | 2 +-
 tests/pos/i22548.scala                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22548.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 1113f7413e6e..6c871f829941 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -2412,7 +2412,7 @@ object Types extends TypeUtils {
           else lastd match {
             case lastd: SymDenotation =>
               if stillValid(lastd) && checkedPeriod.code != NowhereCode then finish(lastd.current)
-              else finish(memberDenot(lastd.initial.name, allowPrivate = false))
+              else finish(memberDenot(lastd.initial.name, allowPrivate = lastd.is(Private)))
             case _ =>
               fromDesignator
           }
diff --git a/tests/pos/i22548.scala b/tests/pos/i22548.scala
new file mode 100644
index 000000000000..beb878d92670
--- /dev/null
+++ b/tests/pos/i22548.scala
@@ -0,0 +1,2 @@
+trait Bar[T]
+class Foo[T <: Bar[T]] (private val buffer: Any) extends AnyVal

From a00e32132ab4ee327a6b544749f31eab9dd92882 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 29 Jan 2025 15:32:15 -0800
Subject: [PATCH 076/505] More OG tests

---
 tests/pos/i22193.scala | 141 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 tests/pos/i22193.scala

diff --git a/tests/pos/i22193.scala b/tests/pos/i22193.scala
new file mode 100644
index 000000000000..2ba7f920fbd7
--- /dev/null
+++ b/tests/pos/i22193.scala
@@ -0,0 +1,141 @@
+
+def fn2(arg: String, arg2: String)(f: String => Unit): Unit = f(arg)
+
+def fn3(arg: String, arg2: String)(f: => Unit): Unit = f
+
+def test() =
+
+  fn2(arg = "blue sleeps faster than tuesday", arg2 = "the quick brown fox jumped over the lazy dog"): env =>
+    val x = env
+    println(x)
+
+  // doesn't compile
+  fn2(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"): env =>
+      val x = env
+      println(x)
+
+  fn2(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"): env =>
+       val x = env
+       println(x)
+
+  fn2(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"): env =>
+    val x = env
+    println(x)
+
+  // does compile
+  fn2(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"):
+    env =>
+      val x = env
+      println(x)
+
+  // does compile
+  fn2(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"
+  ): env =>
+      val x = env
+      println(x)
+
+  fn2(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"
+  ): env =>
+    val x = env
+    println(x)
+
+  fn3(
+    arg = "blue sleeps faster than tuesday",
+    arg2 = "the quick brown fox jumped over the lazy dog"):
+    val x = "Hello"
+    println(x)
+
+  fn3(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"):
+      val x = "Hello"
+      println(x)
+
+  fn3( // arg at 3, body at 3
+     arg = "blue sleeps faster than tuesday",
+     arg2 = "the quick brown fox jumped over the lazy dog"):
+     val x = "Hello"
+     println(x)
+
+  fn3( // arg at 3, body at 1: not sure if sig indent of 1 is allowed, saw some comments from odersky
+     arg = "blue sleeps faster than tuesday",
+     arg2 = "the quick brown fox jumped over the lazy dog"):
+   val x = "Hello"
+   println(x)
+
+  fn3( // arg at 3, body at 2: even if sig indent of 1 is not allowed, body is at fn3+2, not arg2-1
+     arg = "blue sleeps faster than tuesday",
+     arg2 = "the quick brown fox jumped over the lazy dog"):
+    val x = "Hello"
+    println(x)
+
+  fn3( // arg at 3, body at 4
+     arg = "blue sleeps faster than tuesday",
+     arg2 = "the quick brown fox jumped over the lazy dog"):
+      val x = "Hello"
+      println(x)
+
+// don't turn innocent empty cases into functions
+def regress(x: Int) =
+  x match
+  case 42 =>
+  case _ =>
+
+// previously lookahead calculated indent width at the colon
+def k(xs: List[Int]) =
+  xs.foldLeft(
+      0)
+                                            : (acc, x) =>
+        acc + x
+
+def `test kit`(xs: List[Int]): Unit =
+  def addOne(i: Int): Int = i + 1
+  def isPositive(i: Int): Boolean = i > 0
+  // doesn't compile but would be nice
+  // first body is indented "twice", or, rather, first outdent establishes an intermediate indentation level
+  xs.map: x =>
+      x + 1
+    .filter: x =>
+      x > 0
+  xs.map:
+      addOne
+    .filter:
+      isPositive
+
+  // does compile
+  xs
+    .map: x =>
+      x + 1
+    .filter: x =>
+      x > 0
+
+  // does compile but doesn't look good, at least, to some people
+  xs.map: x =>
+      x + 1
+  .filter: x =>
+      x > 0
+
+def `tested kit`(xs: List[Int]): Unit =
+  {
+    def addOne(i: Int): Int = i.+(1)
+    def isPositive(i: Int): Boolean = i.>(0)
+    xs.map[Int]((x: Int) => x.+(1)).filter((x: Int) => x.>(0))
+    xs.map[Int]((i: Int) => addOne(i)).filter((i: Int) => isPositive(i))
+    xs.map[Int]((x: Int) => x.+(1)).filter((x: Int) => x.>(0))
+    {
+      xs.map[Int]((x: Int) => x.+(1)).filter((x: Int) => x.>(0))
+      ()
+    }
+  }

From e39adecab6bc657c170a8c4171d8e1b27a952841 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 10:50:16 +0200
Subject: [PATCH 077/505] More OG tests

[Cherry-picked f5ba8d6e6df4cd3674bdeb8da9f09dbd1d8dcb53][modified]

From 814cf6469815189ad4c1cc9763433fda88a67587 Mon Sep 17 00:00:00 2001
From: Alec Theriault <alec.theriault@gmail.com>
Date: Tue, 4 Feb 2025 07:18:23 -0500
Subject: [PATCH 078/505] Better LSP completions inside of backticks

This improves the presentation compiler name completions inside of
backticks. The existing gaps which motivate doing this are outlined in
[this Metals feature request][0].

[0]: https://github.com/scalameta/metals-feature-requests/issues/418

[Cherry-picked 936f7ad0eff0f187c7f7dfba88f9fd71e6b2d721]
---
 .../tools/dotc/interactive/Completion.scala   |  9 +--
 .../tools/pc/completions/CompletionPos.scala  | 33 +++++++++--
 .../pc/completions/CompletionProvider.scala   | 11 +++-
 .../completion/CompletionBacktickSuite.scala  | 57 +++++++++++++++++++
 4 files changed, 98 insertions(+), 12 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index af27a4006140..61a1db44d8b0 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -145,11 +145,12 @@ object Completion:
         checkBacktickPrefix(ident.source.content(), ident.span.start, ident.span.end)
 
       case (tree: untpd.RefTree) :: _ if tree.name != nme.ERROR =>
-        tree.name.toString.take(pos.span.point - tree.span.point)
-
-      case _ => naiveCompletionPrefix(pos.source.content().mkString, pos.point)
-
+        val nameStart = tree.span.point
+        val start = if pos.source.content().lift(nameStart).contains('`') then nameStart + 1 else nameStart
+        tree.name.toString.take(pos.span.point - start)
 
+      case _ =>
+        naiveCompletionPrefix(pos.source.content().mkString, pos.point)
   end completionPrefix
 
   private object GenericImportSelector:
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionPos.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionPos.scala
index 6d89cb663b9c..40f1ccd2e797 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionPos.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionPos.scala
@@ -23,7 +23,9 @@ case class CompletionPos(
   query: String,
   originalCursorPosition: SourcePosition,
   sourceUri: URI,
-  withCURSOR: Boolean
+  withCURSOR: Boolean,
+  hasLeadingBacktick: Boolean,
+  hasTrailingBacktick: Boolean
 ):
   def queryEnd: Int = originalCursorPosition.point
   def stripSuffixEditRange: l.Range = new l.Range(originalCursorPosition.offsetToPos(queryStart), originalCursorPosition.offsetToPos(identEnd))
@@ -38,16 +40,35 @@ object CompletionPos:
       adjustedPath: List[Tree],
       wasCursorApplied: Boolean
   )(using Context): CompletionPos =
-    val identEnd = adjustedPath match
+    def hasBacktickAt(offset: Int): Boolean =
+      sourcePos.source.content().lift(offset).contains('`')
+
+    val (identEnd, hasTrailingBacktick) = adjustedPath match
       case (refTree: RefTree) :: _ if refTree.name.toString.contains(Cursor.value) =>
-        refTree.span.end - Cursor.value.length
-      case (refTree: RefTree) :: _  => refTree.span.end
-      case _ => sourcePos.end
+        val refTreeEnd = refTree.span.end
+        val hasTrailingBacktick = hasBacktickAt(refTreeEnd - 1)
+        val identEnd = refTreeEnd - Cursor.value.length
+        (if hasTrailingBacktick then identEnd - 1 else identEnd, hasTrailingBacktick)
+      case (refTree: RefTree) :: _  =>
+        val refTreeEnd = refTree.span.end
+        val hasTrailingBacktick = hasBacktickAt(refTreeEnd - 1)
+        (if hasTrailingBacktick then refTreeEnd - 1 else refTreeEnd, hasTrailingBacktick)
+      case _ => (sourcePos.end, false)
 
     val query = Completion.completionPrefix(adjustedPath, sourcePos)
     val start = sourcePos.end - query.length()
+    val hasLeadingBacktick = hasBacktickAt(start - 1)
 
-    CompletionPos(start, identEnd, query.nn, sourcePos, offsetParams.uri.nn, wasCursorApplied)
+    CompletionPos(
+      start,
+      identEnd,
+      query.nn,
+      sourcePos,
+      offsetParams.uri.nn,
+      wasCursorApplied,
+      hasLeadingBacktick,
+      hasTrailingBacktick
+    )
 
   /**
    * Infer the indentation by counting the number of spaces in the given line.
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
index 28519debec63..8c8dd09c8c15 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -248,10 +248,17 @@ class CompletionProvider(
         range: Option[LspRange] = None
     ): CompletionItem =
       val oldText = params.text().nn.substring(completionPos.queryStart, completionPos.identEnd)
-      val editRange = if newText.startsWith(oldText) then completionPos.stripSuffixEditRange
+      val trimmedNewText = {
+        var nt = newText
+        if (completionPos.hasLeadingBacktick) nt = nt.stripPrefix("`")
+        if (completionPos.hasTrailingBacktick) nt = nt.stripSuffix("`")
+        nt
+      }
+
+      val editRange = if trimmedNewText.startsWith(oldText) then completionPos.stripSuffixEditRange
         else completionPos.toEditRange
 
-      val textEdit = new TextEdit(range.getOrElse(editRange), wrapInBracketsIfRequired(newText))
+      val textEdit = new TextEdit(range.getOrElse(editRange), wrapInBracketsIfRequired(trimmedNewText))
 
       val item = new CompletionItem(label)
       item.setSortText(f"${idx}%05d")
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionBacktickSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionBacktickSuite.scala
index 5d13c60b2fd5..d41261d2d21e 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionBacktickSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionBacktickSuite.scala
@@ -179,3 +179,60 @@ class CompletionBacktickSuite extends BaseCompletionSuite:
          |}
          |""".stripMargin
     )
+
+  @Test def `add-backticks-around-identifier` =
+    checkEdit(
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  Foo@@
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  `Foo Bar`
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `complete-inside-backticks` =
+    checkEdit(
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  `Foo@@`
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  `Foo Bar`
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `complete-inside-backticks-after-space` =
+    checkEdit(
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  `Foo B@@a`
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  `Foo Bar`
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `complete-inside-empty-backticks` =
+    checkEdit(
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  `@@`
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def `Foo Bar` = 123
+         |  `Foo Bar`
+         |}
+         |""".stripMargin,
+      filter = _ == "Foo Bar: Int"
+    )

From 31b57b30d83046b428b2016dd86bf862932e9fc1 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Mon, 10 Feb 2025 15:01:52 +0100
Subject: [PATCH 079/505] fix: don't add `()` to semanticdb symbol for java
 variables

[Cherry-picked 38154ba9bb857a46b0ab3546dfa67be1881cc2d1]
---
 .../semanticdb/SemanticSymbolBuilder.scala    |  2 +-
 .../expect/JavaStaticVar.expect.scala         |  7 +++++
 tests/semanticdb/expect/JavaStaticVar.scala   |  7 +++++
 .../javacp/com/javacp/JavaStaticVar.java      |  5 ++++
 tests/semanticdb/metac.expect                 | 27 +++++++++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 tests/semanticdb/expect/JavaStaticVar.expect.scala
 create mode 100644 tests/semanticdb/expect/JavaStaticVar.scala
 create mode 100644 tests/semanticdb/javacp/com/javacp/JavaStaticVar.java

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
index 81f5d37f443f..077ee0e40b86 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
@@ -111,7 +111,7 @@ class SemanticSymbolBuilder:
         addName(b, sym.name)
         if sym.is(Package) then b.append('/')
         else if sym.isType || sym.isAllOf(JavaModule) then b.append('#')
-        else if sym.isOneOf(Method | Mutable)
+        else if sym.is(Method) || (sym.is(Mutable) && !sym.is(JavaDefined))
         && (!sym.is(StableRealizable) || sym.isConstructor) then
           b.append('('); addOverloadIdx(sym); b.append(").")
         else b.append('.')
diff --git a/tests/semanticdb/expect/JavaStaticVar.expect.scala b/tests/semanticdb/expect/JavaStaticVar.expect.scala
new file mode 100644
index 000000000000..171596bc9519
--- /dev/null
+++ b/tests/semanticdb/expect/JavaStaticVar.expect.scala
@@ -0,0 +1,7 @@
+package example
+
+import com.javacp.JavaStaticVar/*->com::javacp::JavaStaticVar#*/
+
+class ScalaFoo/*<-example::ScalaFoo#*/ {
+  val javaStaticVarFoo/*<-example::ScalaFoo#javaStaticVarFoo.*/ = JavaStaticVar/*->com::javacp::JavaStaticVar#*/.foo/*->com::javacp::JavaStaticVar#foo.*/
+}
diff --git a/tests/semanticdb/expect/JavaStaticVar.scala b/tests/semanticdb/expect/JavaStaticVar.scala
new file mode 100644
index 000000000000..7a7efeaa670a
--- /dev/null
+++ b/tests/semanticdb/expect/JavaStaticVar.scala
@@ -0,0 +1,7 @@
+package example
+
+import com.javacp.JavaStaticVar
+
+class ScalaFoo {
+  val javaStaticVarFoo = JavaStaticVar.foo
+}
diff --git a/tests/semanticdb/javacp/com/javacp/JavaStaticVar.java b/tests/semanticdb/javacp/com/javacp/JavaStaticVar.java
new file mode 100644
index 000000000000..1124c8768421
--- /dev/null
+++ b/tests/semanticdb/javacp/com/javacp/JavaStaticVar.java
@@ -0,0 +1,5 @@
+package com.javacp;
+
+public class JavaStaticVar {
+  public static int foo = 0;
+}
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index a89da0fb8aec..4e3dee9d79a6 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -2249,6 +2249,33 @@ Synthetics:
 [8:2..8:10):(x1, x1) => *(Tuple2(Int, Int))
 [8:10..8:10): => *(Int, Int)
 
+expect/JavaStaticVar.scala
+--------------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => JavaStaticVar.scala
+Text => empty
+Language => Scala
+Symbols => 3 entries
+Occurrences => 9 entries
+
+Symbols:
+example/ScalaFoo# => class ScalaFoo extends Object { self: ScalaFoo => +2 decls }
+example/ScalaFoo#`<init>`(). => primary ctor <init> (): ScalaFoo
+example/ScalaFoo#javaStaticVarFoo. => val method javaStaticVarFoo Int
+
+Occurrences:
+[0:8..0:15): example <- example/
+[2:7..2:10): com -> com/
+[2:11..2:17): javacp -> com/javacp/
+[2:18..2:31): JavaStaticVar -> com/javacp/JavaStaticVar#
+[4:6..4:14): ScalaFoo <- example/ScalaFoo#
+[5:2..5:2): <- example/ScalaFoo#`<init>`().
+[5:6..5:22): javaStaticVarFoo <- example/ScalaFoo#javaStaticVarFoo.
+[5:25..5:38): JavaStaticVar -> com/javacp/JavaStaticVar#
+[5:39..5:42): foo -> com/javacp/JavaStaticVar#foo.
+
 expect/Local.scala
 ------------------
 

From 912fd2bcb339dee966a254036c7b7bad0aaaa723 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Mon, 10 Feb 2025 13:46:52 +0100
Subject: [PATCH 080/505] Add warning for :kind command

[Cherry-picked e399364ca0c3888c867f9014caeacbb6b74b7c70]
---
 compiler/src/dotty/tools/repl/ParseResult.scala       | 8 ++++++++
 compiler/src/dotty/tools/repl/ReplDriver.scala        | 4 ++++
 compiler/test-resources/repl/i21655                   | 2 ++
 compiler/test/dotty/tools/repl/TabcompleteTests.scala | 1 +
 4 files changed, 15 insertions(+)
 create mode 100644 compiler/test-resources/repl/i21655

diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala
index 6c9f95d4dca2..2674a385a10c 100644
--- a/compiler/src/dotty/tools/repl/ParseResult.scala
+++ b/compiler/src/dotty/tools/repl/ParseResult.scala
@@ -52,6 +52,13 @@ object Load {
   val command: String = ":load"
 }
 
+/** `:kind <type>` display the kind of a type. see also :help kind
+ */
+case class KindOf(expr: String) extends Command
+object KindOf {
+  val command: String = ":kind"
+}
+
 /** To find out the type of an expression you may simply do:
  *
  * ```
@@ -138,6 +145,7 @@ object ParseResult {
     Help.command -> (_  => Help),
     Reset.command -> (arg  => Reset(arg)),
     Imports.command -> (_  => Imports),
+    KindOf.command -> (arg => KindOf(arg)),
     Load.command -> (arg => Load(arg)),
     TypeOf.command -> (arg => TypeOf(arg)),
     DocOf.command -> (arg => DocOf(arg)),
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index d7ba2d3ce193..bd97336fc792 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -511,6 +511,10 @@ class ReplDriver(settings: Array[String],
         state
       }
 
+    case KindOf(expr) =>
+      out.println(s"""The :kind command is not currently supported.""")
+      state
+
     case TypeOf(expr) =>
       expr match {
         case "" => out.println(s":type <expression>")
diff --git a/compiler/test-resources/repl/i21655 b/compiler/test-resources/repl/i21655
new file mode 100644
index 000000000000..57b09bfad32d
--- /dev/null
+++ b/compiler/test-resources/repl/i21655
@@ -0,0 +1,2 @@
+scala>:kind
+The :kind command is not currently supported.
\ No newline at end of file
diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
index 963d680b69bc..8c817dc2b96f 100644
--- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala
+++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
@@ -216,6 +216,7 @@ class TabcompleteTests extends ReplTest {
         ":exit",
         ":help",
         ":imports",
+        ":kind",
         ":load",
         ":quit",
         ":reset",

From 2333135cba6dd3dc1c1890dfa352b81b0af2d3a7 Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Tue, 11 Feb 2025 18:09:30 +0100
Subject: [PATCH 081/505] fix: Only fallback to the definition of a synthetic
 valdef if it is zero extent (#22551)

closes scalameta/metals#7038
closes scalameta/metals#7191
fixes the reproduction issue from #22217

Co-authored-by: Katarzyna Marek <26606662+kasiaMarek@users.noreply.github.com>
[Cherry-picked 37206cc4a7e8a6ab60f0b54b4716bc65b9333940]
---
 .../tools/pc/completions/CompletionProvider.scala     |  4 ++--
 .../tools/pc/tests/completion/CompletionSuite.scala   | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
index 8c8dd09c8c15..2a63d6a92a81 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -99,9 +99,9 @@ class CompletionProvider(
              *  4|     $1$.sliding@@[Int](size, step)
              *
              */
-            if qual.symbol.is(Flags.Synthetic) && qual.symbol.name.isInstanceOf[DerivedName] =>
+            if qual.symbol.is(Flags.Synthetic) && qual.span.isZeroExtent && qual.symbol.name.isInstanceOf[DerivedName] =>
               qual.symbol.defTree match
-                case valdef: ValDef => Select(valdef.rhs, name) :: tail
+                case valdef: ValDef if !valdef.rhs.isEmpty => Select(valdef.rhs, name) :: tail
                 case _ => tpdPath0
           case _ => tpdPath0
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
index a3217f64d856..27aa3f505b80 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -2134,3 +2134,14 @@ class CompletionSuite extends BaseCompletionSuite:
       """|build: Unit
          |""".stripMargin,
     )
+
+  @Test def i7191 =
+    check(
+      """|val x = Some(3).map(_.@@)
+         |""".stripMargin,
+      """|!=(x: Byte): Boolean
+         |!=(x: Char): Boolean
+         |!=(x: Double): Boolean
+         |""".stripMargin,
+      topLines = Some(3)
+    )

From 2f045b1c350e4324cc9111657bdc86603697f083 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Tue, 11 Feb 2025 15:32:55 +0000
Subject: [PATCH 082/505] Fix copy of annotation on @main methods

[Cherry-picked 15c4e51b9028ca2a2938864428b2b69793934b14]
---
 .../src/dotty/tools/dotc/ast/MainProxies.scala   | 16 ++++++++--------
 tests/pos/annot-main-22364.scala                 |  5 +++++
 tests/pos/annot-main-22364b.scala                |  6 ++++++
 tests/pos/annot-main-22364c.scala                | 10 ++++++++++
 4 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 tests/pos/annot-main-22364.scala
 create mode 100644 tests/pos/annot-main-22364b.scala
 create mode 100644 tests/pos/annot-main-22364c.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala
index 8ee75cbf364b..d04dd82fb424 100644
--- a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala
+++ b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala
@@ -103,17 +103,17 @@ object MainProxies {
       val body = Try(call, handler :: Nil, EmptyTree)
       val mainArg = ValDef(nme.args, TypeTree(defn.ArrayType.appliedTo(defn.StringType)), EmptyTree)
         .withFlags(Param)
-      /** Replace typed `Ident`s that have been typed with a TypeSplice with the reference to the symbol.
-       *  The annotations will be retype-checked in another scope that may not have the same imports.
+
+      /** This context is used to create the `TypeSplices` wrapping annotations
+       *  below. These should have `mainFun` as their owner (and not the
+       *  enclosing package class that we would get otherwise) so that
+       *  subsequent owner changes (for example in `Typer.typedTypedSplice`) are
+       *  correct. See #22364 and associated tests.
        */
-      def insertTypeSplices = new TreeMap {
-          override def transform(tree: Tree)(using Context): Tree = tree match
-            case tree: tpd.Ident @unchecked => TypedSplice(tree)
-            case tree => super.transform(tree)
-      }
+      val annotsCtx = ctx.fresh.setOwner(mainFun)
       val annots = mainFun.annotations
         .filterNot(_.matches(defn.MainAnnot))
-        .map(annot => insertTypeSplices.transform(annot.tree))
+        .map(annot => TypedSplice(annot.tree)(using annotsCtx))
       val mainMeth = DefDef(nme.main, (mainArg :: Nil) :: Nil, TypeTree(defn.UnitType), body)
         .withFlags(JavaStatic | Synthetic)
         .withAnnotations(annots)
diff --git a/tests/pos/annot-main-22364.scala b/tests/pos/annot-main-22364.scala
new file mode 100644
index 000000000000..205589b525bc
--- /dev/null
+++ b/tests/pos/annot-main-22364.scala
@@ -0,0 +1,5 @@
+def id[T](x: T): T = x
+
+class ann(x: Int) extends annotation.Annotation
+
+@ann(id(22)) @main def blop = ()
diff --git a/tests/pos/annot-main-22364b.scala b/tests/pos/annot-main-22364b.scala
new file mode 100644
index 000000000000..c4e3067d7325
--- /dev/null
+++ b/tests/pos/annot-main-22364b.scala
@@ -0,0 +1,6 @@
+import util.chaining.*
+
+class ann(x: Int = 1, y: Int) extends annotation.Annotation
+
+@ann(y = 22.tap(println)) @main def blop = ()
+
diff --git a/tests/pos/annot-main-22364c.scala b/tests/pos/annot-main-22364c.scala
new file mode 100644
index 000000000000..53a6abe1a56b
--- /dev/null
+++ b/tests/pos/annot-main-22364c.scala
@@ -0,0 +1,10 @@
+package p
+
+object P1:
+  class ann(x: Int) extends annotation.Annotation
+
+object P2:
+  def id[T](x: T): T = x
+
+object P3:
+  @P1.ann(P2.id(22)) @main def blop = ()

From 6acb0eb9783187b33c746bccac5a359f2a9b8581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Bra=C4=8Devac?= <bracevac@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:18:19 +0100
Subject: [PATCH 083/505] Prevent Cyclic Exports on Current Class

A member that is visible through inheritance or mixin
should not be eligible for `export`.

We perform the `derivesFrom` check in `canForward`
now on the self-type of the exporting class to detect
such cycles through mixins.

Co-authored-by: Jan-Pieter van den Heuvel <jan-pieter@users.noreply.github.com>
Co-authored-by: Willem W Bakker <wwbakker@users.noreply.github.com>
Co-authored-by: odersky <odersky@gmail.com>

[Cherry-picked 5e8eb7456d588cf647183e3ef97ba82d0254a45f]
---
 .../src/dotty/tools/dotc/typer/Namer.scala    | 17 +++++++-
 tests/neg/exports3.scala                      | 41 +++++++++++++++++++
 tests/neg/i20245.check                        | 14 +++++++
 tests/neg/i20245/Typer_2.scala                |  2 +-
 4 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 tests/neg/exports3.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index 0471bb6a432a..cea045cecc35 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1130,11 +1130,26 @@ class Namer { typer: Typer =>
       def canForward(mbr: SingleDenotation, alias: TermName): CanForward = {
         import CanForward.*
         val sym = mbr.symbol
+        /**
+         * The export selects a member of the current class (issue #22147).
+         * Assumes that cls.classInfo.selfType.derivesFrom(sym.owner) is true.
+         */
+        def isCurrentClassMember: Boolean = expr match
+          case id: (Ident | This) => // Access through self type or this
+            /* Given the usage context below, where cls's self type is a subtype of sym.owner,
+               it suffices to check if symbol is the same class. */
+            cls == id.symbol
+          case _ => false
         if !sym.isAccessibleFrom(pathType) then
           No("is not accessible")
         else if sym.isConstructor || sym.is(ModuleClass) || sym.is(Bridge) || sym.is(ConstructorProxy) || sym.isAllOf(JavaModule) then
           Skip
-        else if cls.derivesFrom(sym.owner) && (sym.owner == cls || !sym.is(Deferred)) then
+        // if the cls is a subclass or mixes in the owner of the symbol
+        // and either
+        // * the symbols owner is the cls itself
+        // * the symbol is not a deferred symbol
+        // * the symbol is a member of the current class (#22147)
+        else if cls.classInfo.selfType.derivesFrom(sym.owner) && (sym.owner == cls || !sym.is(Deferred) || isCurrentClassMember) then
           No(i"is already a member of $cls")
         else if pathMethod.exists && mbr.isType then
           No("is a type, so it cannot be exported as extension method")
diff --git a/tests/neg/exports3.scala b/tests/neg/exports3.scala
new file mode 100644
index 000000000000..eaea93d9f7ce
--- /dev/null
+++ b/tests/neg/exports3.scala
@@ -0,0 +1,41 @@
+trait P:
+  def foo: Int
+
+class A extends P:
+  export this.foo       // error
+
+trait Q extends P:
+  def bar: Int
+
+trait R extends P:
+  def baz: Int
+  val a1: A
+  val a2: A
+
+abstract class B extends R:
+  self =>
+    export this.baz     // error
+    export self.bar     // error
+    export this.a1.foo
+    export self.a2.foo  // error
+    export a2.foo       // error
+
+abstract class D extends P:
+  val p: P
+  export p.foo
+
+abstract class E:
+  self: P =>
+    export self.foo     // error
+
+abstract class F:
+  self: P =>
+    export this.foo     // error
+
+class G(p: P):
+  self: P =>
+    export p.foo
+
+class H(p: P):
+  self: P =>
+    export this.p.foo
\ No newline at end of file
diff --git a/tests/neg/i20245.check b/tests/neg/i20245.check
index 565bde7678b7..49d08c646f99 100644
--- a/tests/neg/i20245.check
+++ b/tests/neg/i20245.check
@@ -15,3 +15,17 @@
    |               Run with both -explain-cyclic and -Ydebug-cyclic to see full stack trace.
    |
    | longer explanation available when compiling with `-explain`
+-- [E046] Cyclic Error: tests/neg/i20245/Typer_2.scala:10:7 ------------------------------------------------------------
+10 |import effekt.source.{ resolve } // error
+   |       ^
+   |       Cyclic reference involving class Context
+   |
+   |       The error occurred while trying to compute the base classes of class Context
+   |         which required to compute the base classes of trait TyperOps
+   |         which required to compute the signature of trait TyperOps
+   |         which required to elaborate the export clause export unification.requireSubtype
+   |         which required to compute the base classes of class Context
+   |
+   |        Run with both -explain-cyclic and -Ydebug-cyclic to see full stack trace.
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i20245/Typer_2.scala b/tests/neg/i20245/Typer_2.scala
index ed7f05de80d0..bf4718de759c 100644
--- a/tests/neg/i20245/Typer_2.scala
+++ b/tests/neg/i20245/Typer_2.scala
@@ -7,7 +7,7 @@ import effekt.util.messages.ErrorReporter
 import effekt.context.{ Context }
 
 // This import is also NECESSARY for the cyclic error
-import effekt.source.{ resolve }
+import effekt.source.{ resolve } // error
 
 
 trait TyperOps extends ErrorReporter { self: Context =>

From f52186d9c75185a0ad9452b024521d5cd5ce9038 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 11:04:20 +0200
Subject: [PATCH 084/505] chore: Add changes from missing commits

---
 .../dotty/tools/dotc/parsing/Parsers.scala    |  4 ++-
 .../dotty/tools/dotc/parsing/Scanners.scala   | 24 +++++++++++---
 tests/neg/i22193.scala                        | 32 +++++++++++++++++++
 3 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 tests/neg/i22193.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 4bd7769187d5..4354be9662be 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -33,6 +33,7 @@ import config.Feature
 import config.Feature.{sourceVersion, migrateTo3, globalOnlyImports}
 import config.SourceVersion.*
 import config.SourceVersion
+import dotty.tools.dotc.util.chaining.*
 
 object Parsers {
 
@@ -1020,10 +1021,11 @@ object Parsers {
      */
     def followingIsLambdaAfterColon(): Boolean =
       val lookahead = in.LookaheadScanner(allowIndent = true)
+                      .tap(_.currentRegion.knownWidth = in.currentRegion.indentWidth)
       def isArrowIndent() =
         lookahead.isArrow
         && {
-          lookahead.nextToken()
+          lookahead.observeArrowIndented()
           lookahead.token == INDENT || lookahead.token == EOF
         }
       lookahead.nextToken()
diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
index 57a7ff1c4a9b..96e9cd600363 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -636,7 +636,6 @@ object Scanners {
                     insert(OUTDENT, offset)
                 else if r.isInstanceOf[InBraces] && !closingRegionTokens.contains(token) then
                   report.warning("Line is indented too far to the left, or a `}` is missing", sourcePos())
-
         else if lastWidth < nextWidth
              || lastWidth == nextWidth && (lastToken == MATCH || lastToken == CATCH) && token == CASE then
           if canStartIndentTokens.contains(lastToken) then
@@ -656,7 +655,7 @@ object Scanners {
     def spaceTabMismatchMsg(lastWidth: IndentWidth, nextWidth: IndentWidth): Message =
       em"""Incompatible combinations of tabs and spaces in indentation prefixes.
           |Previous indent : $lastWidth
-         |Latest indent   : $nextWidth"""
+          |Latest indent   : $nextWidth"""
 
     def observeColonEOL(inTemplate: Boolean): Unit =
       val enabled =
@@ -670,6 +669,23 @@ object Scanners {
         reset()
         if atEOL then token = COLONeol
 
+    // consume => and insert <indent> if applicable. Used to detect colon arrow: x =>
+    def observeArrowIndented(): Unit =
+      if isArrow && indentSyntax then
+        peekAhead()
+        val atEOL = isAfterLineEnd
+        val atEOF = token == EOF
+        reset()
+        if atEOF then
+          token = EOF
+        else if atEOL then
+          val nextWidth = indentWidth(next.offset)
+          val lastWidth = currentRegion.indentWidth
+          if lastWidth < nextWidth then
+            currentRegion = Indented(nextWidth, COLONeol, currentRegion)
+            offset = next.offset
+            token = INDENT
+
     def observeIndented(): Unit =
       if indentSyntax && isNewLine then
         val nextWidth = indentWidth(next.offset)
@@ -1098,7 +1114,7 @@ object Scanners {
         reset()
       next
 
-    class LookaheadScanner(val allowIndent: Boolean = false) extends Scanner(source, offset, allowIndent = allowIndent) {
+    class LookaheadScanner(allowIndent: Boolean = false) extends Scanner(source, offset, allowIndent = allowIndent) {
       override protected def initialCharBufferSize = 8
       override def languageImportContext = Scanner.this.languageImportContext
     }
@@ -1650,7 +1666,7 @@ object Scanners {
   case class InCase(outer: Region) extends Region(OUTDENT)
 
   /** A class describing an indentation region.
-   *  @param width   The principal indendation width
+   *  @param width   The principal indentation width
    *  @param prefix  The token before the initial <indent> of the region
    */
   case class Indented(width: IndentWidth, prefix: Token, outer: Region | Null) extends Region(OUTDENT):
diff --git a/tests/neg/i22193.scala b/tests/neg/i22193.scala
new file mode 100644
index 000000000000..f7ee5b1cf5e1
--- /dev/null
+++ b/tests/neg/i22193.scala
@@ -0,0 +1,32 @@
+
+def fn2(arg: String, arg2: String)(f: String => Unit): Unit = f(arg)
+
+def fn3(arg: String, arg2: String)(f: => Unit): Unit = f
+
+def test1() =
+
+  // ok baseline
+  fn2(arg = "blue sleeps faster than tuesday", arg2 = "the quick brown fox jumped over the lazy dog"): env =>
+    val x = env
+    println(x)
+
+  fn2( // error not a legal formal parameter for a function literal
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"): env =>
+  val x = env // error
+  println(x)
+
+  fn2(
+      arg = "blue sleeps faster than tuesday",
+      arg2 = "the quick brown fox jumped over the lazy dog"):
+  env => // error indented definitions expected, identifier env found
+      val x = env
+      println(x)
+
+def test2() =
+
+  fn3( // error missing argument list for value of type (=> Unit) => Unit
+    arg = "blue sleeps faster than tuesday",
+    arg2 = "the quick brown fox jumped over the lazy dog"):
+  val x = "Hello" // error
+  println(x) // error

From 5a344b932e5368c4e2dcb52646fe1a1424f4e362 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 11:44:18 +0200
Subject: [PATCH 085/505] chore: Fix issue with incompatibility with LTS

---
 .../dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
index 077ee0e40b86..8e7e0ccc2c4b 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
@@ -108,10 +108,12 @@ class SemanticSymbolBuilder:
       else if (sym.isScala2PackageObject) then
         b.append(Symbols.PackageObjectDescriptor)
       else
+        def isScalaMethodOrVar = sym.isOneOf(Method | Mutable) && !sym.is(JavaDefined)
+        def isJavaMethod = sym.is(Method) && sym.is(JavaDefined)
         addName(b, sym.name)
         if sym.is(Package) then b.append('/')
         else if sym.isType || sym.isAllOf(JavaModule) then b.append('#')
-        else if sym.is(Method) || (sym.is(Mutable) && !sym.is(JavaDefined))
+        else if (isScalaMethodOrVar || isJavaMethod)
         && (!sym.is(StableRealizable) || sym.isConstructor) then
           b.append('('); addOverloadIdx(sym); b.append(").")
         else b.append('.')

From 805eadccc6a576b5b5dd4c3f9a2a45cef78271b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= <jtjeferreira@gmail.com>
Date: Fri, 20 Dec 2024 17:59:20 +0000
Subject: [PATCH 086/505] Use by-name parameter for Properties.*OrElse

[Cherry-picked 0dc4b409b5997d9ea13a635f751e05791171c28b]
---
 .../tools/dotc/config/PathResolver.scala      |  3 +-
 .../dotty/tools/dotc/config/Properties.scala  |  6 +--
 .../tools/dotc/config/WrappedProperties.scala | 12 ++---
 .../tools/dotc/config/PropertiesTest.scala    | 45 +++++++++++++++++++
 4 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 compiler/test/dotty/tools/dotc/config/PropertiesTest.scala

diff --git a/compiler/src/dotty/tools/dotc/config/PathResolver.scala b/compiler/src/dotty/tools/dotc/config/PathResolver.scala
index f60727e6bba2..67be0e3587cb 100644
--- a/compiler/src/dotty/tools/dotc/config/PathResolver.scala
+++ b/compiler/src/dotty/tools/dotc/config/PathResolver.scala
@@ -53,8 +53,7 @@ object PathResolver {
     def classPathEnv: String        =  envOrElse("CLASSPATH", "")
     def sourcePathEnv: String       =  envOrElse("SOURCEPATH", "")
 
-    //using propOrNone/getOrElse instead of propOrElse so that searchForBootClasspath is lazy evaluated
-    def javaBootClassPath: String   = propOrNone("sun.boot.class.path") getOrElse searchForBootClasspath
+    def javaBootClassPath: String   = propOrElse("sun.boot.class.path", searchForBootClasspath)
 
     def javaExtDirs: String         = propOrEmpty("java.ext.dirs")
     def scalaHome: String           = propOrEmpty("scala.home")
diff --git a/compiler/src/dotty/tools/dotc/config/Properties.scala b/compiler/src/dotty/tools/dotc/config/Properties.scala
index 4ea058d2cca8..610428b0f752 100644
--- a/compiler/src/dotty/tools/dotc/config/Properties.scala
+++ b/compiler/src/dotty/tools/dotc/config/Properties.scala
@@ -45,7 +45,7 @@ trait PropertiesTrait {
 
   def propIsSet(name: String): Boolean                  = System.getProperty(name) != null
   def propIsSetTo(name: String, value: String): Boolean = propOrNull(name) == value
-  def propOrElse(name: String, alt: String): String     = System.getProperty(name, alt)
+  def propOrElse(name: String, alt: => String): String  = Option(System.getProperty(name)).getOrElse(alt)
   def propOrEmpty(name: String): String                 = propOrElse(name, "")
   def propOrNull(name: String): String                  = propOrElse(name, null)
   def propOrNone(name: String): Option[String]          = Option(propOrNull(name))
@@ -53,11 +53,11 @@ trait PropertiesTrait {
   def setProp(name: String, value: String): String      = System.setProperty(name, value)
   def clearProp(name: String): String                   = System.clearProperty(name)
 
-  def envOrElse(name: String, alt: String): String      = Option(System getenv name) getOrElse alt
+  def envOrElse(name: String, alt: => String): String   = Option(System getenv name) getOrElse alt
   def envOrNone(name: String): Option[String]           = Option(System getenv name)
 
   // for values based on propFilename
-  def scalaPropOrElse(name: String, alt: String): String = scalaProps.getProperty(name, alt)
+  def scalaPropOrElse(name: String, alt: => String): String = scalaProps.getProperty(name, alt)
   def scalaPropOrEmpty(name: String): String             = scalaPropOrElse(name, "")
   def scalaPropOrNone(name: String): Option[String]      = Option(scalaProps.getProperty(name))
 
diff --git a/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala b/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala
index 20304b74c1da..a72830331e9f 100644
--- a/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala
+++ b/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala
@@ -14,12 +14,12 @@ trait WrappedProperties extends PropertiesTrait {
   protected def propCategory: String     = "wrapped"
   protected def pickJarBasedOn: Class[?] = this.getClass
 
-  override def propIsSet(name: String): Boolean              = wrap(super.propIsSet(name)) exists (x => x)
-  override def propOrElse(name: String, alt: String): String = wrap(super.propOrElse(name, alt)) getOrElse alt
-  override def setProp(name: String, value: String): String  = wrap(super.setProp(name, value)).orNull
-  override def clearProp(name: String): String               = wrap(super.clearProp(name)).orNull
-  override def envOrElse(name: String, alt: String): String  = wrap(super.envOrElse(name, alt)) getOrElse alt
-  override def envOrNone(name: String): Option[String]       = wrap(super.envOrNone(name)).flatten
+  override def propIsSet(name: String): Boolean                 = wrap(super.propIsSet(name)) exists (x => x)
+  override def propOrElse(name: String, alt: => String): String = wrap(super.propOrElse(name, alt)) getOrElse alt
+  override def setProp(name: String, value: String): String     = wrap(super.setProp(name, value)).orNull
+  override def clearProp(name: String): String                  = wrap(super.clearProp(name)).orNull
+  override def envOrElse(name: String, alt: => String): String  = wrap(super.envOrElse(name, alt)) getOrElse alt
+  override def envOrNone(name: String): Option[String]          = wrap(super.envOrNone(name)).flatten
 
   def systemProperties: Iterator[(String, String)] = {
     import scala.jdk.CollectionConverters.*
diff --git a/compiler/test/dotty/tools/dotc/config/PropertiesTest.scala b/compiler/test/dotty/tools/dotc/config/PropertiesTest.scala
new file mode 100644
index 000000000000..e45ac1f3983f
--- /dev/null
+++ b/compiler/test/dotty/tools/dotc/config/PropertiesTest.scala
@@ -0,0 +1,45 @@
+package dotty.tools.dotc.config
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.Assert._
+import scala.language.unsafeNulls
+
+class PropertiesTest {
+  final val TestProperty = "dotty.tools.dotc.config.PropertiesTest.__test_property__"
+
+  @Before
+  def beforeEach(): Unit = {
+    Properties.clearProp(TestProperty)
+  }
+
+  @Test
+  def testPropOrNone(): Unit = {
+    assertEquals(Properties.propOrNone(TestProperty), None)
+
+    Properties.setProp(TestProperty, "foo")
+
+    assertEquals(Properties.propOrNone(TestProperty), Some("foo"))
+  }
+
+  @Test
+  def testPropOrElse(): Unit = {
+    assertEquals(Properties.propOrElse(TestProperty, "bar"), "bar")
+
+    Properties.setProp(TestProperty, "foo")
+
+    var done = false
+    assertEquals(Properties.propOrElse(TestProperty, { done = true; "bar" }), "foo")
+    assertFalse("Does not evaluate alt if not needed", done)
+  }
+
+  @Test
+  def testEnvOrElse(): Unit = {
+    assertEquals(Properties.envOrElse("_PropertiesTest_NOT_DEFINED", "test"), "test")
+
+    var done = false
+    val envName = System.getenv().keySet().iterator().next()
+    assertNotEquals(Properties.envOrElse(envName, {done = true; "bar"}), "bar")
+    assertFalse("Does not evaluate alt if not needed", done)
+  }
+}

From b9124825ec32b60998e107e6b075052d29faae9d Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Fri, 14 Feb 2025 15:47:54 +0100
Subject: [PATCH 087/505] Add regression test for #22076 (#22602)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #22076.

---------

Co-authored-by: Sébastien Doeraene <sjrdoeraene@gmail.com>
[Cherry-picked a601e83dffd1d1239c295eb5d50e0d4b93412b91]
---
 tests/pos/match-type-disjoint-22076.scala | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 tests/pos/match-type-disjoint-22076.scala

diff --git a/tests/pos/match-type-disjoint-22076.scala b/tests/pos/match-type-disjoint-22076.scala
new file mode 100644
index 000000000000..c10555501b97
--- /dev/null
+++ b/tests/pos/match-type-disjoint-22076.scala
@@ -0,0 +1,8 @@
+trait Foo[CP <: NonEmptyTuple]:
+  type EndNode = Tuple.Last[CP]
+
+def f(end: Foo[?]): end.EndNode =
+  ???
+
+trait Bar[CP <: NonEmptyTuple] extends Foo[CP]:
+  val v: EndNode = f(this)

From e1fe8f3e67f2a9c9924a89547cecac9d0b74a0ad Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Mon, 13 Jan 2025 17:27:18 +0000
Subject: [PATCH 088/505] Avoid infinite recursion when looking for import
 suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Martin Odersky <odersky@gmail.com>
Co-authored-by: Ondřej Lhoták <olhotak@uwaterloo.ca>
Co-authored-by: Nguyen Pham <nguyen.pham@epfl.ch>

[Cherry-picked a2412d8d0ebaf4d338502c0c61917229f1a3fb8c]
---
 .../tools/dotc/typer/ImportSuggestions.scala  | 47 ++++++++++---------
 tests/neg/22145.check                         |  4 ++
 tests/neg/22145.scala                         |  8 ++++
 tests/neg/22145b.check                        | 36 ++++++++++++++
 tests/neg/22145b.scala                        | 40 ++++++++++++++++
 tests/neg/22145c.check                        |  4 ++
 tests/neg/22145c.scala                        |  8 ++++
 tests/neg/22145d.check                        |  9 ++++
 tests/neg/22145d.scala                        | 10 ++++
 tests/neg/22145e.check                        |  9 ++++
 tests/neg/22145e.scala                        | 11 +++++
 tests/neg/22145f.check                        | 10 ++++
 tests/neg/22145f.scala                        | 11 +++++
 tests/neg/22145g.check                        |  4 ++
 tests/neg/22145g.scala                        | 10 ++++
 15 files changed, 199 insertions(+), 22 deletions(-)
 create mode 100644 tests/neg/22145.check
 create mode 100644 tests/neg/22145.scala
 create mode 100644 tests/neg/22145b.check
 create mode 100644 tests/neg/22145b.scala
 create mode 100644 tests/neg/22145c.check
 create mode 100644 tests/neg/22145c.scala
 create mode 100644 tests/neg/22145d.check
 create mode 100644 tests/neg/22145d.scala
 create mode 100644 tests/neg/22145e.check
 create mode 100644 tests/neg/22145e.scala
 create mode 100644 tests/neg/22145f.check
 create mode 100644 tests/neg/22145f.scala
 create mode 100644 tests/neg/22145g.check
 create mode 100644 tests/neg/22145g.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala b/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala
index 1c30f44c29cf..20a48edba757 100644
--- a/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala
@@ -68,7 +68,7 @@ trait ImportSuggestions:
           && !(root.name == nme.raw.BAR && ctx.settings.scalajs.value && root == JSDefinitions.jsdefn.PseudoUnionModule)
       }
 
-    def nestedRoots(site: Type)(using Context): List[Symbol] =
+    def nestedRoots(site: Type, parentSymbols: Set[Symbol])(using Context): List[Symbol] =
       val seenNames = mutable.Set[Name]()
       site.baseClasses.flatMap { bc =>
         bc.info.decls.filter { dcl =>
@@ -78,34 +78,37 @@ trait ImportSuggestions:
         }
       }
 
-    def rootsStrictlyIn(ref: Type)(using Context): List[TermRef] =
+    def rootsStrictlyIn(ref: Type, parentSymbols: Set[Symbol] = Set())(using Context): List[TermRef] =
       val site = ref.widen
       val refSym = site.typeSymbol
-      val nested =
-        if refSym.is(Package) then
-          if refSym == defn.EmptyPackageClass       // Don't search the empty package
-              || refSym == defn.JavaPackageClass     // As an optimization, don't search java...
-              || refSym == defn.JavaLangPackageClass // ... or java.lang.
-          then Nil
-          else refSym.info.decls.filter(lookInside)
-        else if refSym.infoOrCompleter.isInstanceOf[StubInfo] then
-          Nil // Don't chase roots that do not exist
-        else
-          if !refSym.is(Touched) then
-            refSym.ensureCompleted() // JavaDefined is reliably known only after completion
-          if refSym.is(JavaDefined) then Nil
-          else nestedRoots(site)
-      nested
-        .map(mbr => TermRef(ref, mbr.asTerm))
-        .flatMap(rootsIn)
-        .toList
+      if parentSymbols.contains(refSym) then Nil
+      else
+        val nested =
+          if refSym.is(Package) then
+            if refSym == defn.EmptyPackageClass       // Don't search the empty package
+                || refSym == defn.JavaPackageClass     // As an optimization, don't search java...
+                || refSym == defn.JavaLangPackageClass // ... or java.lang.
+            then Nil
+            else refSym.info.decls.filter(lookInside)
+          else if refSym.infoOrCompleter.isInstanceOf[StubInfo] then
+            Nil // Don't chase roots that do not exist
+          else
+            if !refSym.is(Touched) then
+              refSym.ensureCompleted() // JavaDefined is reliably known only after completion
+            if refSym.is(JavaDefined) then Nil
+            else nestedRoots(site, parentSymbols)
+        val newParentSymbols = parentSymbols + refSym
+        nested
+          .map(mbr => TermRef(ref, mbr.asTerm))
+          .flatMap(rootsIn(_, newParentSymbols))
+          .toList
 
-    def rootsIn(ref: TermRef)(using Context): List[TermRef] =
+    def rootsIn(ref: TermRef, parentSymbols: Set[Symbol] = Set())(using Context): List[TermRef] =
       if seen.contains(ref) then Nil
       else
         implicitsDetailed.println(i"search for suggestions in ${ref.symbol.fullName}")
         seen += ref
-        ref :: rootsStrictlyIn(ref)
+        ref :: rootsStrictlyIn(ref, parentSymbols)
 
     def rootsOnPath(tp: Type)(using Context): List[TermRef] = tp match
       case ref: TermRef => rootsIn(ref) ::: rootsOnPath(ref.prefix)
diff --git a/tests/neg/22145.check b/tests/neg/22145.check
new file mode 100644
index 000000000000..4592c42e9e7f
--- /dev/null
+++ b/tests/neg/22145.check
@@ -0,0 +1,4 @@
+-- [E008] Not Found Error: tests/neg/22145.scala:5:7 -------------------------------------------------------------------
+5 |  base.foo() // error
+  |  ^^^^^^^^
+  |  value foo is not a member of foo.Collection
diff --git a/tests/neg/22145.scala b/tests/neg/22145.scala
new file mode 100644
index 000000000000..59d58b167ab4
--- /dev/null
+++ b/tests/neg/22145.scala
@@ -0,0 +1,8 @@
+package foo
+
+trait Collection:
+  val base: Collection = ???
+  base.foo() // error
+
+  object O extends Collection:
+    def foo(): Int = ???
diff --git a/tests/neg/22145b.check b/tests/neg/22145b.check
new file mode 100644
index 000000000000..de605ce24276
--- /dev/null
+++ b/tests/neg/22145b.check
@@ -0,0 +1,36 @@
+-- [E008] Not Found Error: tests/neg/22145b.scala:15:19 ----------------------------------------------------------------
+15 |      require(base.isWithin(p, start, end), "position is out of bounds") // error
+   |              ^^^^^^^^^^^^^
+   |              value isWithin is not a member of Collection.this.Self
+-- [E008] Not Found Error: tests/neg/22145b.scala:28:59 ----------------------------------------------------------------
+28 |      def positionAfter(p: Position): Position = self.base.positionAfter(p) // error
+   |                                                 ^^^^^^^^^^^^^^^^^^^^^^^
+   |value positionAfter is not a member of Collection.this.Self.
+   |An extension method was tried, but could not be fully constructed:
+   |
+   |    this.positionAfter(self.base)
+   |
+   |    failed with:
+   |
+   |        Found:    (self.base : Collection.this.Self)
+   |        Required: foo.Collection.given_is_Slice_Collection.Self²
+   |        
+   |        where:    Self  is a type in trait Collection
+   |                  Self² is a type in object given_is_Slice_Collection which is an alias of Collection.this.Slice
+   |        
+-- [E008] Not Found Error: tests/neg/22145b.scala:29:50 ----------------------------------------------------------------
+29 |      def apply(p: Position): Element = self.base.apply(p) // error
+   |                                        ^^^^^^^^^^^^^^^
+   |value apply is not a member of Collection.this.Self.
+   |An extension method was tried, but could not be fully constructed:
+   |
+   |    this.apply(self.base)
+   |
+   |    failed with:
+   |
+   |        Found:    (self.base : Collection.this.Self)
+   |        Required: foo.Collection.given_is_Slice_Collection.Self²
+   |        
+   |        where:    Self  is a type in trait Collection
+   |                  Self² is a type in object given_is_Slice_Collection which is an alias of Collection.this.Slice
+   |        
diff --git a/tests/neg/22145b.scala b/tests/neg/22145b.scala
new file mode 100644
index 000000000000..5b8de5672fba
--- /dev/null
+++ b/tests/neg/22145b.scala
@@ -0,0 +1,40 @@
+package foo
+
+import language.experimental.modularity
+
+trait Collection:
+  me =>
+
+  type Self
+  type Position
+  type Element
+
+  final class Slice(private[Collection] val base: Self, val start: Position, val end: Position):
+
+    final def apply(p: Position): Element =
+      require(base.isWithin(p, start, end), "position is out of bounds") // error
+      base.apply(p)
+
+  end Slice
+
+  given Slice is Collection:
+
+    type Position = me.Position
+    type Element = me.Element
+
+    extension (self: Self)
+      def start: Position = self.start
+      def end: Position = self.end
+      def positionAfter(p: Position): Position = self.base.positionAfter(p) // error
+      def apply(p: Position): Element = self.base.apply(p) // error
+
+  end given
+
+  extension (self: Self)
+
+    def start: Position
+    def end: Position
+    def positionAfter(p: Position): Position
+    def apply(p: Position): Element
+
+  end extension
diff --git a/tests/neg/22145c.check b/tests/neg/22145c.check
new file mode 100644
index 000000000000..ddfb6b9daf1d
--- /dev/null
+++ b/tests/neg/22145c.check
@@ -0,0 +1,4 @@
+-- [E008] Not Found Error: tests/neg/22145c.scala:4:35 -----------------------------------------------------------------
+4 |  def bar(base: Collection) = base.foo // error
+  |                              ^^^^^^^^
+  |                              value foo is not a member of foo.Collection
diff --git a/tests/neg/22145c.scala b/tests/neg/22145c.scala
new file mode 100644
index 000000000000..7776e57e7906
--- /dev/null
+++ b/tests/neg/22145c.scala
@@ -0,0 +1,8 @@
+package foo
+
+trait Collection:
+  def bar(base: Collection) = base.foo // error
+  object a extends Collection:
+    def foo: Int = 0
+  object b extends Collection:
+    def foo: Int = 1
diff --git a/tests/neg/22145d.check b/tests/neg/22145d.check
new file mode 100644
index 000000000000..ac6469c10b82
--- /dev/null
+++ b/tests/neg/22145d.check
@@ -0,0 +1,9 @@
+-- [E008] Not Found Error: tests/neg/22145d.scala:10:4 -----------------------------------------------------------------
+10 |  2.f() // error
+   |  ^^^
+   |  value f is not a member of Int, but could be made available as an extension method.
+   |
+   |  The following import might fix the problem:
+   |
+   |    import foo.O2.f
+   |
diff --git a/tests/neg/22145d.scala b/tests/neg/22145d.scala
new file mode 100644
index 000000000000..bfb68e088322
--- /dev/null
+++ b/tests/neg/22145d.scala
@@ -0,0 +1,10 @@
+package foo
+
+class C[T]:
+  extension (x: T) def f(): Int = 1
+
+object O1 extends C[String]
+object O2 extends C[Int]
+
+def main =
+  2.f() // error
diff --git a/tests/neg/22145e.check b/tests/neg/22145e.check
new file mode 100644
index 000000000000..e1c34e59f239
--- /dev/null
+++ b/tests/neg/22145e.check
@@ -0,0 +1,9 @@
+-- [E008] Not Found Error: tests/neg/22145e.scala:11:4 -----------------------------------------------------------------
+11 |  2.f() // error
+   |  ^^^
+   |  value f is not a member of Int, but could be made available as an extension method.
+   |
+   |  The following import might fix the problem:
+   |
+   |    import foo.O2.Ext.f
+   |
diff --git a/tests/neg/22145e.scala b/tests/neg/22145e.scala
new file mode 100644
index 000000000000..579fd65c685e
--- /dev/null
+++ b/tests/neg/22145e.scala
@@ -0,0 +1,11 @@
+package foo
+
+class C[T]:
+  object Ext:
+    extension (x: T) def f(): Int = 1
+
+object O1 extends C[String]
+object O2 extends C[Int]
+
+def main =
+  2.f() // error
diff --git a/tests/neg/22145f.check b/tests/neg/22145f.check
new file mode 100644
index 000000000000..b870eb21057a
--- /dev/null
+++ b/tests/neg/22145f.check
@@ -0,0 +1,10 @@
+-- [E008] Not Found Error: tests/neg/22145f.scala:11:6 -----------------------------------------------------------------
+11 |    2.f() // error
+   |    ^^^
+   |    value f is not a member of Int, but could be made available as an extension method.
+   |
+   |    One of the following imports might fix the problem:
+   |
+   |      import C.this.O1.O2.Ext.f
+   |      import C.this.O2.Ext.f
+   |
diff --git a/tests/neg/22145f.scala b/tests/neg/22145f.scala
new file mode 100644
index 000000000000..97f1336d1b1b
--- /dev/null
+++ b/tests/neg/22145f.scala
@@ -0,0 +1,11 @@
+package foo
+
+class C[T]:
+  object Ext:
+    extension (x: T) def f(): Int = 1
+
+  object O1 extends C[String]
+  object O2 extends C[Int]
+
+  def g =
+    2.f() // error
diff --git a/tests/neg/22145g.check b/tests/neg/22145g.check
new file mode 100644
index 000000000000..175949ac113f
--- /dev/null
+++ b/tests/neg/22145g.check
@@ -0,0 +1,4 @@
+-- [E008] Not Found Error: tests/neg/22145g.scala:10:4 -----------------------------------------------------------------
+10 |  2.f() // error
+   |  ^^^
+   |  value f is not a member of Int
diff --git a/tests/neg/22145g.scala b/tests/neg/22145g.scala
new file mode 100644
index 000000000000..8b888516c044
--- /dev/null
+++ b/tests/neg/22145g.scala
@@ -0,0 +1,10 @@
+package foo
+
+class C[T]:
+  extension (x: T) def f(): Int = 1
+
+object O:
+  val c0: C[String] = new C[String]
+  val c1: C[Int] = new C[Int]
+  // Currently no import suggestions here
+  2.f() // error

From 4c91a0bf9d54fe4490f9992354b98605a3bec6c4 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 14 Feb 2025 10:01:21 +0000
Subject: [PATCH 089/505] Avoid crash in uninhab check in Space

[Cherry-picked 899d4078a0d83ccdd8663a4ff11f79b1350e8a8e]
---
 .../src/dotty/tools/dotc/transform/patmat/Space.scala    | 2 +-
 tests/pos/i22518.scala                                   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22518.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index 9cf94877328b..8f015bcd5f42 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -655,7 +655,7 @@ object SpaceEngine {
           val superType = child.typeRef.superType
           if typeArgs.exists(_.isBottomType) && superType.isInstanceOf[ClassInfo] then
             val parentClass = superType.asInstanceOf[ClassInfo].declaredParents.find(_.classSymbol == parent).get
-            val paramTypeMap = Map.from(parentClass.argTypes.map(_.typeSymbol).zip(typeArgs))
+            val paramTypeMap = Map.from(parentClass.argInfos.map(_.typeSymbol).zip(typeArgs))
             val substArgs = child.typeRef.typeParamSymbols.map(param => paramTypeMap.getOrElse(param, WildcardType))
             substArgs
           else Nil
diff --git a/tests/pos/i22518.scala b/tests/pos/i22518.scala
new file mode 100644
index 000000000000..d530159701c4
--- /dev/null
+++ b/tests/pos/i22518.scala
@@ -0,0 +1,9 @@
+sealed trait Foo[T]
+class Bar extends Foo[?]
+
+def mkFoo[T]: Foo[T] =
+  ???
+
+def test: Unit =
+  mkFoo match
+    case _ => ()

From 65bc5aa5c6997f1326d8d8430f0d24a82c09b33a Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Fri, 24 Jan 2025 18:26:13 +0100
Subject: [PATCH 090/505] fix: treat static vals as enclosures in lambdalift

[Cherry-picked f52782e315256b54639c01ed7a041cf790a4aeb9]
---
 .../src/dotty/tools/dotc/core/SymDenotations.scala    |  9 +++++++++
 .../src/dotty/tools/dotc/transform/LambdaLift.scala   |  4 ++--
 tests/pos/i22408.scala                                | 11 +++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/i22408.scala

diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
index c26d8c320897..0e068eff2cfd 100644
--- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -1218,6 +1218,15 @@ object SymDenotations {
       else if (this.exists) owner.enclosingMethod
       else NoSymbol
 
+    /** The closest enclosing method or static symbol containing this definition.
+     *  A local dummy owner is mapped to the primary constructor of the class.
+     */
+    final def enclosingMethodOrStatic(using Context): Symbol =
+      if this.is(Method) || this.hasAnnotation(defn.ScalaStaticAnnot) then symbol
+      else if this.isClass then primaryConstructor
+      else if this.exists then owner.enclosingMethodOrStatic
+      else NoSymbol
+
     /** The closest enclosing extension method containing this definition,
      *  including methods outside the current class.
      */
diff --git a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
index 3fbdf1fa5427..12045be7419a 100644
--- a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
@@ -34,8 +34,8 @@ object LambdaLift:
     val liftedDefs: HashMap[Symbol, ListBuffer[Tree]] = new HashMap
 
     val deps = new Dependencies(ctx.compilationUnit.tpdTree, ctx.withPhase(thisPhase)):
-      def isExpr(sym: Symbol)(using Context): Boolean = sym.is(Method)
-      def enclosure(using Context) = ctx.owner.enclosingMethod
+      def isExpr(sym: Symbol)(using Context): Boolean = sym.is(Method) || sym.hasAnnotation(defn.ScalaStaticAnnot)
+      def enclosure(using Context) = ctx.owner.enclosingMethodOrStatic
 
       override def process(tree: Tree)(using Context): Unit =
         super.process(tree)
diff --git a/tests/pos/i22408.scala b/tests/pos/i22408.scala
new file mode 100644
index 000000000000..17fd0fbb474d
--- /dev/null
+++ b/tests/pos/i22408.scala
@@ -0,0 +1,11 @@
+object Obj:
+  @scala.annotation.static
+  val some_static_value: Int = {
+    val some_local_value: Int = {
+      val some_local_value_1 = ???
+      some_local_value_1
+    }
+    some_local_value
+  }
+
+class Obj

From 9f5e2b54fe07d717bd6e51a4c7271e4d3198ab4c Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sun, 9 Feb 2025 01:20:29 -0800
Subject: [PATCH 091/505] Constructor proxy or companion is as protected as
 class

Require the constructor companion to be protected if the class is;
or create it protected. Otherwise, create protected proxies.
---
 .../src/dotty/tools/dotc/core/NamerOps.scala  |  8 +++++--
 .../dotty/tools/dotc/typer/Applications.scala |  3 +--
 .../src/dotty/tools/dotc/typer/Typer.scala    |  6 ++---
 tests/neg/i22560.scala                        | 22 +++++++++++++++++++
 tests/neg/i22560b.scala                       |  9 ++++++++
 tests/pos/i22560.scala                        | 22 +++++++++++++++++++
 6 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 tests/neg/i22560.scala
 create mode 100644 tests/neg/i22560b.scala
 create mode 100644 tests/pos/i22560.scala

diff --git a/compiler/src/dotty/tools/dotc/core/NamerOps.scala b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
index e4364d168267..7129527fb22a 100644
--- a/compiler/src/dotty/tools/dotc/core/NamerOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
@@ -110,8 +110,10 @@ object NamerOps:
    */
   def addConstructorApplies(scope: MutableScope, cls: ClassSymbol, modcls: ClassSymbol)(using Context): scope.type =
     def proxy(constr: Symbol): Symbol =
+      var flags = ApplyProxyFlags | (constr.flagsUNSAFE & AccessFlags)
+      if cls.is(Protected) && !modcls.is(Protected) then flags |= Protected
       newSymbol(
-        modcls, nme.apply, ApplyProxyFlags | (constr.flagsUNSAFE & AccessFlags),
+        modcls, nme.apply, flags,
         ApplyProxyCompleter(constr), coord = constr.coord)
     for dcl <- cls.info.decls do
       if dcl.isConstructor then scope.enter(proxy(dcl))
@@ -133,9 +135,11 @@ object NamerOps:
 
   /** A new symbol that is the constructor companion for class `cls` */
   def classConstructorCompanion(cls: ClassSymbol)(using Context): TermSymbol =
+    var flags = ConstructorCompanionFlags
+    if cls.is(Protected) then flags |= Protected
     val companion = newModuleSymbol(
         cls.owner, cls.name.toTermName,
-        ConstructorCompanionFlags, ConstructorCompanionFlags,
+        flags, flags,
         constructorCompanionCompleter(cls),
         coord = cls.coord,
         assocFile = cls.assocFile)
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 1e6fbd7bed17..5254ec3712c1 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -1111,9 +1111,8 @@ trait Applications extends Compatibility {
             //
             //    summonFrom {
             //      case given A[t] =>
-            //        summonFrom
+            //        summonFrom:
             //          case given `t` => ...
-            //        }
             //    }
             //
             // the second `summonFrom` should expand only once the first `summonFrom` is
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index 38bc6960e370..42a0c24c9f24 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3821,9 +3821,9 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
           readapt(tree.appliedToNone) // insert () to primary constructors
         else
           errorTree(tree, em"Missing arguments for $methodStr")
-      case _ => tryInsertApplyOrImplicit(tree, pt, locked) {
-        errorTree(tree, MethodDoesNotTakeParameters(tree))
-      }
+      case _ =>
+        tryInsertApplyOrImplicit(tree, pt, locked):
+          errorTree(tree, MethodDoesNotTakeParameters(tree))
     }
 
     def adaptNoArgsImplicitMethod(wtp: MethodType): Tree = {
diff --git a/tests/neg/i22560.scala b/tests/neg/i22560.scala
new file mode 100644
index 000000000000..2957ac4a1bf1
--- /dev/null
+++ b/tests/neg/i22560.scala
@@ -0,0 +1,22 @@
+
+class A:
+  protected class B
+
+// This fails to compile, as expected
+val x = A().B() // error
+
+object C:
+  protected val p = "protected"
+  protected def getString() = "Hello!"
+  protected class D:
+    def d = D() // ok
+
+// This fails to compile
+// val y = C.p
+
+// And this also fails to compile
+// val z = C.getString()
+
+// However, this compiles just fine.
+val alpha = C.D() // error
+val beta = new C.D() // error
diff --git a/tests/neg/i22560b.scala b/tests/neg/i22560b.scala
new file mode 100644
index 000000000000..0a906832f2b3
--- /dev/null
+++ b/tests/neg/i22560b.scala
@@ -0,0 +1,9 @@
+
+class Enumeration:
+  protected class Val(i: Int):
+    def this() = this(42)
+  object Val
+
+class Test extends Enumeration:
+  val Hearts = Val(27) // error
+  val Diamonds = Val() // error
diff --git a/tests/pos/i22560.scala b/tests/pos/i22560.scala
new file mode 100644
index 000000000000..947923aba259
--- /dev/null
+++ b/tests/pos/i22560.scala
@@ -0,0 +1,22 @@
+
+package companionless:
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+
+  class Test extends Enumeration:
+    val Hearts = Val(27)
+    val Diamonds = Val()
+
+
+package companioned:
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+    protected object Val
+
+  class Test extends Enumeration:
+    val Hearts = Val(27)
+    val Diamonds = Val()

From ed37fe0d1d1e2ca303f5864a97645d3f6ba00674 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 15:43:02 +0200
Subject: [PATCH 092/505] Constructor proxy or companion is as protected as
 class

Require the constructor companion to be protected if the class is;
or create it protected. Otherwise, create protected proxies.

[Cherry-picked fddab10b57bacef6891dc6f169a238a80d232b1d][modified]

From ca09ca79b23f62eacf80e27d594d8f322aa3da10 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 13 Feb 2025 09:30:58 -0800
Subject: [PATCH 093/505] Reference on access of ctor proxy

[Cherry-picked b6ad24f21798fe0d148deea276e23c3226fd68f1]
---
 .../reference/other-new-features/creator-applications.md | 7 +++++--
 tests/neg/i22560b.scala                                  | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/reference/other-new-features/creator-applications.md b/docs/_docs/reference/other-new-features/creator-applications.md
index 8b1de02b2f25..f3b58b87bc48 100644
--- a/docs/_docs/reference/other-new-features/creator-applications.md
+++ b/docs/_docs/reference/other-new-features/creator-applications.md
@@ -39,8 +39,11 @@ The precise rules are as follows:
     - the class has a companion object (which might have been generated in step 1), and
     - that companion object does not already define a member named `apply`.
 
-    Each generated `apply` method forwards to one constructor of the class. It has the
-    same type and value parameters as the constructor.
+    Each generated `apply` method forwards to one constructor of the class.
+    It has the same type and value parameters as the constructor,
+    as well as the same access restriction as the class.
+    If the class is `protected`, then either the companion object must be `protected`
+    or the `apply` method will be made `protected`.
 
 Constructor proxy companions cannot be used as values by themselves. A proxy companion object must
 be selected with `apply` (or be applied to arguments, in which case the `apply` is implicitly
diff --git a/tests/neg/i22560b.scala b/tests/neg/i22560b.scala
index 0a906832f2b3..bce079e0eeb2 100644
--- a/tests/neg/i22560b.scala
+++ b/tests/neg/i22560b.scala
@@ -7,3 +7,12 @@ class Enumeration:
 class Test extends Enumeration:
   val Hearts = Val(27) // error
   val Diamonds = Val() // error
+
+package p:
+  private[p] class C(i: Int) // ctor proxy gets privateWithin of class
+  private[p] class D(i: Int)
+  object D
+
+package q:
+  def f() = p.C(42) // error
+  def g() = p.D(42) // error

From ac5c0db63b51e51c0c01182be70924c086cfaddc Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 17 Feb 2025 09:56:53 -0800
Subject: [PATCH 094/505] Clarify reference on inferred object-private
 parameter

[Cherry-picked 7aca1280b78a794afee160ca6bb83a05e5042a71]
---
 .../reference/dropped-features/this-qualifier.md     | 12 ++++++++++++
 tests/neg/i22620.scala                               |  4 ++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/neg/i22620.scala

diff --git a/docs/_docs/reference/dropped-features/this-qualifier.md b/docs/_docs/reference/dropped-features/this-qualifier.md
index f75d19356696..541c91e5cdfa 100644
--- a/docs/_docs/reference/dropped-features/this-qualifier.md
+++ b/docs/_docs/reference/dropped-features/this-qualifier.md
@@ -29,3 +29,15 @@ This can cause problems if a program tries to access the missing private field v
       // [C] needed if `field` is to be accessed through reflection
     val retained = field * field
 ```
+
+Class parameters are normally inferred object-private,
+so that members introduced by explicitly declaring them `val` or `var` are exempt from the rule described here.
+
+In particular, the following field is not excluded from variance checking:
+```scala
+  class C[-T](private val t: T) // error
+```
+And in contrast to the private field shown above, this field is not eliminated:
+```scala
+  class C(private val c: Int)
+```
diff --git a/tests/neg/i22620.scala b/tests/neg/i22620.scala
new file mode 100644
index 000000000000..97d1d55e3302
--- /dev/null
+++ b/tests/neg/i22620.scala
@@ -0,0 +1,4 @@
+
+import scala.collection.mutable.ArrayBuffer
+
+class PrivateTest[-M](private val v: ArrayBuffer[M]) // error

From b71066aeda345b583fbcc5c9e6055662622382da Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sat, 15 Feb 2025 14:32:39 -0800
Subject: [PATCH 095/505] Allow observing an indent after conditional

Normally do not infer NEWLINE within parens,
but special case old syntax for conditionals,
so that it can observe indented syntax.
The mechanism is to inject an Indented region
when parsing a parenthesized condition which is
within an InParens region, such as an arg list.
The effect is not to advance past EOL after `(true)`.

[Cherry-picked 4ba89e9e8eb027b2bd11503e3621fa5e62e7bad0]
---
 .../dotty/tools/dotc/parsing/Parsers.scala    |  9 +++-
 tests/pos/i22608.scala                        | 48 +++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/i22608.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 4354be9662be..63acae33be43 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -97,6 +97,9 @@ object Parsers {
   private val InCase: Region => Region = Scanners.InCase(_)
   private val InCond: Region => Region = Scanners.InParens(LPAREN, _)
   private val InFor : Region => Region = Scanners.InBraces(_)
+  private val InBrk : Region => Region = _.match
+    case p: Scanners.InParens => Scanners.Indented(p.indentWidth, p.prefix, p)
+    case r => r
 
   abstract class ParserCommon(val source: SourceFile)(using Context) {
 
@@ -2129,8 +2132,10 @@ object Parsers {
     def condExpr(altToken: Token): Tree =
       val t: Tree =
         if in.token == LPAREN then
-          var t: Tree = atSpan(in.offset):
-            makeTupleOrParens(inParensWithCommas(commaSeparated(exprInParens)))
+          var t: Tree =
+            inSepRegion(InBrk): // allow inferred NEWLINE for observeIndented below
+              atSpan(in.offset):
+                makeTupleOrParens(inParensWithCommas(commaSeparated(exprInParens)))
           if in.token != altToken then
             if toBeContinued(altToken) then
               t = inSepRegion(InCond) {
diff --git a/tests/pos/i22608.scala b/tests/pos/i22608.scala
new file mode 100644
index 000000000000..e4b49e87769f
--- /dev/null
+++ b/tests/pos/i22608.scala
@@ -0,0 +1,48 @@
+
+def f(i: Int) = i
+def g(i: Int, j: Int) = i+j
+
+def t =
+  val y = f(
+    if (true)// then
+      val x = 1
+      5
+    else 7
+  )
+  y
+
+def u(j: Int) =
+  val y = g(
+    if (true)// then
+      val x = 1
+      5
+    else 7,
+    j
+  )
+  y
+
+def b(k: Boolean): Int =
+  f(
+    if (
+       k
+    && b(!k) > 0
+    ) then 27
+    else 42
+  )
+
+def p(b: Boolean) =
+  import collection.mutable.ListBuffer
+  val xs, ys = ListBuffer.empty[String]
+  (if (b)
+    xs
+  else
+    ys) += "hello, world"
+  (xs.toString, ys.toString)
+
+def q(b: Boolean) =
+  import collection.mutable.ListBuffer
+  val xs, ys = ListBuffer.empty[String]
+  (if (b)
+   then xs
+   else ys) += "hello, world"
+  (xs.toString, ys.toString)

From 1e9068ebd39aa13e998b8bdb7491928d500c5cec Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sun, 16 Feb 2025 08:49:08 -0800
Subject: [PATCH 096/505] Prefer chaining, avoid duplication in finally

[Cherry-picked c8131c031a644c2f9d0dcd9f5fb9f07889880657]
---
 .../dotty/tools/dotc/parsing/Parsers.scala    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 63acae33be43..2a2acc84d7b4 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -97,7 +97,7 @@ object Parsers {
   private val InCase: Region => Region = Scanners.InCase(_)
   private val InCond: Region => Region = Scanners.InParens(LPAREN, _)
   private val InFor : Region => Region = Scanners.InBraces(_)
-  private val InBrk : Region => Region = _.match
+  private val InBrk : Region => Region =
     case p: Scanners.InParens => Scanners.Indented(p.indentWidth, p.prefix, p)
     case r => r
 
@@ -2132,27 +2132,25 @@ object Parsers {
     def condExpr(altToken: Token): Tree =
       val t: Tree =
         if in.token == LPAREN then
-          var t: Tree =
-            inSepRegion(InBrk): // allow inferred NEWLINE for observeIndented below
-              atSpan(in.offset):
-                makeTupleOrParens(inParensWithCommas(commaSeparated(exprInParens)))
-          if in.token != altToken then
-            if toBeContinued(altToken) then
-              t = inSepRegion(InCond) {
+          inSepRegion(InBrk): // allow inferred NEWLINE for observeIndented below
+            atSpan(in.offset):
+              makeTupleOrParens(inParensWithCommas(commaSeparated(exprInParens)))
+          .pipe: t =>
+            if in.token == altToken then t
+            else if toBeContinued(altToken) then
+              inSepRegion(InCond):
                 expr1Rest(
                   postfixExprRest(
                     simpleExprRest(t, Location.ElseWhere),
                     Location.ElseWhere),
                   Location.ElseWhere)
-              }
             else
               if rewriteToNewSyntax(t.span) then
-                dropParensOrBraces(t.span.start, s"${tokenString(altToken)}")
+                dropParensOrBraces(t.span.start, tokenString(altToken))
               in.observeIndented()
               return t
-          t
         else if in.isNestedStart then
-          try expr() finally newLinesOpt()
+          expr().tap(_ => newLinesOpt())
         else
           inSepRegion(InCond)(expr())
       if rewriteToOldSyntax(t.span.startPos) then revertToParens(t)

From bb8eb471d423e98b629216fbca54f4ce90d28f85 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 18 Feb 2025 09:18:01 -0800
Subject: [PATCH 097/505] Clarify region workaround

[Cherry-picked a19c14ad704c4d1d2e2e794c888fecf8672b0797]
---
 compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 2a2acc84d7b4..47389fbce054 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -97,7 +97,7 @@ object Parsers {
   private val InCase: Region => Region = Scanners.InCase(_)
   private val InCond: Region => Region = Scanners.InParens(LPAREN, _)
   private val InFor : Region => Region = Scanners.InBraces(_)
-  private val InBrk : Region => Region =
+  private val InOldCond: Region => Region = // old-style Cond to allow indent when InParens, see #22608
     case p: Scanners.InParens => Scanners.Indented(p.indentWidth, p.prefix, p)
     case r => r
 
@@ -2132,7 +2132,7 @@ object Parsers {
     def condExpr(altToken: Token): Tree =
       val t: Tree =
         if in.token == LPAREN then
-          inSepRegion(InBrk): // allow inferred NEWLINE for observeIndented below
+          inSepRegion(InOldCond): // allow inferred NEWLINE for observeIndented below
             atSpan(in.offset):
               makeTupleOrParens(inParensWithCommas(commaSeparated(exprInParens)))
           .pipe: t =>

From c20c16d77d54e2e1e4382141103ab0b6e47b9771 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 17 Feb 2025 15:30:42 +0100
Subject: [PATCH 098/505] Fix issue with static `this` references erroring in
 quoted code

Previously, inherited methods, even if accessed via static objects,
were not able to be used in quotations, unless explicitly pointed to
with a non-`this` prefix. This was due to the fact that during the
cross-stage safety check, first the method itself was checked for if it
was static (which for the inherited method, it was not), and if not,
the prefix was checked further, erroring on any `this` tree found along
the way.

This was fixed by allowing `this` trees if they point to static objects.
This way not only is the initial issue fixed, but also we are able to
freely reference static methods with `this`, like '{this.objectMethod}
(whereas previously, only '{Object.objectMethod} or '{objectMethod}
were allowed, despite them all pointing to the same static method).

[Cherry-picked 71ddfb5f628b3d5c9b02d187f8fbbf6c03147283]
---
 .../tools/dotc/staging/CrossStageSafety.scala     | 10 +++++++++-
 tests/neg/i22592.scala                            | 14 ++++++++++++++
 tests/pos/i22592.scala                            | 15 +++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/neg/i22592.scala
 create mode 100644 tests/pos/i22592.scala

diff --git a/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala b/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala
index 1832eeabca7e..4534af0f0883 100644
--- a/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala
+++ b/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala
@@ -189,11 +189,19 @@ class CrossStageSafety extends TreeMapWithStages {
 
   /** Check level consistency of terms references */
   private def checkLevelConsistency(tree: Ident | This)(using Context): Unit =
+    def isStatic(pre: Type)(using Context): Boolean = pre match
+      case pre: NamedType =>
+        val sym = pre.currentSymbol
+        sym.is(Package) || sym.isStaticOwner && isStatic(pre.prefix)
+      case pre: ThisType => isStatic(pre.tref)
+      case _ => true
     new TypeTraverser {
       def traverse(tp: Type): Unit =
         tp match
           case tp @ TermRef(NoPrefix, _) if !tp.symbol.isStatic && level != levelOf(tp.symbol) =>
             levelError(tp.symbol, tp, tree.srcPos)
+          case tp: ThisType if isStatic(tp) =>
+            // static object (OK)
           case tp: ThisType if level != -1 && level != levelOf(tp.cls) =>
             levelError(tp.cls, tp, tree.srcPos)
           case tp: AnnotatedType =>
@@ -201,7 +209,7 @@ class CrossStageSafety extends TreeMapWithStages {
           case _ if tp.typeSymbol.is(Package) =>
             // OK
           case _ =>
-             traverseChildren(tp)
+            traverseChildren(tp)
     }.traverse(tree.tpe)
 
   private def levelError(sym: Symbol, tp: Type, pos: SrcPos)(using Context): tp.type = {
diff --git a/tests/neg/i22592.scala b/tests/neg/i22592.scala
new file mode 100644
index 000000000000..6a9a89cacf2a
--- /dev/null
+++ b/tests/neg/i22592.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+trait Foo:
+  def inherited = ()
+
+class Bar extends Foo:
+  def local = ()
+  def localArg(arg: Any) = ()
+
+  def macro1(using Quotes): Expr[Unit] = '{ local } // error
+  def macro3(using Quotes): Expr[Unit] = '{ inherited } // error
+  def macro4(using Quotes): Expr[Unit] = '{ this.local } // error
+  def macro5(using Quotes): Expr[Unit] = '{ this.inherited } // error
+  def macro6(using Quotes): Expr[Unit] = '{ localArg(this) } // error // error
diff --git a/tests/pos/i22592.scala b/tests/pos/i22592.scala
new file mode 100644
index 000000000000..f6a1f2eff696
--- /dev/null
+++ b/tests/pos/i22592.scala
@@ -0,0 +1,15 @@
+import scala.quoted.*
+
+trait Foo:
+  def inherited = ()
+
+object Bar extends Foo:
+  def local = ()
+  def localArg(arg: Any) = ()
+
+  def macro1(using Quotes): Expr[Unit] = '{ local }
+  def macro2(using Quotes): Expr[Unit] = '{ Bar.inherited }
+  def macro3(using Quotes): Expr[Unit] = '{ inherited }
+  def macro4(using Quotes): Expr[Unit] = '{ this.local }
+  def macro5(using Quotes): Expr[Unit] = '{ this.inherited }
+  def macro6(using Quotes): Expr[Unit] = '{ localArg(this) }

From 663f8ecdb98528dc43a554467021faf8f031bb2e Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 17 Feb 2025 15:30:42 +0100
Subject: [PATCH 099/505] chore: Add @nowarn annotation to LazyVals. (#22270)

Unsafe is planned to be removed in future  Java versions.

Motivication:

Makes it compile on JDK 23
refs: https://openjdk.org/jeps/471

Modification:
Add `@nowarn("cat=deprecation")`

Result:
Compiles successfully on JDK 23
[Cherry-picked 4952e0af407d652a47efb5436fe0e0f023db3367]
---
 .../tools/dotc/staging/CrossStageSafety.scala     | 10 +++++++++-
 tests/neg/i22592.scala                            | 14 ++++++++++++++
 tests/pos/i22592.scala                            | 15 +++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/neg/i22592.scala
 create mode 100644 tests/pos/i22592.scala

diff --git a/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala b/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala
index 1832eeabca7e..4534af0f0883 100644
--- a/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala
+++ b/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala
@@ -189,11 +189,19 @@ class CrossStageSafety extends TreeMapWithStages {
 
   /** Check level consistency of terms references */
   private def checkLevelConsistency(tree: Ident | This)(using Context): Unit =
+    def isStatic(pre: Type)(using Context): Boolean = pre match
+      case pre: NamedType =>
+        val sym = pre.currentSymbol
+        sym.is(Package) || sym.isStaticOwner && isStatic(pre.prefix)
+      case pre: ThisType => isStatic(pre.tref)
+      case _ => true
     new TypeTraverser {
       def traverse(tp: Type): Unit =
         tp match
           case tp @ TermRef(NoPrefix, _) if !tp.symbol.isStatic && level != levelOf(tp.symbol) =>
             levelError(tp.symbol, tp, tree.srcPos)
+          case tp: ThisType if isStatic(tp) =>
+            // static object (OK)
           case tp: ThisType if level != -1 && level != levelOf(tp.cls) =>
             levelError(tp.cls, tp, tree.srcPos)
           case tp: AnnotatedType =>
@@ -201,7 +209,7 @@ class CrossStageSafety extends TreeMapWithStages {
           case _ if tp.typeSymbol.is(Package) =>
             // OK
           case _ =>
-             traverseChildren(tp)
+            traverseChildren(tp)
     }.traverse(tree.tpe)
 
   private def levelError(sym: Symbol, tp: Type, pos: SrcPos)(using Context): tp.type = {
diff --git a/tests/neg/i22592.scala b/tests/neg/i22592.scala
new file mode 100644
index 000000000000..6a9a89cacf2a
--- /dev/null
+++ b/tests/neg/i22592.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+trait Foo:
+  def inherited = ()
+
+class Bar extends Foo:
+  def local = ()
+  def localArg(arg: Any) = ()
+
+  def macro1(using Quotes): Expr[Unit] = '{ local } // error
+  def macro3(using Quotes): Expr[Unit] = '{ inherited } // error
+  def macro4(using Quotes): Expr[Unit] = '{ this.local } // error
+  def macro5(using Quotes): Expr[Unit] = '{ this.inherited } // error
+  def macro6(using Quotes): Expr[Unit] = '{ localArg(this) } // error // error
diff --git a/tests/pos/i22592.scala b/tests/pos/i22592.scala
new file mode 100644
index 000000000000..f6a1f2eff696
--- /dev/null
+++ b/tests/pos/i22592.scala
@@ -0,0 +1,15 @@
+import scala.quoted.*
+
+trait Foo:
+  def inherited = ()
+
+object Bar extends Foo:
+  def local = ()
+  def localArg(arg: Any) = ()
+
+  def macro1(using Quotes): Expr[Unit] = '{ local }
+  def macro2(using Quotes): Expr[Unit] = '{ Bar.inherited }
+  def macro3(using Quotes): Expr[Unit] = '{ inherited }
+  def macro4(using Quotes): Expr[Unit] = '{ this.local }
+  def macro5(using Quotes): Expr[Unit] = '{ this.inherited }
+  def macro6(using Quotes): Expr[Unit] = '{ localArg(this) }

From 91923ea2f78074cc46c82ba625e92c1625a431bc Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 15:49:36 +0200
Subject: [PATCH 100/505] chore: Remove one test that only works with new
 experimental feature

---
 tests/neg/22145b.check | 36 ------------------------------------
 tests/neg/22145b.scala | 40 ----------------------------------------
 2 files changed, 76 deletions(-)
 delete mode 100644 tests/neg/22145b.check
 delete mode 100644 tests/neg/22145b.scala

diff --git a/tests/neg/22145b.check b/tests/neg/22145b.check
deleted file mode 100644
index de605ce24276..000000000000
--- a/tests/neg/22145b.check
+++ /dev/null
@@ -1,36 +0,0 @@
--- [E008] Not Found Error: tests/neg/22145b.scala:15:19 ----------------------------------------------------------------
-15 |      require(base.isWithin(p, start, end), "position is out of bounds") // error
-   |              ^^^^^^^^^^^^^
-   |              value isWithin is not a member of Collection.this.Self
--- [E008] Not Found Error: tests/neg/22145b.scala:28:59 ----------------------------------------------------------------
-28 |      def positionAfter(p: Position): Position = self.base.positionAfter(p) // error
-   |                                                 ^^^^^^^^^^^^^^^^^^^^^^^
-   |value positionAfter is not a member of Collection.this.Self.
-   |An extension method was tried, but could not be fully constructed:
-   |
-   |    this.positionAfter(self.base)
-   |
-   |    failed with:
-   |
-   |        Found:    (self.base : Collection.this.Self)
-   |        Required: foo.Collection.given_is_Slice_Collection.Self²
-   |        
-   |        where:    Self  is a type in trait Collection
-   |                  Self² is a type in object given_is_Slice_Collection which is an alias of Collection.this.Slice
-   |        
--- [E008] Not Found Error: tests/neg/22145b.scala:29:50 ----------------------------------------------------------------
-29 |      def apply(p: Position): Element = self.base.apply(p) // error
-   |                                        ^^^^^^^^^^^^^^^
-   |value apply is not a member of Collection.this.Self.
-   |An extension method was tried, but could not be fully constructed:
-   |
-   |    this.apply(self.base)
-   |
-   |    failed with:
-   |
-   |        Found:    (self.base : Collection.this.Self)
-   |        Required: foo.Collection.given_is_Slice_Collection.Self²
-   |        
-   |        where:    Self  is a type in trait Collection
-   |                  Self² is a type in object given_is_Slice_Collection which is an alias of Collection.this.Slice
-   |        
diff --git a/tests/neg/22145b.scala b/tests/neg/22145b.scala
deleted file mode 100644
index 5b8de5672fba..000000000000
--- a/tests/neg/22145b.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package foo
-
-import language.experimental.modularity
-
-trait Collection:
-  me =>
-
-  type Self
-  type Position
-  type Element
-
-  final class Slice(private[Collection] val base: Self, val start: Position, val end: Position):
-
-    final def apply(p: Position): Element =
-      require(base.isWithin(p, start, end), "position is out of bounds") // error
-      base.apply(p)
-
-  end Slice
-
-  given Slice is Collection:
-
-    type Position = me.Position
-    type Element = me.Element
-
-    extension (self: Self)
-      def start: Position = self.start
-      def end: Position = self.end
-      def positionAfter(p: Position): Position = self.base.positionAfter(p) // error
-      def apply(p: Position): Element = self.base.apply(p) // error
-
-  end given
-
-  extension (self: Self)
-
-    def start: Position
-    def end: Position
-    def positionAfter(p: Position): Position
-    def apply(p: Position): Element
-
-  end extension

From ca1fb936399e920ee41079c0713184273c45910c Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Thu, 20 Feb 2025 08:34:49 -0800
Subject: [PATCH 101/505] Discourage default arg for extension receiver
 (#22492)

Fixes #12460

I shied away from making it an error, as that is a language change that
violates the rule that extension methods are ordinary methods. There are
other restrictions, but an extension always allows explicit invocation
`m()(x)` that could leverage a default.

The caret is wrong on the second test case (~todo~). Edit: span of
default getter was union of first parameter and the param RHS, so that
the synthetic position of the getter symbol was a point at the first
parameter. Now the getter tree gets the span of the RHS. (That span is
non-synthetic, but the definition is still synthetic. The name pos of a
synthetic is the point.)
---
 .../src/dotty/tools/dotc/ast/Desugar.scala    |  1 +
 .../tools/dotc/reporting/ErrorMessageID.scala |  2 ++
 .../dotty/tools/dotc/reporting/messages.scala | 11 ++++++++
 .../dotty/tools/dotc/typer/RefChecks.scala    | 25 ++++++++++++-------
 tests/warn/i12460.check                       | 24 ++++++++++++++++++
 tests/warn/i12460.scala                       |  9 +++++++
 6 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 tests/warn/i12460.check
 create mode 100644 tests/warn/i12460.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
index ca180e5ea612..0666cea91f20 100644
--- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -338,6 +338,7 @@ object desugar {
           .withMods(Modifiers(
             meth.mods.flags & (AccessFlags | Synthetic) | (vparam.mods.flags & Inline),
             meth.mods.privateWithin))
+          .withSpan(vparam.rhs.span)
         val rest = defaultGetters(vparams :: paramss1, n + 1)
         if vparam.rhs.isEmpty then rest else defaultGetter :: rest
       case _ :: paramss1 =>  // skip empty parameter lists and type parameters
diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index c3cad8cbfea5..93744197cadd 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -220,6 +220,8 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case DeprecatedInfixNamedArgumentSyntaxID // errorNumber: 204
   case GivenSearchPriorityID // errorNumber: 205
   case EnumMayNotBeValueClassesID // errorNumber: 206
+  case IllegalUnrollPlacementID // errorNumber: 207  - unused in LTS
+  case ExtensionHasDefaultID // errorNumber: 208
 
   def errorNumber = ordinal - 1
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 886ed3979ba5..7cafa04f8792 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -2474,6 +2474,17 @@ class ExtensionNullifiedByMember(method: Symbol, target: Symbol)(using Context)
        |
        |The extension may be invoked as though selected from an arbitrary type if conversions are in play."""
 
+class ExtensionHasDefault(method: Symbol)(using Context)
+  extends Message(ExtensionHasDefaultID):
+  def kind = MessageKind.PotentialIssue
+  def msg(using Context) =
+    i"""Extension method ${hl(method.name.toString)} should not have a default argument for its receiver."""
+  def explain(using Context) =
+    i"""The receiver cannot be omitted when an extension method is invoked as a selection.
+       |A default argument for that parameter would never be used in that case.
+       |An extension method can be invoked as a regular method, but if that is the intended usage,
+       |it should not be defined as an extension."""
+
 class TraitCompanionWithMutableStatic()(using Context)
   extends SyntaxMsg(TraitCompanionWithMutableStaticID) {
   def msg(using Context) = i"Companion of traits cannot define mutable @static fields"
diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
index bb58bb05fadf..128a0253a8cf 100644
--- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
@@ -1062,22 +1062,21 @@ object RefChecks {
    *  that are either both opaque types or both not.
    */
   def checkExtensionMethods(sym: Symbol)(using Context): Unit =
-    if sym.is(Extension) && !sym.nextOverriddenSymbol.exists then
+    if sym.is(Extension) then
       extension (tp: Type)
-        def strippedResultType = Applications.stripImplicit(tp.stripPoly, wildcardOnly = true).resultType
-        def firstExplicitParamTypes = Applications.stripImplicit(tp.stripPoly, wildcardOnly = true).firstParamTypes
+        def explicit = Applications.stripImplicit(tp.stripPoly, wildcardOnly = true)
         def hasImplicitParams = tp.stripPoly match { case mt: MethodType => mt.isImplicitMethod case _ => false }
-      val target = sym.info.firstExplicitParamTypes.head // required for extension method, the putative receiver
-      val methTp = sym.info.strippedResultType // skip leading implicits and the "receiver" parameter
+      val explicitInfo = sym.info.explicit // consider explicit value params
+      val target = explicitInfo.firstParamTypes.head // required for extension method, the putative receiver
+      val methTp = explicitInfo.resultType // skip leading implicits and the "receiver" parameter
       def hidden =
         target.nonPrivateMember(sym.name)
-        .filterWithPredicate:
-          member =>
+        .filterWithPredicate: member =>
           member.symbol.isPublic && {
             val memberIsImplicit = member.info.hasImplicitParams
             val paramTps =
               if memberIsImplicit then methTp.stripPoly.firstParamTypes
-              else methTp.firstExplicitParamTypes
+              else methTp.explicit.firstParamTypes
 
             paramTps.isEmpty || memberIsImplicit && !methTp.hasImplicitParams || {
               val memberParamTps = member.info.stripPoly.firstParamTypes
@@ -1089,7 +1088,15 @@ object RefChecks {
             }
           }
         .exists
-      if !target.typeSymbol.isOpaqueAlias && hidden
+      if sym.is(HasDefaultParams) then
+        val getterDenot =
+          val receiverName = explicitInfo.firstParamNames.head
+          val num = sym.info.paramNamess.flatten.indexWhere(_ == receiverName)
+          val getterName = DefaultGetterName(sym.name.toTermName, num = num)
+          sym.owner.info.member(getterName)
+        if getterDenot.exists
+        then report.warning(ExtensionHasDefault(sym), getterDenot.symbol.srcPos)
+      if !target.typeSymbol.isOpaqueAlias && !sym.nextOverriddenSymbol.exists && hidden
       then report.warning(ExtensionNullifiedByMember(sym, target.typeSymbol), sym.srcPos)
   end checkExtensionMethods
 
diff --git a/tests/warn/i12460.check b/tests/warn/i12460.check
new file mode 100644
index 000000000000..ba44bed1a18f
--- /dev/null
+++ b/tests/warn/i12460.check
@@ -0,0 +1,24 @@
+-- [E208] Potential Issue Warning: tests/warn/i12460.scala:3:23 --------------------------------------------------------
+3 |extension (s: String = "hello, world") def invert = s.reverse.toUpperCase // warn
+  |                       ^
+  |                       Extension method invert should not have a default argument for its receiver.
+  |---------------------------------------------------------------------------------------------------------------------
+  | Explanation (enabled by `-explain`)
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  | The receiver cannot be omitted when an extension method is invoked as a selection.
+  | A default argument for that parameter would never be used in that case.
+  | An extension method can be invoked as a regular method, but if that is the intended usage,
+  | it should not be defined as an extension.
+   ---------------------------------------------------------------------------------------------------------------------
+-- [E208] Potential Issue Warning: tests/warn/i12460.scala:5:37 --------------------------------------------------------
+5 |extension (using String)(s: String = "hello, world") def revert = s.reverse.toUpperCase // warn
+  |                                     ^
+  |                                     Extension method revert should not have a default argument for its receiver.
+  |---------------------------------------------------------------------------------------------------------------------
+  | Explanation (enabled by `-explain`)
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  | The receiver cannot be omitted when an extension method is invoked as a selection.
+  | A default argument for that parameter would never be used in that case.
+  | An extension method can be invoked as a regular method, but if that is the intended usage,
+  | it should not be defined as an extension.
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/warn/i12460.scala b/tests/warn/i12460.scala
new file mode 100644
index 000000000000..0e37c6aa7de7
--- /dev/null
+++ b/tests/warn/i12460.scala
@@ -0,0 +1,9 @@
+//> using options -explain -Ystop-after:refchecks
+
+extension (s: String = "hello, world") def invert = s.reverse.toUpperCase // warn
+
+extension (using String)(s: String = "hello, world") def revert = s.reverse.toUpperCase // warn
+
+extension (s: String)
+  def divert(m: String = "hello, world") = (s+m).reverse.toUpperCase // ok
+  def divertimento(using String)(m: String = "hello, world") = (s+m).reverse.toUpperCase // ok

From 6ec57128adb4f5bbb390c0749c3ac3a0465e562b Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 19:26:18 +0200
Subject: [PATCH 102/505] Discourage default arg for extension receiver
 (#22492)

Fixes #12460

I shied away from making it an error, as that is a language change that
violates the rule that extension methods are ordinary methods. There are
other restrictions, but an extension always allows explicit invocation
`m()(x)` that could leverage a default.

The caret is wrong on the second test case (~todo~). Edit: span of
default getter was union of first parameter and the param RHS, so that
the synthetic position of the getter symbol was a point at the first
parameter. Now the getter tree gets the span of the RHS. (That span is
non-synthetic, but the definition is still synthetic. The name pos of a
synthetic is the point.)
[Cherry-picked afb4806afe422eeedd060fba11509ac3c1f749f3][modified]

From 4fd0e18e6441e6c94095e936c4a9456bb18464cd Mon Sep 17 00:00:00 2001
From: Joel Wilsson <joel.wilsson@gmail.com>
Date: Thu, 29 Aug 2024 18:31:17 +0200
Subject: [PATCH 103/505] Print parens for single method argument only if a
 direct tuple type

A type alias of a tuple type should be printed without parenthesis.
---
 .../dotty/tools/dotc/core/Definitions.scala   | 28 ++++++++----
 .../tools/dotc/printing/RefinedPrinter.scala  |  2 +-
 .../pc/tests/completion/CompletionSuite.scala | 44 +++++++++++++++++++
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
index 26ddc47c6b89..f084e98e8806 100644
--- a/compiler/src/dotty/tools/dotc/core/Definitions.scala
+++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -1722,18 +1722,30 @@ class Definitions {
   def isPolymorphicAfterErasure(sym: Symbol): Boolean =
      (sym eq Any_isInstanceOf) || (sym eq Any_asInstanceOf) || (sym eq Object_synchronized)
 
-  /** Is this type a `TupleN` type?
+  def isTypeTestOrCast(sym: Symbol): Boolean =
+       (sym eq Any_isInstanceOf)
+    || (sym eq Any_asInstanceOf)
+    || (sym eq Any_typeTest)
+    || (sym eq Any_typeCast)
+
+  /** Is `tp` a `TupleN` type?
+    *
+    * @return true if the type of `tp` is `TupleN[T1, T2, ..., Tn]`
+    */
+  def isDirectTupleNType(tp: Type)(using Context): Boolean =
+    val arity = tp.argInfos.length
+    arity <= MaxTupleArity && {
+      val tupletp = TupleType(arity)
+      tupletp != null && tp.isRef(tupletp.symbol)
+    }
+
+  /** Is `tp` (an alias of) a `TupleN` type?
    *
    * @return true if the dealiased type of `tp` is `TupleN[T1, T2, ..., Tn]`
    */
-  def isTupleNType(tp: Type)(using Context): Boolean = {
+  def isTupleNType(tp: Type)(using Context): Boolean =
     val tp1 = tp.dealias
-    val arity = tp1.argInfos.length
-    arity <= MaxTupleArity && {
-      val tupletp = TupleType(arity)
-      tupletp != null && tp1.isRef(tupletp.symbol)
-    }
-  }
+    isDirectTupleNType(tp1)
 
   def tupleType(elems: List[Type]): Type = {
     val arity = elems.length
diff --git a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
index 4fdfd7cb3e60..286d68319c4e 100644
--- a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
+++ b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
@@ -159,7 +159,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     changePrec(GlobalPrec) {
       val argStr: Text =
         if args.length == 2
-            && !defn.isTupleNType(args.head)
+            && !defn.isDirectTupleNType(args.head)
             && !isGiven
         then
           atPrec(InfixPrec) { argText(args.head) }
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
index 27aa3f505b80..862257d7d1eb 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -146,6 +146,50 @@ class CompletionSuite extends BaseCompletionSuite:
       "XtensionMethod(a: Int): XtensionMethod"
     )
 
+  @Test def tupleDirect =
+    check(
+      """
+        |trait Foo {
+        |  def setup: List[(String, String)]
+        |}
+        |object Foo {
+        |  val foo: Foo = ???
+        |  foo.setup.exist@@
+        |}""".stripMargin,
+      """|exists(p: ((String, String)) => Boolean): Boolean
+          |""".stripMargin
+    )
+
+  @Test def tupleAlias =
+    check(
+      """
+        |trait Foo {
+        |  def setup: List[Foo.TupleAliasResult]
+        |}
+        |object Foo {
+        |  type TupleAliasResult = (String, String)
+        |  val foo: Foo = ???
+        |  foo.setup.exist@@
+        |}""".stripMargin,
+      """|exists(p: TupleAliasResult => Boolean): Boolean
+         |""".stripMargin
+    )
+
+  @Test def listAlias =
+    check(
+      """
+        |trait Foo {
+        |  def setup: List[Foo.ListAliasResult]
+        |}
+        |object Foo {
+        |  type ListAliasResult = List[String]
+        |  val foo: Foo = ???
+        |  foo.setup.exist@@
+        |}""".stripMargin,
+      """|exists(p: ListAliasResult => Boolean): Boolean
+         |""".stripMargin
+    )
+
   @Ignore("This test should be handled by compiler fuzzy search")
   @Test def fuzzy =
     check(

From 665c1f847c8a043e19b7d7c78efb45a7b10321d0 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 19:28:38 +0200
Subject: [PATCH 104/505] Print parens for single method argument only if a
 direct tuple type

A type alias of a tuple type should be printed without parenthesis.

[Cherry-picked 57e2ef022d53d5725b9becc44b6ce9d6dcd4a353][modified]

From 9bff6739bc922d1e0fd6e980454eee2bc0477ace Mon Sep 17 00:00:00 2001
From: Niklas Fiekas <niklas.fiekas@backscattering.de>
Date: Mon, 23 Sep 2024 20:47:44 +0200
Subject: [PATCH 105/505] Remove locale dependent FileSystemException check

Fin SourceFile, files that do not exist are expected and related exceptions
should be ignored. There are two relevant cases:

    scala> java.nio.file.Files.newInputStream(java.nio.file.FileSystems.getDefault().getPath("does-not-exist"))
    java.nio.file.NoSuchFileException: does-not-exist

    scala> java.nio.file.Files.newInputStream(java.nio.file.FileSystems.getDefault().getPath("regular-file-instead-of-directory/filename"))
    java.nio.file.FileSystemException: regular-file-instead-of-directory/filename: Not a directory

Ideally, other I/O errors would be propagated to the caller.

However, there is no reliable way to distinguish them based on the
exceptions alone. In particular, the message cannot be checked, because
it depends on the operating system and it is localized.

Revert the addition of the check and just accept this.

[Cherry-picked aa91e9fd26d262335a98fa8d1468801b97033703]
---
 compiler/src/dotty/tools/dotc/util/SourceFile.scala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/util/SourceFile.scala b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
index 939690bb2ee0..7cad81b4096d 100644
--- a/compiler/src/dotty/tools/dotc/util/SourceFile.scala
+++ b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
@@ -275,12 +275,11 @@ object SourceFile {
 
   def apply(file: AbstractFile | Null, codec: Codec): SourceFile =
     // Files.exists is slow on Java 8 (https://rules.sonarsource.com/java/tag/performance/RSPEC-3725),
-    // so cope with failure; also deal with path prefix "Not a directory".
+    // so cope with failure.
     val chars =
       try new String(file.toByteArray, codec.charSet).toCharArray
       catch
-        case _: NoSuchFileException => Array.empty[Char]
-        case fse: FileSystemException if fse.getMessage.endsWith("Not a directory") => Array.empty[Char]
+        case _: FileSystemException => Array.empty[Char]
 
     if isScript(file, chars) then
       ScriptSourceFile(file, chars)

From 32cb51403531e0848b7364fcc1cd14f4d759b262 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 17 Oct 2024 15:55:34 -0700
Subject: [PATCH 106/505] Revert dubious retry in vulpix

[Cherry-picked 72bff197cf8c9c97b7eb0eab1339109ca85b12bc]
---
 .../dotty/tools/vulpix/ParallelTesting.scala     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index e15103046fbf..08ade9b035eb 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -12,7 +12,7 @@ import java.nio.file.{Files, NoSuchFileException, Path, Paths}
 import java.nio.charset.{Charset, StandardCharsets}
 import java.text.SimpleDateFormat
 import java.util.{HashMap, Timer, TimerTask}
-import java.util.concurrent.{ExecutionException, TimeUnit, TimeoutException, Executors => JExecutors}
+import java.util.concurrent.{TimeUnit, TimeoutException, Executors => JExecutors}
 
 import scala.collection.mutable
 import scala.io.{Codec, Source}
@@ -511,12 +511,6 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         .and("-d", targetDir.getPath)
         .withClasspath(targetDir.getPath)
 
-      def waitForJudiciously(process: Process): Int =
-        try process.waitFor()
-        catch case _: InterruptedException =>
-          try if process.waitFor(5L, TimeUnit.MINUTES) then process.exitValue() else -2
-          finally Thread.currentThread.interrupt()
-
       def compileWithJavac(fs: Array[String]) = if (fs.nonEmpty) {
         val fullArgs = Array(
           "-encoding", StandardCharsets.UTF_8.name,
@@ -525,7 +519,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         val process = Runtime.getRuntime.exec("javac" +: fullArgs)
         val output = Source.fromInputStream(process.getErrorStream).mkString
 
-        if waitForJudiciously(process) != 0 then Some(output)
+        if process.waitFor() != 0 then Some(output)
         else None
       } else None
 
@@ -704,11 +698,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
         for fut <- eventualResults do
           try fut.get()
-          catch
-          case ee: ExecutionException if ee.getCause.isInstanceOf[InterruptedException] =>
-            System.err.println("Interrupted (probably running after shutdown)")
-            ee.printStackTrace()
-          case ex: Exception =>
+          catch case ex: Exception =>
             System.err.println(ex.getMessage)
             ex.printStackTrace()
 

From 0b9f7952068306c18a5f8dc4c7887e8d10743236 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Tue, 26 Nov 2024 17:21:14 +0100
Subject: [PATCH 107/505] Add a check for correct Array shape in
 quotes.reflect.ClassOfConstant

[Cherry-picked 80ae4086a10b4c593f7abb36c800ad8ca6cbfc8b]
---
 .../scala/quoted/runtime/impl/QuotesImpl.scala    | 12 +++++++++++-
 tests/neg-macros/i21916.check                     | 15 +++++++++++++++
 tests/neg-macros/i21916/Macro_1.scala             |  9 +++++++++
 tests/neg-macros/i21916/Test_2.scala              |  3 +++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/neg-macros/i21916.check
 create mode 100644 tests/neg-macros/i21916/Macro_1.scala
 create mode 100644 tests/neg-macros/i21916/Test_2.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index d4f2bdd0991b..f5a201de1f2e 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -2448,7 +2448,17 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object ClassOfConstant extends ClassOfConstantModule:
       def apply(x: TypeRepr): ClassOfConstant =
-        // TODO check that the type is a valid class when creating this constant or let Ycheck do it?
+        // We only check if the supplied TypeRepr is valid if it contains an Array,
+        // as so far only that Array could cause issues
+        def correctTypeApplicationForArray(typeRepr: TypeRepr): Boolean =
+            val isArray = typeRepr.typeSymbol != dotc.core.Symbols.defn.ArrayClass
+            typeRepr match
+              case AppliedType(_, targs) if !targs.isEmpty => true
+              case _ => isArray
+        xCheckMacroAssert(
+          correctTypeApplicationForArray(x),
+          "Illegal empty Array type constructor. Please supply a type parameter."
+        )
         dotc.core.Constants.Constant(x)
       def unapply(constant: ClassOfConstant): Some[TypeRepr] = Some(constant.typeValue)
     end ClassOfConstant
diff --git a/tests/neg-macros/i21916.check b/tests/neg-macros/i21916.check
new file mode 100644
index 000000000000..58a8ac43782a
--- /dev/null
+++ b/tests/neg-macros/i21916.check
@@ -0,0 +1,15 @@
+
+-- Error: tests/neg-macros/i21916/Test_2.scala:3:27 --------------------------------------------------------------------
+3 |@main def Test = Macro.test() // error
+  |                 ^^^^^^^^^^^^
+  |                 Exception occurred while executing macro expansion.
+  |                 java.lang.AssertionError: Illegal empty Array type constructor. Please supply a type parameter.
+  |                 	at Macro$.testImpl(Macro_1.scala:8)
+  |
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Macro_1.scala:3
+3 |  inline def test() = ${testImpl}
+  |                      ^^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/i21916/Macro_1.scala b/tests/neg-macros/i21916/Macro_1.scala
new file mode 100644
index 000000000000..78af2cde2963
--- /dev/null
+++ b/tests/neg-macros/i21916/Macro_1.scala
@@ -0,0 +1,9 @@
+import scala.quoted._
+object Macro:
+  inline def test() = ${testImpl}
+  def testImpl(using Quotes): Expr[Any] = {
+    import quotes.reflect._
+    val tpe = TypeRepr.of[Array[Byte]] match
+      case AppliedType(tycons, _) => tycons
+    Literal(ClassOfConstant(tpe)).asExpr
+  }
diff --git a/tests/neg-macros/i21916/Test_2.scala b/tests/neg-macros/i21916/Test_2.scala
new file mode 100644
index 000000000000..103bced0c04e
--- /dev/null
+++ b/tests/neg-macros/i21916/Test_2.scala
@@ -0,0 +1,3 @@
+// lack of type ascription is on purpose,
+// as that was part of what would cause the crash before.
+@main def Test = Macro.test() // error

From 78ddbb9b67dfd5465ba92f6a36d353814e864187 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 20 Feb 2025 03:18:16 -0800
Subject: [PATCH 108/505] Constructor companion gets privateWithin

---
 .../src/dotty/tools/dotc/core/NamerOps.scala  |  1 +
 tests/neg/i18545.check                        | 26 +++++++++++++++++++
 tests/neg/i18545.scala                        | 20 ++++++++++++++
 tests/neg/i22560b.scala                       |  2 ++
 tests/neg/i22560c/client_2.scala              | 11 ++++++++
 tests/neg/i22560c/lib_1.scala                 | 16 ++++++++++++
 tests/pos/i22560.scala                        | 10 +++++++
 tests/pos/i22560b/client_2.scala              | 17 ++++++++++++
 tests/pos/i22560b/lib_1.scala                 | 19 ++++++++++++++
 9 files changed, 122 insertions(+)
 create mode 100644 tests/neg/i18545.check
 create mode 100644 tests/neg/i18545.scala
 create mode 100644 tests/neg/i22560c/client_2.scala
 create mode 100644 tests/neg/i22560c/lib_1.scala
 create mode 100644 tests/pos/i22560b/client_2.scala
 create mode 100644 tests/pos/i22560b/lib_1.scala

diff --git a/compiler/src/dotty/tools/dotc/core/NamerOps.scala b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
index 7129527fb22a..2fffa1fed1e5 100644
--- a/compiler/src/dotty/tools/dotc/core/NamerOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
@@ -141,6 +141,7 @@ object NamerOps:
         cls.owner, cls.name.toTermName,
         flags, flags,
         constructorCompanionCompleter(cls),
+        cls.privateWithin,
         coord = cls.coord,
         assocFile = cls.assocFile)
     companion.moduleClass.registerCompanion(cls)
diff --git a/tests/neg/i18545.check b/tests/neg/i18545.check
new file mode 100644
index 000000000000..1b336b0cc5ab
--- /dev/null
+++ b/tests/neg/i18545.check
@@ -0,0 +1,26 @@
+-- [E173] Reference Error: tests/neg/i18545.scala:16:20 ----------------------------------------------------------------
+16 |  def test: IOLocal.IOLocalImpl[Int] = // error
+   |            ^^^^^^^^^^^^^^^^^^^
+   |class IOLocalImpl cannot be accessed as a member of iolib.IOLocal.type from the top-level definitions in package tests.
+   |  private[IOLocal] class IOLocalImpl can only be accessed from object IOLocal in package iolib.
+-- [E173] Reference Error: tests/neg/i18545.scala:17:24 ----------------------------------------------------------------
+17 |    IOLocal.IOLocalImpl.apply(42) // error
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |method apply cannot be accessed as a member of iolib.IOLocal.IOLocalImpl.type from the top-level definitions in package tests.
+   |  private[IOLocal] method apply can only be accessed from object IOLocal in package iolib.
+-- [E050] Type Error: tests/neg/i18545.scala:18:22 ---------------------------------------------------------------------
+18 |  def test2 = IOLocal.IOLocalImpl(42) // error
+   |              ^^^^^^^^^^^^^^^^^^^
+   |              object IOLocalImpl in object IOLocal does not take parameters
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E173] Reference Error: tests/neg/i18545.scala:19:22 ----------------------------------------------------------------
+19 |  def test3 = IOLocal.AltIOLocalImpl.apply(42) // error
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+   |object AltIOLocalImpl cannot be accessed as a member of iolib.IOLocal.type from the top-level definitions in package tests.
+   |  private[IOLocal] object AltIOLocalImpl can only be accessed from object IOLocal in package iolib.
+-- [E173] Reference Error: tests/neg/i18545.scala:20:22 ----------------------------------------------------------------
+20 |  def test4 = IOLocal.AltIOLocalImpl(42) // error
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+   |object AltIOLocalImpl cannot be accessed as a member of iolib.IOLocal.type from the top-level definitions in package tests.
+   |  private[IOLocal] object AltIOLocalImpl can only be accessed from object IOLocal in package iolib.
diff --git a/tests/neg/i18545.scala b/tests/neg/i18545.scala
new file mode 100644
index 000000000000..86f18cd60771
--- /dev/null
+++ b/tests/neg/i18545.scala
@@ -0,0 +1,20 @@
+package iolib:
+  case class IO[A](value: A)
+
+  sealed trait IOLocal[A]
+
+  object IOLocal:
+    def apply[A](default: A): IO[IOLocal[A]] = IO(new IOLocalImpl(default))
+
+    private[IOLocal] final class IOLocalImpl[A](default: A) extends IOLocal[A]
+    object IOLocalImpl
+
+    private[IOLocal] final class AltIOLocalImpl[A](default: A) extends IOLocal[A]
+
+package tests:
+  import iolib.IOLocal
+  def test: IOLocal.IOLocalImpl[Int] = // error
+    IOLocal.IOLocalImpl.apply(42) // error
+  def test2 = IOLocal.IOLocalImpl(42) // error
+  def test3 = IOLocal.AltIOLocalImpl.apply(42) // error
+  def test4 = IOLocal.AltIOLocalImpl(42) // error
diff --git a/tests/neg/i22560b.scala b/tests/neg/i22560b.scala
index bce079e0eeb2..58b41b6f8766 100644
--- a/tests/neg/i22560b.scala
+++ b/tests/neg/i22560b.scala
@@ -12,7 +12,9 @@ package p:
   private[p] class C(i: Int) // ctor proxy gets privateWithin of class
   private[p] class D(i: Int)
   object D
+  private class E(i: Int)
 
 package q:
   def f() = p.C(42) // error
   def g() = p.D(42) // error
+  def h() = p.E(42) // error
diff --git a/tests/neg/i22560c/client_2.scala b/tests/neg/i22560c/client_2.scala
new file mode 100644
index 000000000000..c04720cd207b
--- /dev/null
+++ b/tests/neg/i22560c/client_2.scala
@@ -0,0 +1,11 @@
+
+package i22560:
+  val alpha = C.D() // error
+
+  class Test extends Enumeration:
+    val Hearts = Val(27) // error
+    val Diamonds = Val() // error
+
+package q:
+  def f() = p.C(42) // error
+  def g() = p.D(42) // error
diff --git a/tests/neg/i22560c/lib_1.scala b/tests/neg/i22560c/lib_1.scala
new file mode 100644
index 000000000000..2d9d24962b8d
--- /dev/null
+++ b/tests/neg/i22560c/lib_1.scala
@@ -0,0 +1,16 @@
+
+package i22560:
+
+  object C:
+    protected class D
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+    object Val
+
+package p:
+  private[p] class C(i: Int) // companion gets privateWithin of class
+  private[p] class D(i: Int) // ctor proxy gets privateWithin of class
+  object D
+
diff --git a/tests/pos/i22560.scala b/tests/pos/i22560.scala
index 947923aba259..af4382ba5a15 100644
--- a/tests/pos/i22560.scala
+++ b/tests/pos/i22560.scala
@@ -20,3 +20,13 @@ package companioned:
   class Test extends Enumeration:
     val Hearts = Val(27)
     val Diamonds = Val()
+
+package p:
+
+  package internal:
+
+    protected[p] class P(i : Int)
+    private[p] class Q(i : Int)
+
+  def f = internal.P(42)
+  def g = internal.Q(42)
diff --git a/tests/pos/i22560b/client_2.scala b/tests/pos/i22560b/client_2.scala
new file mode 100644
index 000000000000..bb57276c12c6
--- /dev/null
+++ b/tests/pos/i22560b/client_2.scala
@@ -0,0 +1,17 @@
+
+package companionless:
+
+  class Test extends Enumeration:
+    val Hearts = Val(27)
+    val Diamonds = Val()
+
+
+package companioned:
+
+  class Test extends Enumeration:
+    val Hearts = Val(27)
+    val Diamonds = Val()
+
+package p:
+
+  def f = internal.P(42)
diff --git a/tests/pos/i22560b/lib_1.scala b/tests/pos/i22560b/lib_1.scala
new file mode 100644
index 000000000000..d247d63ec9cf
--- /dev/null
+++ b/tests/pos/i22560b/lib_1.scala
@@ -0,0 +1,19 @@
+
+package companionless:
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+
+package companioned:
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+    protected object Val
+
+package p:
+
+  package internal:
+
+    protected[p] class P(i : Int)

From 7681fef8b5de01e66116ffc78b83bcbe4d6b91b6 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 19:32:57 +0200
Subject: [PATCH 109/505] Constructor companion gets privateWithin

[Cherry-picked eea481fff44599de0215469e521b244efbaae141][modified]

From b265a7600318523e954e0bccfe1c63e8f5b18d6f Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 19:33:42 +0200
Subject: [PATCH 110/505] chore: avoid double configuration in scala2-library
 projects

[Cherry-picked 0d21a162c4bbb48aeaf56c6bd52b6961318715ec][modified]

From 633f1da2a0d97e7bd39ad65af5e37ae985261e79 Mon Sep 17 00:00:00 2001
From: philwalk <philwalk9@gmail.com>
Date: Fri, 21 Feb 2025 11:23:47 -0700
Subject: [PATCH 111/505] replaced previous commits with a cp filter in
 Jar.scala

[Cherry-picked f24b5d15eaa3badfeb4b712b3f2d6c234e409a85]
---
 compiler/src/dotty/tools/io/Jar.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/io/Jar.scala b/compiler/src/dotty/tools/io/Jar.scala
index b4c2024bb487..4f70bafecae9 100644
--- a/compiler/src/dotty/tools/io/Jar.scala
+++ b/compiler/src/dotty/tools/io/Jar.scala
@@ -50,7 +50,7 @@ class Jar(file: File) {
   def mainClass: Option[String]     = manifest.map(_(Name.MAIN_CLASS))
   /** The manifest-defined classpath String if available. */
   def classPathString: Option[String] =
-    for (m <- manifest ; cp <- m.attrs.get(Name.CLASS_PATH)) yield cp
+    for (m <- manifest ; cp <- m.attrs.get(Name.CLASS_PATH) if !cp.isBlank()) yield cp
   def classPathElements: List[String] = classPathString match {
     case Some(s)  => s.split("\\s+").toList
     case _        => Nil

From 13b6b8c36926bb4fc7b1e56fd9c9e377816f1fcd Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Fri, 21 Feb 2025 20:39:02 +0100
Subject: [PATCH 112/505] chore: Apply suggestions from code review

[Cherry-picked 01fc715ee486bb2257165804f6a9ebcad2d29ddd]
---
 compiler/src/dotty/tools/io/Jar.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/io/Jar.scala b/compiler/src/dotty/tools/io/Jar.scala
index 4f70bafecae9..6076638bff45 100644
--- a/compiler/src/dotty/tools/io/Jar.scala
+++ b/compiler/src/dotty/tools/io/Jar.scala
@@ -50,7 +50,7 @@ class Jar(file: File) {
   def mainClass: Option[String]     = manifest.map(_(Name.MAIN_CLASS))
   /** The manifest-defined classpath String if available. */
   def classPathString: Option[String] =
-    for (m <- manifest ; cp <- m.attrs.get(Name.CLASS_PATH) if !cp.isBlank()) yield cp
+    for (m <- manifest ; cp <- m.attrs.get(Name.CLASS_PATH) if !cp.trim().isEmpty()) yield cp
   def classPathElements: List[String] = classPathString match {
     case Some(s)  => s.split("\\s+").toList
     case _        => Nil

From 2df2319bff1861f53fe4abe4f91cd3299a11672e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Rochala?=
 <48657087+rochala@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:23:13 +0100
Subject: [PATCH 113/505] Warn universal extensions on opaque types (#22502)

Fixes #22232

Work also done by @hamzaremmal, @julian-a-avar-c and @nmcb

Co-authored-by: Hamza Remmal <hamza@remmal.net>
[Cherry-picked 7d79c561d2f7cc0b831a072c0cd4f722a8246062]
---
 .../dotty/tools/dotc/typer/RefChecks.scala    |  4 +--
 tests/warn/i22232.check                       | 28 ++++++++++++++++
 tests/warn/i22232.scala                       | 32 +++++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 tests/warn/i22232.check
 create mode 100644 tests/warn/i22232.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
index 128a0253a8cf..70daeb600708 100644
--- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
@@ -1067,7 +1067,7 @@ object RefChecks {
         def explicit = Applications.stripImplicit(tp.stripPoly, wildcardOnly = true)
         def hasImplicitParams = tp.stripPoly match { case mt: MethodType => mt.isImplicitMethod case _ => false }
       val explicitInfo = sym.info.explicit // consider explicit value params
-      val target = explicitInfo.firstParamTypes.head // required for extension method, the putative receiver
+      val target = explicitInfo.firstParamTypes.head.typeSymbol.info // required for extension method, the putative receiver
       val methTp = explicitInfo.resultType // skip leading implicits and the "receiver" parameter
       def hidden =
         target.nonPrivateMember(sym.name)
@@ -1096,7 +1096,7 @@ object RefChecks {
           sym.owner.info.member(getterName)
         if getterDenot.exists
         then report.warning(ExtensionHasDefault(sym), getterDenot.symbol.srcPos)
-      if !target.typeSymbol.isOpaqueAlias && !sym.nextOverriddenSymbol.exists && hidden
+      if !sym.nextOverriddenSymbol.exists && hidden
       then report.warning(ExtensionNullifiedByMember(sym, target.typeSymbol), sym.srcPos)
   end checkExtensionMethods
 
diff --git a/tests/warn/i22232.check b/tests/warn/i22232.check
new file mode 100644
index 000000000000..cf3d6d4e004e
--- /dev/null
+++ b/tests/warn/i22232.check
@@ -0,0 +1,28 @@
+-- [E194] Potential Issue Warning: tests/warn/i22232.scala:3:23 --------------------------------------------------------
+3 |  extension (c: C) def equals(that: Any): Boolean = false // warn
+  |                       ^
+  |                       Extension method equals will never be selected from type C
+  |                       because C already has a member with the same name and compatible parameter types.
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E194] Potential Issue Warning: tests/warn/i22232.scala:9:25 --------------------------------------------------------
+9 |    extension (d: D) def equals(that: Any): Boolean = false // warn
+  |                         ^
+  |                         Extension method equals will never be selected from type C
+  |                         because C already has a member with the same name and compatible parameter types.
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E194] Potential Issue Warning: tests/warn/i22232.scala:13:38 -------------------------------------------------------
+13 |  extension (arr: MyString[Byte]) def length: Int = 0 // warn
+   |                                      ^
+   |                          Extension method length will never be selected from type String
+   |                          because String already has a member with the same name and compatible parameter types.
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E194] Potential Issue Warning: tests/warn/i22232.scala:17:46 -------------------------------------------------------
+17 |  extension [T <: MyString[Byte]](arr: T) def length: Int = 0 // warn
+   |                                              ^
+   |                          Extension method length will never be selected from type String
+   |                          because String already has a member with the same name and compatible parameter types.
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/warn/i22232.scala b/tests/warn/i22232.scala
new file mode 100644
index 000000000000..79b8317a7329
--- /dev/null
+++ b/tests/warn/i22232.scala
@@ -0,0 +1,32 @@
+class C
+object C:
+  extension (c: C) def equals(that: Any): Boolean = false // warn
+
+object X:
+  class C
+  opaque type D <: C = C
+  object D:
+    extension (d: D) def equals(that: Any): Boolean = false // warn
+
+object Upperbound1:
+  opaque type MyString[+T] <: String = String
+  extension (arr: MyString[Byte]) def length: Int = 0 // warn
+
+object Upperbound2:
+  opaque type MyString[+T] <: String = String
+  extension [T <: MyString[Byte]](arr: T) def length: Int = 0 // warn
+
+object Upperbound3:
+  opaque type MyString[+T] <: String = String
+  extension [T](arr: T) def length: Int = 0 // nowarn
+
+object NonUpperbound1:
+  opaque type MyString[+T] = String
+  extension (arr: MyString[Byte]) def length: Int = 0 // nowarn
+object NonUpperbound2:
+  opaque type MyString[+T] = String
+  extension [T <: MyString[Byte]](arr: T) def length2: Int = 0 // nowarn
+
+object NonUpperbound3:
+  opaque type MyString[+T] = String
+  extension [T](arr: T) def length: Int = 0 // nowarn

From dba8eaa3cdb5ed6136c8f6fa2c78f93ecb3c87bf Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 9 Oct 2024 01:54:09 +0200
Subject: [PATCH 114/505] Make overload pruning based on result types less
 aggressive

`adaptByResult` was introduced in 2015 in
54835b6fb19ab0758c7503fb6f0e990ee4c25491 as a last step in overloading
resolution:

> Take expected result type into account more often for overloading resolution
>
> Previously, the expected result type of a FunProto type was ignored and taken into
> account only in case of ambiguities. arrayclone-new.scala shows that this is not enough.
> In a case like
>
>     val x: Array[Byte] = Array(1, 2)
>
> we typed 1, 2 to be Int, so overloading resulution would give the Array.apply of
> type (Int, Int*)Array[Int]. But that's a dead end, since Array[Int] is not a subtype
> of Array[Byte].
>
> This commit proposes the following modified rule for overloading resulution:
>
>   A method alternative is applicable if ... (as before), and if its result type
>   is copmpatible with the expected type of the method application.
>
> The commit does not pre-select alternatives based on comparing with the expected
> result type. I tried that but it slowed down typechecking by a factor of at least 4.
> Instead, we proceed as usual, ignoring the result type except in case of
> ambiguities, but check whether the result of overloading resolution has a
> compatible result type. If that's not the case, we filter all alternatives
> for result type compatibility and try again.

In i21410.scala this means we end up checking:

    F[?U] <:< Int
    (where ?U is unconstrained, because the check is done without looking at the
    argument types)

The problem is that the subtype check returning false does not mean that there
is no instantiation of `?U` that would make this check return true, just that
type inference was not able to come up with one. This could happen for any
number of reason but commonly will happen with match types since inference
cannot do much with them.

We cannot avoid this by taking the argument types into account, because this
logic was added precisely to handle cases where the argument types mislead you
because adaptation isn't taken into account. Instead, we can approximate type
variables in the result type to trade false negatives for false positives which
should be less problematic here.

Fixes #21410.

[Cherry-picked 528d0f029ab17dfbc9bac80b3bb33d60220c467e]
---
 .../src/dotty/tools/dotc/typer/Applications.scala    | 10 +++++++---
 tests/pos/i21410.scala                               | 12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 tests/pos/i21410.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 5254ec3712c1..8f29c673348d 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -1949,16 +1949,20 @@ trait Applications extends Compatibility {
   def resolveOverloaded(alts: List[TermRef], pt: Type)(using Context): List[TermRef] =
     record("resolveOverloaded")
 
-    /** Is `alt` a method or polytype whose result type after the first value parameter
+    /** Is `alt` a method or polytype whose approximated result type after the first value parameter
      *  section conforms to the expected type `resultType`? If `resultType`
      *  is a `IgnoredProto`, pick the underlying type instead.
+     *
+     *  Using approximated result types is necessary to avoid false negatives
+     *  due to incomplete type inference such as in tests/pos/i21410.scala.
      */
     def resultConforms(altSym: Symbol, altType: Type, resultType: Type)(using Context): Boolean =
       resultType.revealIgnored match {
         case resultType: ValueType =>
           altType.widen match {
-            case tp: PolyType => resultConforms(altSym, instantiateWithTypeVars(tp), resultType)
-            case tp: MethodType => constrainResult(altSym, tp.resultType, resultType)
+            case tp: PolyType => resultConforms(altSym, tp.resultType, resultType)
+            case tp: MethodType =>
+              constrainResult(altSym, wildApprox(tp.resultType), resultType)
             case _ => true
           }
         case _ => true
diff --git a/tests/pos/i21410.scala b/tests/pos/i21410.scala
new file mode 100644
index 000000000000..c3ba3ea862bc
--- /dev/null
+++ b/tests/pos/i21410.scala
@@ -0,0 +1,12 @@
+class A
+object Test:
+  type F[X] <: Any = X match
+    case A => Int
+
+  def foo[T](x: String): T = ???
+  def foo[U](x: U): F[U] = ???
+
+  val x1 = foo(A())
+  val y: Int = x1
+
+  val x2: Int = foo(A()) // error

From 73aaf2a9b122111306da79df62290c619c606127 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Thu, 10 Oct 2024 19:41:58 +0200
Subject: [PATCH 115/505] Make `Applications#resolveMapped` preserve
 annotations

Overloading may create a temporary symbol via `Applications#resolveMapped`, but
before this commit, this symbol did not carry the annotations from the original
symbol. This meant in particular that `isInlineable` would always return false
for them. This matters because during the course of overloading resolution we
might call `ProtoTypes.Compatibility#constrainResult` which special-cases
transparent inline methods.

Fixes a regression in Monocle introduced in the previous commit.

wip

[Cherry-picked f7259cf77e053b00068bd5dca124e9a3013489dd]
---
 .../src/dotty/tools/dotc/typer/Applications.scala     |  1 +
 tests/pos/i21410c.scala                               | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 tests/pos/i21410c.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 8f29c673348d..cf98e67f7169 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -2308,6 +2308,7 @@ trait Applications extends Compatibility {
       if t.exists && alt.symbol.exists then
         val (trimmed, skipped) = trimParamss(t.stripPoly, alt.symbol.rawParamss)
         val mappedSym = alt.symbol.asTerm.copy(info = t)
+        mappedSym.annotations = alt.symbol.annotations
         mappedSym.rawParamss = trimmed
         val (pre, totalSkipped) = mappedAltInfo(alt.symbol) match
           case Some((pre, prevSkipped)) =>
diff --git a/tests/pos/i21410c.scala b/tests/pos/i21410c.scala
new file mode 100644
index 000000000000..21f69fec20fa
--- /dev/null
+++ b/tests/pos/i21410c.scala
@@ -0,0 +1,11 @@
+class AppliedPIso[A, B]()
+case class User(age: Int)
+
+object Test:
+  extension [From, To](from: From)
+    def focus(): AppliedPIso[From, From] = ???
+    transparent inline def focus(inline lambda: (From => To)): Any = ???
+
+
+  val u = User(1)
+  val ap: AppliedPIso[User, User] = u.focus(_.age) // error

From 95b8702eeb326fce82852d61b26e3997c11a0f78 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Sat, 12 Oct 2024 10:41:03 +0200
Subject: [PATCH 116/505] Avoid even more false negatives in overload pruning

The changes two commits ago were not enough to handle i21410b.scala because we
end up checking:

    Tuple.Map[WildcardType(...), List] <: (List[Int], List[String])

which fails because a match type with a wildcard argument apparently only gets
reduced when the match type case is not parameterized.

To handle this more generally we use AvoidWildcardsMap to remove wildcards from
the result type, but since we want to prevent false negatives we start with
`variance = -1` to get a lower-bound instead of an upper-bound.

[Cherry-picked 32ac2e62f9b18aecf0064236a7ce6c60a1bbf579]
---
 .../src/dotty/tools/dotc/typer/Applications.scala   | 13 ++++++++++---
 tests/pos/i21410b.scala                             | 10 ++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 tests/pos/i21410b.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index cf98e67f7169..8947a2941cc0 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -1953,8 +1953,8 @@ trait Applications extends Compatibility {
      *  section conforms to the expected type `resultType`? If `resultType`
      *  is a `IgnoredProto`, pick the underlying type instead.
      *
-     *  Using approximated result types is necessary to avoid false negatives
-     *  due to incomplete type inference such as in tests/pos/i21410.scala.
+     *  Using an approximated result type is necessary to avoid false negatives
+     *  due to incomplete type inference such as in tests/pos/i21410.scala and tests/pos/i21410b.scala.
      */
     def resultConforms(altSym: Symbol, altType: Type, resultType: Type)(using Context): Boolean =
       resultType.revealIgnored match {
@@ -1962,7 +1962,14 @@ trait Applications extends Compatibility {
           altType.widen match {
             case tp: PolyType => resultConforms(altSym, tp.resultType, resultType)
             case tp: MethodType =>
-              constrainResult(altSym, wildApprox(tp.resultType), resultType)
+              val wildRes = wildApprox(tp.resultType)
+
+              class ResultApprox extends AvoidWildcardsMap:
+                // Avoid false negatives by approximating to a lower bound
+                variance = -1
+
+              val approx = ResultApprox()(wildRes)
+              constrainResult(altSym, approx, resultType)
             case _ => true
           }
         case _ => true
diff --git a/tests/pos/i21410b.scala b/tests/pos/i21410b.scala
new file mode 100644
index 000000000000..a17ad59bc59e
--- /dev/null
+++ b/tests/pos/i21410b.scala
@@ -0,0 +1,10 @@
+object Test:
+  def foo[T](x: Option[T]): T = ???
+  def foo[T <: Tuple](x: T): Tuple.Map[T, List] = ???
+
+  val tup: (Int, String) = (1, "")
+
+  val x = foo(tup)
+  val y: (List[Int], List[String]) = x
+
+  val x2: (List[Int], List[String]) = foo(tup) // error

From a1d6be08cc182b9ad53dd23c3ae954cd40a402ab Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 22 Apr 2025 20:11:52 +0200
Subject: [PATCH 117/505] backport: Also backport missing
 https://github.com/scala/scala3/pull/18893

---
 compiler/src/dotty/tools/dotc/core/NamerOps.scala | 7 +++++--
 tests/pos/i22560b/client_2.scala                  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/NamerOps.scala b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
index 2fffa1fed1e5..82ebb03b9662 100644
--- a/compiler/src/dotty/tools/dotc/core/NamerOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
@@ -113,8 +113,11 @@ object NamerOps:
       var flags = ApplyProxyFlags | (constr.flagsUNSAFE & AccessFlags)
       if cls.is(Protected) && !modcls.is(Protected) then flags |= Protected
       newSymbol(
-        modcls, nme.apply, flags,
-        ApplyProxyCompleter(constr), coord = constr.coord)
+        modcls, nme.apply,
+        flags,
+        ApplyProxyCompleter(constr),
+        cls.privateWithin,
+        constr.coord)
     for dcl <- cls.info.decls do
       if dcl.isConstructor then scope.enter(proxy(dcl))
     scope
diff --git a/tests/pos/i22560b/client_2.scala b/tests/pos/i22560b/client_2.scala
index bb57276c12c6..5376bcfa03cd 100644
--- a/tests/pos/i22560b/client_2.scala
+++ b/tests/pos/i22560b/client_2.scala
@@ -14,4 +14,4 @@ package companioned:
 
 package p:
 
-  def f = internal.P(42)
+  def f = new internal.P(42)

From 8a869d8a232f193442a10b2bc0d7202306534312 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 20 Feb 2025 15:18:19 -0800
Subject: [PATCH 118/505] Check only stable qual for import prefix

[Cherry-picked 5429dfa83808e53040b4535d7d1c0d3c9543fe29]
---
 .../tools/dotc/transform/CheckUnused.scala    |  2 +-
 tests/warn/i22629.scala                       | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 tests/warn/i22629.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index a454c59eea7b..f9bfbe680352 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -73,7 +73,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         val target = res.dealias.typeSymbol
         resolveUsage(target, target.name, res.importPrefix.skipPackageObject) // case _: T =>
       case _ =>
-    else if tree.qualifier.srcPos.isSynthetic || name.exists(_ != tree.symbol.name) then
+    else if tree.qualifier.srcPos.isSynthetic && tree.qualifier.tpe.isStable || name.exists(_ != tree.symbol.name) then
       if !ignoreTree(tree) then
         resolveUsage(tree.symbol, name, tree.qualifier.tpe)
     else
diff --git a/tests/warn/i22629.scala b/tests/warn/i22629.scala
new file mode 100644
index 000000000000..53d17ec4da3b
--- /dev/null
+++ b/tests/warn/i22629.scala
@@ -0,0 +1,42 @@
+//> using options -Wunused:all -Yno-deep-subtypes "-Wconf:msg=set repeatedly:s"
+
+//import either.*
+
+trait ResultMapper[A] {
+  final def map[B](f: A => B): ResultMapper[B] = ???
+
+  infix final def and[B](other: ResultMapper[B]): ResultMapper[(A, B)] = ???
+}
+
+trait BoilerplateResultMappers {
+
+  def and[B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W](
+    b: ResultMapper[B], c: ResultMapper[C], d: ResultMapper[D], e: ResultMapper[E], f: ResultMapper[F], g: ResultMapper[G], h: ResultMapper[H], i: ResultMapper[I], j: ResultMapper[J], k: ResultMapper[K], l: ResultMapper[L], m: ResultMapper[M], n: ResultMapper[N], o: ResultMapper[O], p: ResultMapper[P], q: ResultMapper[Q], r: ResultMapper[R], s: ResultMapper[S], t: ResultMapper[T], u: ResultMapper[U], v: ResultMapper[V], w: ResultMapper[W]
+  ): ResultMapper[(B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W)] =
+    (b and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t and u and v and w).map {
+      case ((((((((((((((((((((((b), c), d), e), f), g), h), i), j), k), l), m), n), o), p), q), r), s), t), u), v), w) =>
+      (b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w)
+    }
+}
+
+/*
+object either {
+  type ResultMapperException = RuntimeException
+  implicit class EitherOps[A](private val ea: Either[ResultMapperException, A]) extends AnyVal {
+    def and[B](eb: Either[ResultMapperException, B]): Either[ResultMapperException, (A, B)] =
+      (ea, eb) match {
+        case (Right(a), Right(b)) =>
+          Right((a, b))
+
+        case (Right(_), Left(ex)) =>
+          Left(ex)
+
+        case (Left(ex), Right(_)) =>
+          Left(ex)
+
+        case (Left(_), Left(_)) =>
+          Left(RuntimeException())
+      }
+  }
+}
+*/

From 5ab90ffe88fcfde405f85c7c1f61558a62a156b2 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 25 Feb 2025 12:40:07 +0100
Subject: [PATCH 119/505] chore: check name when renaming

[Cherry-picked ec610bd4771533bac44fd65301d984d15eb50d2e]
---
 .../dotty/tools/pc/PcRenameProvider.scala     | 16 +++++++++---
 .../tools/pc/tests/edit/PcRenameSuite.scala   | 26 +++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcRenameProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcRenameProvider.scala
index 666ccf9c614f..467f331ea7dc 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcRenameProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcRenameProvider.scala
@@ -18,11 +18,19 @@ final class PcRenameProvider(
     name: Option[String]
 ) extends WithSymbolSearchCollector[l.TextEdit](driver, params):
   private val forbiddenMethods =
-    Set("equals", "hashCode", "unapply", "unary_!", "!")
+    Set("equals", "hashCode", "unapply", "apply", "<init>", "unary_!", "!")
+
+  private val soughtSymbolNames = soughtSymbols match
+    case Some((symbols, _)) =>
+      symbols.filterNot(_.isError).map(symbol => symbol.decodedName.toString)
+    case None => Set.empty[String]
+
   def canRenameSymbol(sym: Symbol)(using Context): Boolean =
-    (!sym.is(Method) || !forbiddenMethods(sym.decodedName))
-      && (sym.ownersIterator.drop(1).exists(ow => ow.is(Method))
-        || sym.source.path.isWorksheet)
+    val decodedName = sym.decodedName
+    def isForbiddenMethod = sym.is(Method) && forbiddenMethods(decodedName)
+    def local = sym.ownersIterator.drop(1).exists(ow => ow.is(Method))
+    def isInWorksheet = sym.source.path.isWorksheet
+    !isForbiddenMethod && (local || isInWorksheet) && soughtSymbolNames(decodedName)
 
   def prepareRename(): Option[l.Range] =
     soughtSymbols.flatMap((symbols, pos) =>
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala
index 23c81fcf515a..3226018f88d4 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala
@@ -508,3 +508,29 @@ class PcRenameSuite extends BasePcRenameSuite:
         |    ???
         |  end bar""".stripMargin
     )
+
+  @Test def `apply-rename` =
+    check(
+     """|object B {
+        |  def locally = {
+        |    object A{ def app@@ly(a: Int) = ??? }
+        |    A(123)
+        |    A.apply(123)
+        |  }
+        |}
+        |""".stripMargin,
+     wrap = false
+   )
+
+  @Test def `constructor-rename` =
+   check(
+     """|object B {
+        |  def locally = {
+        |    class A(a : String){ def th@@is(a: Int) = this(a.toString) }
+        |    A(123)
+        |    A.apply(123)
+        |  }
+        |}
+        |""".stripMargin,
+     wrap = false
+   )

From 6375c9418196422665188ae56625407f75111724 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 25 Feb 2025 12:49:20 +0100
Subject: [PATCH 120/505] test: add type params selection range test

[Cherry-picked 666f393f9fe1e36e35774210b77cb270e4bc1831]
---
 .../tools/pc/tests/SelectionRangeSuite.scala  | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
index e277a67c466b..143d998a0ec1 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
@@ -123,27 +123,13 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
            |}""".stripMargin
       )
     )
+
+  @Test def `def - type params` =
     check(
-      """|object Main extends App {
-         |  val func = (a@@: Int, b: Int) =>
-         |    a + b
-         |}""".stripMargin,
-      List[String](
-        """|object Main extends App {
-           |  val func = (>>region>>a: Int<<region<<, b: Int) =>
-           |    a + b
-           |}""".stripMargin,
-        """|object Main extends App {
-           |  val func = (>>region>>a: Int, b: Int<<region<<) =>
-           |    a + b
-           |}""".stripMargin,
-        """|object Main extends App {
-           |  val func = >>region>>(a: Int, b: Int) =>
-           |    a + b<<region<<
-           |}""".stripMargin,
-        """|object Main extends App {
-           |  >>region>>val func = (a: Int, b: Int) =>
-           |    a + b<<region<<
-           |}""".stripMargin
+      "object Main extends App { def foo[Type@@ <: T1, B](hi: Int, b: Int, c:Int) = ??? }",
+      List(
+        "object Main extends App { def foo[>>region>>Type <: T1<<region<<, B](hi: Int, b: Int, c:Int) = ??? }",
+        "object Main extends App { def foo[>>region>>Type <: T1, B<<region<<](hi: Int, b: Int, c:Int) = ??? }",
+        "object Main extends App { >>region>>def foo[Type <: T1, B](hi: Int, b: Int, c:Int) = ???<<region<< }"
       )
     )

From 23e670bf35d5318b1946e7e2a298b655743902a5 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Thu, 27 Feb 2025 12:33:18 +0100
Subject: [PATCH 121/505] fix: don't search for members in pc info when
 irrelevant

[Cherry-picked 53b2786ab9351d852e0352629bcc698c44ead15b]
---
 .../tools/pc/SymbolInformationProvider.scala  |  8 +++-
 .../dotty/tools/pc/tests/info/InfoSuite.scala | 47 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala
index ccda618078b8..8bed605a87f8 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala
@@ -55,7 +55,13 @@ class SymbolInformationProvider(using Context):
         val classOwner =
           sym.ownersIterator.drop(1).find(s => s.isClass || s.is(Flags.Module))
         val overridden = sym.denot.allOverriddenSymbols.toList
-        val memberDefAnnots = sym.info.membersBasedOnFlags(Flags.Method, Flags.EmptyFlags).flatMap(_.allSymbols).flatMap(_.denot.annotations)
+        val memberDefAnnots =
+          if classSym.exists then
+            classSym.info
+              .membersBasedOnFlags(Flags.Method, Flags.EmptyFlags)
+              .flatMap(_.allSymbols)
+              .flatMap(_.denot.annotations)
+          else Nil
 
         val pcSymbolInformation =
           PcSymbolInformation(
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/info/InfoSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/info/InfoSuite.scala
index 8464c4d69da4..57ceb7a099d7 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/info/InfoSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/info/InfoSuite.scala
@@ -8,6 +8,9 @@ import scala.meta.pc.PcSymbolInformation
 import dotty.tools.pc.base.BasePCSuite
 import scala.language.unsafeNulls
 import org.junit.Test
+import scala.meta.internal.metals.CompilerOffsetParams
+import java.nio.file.Paths
+import scala.annotation.nowarn
 
 class InfoSuite extends BasePCSuite {
 
@@ -53,4 +56,48 @@ class InfoSuite extends BasePCSuite {
          |scala/collection/IterableOnceOps#flatMap().
          |""".stripMargin
     )
+
+  @Test def i7251 =
+    withSource(
+      """|package a
+         |sealed trait TA:
+         |  type SomeType
+         |trait TB extends TA:
+         |  type SomeType = Int
+         |""".stripMargin
+    )
+    val info = presentationCompiler.info("a/TA#SomeType#").get()
+    assertNoDiff(info.get().symbol(), "a/TA#SomeType#")
+
+  @Test def memberDefsAnnotations =
+    def assertMemberDefsAnnotations(symbol: String, expected: String) =
+      val info = presentationCompiler.info(symbol).get()
+      assertNoDiff(info.get().memberDefsAnnotations().asScala.mkString("\n"), expected, Some(symbol))
+    withSource(
+      """|package a
+         |import scala.annotation.nowarn
+         |sealed trait TA:
+         | @nowarn
+         | def aaa = 1
+         |
+         |object O:
+         | @nowarn
+         | def aaa = 1
+         |
+         |class D:
+         | @nowarn
+         | def bbb = 1
+         |""".stripMargin
+    )
+    assertMemberDefsAnnotations("a/TA#", "scala.annotation.nowarn")
+    assertMemberDefsAnnotations("a/O.", "scala.annotation.nowarn")
+    assertMemberDefsAnnotations("a/D#", "scala.annotation.nowarn")
+    assertMemberDefsAnnotations("a/D#bbb().", "")
+
+  // hacky way to add a source file to the presentation compiler sources
+  private def withSource(code: String) =
+    val filename = "Hover.scala"
+    val pcParams = CompilerOffsetParams(Paths.get(filename).toUri(), code, 0)
+    presentationCompiler.hover(pcParams).get()
+
 }

From 3098364db802a5c39933e704caa4e52525ff634e Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 27 Feb 2025 17:44:30 -0800
Subject: [PATCH 122/505] sbt 1.10.7 (was 1.10.5)

[Cherry-picked fe0ec858a9d5b2aa67574d08c55b783a8c773180]
---
 .github/Dockerfile                                              | 2 +-
 community-build/src/scala/dotty/communitybuild/projects.scala   | 2 +-
 project/Dependencies.scala                                      | 2 +-
 project/build.properties                                        | 2 +-
 .../sourcepath-with-inline-api-hash/project/build.properties    | 2 +-
 .../sourcepath-with-inline/project/build.properties             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/Dockerfile b/.github/Dockerfile
index 3ba5466c30b8..e9b449421858 100644
--- a/.github/Dockerfile
+++ b/.github/Dockerfile
@@ -22,5 +22,5 @@ RUN apt-get update && \
 # Install sbt
 ENV SBT_HOME /usr/local/sbt
 ENV PATH ${SBT_HOME}/bin:${PATH}
-ENV SBT_VERSION 1.10.5
+ENV SBT_VERSION 1.10.7
 RUN curl -sL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | gunzip | tar -x -C /usr/local
\ No newline at end of file
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
index c8e16d7df946..d8d791682cd3 100644
--- a/community-build/src/scala/dotty/communitybuild/projects.scala
+++ b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -128,7 +128,7 @@ final case class SbtCommunityProject(
       case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
       case _ => Nil
     extraSbtArgs ++ sbtProps ++ List(
-      "-sbt-version", "1.10.5",
+      "-sbt-version", "1.10.7",
       "-Dsbt.supershell=false",
       s"-Ddotty.communitybuild.dir=$communitybuildDir",
       s"--addPluginSbtFile=$sbtPluginFilePath"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 427b53e45221..22871db0570a 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -28,5 +28,5 @@ object Dependencies {
     "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
   )
 
-  val compilerInterface = "org.scala-sbt" % "compiler-interface" % "1.10.4"
+  val compilerInterface = "org.scala-sbt" % "compiler-interface" % "1.10.7"
 }
diff --git a/project/build.properties b/project/build.properties
index db1723b08622..73df629ac1a7 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.5
+sbt.version=1.10.7
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
index db1723b08622..73df629ac1a7 100644
--- a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.5
+sbt.version=1.10.7
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
index db1723b08622..73df629ac1a7 100644
--- a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.5
+sbt.version=1.10.7

From ca77d84a8bb47fd6fd78151f734bd2d3874cd8a6 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Fri, 28 Feb 2025 03:47:32 -0800
Subject: [PATCH 123/505] Regression test for extension nullification, nowarn
 for different opacities (#21191)

Fixes #21190

~Adjust~ test that params must not be of different opacity ~opaque~.

~Other aliases are permitted, but could check if they are effectively
final. String alias can't be overridden.~

The tweak was https://github.com/scala/scala3/pull/22268 and the ticket
was a duplicate. In the meantime, it also doesn't warn for any override,
so the previous concern about aliases doesn't apply.
[Cherry-picked ee62b32974eec926dc813b1d2d649a9e970ffa16]
---
 tests/warn/i21190.scala | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 tests/warn/i21190.scala

diff --git a/tests/warn/i21190.scala b/tests/warn/i21190.scala
new file mode 100644
index 000000000000..652a4ad36853
--- /dev/null
+++ b/tests/warn/i21190.scala
@@ -0,0 +1,23 @@
+
+//> using options -Werror
+
+opaque type FromEnd = Int
+object FromEnd:
+  inline def apply(i: Int): FromEnd = i
+  extension (fe: FromEnd)
+    inline def value: Int = fe
+
+// Warning appears when extension is in same namespace as opaque type
+extension [A](a: Array[A])
+  inline def apply(fe: FromEnd): A =
+    a(a.length - 1 - FromEnd.value(fe))
+
+class R:
+  def run(): String =
+    val xs = Array(1, 2, 3)
+
+    s"""First element = ${xs(0)}
+       |Last element = ${xs(FromEnd(0))}""".stripMargin
+
+@main def test = println:
+  R().run()

From 05b01e775fdf7dda4d4e702054acb4ea441d22ce Mon Sep 17 00:00:00 2001
From: Vadim Chelyshov <qtankle@gmail.com>
Date: Fri, 7 Jun 2024 15:21:50 +0300
Subject: [PATCH 124/505] completions: do not complete package

There is an issue with completions for package in Metals.

```scala
// code
package one@@
// compeltions
oneCURSOR
```

It seems there is no need in completions for Package at all.

[Cherry-picked 7c76ded6b1e02a986d68ea8b3138a257afc5baba]
---
 .../dotty/tools/dotc/interactive/Completion.scala  |  2 ++
 .../pc/tests/completion/CompletionSuite.scala      | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index 61a1db44d8b0..ba37a48287ff 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -88,6 +88,8 @@ object Completion:
    * Otherwise, provide no completion suggestion.
    */
   def completionMode(path: List[untpd.Tree], pos: SourcePosition): Mode = path match
+    // Ignore `package foo@@` and `package foo.bar@@`
+    case ((_: tpd.Select) | (_: tpd.Ident)):: (_ : tpd.PackageDef) :: _  => Mode.None
     case GenericImportSelector(sel) =>
       if sel.imported.span.contains(pos.span) then Mode.ImportOrExport // import scala.@@
       else if sel.isGiven && sel.bound.span.contains(pos.span) then Mode.ImportOrExport
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
index 862257d7d1eb..bc9f158ca97c 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -2189,3 +2189,17 @@ class CompletionSuite extends BaseCompletionSuite:
          |""".stripMargin,
       topLines = Some(3)
     )
+
+  @Test def `packageIssueIdent` =
+    check(
+      """package one@@
+        |""".stripMargin,
+      ""
+    )
+
+  @Test def `packageIssueSelect` =
+    check(
+      """package one.two@@
+        |""".stripMargin,
+      ""
+    )

From 42e1ada837d2b0f75eff1b039f39d1d9083c3c27 Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:37:29 +0100
Subject: [PATCH 125/505] Add REPL flag to quit after evaluating init script

---
 bin/replQ                                     |   6 +
 .../tools/dotc/config/ScalaSettings.scala     |   1 +
 .../src/dotty/tools/repl/ReplDriver.scala     |   4 +-
 .../tools/scripting/BashExitCodeTests.scala   |   3 +
 .../dotty/tools/scripting/ScriptTestEnv.scala |   5 +-
 dist/bin/repl                                 |  88 ++++++++++++++
 dist/bin/repl.bat                             | 110 ++++++++++++++++++
 7 files changed, 214 insertions(+), 3 deletions(-)
 create mode 100755 bin/replQ
 create mode 100755 dist/bin/repl
 create mode 100644 dist/bin/repl.bat

diff --git a/bin/replQ b/bin/replQ
new file mode 100755
index 000000000000..5d0b84c4a229
--- /dev/null
+++ b/bin/replQ
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
+. $ROOT/bin/commonQ
+
+java -Dscala.usejavacp=true -cp $cp dotty.tools.repl.Main -usejavacp "$@"
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index 8dfe72cf85d4..ac08c039c254 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -135,6 +135,7 @@ trait CommonScalaSettings:
   val usejavacp: Setting[Boolean] = BooleanSetting("-usejavacp", "Utilize the java.class.path in classpath resolution.", aliases = List("--use-java-class-path"))
   val scalajs: Setting[Boolean] = BooleanSetting("-scalajs", "Compile in Scala.js mode (requires scalajs-library.jar on the classpath).", aliases = List("--scalajs"))
   val replInitScript: Setting[String] = StringSetting("-repl-init-script", "code", "The code will be run on REPL startup.", "", aliases = List("--repl-init-script"))
+  val replEvalOnly: Setting[Boolean] = BooleanSetting("-repl-eval", "Quit REPL after evaluating the init script.", aliases = List("--repl-eval"))
 
 end CommonScalaSettings
 
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index bd97336fc792..492cc1f60c5a 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -139,7 +139,9 @@ class ReplDriver(settings: Array[String],
    *
    *  Possible reason for unsuccessful run are raised flags in CLI like --help or --version
    */
-  final def tryRunning = if shouldStart then runUntilQuit()
+  final def tryRunning = if shouldStart then
+    if rootCtx.settings.replEvalOnly.value(using rootCtx) then initialState
+    else runUntilQuit()
 
   /** Run REPL with `state` until `:quit` command found
    *
diff --git a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
index f2e64b5fad62..c76aa25ac84d 100644
--- a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
+++ b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
@@ -30,6 +30,7 @@ class BashExitCodeTests:
   def scala(args: String*)     = verifyExit(scalaPath, args*)
   def scalacRaw(args: String*) = verifyExit(scalacPath, args*)
   def scalac(args: String*)    = scalacRaw(("-d" +: tmpDir +: args)*)
+  def repl(args: String*)      = verifyExit(replPath, args*)
 
   /** The path to the test file for this class. */
   def f(body: String, suffix: String = ".scala"): String =
@@ -62,6 +63,8 @@ class BashExitCodeTests:
   @Test def xPluginList   = scala("-Xplugin-list")(0)
   @Test def vPhases       = scala("-Vphases")(0)
 
+  @Test def replEval      = repl("--repl-eval", "--repl-init-script", "\'println(\"Hello from init script!\"); val i = 2 * 2\'")(0)
+
   /** A utility for running two commands in a row, like you do in bash. */
   extension (inline u1: Unit) inline def & (inline u2: Unit): Unit = { u1; u2 }
 end BashExitCodeTests
diff --git a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
index 1db92d5415b4..7792ecb34239 100644
--- a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
+++ b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
@@ -234,10 +234,11 @@ object ScriptTestEnv {
 
   lazy val cwd: Path = Paths.get(".").toAbsolutePath.normalize
 
-  lazy val (scalacPath: String, scalaPath: String) = {
+  lazy val (scalacPath: String, scalaPath: String, replPath: String) = {
     val scalac = s"$workingDirectory/dist/target/pack/bin/scalac".toPath.normalize
     val scala = s"$workingDirectory/dist/target/pack/bin/scala".toPath.normalize
-    (scalac.norm, scala.norm)
+    val repl = s"$workingDirectory/dist/target/pack/bin/repl".toPath.normalize
+    (scalac.norm, scala.norm, repl.norm)
   }
 
 
diff --git a/dist/bin/repl b/dist/bin/repl
new file mode 100755
index 000000000000..e8f0f1bae93f
--- /dev/null
+++ b/dist/bin/repl
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+#set -o nounset ; set -o errexit
+
+# Try to autodetect real location of the script
+if [ -z "${PROG_HOME-}" ] ; then
+  ## resolve links - $0 may be a link to PROG_HOME
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  PROG_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  PROG_HOME=`cd "$PROG_HOME" && pwd`
+
+  cd "$saveddir"
+fi
+
+source "$PROG_HOME/libexec/common"
+default_java_opts="-Xmx768m -Xms768m"
+withCompiler=true
+
+CompilerMain=dotty.tools.dotc.Main
+DecompilerMain=dotty.tools.dotc.decompiler.Main
+ReplMain=dotty.tools.repl.Main
+ScriptingMain=dotty.tools.scripting.Main
+JVM_CP_ARGS="$PROG_HOME/lib/scaladoc.jar"
+
+PROG_NAME=$CompilerMain
+
+addJava () {
+  java_args+=("'$1'")
+}
+addScala () {
+  scala_args+=("'$1'")
+}
+addResidual () {
+  residual_args+=("'$1'")
+}
+addScrip() {
+  script_args+=("'$1'")
+}
+
+#for A in "$@" ; do echo "A[$A]" ; done ; exit 2
+
+while [[ $# -gt 0 ]]; do
+case "$1" in
+           --) shift; for arg; do addResidual "$arg"; done; set -- ;;
+  -v|-verbose) verbose=true && addScala "-verbose" && shift ;;
+    -q|-quiet) quiet=true && shift ;;
+
+      -colors) colors=true && shift ;;
+   -no-colors) unset colors && shift ;;
+          # break out -D and -J options and add them to java_args so
+          # they reach the JVM in time to do some good. The -D options
+          # will be available as system properties.
+          -D*) addJava "$1" && shift ;;
+          -J*) addJava "${1:2}" && shift ;;
+            *) addResidual "$1"
+               shift
+               ;;
+  esac
+done
+
+eval "\"$JAVACMD\"" \
+     ${JAVA_OPTS:-$default_java_opts} \
+     "${java_args[@]}" \
+     -classpath "${JVM_CP_ARGS}" \
+      -Dscala.expandjavacp=true \
+      -Dscala.usejavacp=true \
+     "dotty.tools.repl.Main"  \
+     "${scala_args[@]}" \
+     "${residual_args[@]}" \
+     "${scripting_string-}"
+scala_exit_status=$?
+onExit
diff --git a/dist/bin/repl.bat b/dist/bin/repl.bat
new file mode 100644
index 000000000000..5d710850c5ff
--- /dev/null
+++ b/dist/bin/repl.bat
@@ -0,0 +1,110 @@
+@echo off
+setlocal enabledelayedexpansion
+
+@rem #########################################################################
+@rem ## Environment setup
+
+set _EXITCODE=0
+
+for %%f in ("%~dp0.") do (
+    set "_PROG_HOME=%%~dpf"
+    @rem get rid of the trailing slash
+    set "_PROG_HOME=!_PROG_HOME:~0,-1!"
+)
+call "%_PROG_HOME%\libexec\common.bat"
+if not %_EXITCODE%==0 goto end
+
+set _DEFAULT_JAVA_OPTS=-Xmx768m -Xms768m
+
+call :args %*
+
+@rem #########################################################################
+@rem ## Main
+
+if defined JAVA_OPTS ( set _JAVA_OPTS=%JAVA_OPTS%
+) else ( set _JAVA_OPTS=%_DEFAULT_JAVA_OPTS%
+)
+
+@rem we need to escape % in the java command path, for some reason this doesnt work in common.bat
+set "_JAVACMD=!_JAVACMD:%%=%%%%!"
+
+call "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% ^
+-classpath "%_LIB_DIR%\scaladoc.jar" ^
+-Dscala.expandjavacp=true ^
+-Dscala.usejavacp=true ^
+dotty.tools.repl.Main %_SCALA_ARGS% %_RESIDUAL_ARGS%
+if not %ERRORLEVEL%==0 (
+    @rem echo Error: Scaladoc execution failed 1>&2
+    set _EXITCODE=1
+    goto end
+)
+goto end
+
+@rem #########################################################################
+@rem ## Subroutines
+
+:args
+set _JAVA_DEBUG=
+set _HELP=
+set _VERBOSE=
+set _QUIET=
+set _COLORS=
+set _SCALA_ARGS=
+set _JAVA_ARGS=
+set _RESIDUAL_ARGS=
+
+:args_loop
+if "%~1"=="" goto args_done
+set "__ARG=%~1"
+if "%__ARG%"=="--" (
+    @rem for arg; do addResidual "$arg"; done; set -- ;;
+) else if "%__ARG%"=="-h" (
+    set _HELP=true
+    call :addScala "-help"
+) else if "%__ARG%"=="-help" (
+    set _HELP=true
+    call :addScala "-help"
+) else if "%__ARG%"=="-v" (
+    set _VERBOSE=true
+    call :addScala "-verbose"
+) else if "%__ARG%"=="-verbose" (
+    set _VERBOSE=true
+    call :addScala "-verbose"
+) else if "%__ARG%"=="-debug" ( set "_JAVA_DEBUG=%_DEBUG_STR%"
+) else if "%__ARG%"=="-q" ( set _QUIET=true
+) else if "%__ARG%"=="-quiet" ( set _QUIET=true
+) else if "%__ARG%"=="-colors" ( set _COLORS=true
+) else if "%__ARG%"=="-no-colors" ( set _COLORS=
+) else if "%__ARG:~0,2%"=="-D" ( call :addJava "%__ARG%"
+) else if "%__ARG:~0,2%"=="-J" ( call :addJava "%__ARG:~2%"
+) else (
+    if defined _IN_SCRIPTING_ARGS ( call :addScripting "%__ARG%"
+    ) else ( call :addResidual "%__ARG%"
+    )
+)
+shift
+goto args_loop
+:args_done
+goto :eof
+
+@rem output parameter: _SCALA_ARGS
+:addScala
+set _SCALA_ARGS=%_SCALA_ARGS% %~1
+goto :eof
+
+@rem output parameter: _JAVA_ARGS
+:addJava
+set _JAVA_ARGS=%_JAVA_ARGS% %~1
+goto :eof
+
+@rem output parameter: _RESIDUAL_ARGS
+:addResidual
+set _RESIDUAL_ARGS=%_RESIDUAL_ARGS% %~1
+goto :eof
+
+@rem #########################################################################
+@rem ## Cleanups
+
+:end
+exit /b %_EXITCODE%
+endlocal

From 4eff65527b981a91720beb3fa4826a0fcdd9081f Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:11:52 +0200
Subject: [PATCH 126/505] Add REPL flag to quit after evaluating init script

[Cherry-picked 1a9ba3a2cd555bd73b92148326e1a62d18ccb1f6][modified]

From db49c88213e51fda8141880a3aee3c238c84f217 Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Wed, 26 Feb 2025 13:49:42 +0100
Subject: [PATCH 127/505] Remove repl bin; rename flag

---
 .../tools/dotc/config/ScalaSettings.scala     |   2 +-
 .../tools/scripting/BashExitCodeTests.scala   |   4 +-
 .../dotty/tools/scripting/ScriptTestEnv.scala |   5 +-
 dist/bin/repl                                 |  88 --------------
 dist/bin/repl.bat                             | 110 ------------------
 5 files changed, 5 insertions(+), 204 deletions(-)
 delete mode 100755 dist/bin/repl
 delete mode 100644 dist/bin/repl.bat

diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index ac08c039c254..9ad6b82984ec 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -135,7 +135,7 @@ trait CommonScalaSettings:
   val usejavacp: Setting[Boolean] = BooleanSetting("-usejavacp", "Utilize the java.class.path in classpath resolution.", aliases = List("--use-java-class-path"))
   val scalajs: Setting[Boolean] = BooleanSetting("-scalajs", "Compile in Scala.js mode (requires scalajs-library.jar on the classpath).", aliases = List("--scalajs"))
   val replInitScript: Setting[String] = StringSetting("-repl-init-script", "code", "The code will be run on REPL startup.", "", aliases = List("--repl-init-script"))
-  val replEvalOnly: Setting[Boolean] = BooleanSetting("-repl-eval", "Quit REPL after evaluating the init script.", aliases = List("--repl-eval"))
+  val replEvalOnly: Setting[Boolean] = BooleanSetting("-repl-quit-after-init", "Quit REPL after evaluating the init script.", aliases = List("--repl-quit-after-init"))
 
 end CommonScalaSettings
 
diff --git a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
index c76aa25ac84d..64ba94eac428 100644
--- a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
+++ b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
@@ -30,7 +30,7 @@ class BashExitCodeTests:
   def scala(args: String*)     = verifyExit(scalaPath, args*)
   def scalacRaw(args: String*) = verifyExit(scalacPath, args*)
   def scalac(args: String*)    = scalacRaw(("-d" +: tmpDir +: args)*)
-  def repl(args: String*)      = verifyExit(replPath, args*)
+  def repl(args: String*)      = verifyExit(scalaPath, "--power", "repl", "--offline", "--", args*)
 
   /** The path to the test file for this class. */
   def f(body: String, suffix: String = ".scala"): String =
@@ -63,7 +63,7 @@ class BashExitCodeTests:
   @Test def xPluginList   = scala("-Xplugin-list")(0)
   @Test def vPhases       = scala("-Vphases")(0)
 
-  @Test def replEval      = repl("--repl-eval", "--repl-init-script", "\'println(\"Hello from init script!\"); val i = 2 * 2\'")(0)
+  @Test def replEval      = repl("--repl-quit-after-init", "--repl-init-script", "\'println(\"Hello from init script!\"); val i = 2 * 2\'")(0)
 
   /** A utility for running two commands in a row, like you do in bash. */
   extension (inline u1: Unit) inline def & (inline u2: Unit): Unit = { u1; u2 }
diff --git a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
index 7792ecb34239..1db92d5415b4 100644
--- a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
+++ b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
@@ -234,11 +234,10 @@ object ScriptTestEnv {
 
   lazy val cwd: Path = Paths.get(".").toAbsolutePath.normalize
 
-  lazy val (scalacPath: String, scalaPath: String, replPath: String) = {
+  lazy val (scalacPath: String, scalaPath: String) = {
     val scalac = s"$workingDirectory/dist/target/pack/bin/scalac".toPath.normalize
     val scala = s"$workingDirectory/dist/target/pack/bin/scala".toPath.normalize
-    val repl = s"$workingDirectory/dist/target/pack/bin/repl".toPath.normalize
-    (scalac.norm, scala.norm, repl.norm)
+    (scalac.norm, scala.norm)
   }
 
 
diff --git a/dist/bin/repl b/dist/bin/repl
deleted file mode 100755
index e8f0f1bae93f..000000000000
--- a/dist/bin/repl
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env bash
-
-#set -o nounset ; set -o errexit
-
-# Try to autodetect real location of the script
-if [ -z "${PROG_HOME-}" ] ; then
-  ## resolve links - $0 may be a link to PROG_HOME
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  PROG_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  PROG_HOME=`cd "$PROG_HOME" && pwd`
-
-  cd "$saveddir"
-fi
-
-source "$PROG_HOME/libexec/common"
-default_java_opts="-Xmx768m -Xms768m"
-withCompiler=true
-
-CompilerMain=dotty.tools.dotc.Main
-DecompilerMain=dotty.tools.dotc.decompiler.Main
-ReplMain=dotty.tools.repl.Main
-ScriptingMain=dotty.tools.scripting.Main
-JVM_CP_ARGS="$PROG_HOME/lib/scaladoc.jar"
-
-PROG_NAME=$CompilerMain
-
-addJava () {
-  java_args+=("'$1'")
-}
-addScala () {
-  scala_args+=("'$1'")
-}
-addResidual () {
-  residual_args+=("'$1'")
-}
-addScrip() {
-  script_args+=("'$1'")
-}
-
-#for A in "$@" ; do echo "A[$A]" ; done ; exit 2
-
-while [[ $# -gt 0 ]]; do
-case "$1" in
-           --) shift; for arg; do addResidual "$arg"; done; set -- ;;
-  -v|-verbose) verbose=true && addScala "-verbose" && shift ;;
-    -q|-quiet) quiet=true && shift ;;
-
-      -colors) colors=true && shift ;;
-   -no-colors) unset colors && shift ;;
-          # break out -D and -J options and add them to java_args so
-          # they reach the JVM in time to do some good. The -D options
-          # will be available as system properties.
-          -D*) addJava "$1" && shift ;;
-          -J*) addJava "${1:2}" && shift ;;
-            *) addResidual "$1"
-               shift
-               ;;
-  esac
-done
-
-eval "\"$JAVACMD\"" \
-     ${JAVA_OPTS:-$default_java_opts} \
-     "${java_args[@]}" \
-     -classpath "${JVM_CP_ARGS}" \
-      -Dscala.expandjavacp=true \
-      -Dscala.usejavacp=true \
-     "dotty.tools.repl.Main"  \
-     "${scala_args[@]}" \
-     "${residual_args[@]}" \
-     "${scripting_string-}"
-scala_exit_status=$?
-onExit
diff --git a/dist/bin/repl.bat b/dist/bin/repl.bat
deleted file mode 100644
index 5d710850c5ff..000000000000
--- a/dist/bin/repl.bat
+++ /dev/null
@@ -1,110 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-@rem #########################################################################
-@rem ## Environment setup
-
-set _EXITCODE=0
-
-for %%f in ("%~dp0.") do (
-    set "_PROG_HOME=%%~dpf"
-    @rem get rid of the trailing slash
-    set "_PROG_HOME=!_PROG_HOME:~0,-1!"
-)
-call "%_PROG_HOME%\libexec\common.bat"
-if not %_EXITCODE%==0 goto end
-
-set _DEFAULT_JAVA_OPTS=-Xmx768m -Xms768m
-
-call :args %*
-
-@rem #########################################################################
-@rem ## Main
-
-if defined JAVA_OPTS ( set _JAVA_OPTS=%JAVA_OPTS%
-) else ( set _JAVA_OPTS=%_DEFAULT_JAVA_OPTS%
-)
-
-@rem we need to escape % in the java command path, for some reason this doesnt work in common.bat
-set "_JAVACMD=!_JAVACMD:%%=%%%%!"
-
-call "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% ^
--classpath "%_LIB_DIR%\scaladoc.jar" ^
--Dscala.expandjavacp=true ^
--Dscala.usejavacp=true ^
-dotty.tools.repl.Main %_SCALA_ARGS% %_RESIDUAL_ARGS%
-if not %ERRORLEVEL%==0 (
-    @rem echo Error: Scaladoc execution failed 1>&2
-    set _EXITCODE=1
-    goto end
-)
-goto end
-
-@rem #########################################################################
-@rem ## Subroutines
-
-:args
-set _JAVA_DEBUG=
-set _HELP=
-set _VERBOSE=
-set _QUIET=
-set _COLORS=
-set _SCALA_ARGS=
-set _JAVA_ARGS=
-set _RESIDUAL_ARGS=
-
-:args_loop
-if "%~1"=="" goto args_done
-set "__ARG=%~1"
-if "%__ARG%"=="--" (
-    @rem for arg; do addResidual "$arg"; done; set -- ;;
-) else if "%__ARG%"=="-h" (
-    set _HELP=true
-    call :addScala "-help"
-) else if "%__ARG%"=="-help" (
-    set _HELP=true
-    call :addScala "-help"
-) else if "%__ARG%"=="-v" (
-    set _VERBOSE=true
-    call :addScala "-verbose"
-) else if "%__ARG%"=="-verbose" (
-    set _VERBOSE=true
-    call :addScala "-verbose"
-) else if "%__ARG%"=="-debug" ( set "_JAVA_DEBUG=%_DEBUG_STR%"
-) else if "%__ARG%"=="-q" ( set _QUIET=true
-) else if "%__ARG%"=="-quiet" ( set _QUIET=true
-) else if "%__ARG%"=="-colors" ( set _COLORS=true
-) else if "%__ARG%"=="-no-colors" ( set _COLORS=
-) else if "%__ARG:~0,2%"=="-D" ( call :addJava "%__ARG%"
-) else if "%__ARG:~0,2%"=="-J" ( call :addJava "%__ARG:~2%"
-) else (
-    if defined _IN_SCRIPTING_ARGS ( call :addScripting "%__ARG%"
-    ) else ( call :addResidual "%__ARG%"
-    )
-)
-shift
-goto args_loop
-:args_done
-goto :eof
-
-@rem output parameter: _SCALA_ARGS
-:addScala
-set _SCALA_ARGS=%_SCALA_ARGS% %~1
-goto :eof
-
-@rem output parameter: _JAVA_ARGS
-:addJava
-set _JAVA_ARGS=%_JAVA_ARGS% %~1
-goto :eof
-
-@rem output parameter: _RESIDUAL_ARGS
-:addResidual
-set _RESIDUAL_ARGS=%_RESIDUAL_ARGS% %~1
-goto :eof
-
-@rem #########################################################################
-@rem ## Cleanups
-
-:end
-exit /b %_EXITCODE%
-endlocal

From fa115526960cf1088d75b1ab0aab2360e9a09397 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:23:13 +0200
Subject: [PATCH 128/505] Remove repl bin; rename flag

[Cherry-picked 28c877f74b919348f6d715ff01570aee8ee89822][modified]
---
 compiler/test/dotty/tools/scripting/BashExitCodeTests.scala | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
index 64ba94eac428..f2e64b5fad62 100644
--- a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
+++ b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
@@ -30,7 +30,6 @@ class BashExitCodeTests:
   def scala(args: String*)     = verifyExit(scalaPath, args*)
   def scalacRaw(args: String*) = verifyExit(scalacPath, args*)
   def scalac(args: String*)    = scalacRaw(("-d" +: tmpDir +: args)*)
-  def repl(args: String*)      = verifyExit(scalaPath, "--power", "repl", "--offline", "--", args*)
 
   /** The path to the test file for this class. */
   def f(body: String, suffix: String = ".scala"): String =
@@ -63,8 +62,6 @@ class BashExitCodeTests:
   @Test def xPluginList   = scala("-Xplugin-list")(0)
   @Test def vPhases       = scala("-Vphases")(0)
 
-  @Test def replEval      = repl("--repl-quit-after-init", "--repl-init-script", "\'println(\"Hello from init script!\"); val i = 2 * 2\'")(0)
-
   /** A utility for running two commands in a row, like you do in bash. */
   extension (inline u1: Unit) inline def & (inline u2: Unit): Unit = { u1; u2 }
 end BashExitCodeTests

From c93f4f4b30e5bfbc7d7110745c5c132dbfc3e808 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:24:00 +0200
Subject: [PATCH 129/505] Fix arguments

[Cherry-picked e8b1d1e163921d289f9f4a101ddfa9d76a853d5b][modified]

From fce04dc4938c3681c750a167633a10693eb7bc46 Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Thu, 27 Feb 2025 13:24:44 +0100
Subject: [PATCH 130/505] Rename setting name

---
 compiler/src/dotty/tools/dotc/config/ScalaSettings.scala | 2 +-
 compiler/src/dotty/tools/repl/ReplDriver.scala           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index 9ad6b82984ec..cfd20c95a76b 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -135,7 +135,7 @@ trait CommonScalaSettings:
   val usejavacp: Setting[Boolean] = BooleanSetting("-usejavacp", "Utilize the java.class.path in classpath resolution.", aliases = List("--use-java-class-path"))
   val scalajs: Setting[Boolean] = BooleanSetting("-scalajs", "Compile in Scala.js mode (requires scalajs-library.jar on the classpath).", aliases = List("--scalajs"))
   val replInitScript: Setting[String] = StringSetting("-repl-init-script", "code", "The code will be run on REPL startup.", "", aliases = List("--repl-init-script"))
-  val replEvalOnly: Setting[Boolean] = BooleanSetting("-repl-quit-after-init", "Quit REPL after evaluating the init script.", aliases = List("--repl-quit-after-init"))
+  val replQuitAfterInit: Setting[Boolean] = BooleanSetting("-repl-quit-after-init", "Quit REPL after evaluating the init script.", aliases = List("--repl-quit-after-init"))
 
 end CommonScalaSettings
 
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 492cc1f60c5a..282ad86efa32 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -140,7 +140,7 @@ class ReplDriver(settings: Array[String],
    *  Possible reason for unsuccessful run are raised flags in CLI like --help or --version
    */
   final def tryRunning = if shouldStart then
-    if rootCtx.settings.replEvalOnly.value(using rootCtx) then initialState
+    if rootCtx.settings.replQuitAfterInit.value(using rootCtx) then initialState
     else runUntilQuit()
 
   /** Run REPL with `state` until `:quit` command found

From 9e48c64715500fdbe165ddf86cbce093285d20d8 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:25:12 +0200
Subject: [PATCH 131/505] Rename setting name

[Cherry-picked 7c4a701bd4a83398110423c4367f686bdee0da9f][modified]

From ee6ea2481058d7efcffe7386fea7f926584c310d Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:25:36 +0200
Subject: [PATCH 132/505] Update
 compiler/test/dotty/tools/scripting/BashExitCodeTests.scala

Co-authored-by: Hamza Remmal <hamza@remmal.net>
[Cherry-picked fbd34ec3379e4f86f74f740be389e7720f1e0e87][modified]

From cf181c29f12e87ec798aff3d4f729f52f49442fd Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 24 Feb 2025 07:08:53 -0800
Subject: [PATCH 133/505] Handle Typeable

[Cherry-picked b52b0579d2192cfef689130cbbad8a07f1bc79f1]
---
 .../dotty/tools/dotc/core/Definitions.scala    |  1 +
 .../tools/dotc/transform/CheckUnused.scala     |  7 +++++--
 tests/warn/i15503d.scala                       |  9 ---------
 tests/warn/i21525.scala                        | 18 +++++++++++++++++-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
index f084e98e8806..da57315e15ff 100644
--- a/compiler/src/dotty/tools/dotc/core/Definitions.scala
+++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -811,6 +811,7 @@ class Definitions {
 
   @tu lazy val ReflectSelectableTypeRef: TypeRef = requiredClassRef("scala.reflect.Selectable")
 
+  @tu lazy val TypeableType: TypeSymbol = requiredPackage("scala.reflect.Typeable$package").moduleClass.requiredType("Typeable")
   @tu lazy val TypeTestClass: ClassSymbol = requiredClass("scala.reflect.TypeTest")
     @tu lazy val TypeTest_unapply: Symbol = TypeTestClass.requiredMethod(nme.unapply)
   @tu lazy val TypeTestModule_identity: Symbol = TypeTestClass.companionModule.requiredMethod(nme.identity)
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index f9bfbe680352..b40c07c78a62 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -68,8 +68,11 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     val name = tree.removeAttachment(OriginalName).getOrElse(nme.NO_NAME)
     if tree.srcPos.isSynthetic && tree.symbol == defn.TypeTest_unapply then
       tree.qualifier.tpe.underlying.finalResultType match
-      case AppliedType(_, args) => // tycon.typeSymbol == defn.TypeTestClass
-        val res = args(1) // T in TypeTest[-S, T]
+      case AppliedType(tycon, args) =>
+        val res =
+          if tycon.typeSymbol == defn.TypeTestClass then args(1) // T in TypeTest[-S, T]
+          else if tycon.typeSymbol == defn.TypeableType then args(0) // T in Typeable[T]
+          else return tree
         val target = res.dealias.typeSymbol
         resolveUsage(target, target.name, res.importPrefix.skipPackageObject) // case _: T =>
       case _ =>
diff --git a/tests/warn/i15503d.scala b/tests/warn/i15503d.scala
index 494952e2e4b0..2981986daff6 100644
--- a/tests/warn/i15503d.scala
+++ b/tests/warn/i15503d.scala
@@ -1,7 +1,5 @@
 //> using options -Wunused:patvars
 
-import scala.reflect.Typeable
-
 sealed trait Calc
 sealed trait Const extends Calc
 case class Sum(a: Calc, b: Calc) extends Calc
@@ -74,13 +72,6 @@ class C(c0: Option[Int], k0: K):
     for case Some(value) <- List(Option(42))
     yield 27
 
-    /*
-  def tester[A](a: A)(using Typeable[K]) =
-    a match
-    case S(i, j) => i + j
-    case _ => 0
-    */
-
 class Wild:
   def f(x: Any) =
     x match
diff --git a/tests/warn/i21525.scala b/tests/warn/i21525.scala
index aa156dc3960e..721486c4bd64 100644
--- a/tests/warn/i21525.scala
+++ b/tests/warn/i21525.scala
@@ -1,6 +1,7 @@
 //> using options -Werror -Wunused:imports
 
-import scala.reflect.TypeTest
+import scala.reflect.{Typeable, TypeTest}
+import compiletime.*
 
 trait A {
   type B
@@ -18,3 +19,18 @@ def f(a: A, b: a.B): Boolean = {
       false
   }
 }
+
+trait T:
+  type X
+  given Typeable[X] = deferred
+
+def g(t: T, x: Any) =
+  import t.X
+  x match
+  case _: X => true
+  case _ => false
+
+def typer[T: Typeable](x: Any) =
+  x match
+  case _: T => 1
+  case _ => 0

From 5abc895bd7842cf2928d136cbfbb155d3728deff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Bra=C4=8Devac?= <bracevac@users.noreply.github.com>
Date: Sun, 2 Mar 2025 22:45:08 +0100
Subject: [PATCH 134/505] Repl: emit warning for the `:sh` command

Fixes #21657

[Cherry-picked 9181b5588eae06ff3cfe7a35a415008fbd215bfe]
---
 compiler/src/dotty/tools/repl/ParseResult.scala       | 7 +++++++
 compiler/src/dotty/tools/repl/ReplDriver.scala        | 4 ++++
 compiler/test-resources/repl/i21657                   | 2 ++
 compiler/test/dotty/tools/repl/TabcompleteTests.scala | 1 +
 4 files changed, 14 insertions(+)
 create mode 100644 compiler/test-resources/repl/i21657

diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala
index 2674a385a10c..dd4c5d80a9e1 100644
--- a/compiler/src/dotty/tools/repl/ParseResult.scala
+++ b/compiler/src/dotty/tools/repl/ParseResult.scala
@@ -100,6 +100,12 @@ object Reset {
   val command: String = ":reset"
 }
 
+/** `:sh <command line>` run a shell command (result is implicitly => List[String]) */
+case class Sh(expr: String) extends Command
+object Sh {
+  val command: String = ":sh"
+}
+
 /** Toggle automatic printing of results */
 case object Silent extends Command:
   val command: String = ":silent"
@@ -150,6 +156,7 @@ object ParseResult {
     TypeOf.command -> (arg => TypeOf(arg)),
     DocOf.command -> (arg => DocOf(arg)),
     Settings.command -> (arg => Settings(arg)),
+    Sh.command -> (arg => Sh(arg)),
     Silent.command -> (_ => Silent),
   )
 
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 282ad86efa32..114fa607f945 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -539,6 +539,10 @@ class ReplDriver(settings: Array[String],
       }
       state
 
+    case Sh(expr) =>
+      out.println(s"""The :sh command is deprecated. Use `import scala.sys.process._` and `"command".!` instead.""")
+      state
+
     case Settings(arg) => arg match
       case "" =>
         given ctx: Context = state.context
diff --git a/compiler/test-resources/repl/i21657 b/compiler/test-resources/repl/i21657
new file mode 100644
index 000000000000..fa2eec3ac891
--- /dev/null
+++ b/compiler/test-resources/repl/i21657
@@ -0,0 +1,2 @@
+scala>:sh
+The :sh command is deprecated. Use `import scala.sys.process._` and `"command".!` instead.
\ No newline at end of file
diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
index 8c817dc2b96f..a881b828ec75 100644
--- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala
+++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
@@ -221,6 +221,7 @@ class TabcompleteTests extends ReplTest {
         ":quit",
         ":reset",
         ":settings",
+        ":sh",
         ":silent",
         ":type"
       ),

From 352d41e221664169d2a7ca4b03270e8d391a5274 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 14 Feb 2025 16:12:24 +0000
Subject: [PATCH 135/505] Check exhaustivity of any case class

---
 .../dotty/tools/dotc/transform/patmat/Space.scala |  6 +-----
 i22590.arity2.scala                               | 15 +++++++++++++++
 i22590.scala                                      |  9 +++++++++
 tests/pos/switches.scala                          |  1 +
 tests/warn/i15662.scala                           |  1 +
 tests/warn/opaque-match.scala                     |  2 ++
 tests/{pos => warn}/t10373.scala                  |  4 ++--
 7 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 i22590.arity2.scala
 create mode 100644 i22590.scala
 rename tests/{pos => warn}/t10373.scala (74%)

diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index 8f015bcd5f42..20b6a2e5b272 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -813,7 +813,6 @@ object SpaceEngine {
   }
 
   private def exhaustivityCheckable(sel: Tree)(using Context): Boolean = {
-    val seen = collection.mutable.Set.empty[Symbol]
 
     // Possible to check everything, but be compatible with scalac by default
     def isCheckable(tp: Type): Boolean =
@@ -828,10 +827,7 @@ object SpaceEngine {
       }) ||
       tpw.isRef(defn.BooleanClass) ||
       classSym.isAllOf(JavaEnumTrait) ||
-      classSym.is(Case) && {
-        if seen.add(classSym) then productSelectorTypes(tpw, sel.srcPos).exists(isCheckable(_))
-        else true // recursive case class: return true and other members can still fail the check
-      }
+      classSym.is(Case)
 
     !sel.tpe.hasAnnotation(defn.UncheckedAnnot)
     && {
diff --git a/i22590.arity2.scala b/i22590.arity2.scala
new file mode 100644
index 000000000000..ddd126210cae
--- /dev/null
+++ b/i22590.arity2.scala
@@ -0,0 +1,15 @@
+sealed trait T_B
+case class CC_A() extends T_B
+case class CC_C() extends T_B
+
+sealed trait T_A
+case class CC_B[B](a: B,b:T_B) extends T_A
+
+
+@main def test() = {
+  val v_a: CC_B[Int] = null
+  val v_b: Int = v_a match {
+    case CC_B(12, CC_A()) => 0
+    case CC_B(_, CC_C()) => 0
+  }
+}
diff --git a/i22590.scala b/i22590.scala
new file mode 100644
index 000000000000..41d503ef8c6f
--- /dev/null
+++ b/i22590.scala
@@ -0,0 +1,9 @@
+sealed trait T_A
+case class CC_B[T](a: T) extends T_A
+
+@main def test() = {
+  val v_a: CC_B[Int] = CC_B(10)
+  val v_b: Int = v_a match{
+    case CC_B(12) => 0
+  }
+}
diff --git a/tests/pos/switches.scala b/tests/pos/switches.scala
index bd7e44f1c8cf..beb378debb40 100644
--- a/tests/pos/switches.scala
+++ b/tests/pos/switches.scala
@@ -42,6 +42,7 @@ class Test {
     case IntAnyVal(100) => 2
     case IntAnyVal(1000) => 3
     case IntAnyVal(10000) => 4
+    case _ => -1
   }
 }
 
diff --git a/tests/warn/i15662.scala b/tests/warn/i15662.scala
index 0cf0e57ed0c3..f17a040b4980 100644
--- a/tests/warn/i15662.scala
+++ b/tests/warn/i15662.scala
@@ -5,6 +5,7 @@ case class Composite[T](v: T)
 def m(composite: Composite[?]): Unit =
   composite match {
     case Composite[Int](v) => println(v)  // warn: cannot be checked at runtime
+    case _ => println("OTHER")
   }
 
 def m2(composite: Composite[?]): Unit =
diff --git a/tests/warn/opaque-match.scala b/tests/warn/opaque-match.scala
index 06cca835ab91..f66370def9b2 100644
--- a/tests/warn/opaque-match.scala
+++ b/tests/warn/opaque-match.scala
@@ -13,8 +13,10 @@ def Test[T] =
     case _: C => ???   // ok
   C() match
     case _: O.T => ???  // warn
+    case _ => ???
   C() match
     case _: T => ???   // warn
+    case _ => ???
 
   (??? : Any) match
     case _: List[O.T] => ???  // warn
diff --git a/tests/pos/t10373.scala b/tests/warn/t10373.scala
similarity index 74%
rename from tests/pos/t10373.scala
rename to tests/warn/t10373.scala
index 0d91313f694d..ca49e7b1ce16 100644
--- a/tests/pos/t10373.scala
+++ b/tests/warn/t10373.scala
@@ -1,4 +1,4 @@
-//> using options -Xfatal-warnings -deprecation -feature
+//> using options -deprecation -feature
 
 abstract class Foo {
   def bar(): Unit = this match {
@@ -7,7 +7,7 @@ abstract class Foo {
                     // Works fine
   }
 
-  def baz(that: Foo): Unit = (this, that) match {
+  def baz(that: Foo): Unit = (this, that) match { // warn: match may not be exhaustive.
     case (Foo_1(), _) => //do something
     case (Foo_2(), _) => //do something
                          // match may not be exhaustive

From d207772d9fecced7afa1bcf5033c43ff60a25450 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:27:37 +0200
Subject: [PATCH 136/505] Check exhaustivity of any case class

[Cherry-picked c00dda3d033b3a68333faeade691381c180c6873][modified]

From e7ef5918400760ee30b02d8ab5c1e449f89fa496 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 17 Feb 2025 11:54:38 +0000
Subject: [PATCH 137/505] Fix fresh exhaustivity warnings in the compiler

---
 .../tools/backend/jvm/BCodeSkelBuilder.scala  |  2 +-
 .../src/dotty/tools/dotc/core/Comments.scala  | 13 ++---
 .../dotty/tools/dotc/typer/Implicits.scala    | 47 ++++++++++---------
 3 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
index 955597261327..437a34a53902 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
@@ -169,7 +169,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
 
     /* ---------------- helper utils for generating classes and fields ---------------- */
 
-    def genPlainClass(cd0: TypeDef) = cd0 match {
+    def genPlainClass(cd0: TypeDef) = (cd0: @unchecked) match {
       case TypeDef(_, impl: Template) =>
       assert(cnode == null, "GenBCode detected nested methods.")
 
diff --git a/compiler/src/dotty/tools/dotc/core/Comments.scala b/compiler/src/dotty/tools/dotc/core/Comments.scala
index 92160c97973d..b1d1e387c2cf 100644
--- a/compiler/src/dotty/tools/dotc/core/Comments.scala
+++ b/compiler/src/dotty/tools/dotc/core/Comments.scala
@@ -405,15 +405,10 @@ object Comments {
       val Trim = "(?s)^[\\s&&[^\n\r]]*(.*?)\\s*$".r
 
       val raw = ctx.docCtx.flatMap(_.docstring(sym).map(_.raw)).getOrElse("")
-      defs(sym) ++= defines(raw).map {
-        str => {
-          val start = skipWhitespace(str, "@define".length)
-          val (key, value) = str.splitAt(skipVariable(str, start))
-          key.drop(start) -> value
-        }
-      } map {
-        case (key, Trim(value)) =>
-          variableName(key) -> value.replaceAll("\\s+\\*+$", "")
+      defs(sym) ++= defines(raw).map { str =>
+        val start = skipWhitespace(str, "@define".length)
+        val (key, Trim(value)) = str.splitAt(skipVariable(str, start)): @unchecked
+        variableName(key.drop(start)) -> value.replaceAll("\\s+\\*+$", "")
       }
     }
 
diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
index 69237c2aa493..a1a01823e2f3 100644
--- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
@@ -1290,29 +1290,30 @@ trait Implicits:
             if alt1.isExtension then
               // Fall back: if both results are extension method applications,
               // compare the extension methods instead of their wrappers.
-              def stripExtension(alt: SearchSuccess) = methPart(stripApply(alt.tree)).tpe
-              (stripExtension(alt1), stripExtension(alt2)) match
-                case (ref1: TermRef, ref2: TermRef) =>
-                  // ref1 and ref2 might refer to type variables owned by
-                  // alt1.tstate and alt2.tstate respectively, to compare the
-                  // alternatives correctly we need a TyperState that includes
-                  // constraints from both sides, see
-                  // tests/*/extension-specificity2.scala for test cases.
-                  val constraintsIn1 = alt1.tstate.constraint ne ctx.typerState.constraint
-                  val constraintsIn2 = alt2.tstate.constraint ne ctx.typerState.constraint
-                  def exploreState(alt: SearchSuccess): TyperState =
-                    alt.tstate.fresh(committable = false)
-                  val comparisonState =
-                    if constraintsIn1 && constraintsIn2 then
-                      exploreState(alt1).mergeConstraintWith(alt2.tstate)
-                    else if constraintsIn1 then
-                      exploreState(alt1)
-                    else if constraintsIn2 then
-                      exploreState(alt2)
-                    else
-                      ctx.typerState
-
-                  diff = inContext(ctx.withTyperState(comparisonState)):
+              def stripExtension(alt: SearchSuccess) =
+                methPart(stripApply(alt.tree)).tpe: @unchecked match { case ref: TermRef => ref }
+              val ref1 = stripExtension(alt1)
+              val ref2 = stripExtension(alt2)
+              // ref1 and ref2 might refer to type variables owned by
+              // alt1.tstate and alt2.tstate respectively, to compare the
+              // alternatives correctly we need a TyperState that includes
+              // constraints from both sides, see
+              // tests/*/extension-specificity2.scala for test cases.
+              val constraintsIn1 = alt1.tstate.constraint ne ctx.typerState.constraint
+              val constraintsIn2 = alt2.tstate.constraint ne ctx.typerState.constraint
+              def exploreState(alt: SearchSuccess): TyperState =
+                alt.tstate.fresh(committable = false)
+              val comparisonState =
+                if constraintsIn1 && constraintsIn2 then
+                  exploreState(alt1).mergeConstraintWith(alt2.tstate)
+                else if constraintsIn1 then
+                  exploreState(alt1)
+                else if constraintsIn2 then
+                  exploreState(alt2)
+                else
+                  ctx.typerState
+
+              diff = inContext(ctx.withTyperState(comparisonState)):
                     compare(ref1, ref2)
             else // alt1 is a conversion, prefer extension alt2 over it
               diff = -1

From 2d612911b6e808ec88bd437e79cd8ae96e51eaf5 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:29:16 +0200
Subject: [PATCH 138/505] Fix fresh exhaustivity warnings in the compiler

[Cherry-picked 4072218f4d956d90ca9d50aaf0793ef3e77664dd][modified]

From 52e811c0ef6b4485df3192df12c130a798ebf443 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 11:30:43 +0200
Subject: [PATCH 139/505] Fix fresh exhaustivity warnings in scaladoc

[Cherry-picked daa31fd0f598a48df8a2c64392fc76519e0d490f][modified]
---
 scaladoc/src/dotty/tools/scaladoc/site/templates.scala | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
index 92e0096e5af1..56a0f7f6d6b6 100644
--- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
@@ -102,11 +102,9 @@ case class TemplateFile(
       ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}"))
     )
 
-    def asJavaElement(o: Object): Object = o match
-      case m: Map[_, _] => m.transform {
-        case (k: String, v: Object) => asJavaElement(v)
-      }.asJava
-      case l: List[_] => l.map(x => asJavaElement(x.asInstanceOf[Object])).asJava
+    def asJavaElement(o: Any): Any = o match
+      case m: Map[?, ?] => m.transform { (k, v) => asJavaElement(v) }.asJava
+      case l: List[?] => l.map(asJavaElement).asJava
       case other => other
 
     // Library requires mutable maps..

From 3ec2223bc843c0f6a1422334ca1a28907b62bb91 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 18 Feb 2025 10:10:31 +0000
Subject: [PATCH 140/505] Move exh checking case class tests in

[Cherry-picked 892f048594b65e22498291f388daf4554a315ffe]
---
 library/src/scala/annotation/newMain.scala            | 1 +
 i22590.arity2.scala => tests/warn/i22590.arity2.scala | 2 +-
 i22590.scala => tests/warn/i22590.scala               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename i22590.arity2.scala => tests/warn/i22590.arity2.scala (79%)
 rename i22590.scala => tests/warn/i22590.scala (67%)

diff --git a/library/src/scala/annotation/newMain.scala b/library/src/scala/annotation/newMain.scala
index 552e4225a648..686f3bf14b54 100644
--- a/library/src/scala/annotation/newMain.scala
+++ b/library/src/scala/annotation/newMain.scala
@@ -253,6 +253,7 @@ final class newMain extends MainAnnotation[FromString, Any]:
             case (arg +: t, "") => recurse(t, arg, acc)
             case (arg +: t, l) if l.length + 1 + arg.length <= maxLength => recurse(t, s"$l $arg", acc)
             case (arg +: t, l) => recurse(t, arg, acc :+ l)
+            case (_, _) => acc
           }
 
         recurse(argsUsage, "", Vector()).toList
diff --git a/i22590.arity2.scala b/tests/warn/i22590.arity2.scala
similarity index 79%
rename from i22590.arity2.scala
rename to tests/warn/i22590.arity2.scala
index ddd126210cae..8ce84ab299f1 100644
--- a/i22590.arity2.scala
+++ b/tests/warn/i22590.arity2.scala
@@ -8,7 +8,7 @@ case class CC_B[B](a: B,b:T_B) extends T_A
 
 @main def test() = {
   val v_a: CC_B[Int] = null
-  val v_b: Int = v_a match {
+  val v_b: Int = v_a match { // warn: match may not be exhaustive.
     case CC_B(12, CC_A()) => 0
     case CC_B(_, CC_C()) => 0
   }
diff --git a/i22590.scala b/tests/warn/i22590.scala
similarity index 67%
rename from i22590.scala
rename to tests/warn/i22590.scala
index 41d503ef8c6f..1520a07b86b8 100644
--- a/i22590.scala
+++ b/tests/warn/i22590.scala
@@ -3,7 +3,7 @@ case class CC_B[T](a: T) extends T_A
 
 @main def test() = {
   val v_a: CC_B[Int] = CC_B(10)
-  val v_b: Int = v_a match{
+  val v_b: Int = v_a match{ // warn: match may not be exhaustive.
     case CC_B(12) => 0
   }
 }

From e15b83a6ee8e61a6f6be19630fa5c666efcb5864 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 13:34:25 +0200
Subject: [PATCH 141/505] chore: Adjust test output

---
 tests/warn/i21218.scala | 1 +
 tests/warn/i21525.scala | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/warn/i21218.scala b/tests/warn/i21218.scala
index 29fa957e2e70..db0810c5d7b0 100644
--- a/tests/warn/i21218.scala
+++ b/tests/warn/i21218.scala
@@ -6,5 +6,6 @@ def Test[U, A](thisElem: A, thatElem: U) = {
       case (`passedEnd`, r: U @unchecked) => (thisElem, r)
       case (l: A @unchecked, `passedEnd`) => (l, thatElem)
       case t: (A, U) @unchecked           => t // false-positive warning
+      case (t1, t2) => (t1, t2)
     }
 }
diff --git a/tests/warn/i21525.scala b/tests/warn/i21525.scala
index 721486c4bd64..71b6fbe1ce48 100644
--- a/tests/warn/i21525.scala
+++ b/tests/warn/i21525.scala
@@ -22,7 +22,7 @@ def f(a: A, b: a.B): Boolean = {
 
 trait T:
   type X
-  given Typeable[X] = deferred
+  given tpe: Typeable[X]
 
 def g(t: T, x: Any) =
   import t.X

From 8b2f2c31c04c136cf4d8a5c37abe790805e40f95 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 13:48:37 +0200
Subject: [PATCH 142/505] chore: Add back repl test using bin/scala

---
 compiler/test/dotty/tools/scripting/BashExitCodeTests.scala | 3 +++
 tests/warn/i21525.scala                                     | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
index f2e64b5fad62..3aad9ef8813f 100644
--- a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
+++ b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
@@ -62,6 +62,9 @@ class BashExitCodeTests:
   @Test def xPluginList   = scala("-Xplugin-list")(0)
   @Test def vPhases       = scala("-Vphases")(0)
 
+  @Test def replEval      =
+    scala("--repl-quit-after-init", "--repl-init-script", "'val i = 2 * 2; val j = i + 2'")(0)
+
   /** A utility for running two commands in a row, like you do in bash. */
   extension (inline u1: Unit) inline def & (inline u2: Unit): Unit = { u1; u2 }
 end BashExitCodeTests
diff --git a/tests/warn/i21525.scala b/tests/warn/i21525.scala
index 71b6fbe1ce48..7fecb14a9673 100644
--- a/tests/warn/i21525.scala
+++ b/tests/warn/i21525.scala
@@ -1,7 +1,6 @@
 //> using options -Werror -Wunused:imports
 
 import scala.reflect.{Typeable, TypeTest}
-import compiletime.*
 
 trait A {
   type B

From 511e8d2b1614a3aba6e60c02c4136e5cf1871aee Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sun, 2 Mar 2025 20:01:45 -0800
Subject: [PATCH 143/505] Exclude synthetic this.m, Any.m from import lookup

[Cherry-picked fb1fe22611088629e48b66ef9258cd1bb639fd5f]
---
 .../src/dotty/tools/dotc/transform/CheckUnused.scala | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index b40c07c78a62..22d27cb61c66 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -66,6 +66,10 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   // import x.y; y may be rewritten x.y, also import x.z as y
   override def transformSelect(tree: Select)(using Context): tree.type =
     val name = tree.removeAttachment(OriginalName).getOrElse(nme.NO_NAME)
+    inline def isImportable = tree.qualifier.srcPos.isSynthetic
+      && tree.qualifier.tpe.match
+        case ThisType(_) | SuperType(_, _) => false
+        case qualtpe => qualtpe.isStable
     if tree.srcPos.isSynthetic && tree.symbol == defn.TypeTest_unapply then
       tree.qualifier.tpe.underlying.finalResultType match
       case AppliedType(tycon, args) =>
@@ -76,10 +80,10 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         val target = res.dealias.typeSymbol
         resolveUsage(target, target.name, res.importPrefix.skipPackageObject) // case _: T =>
       case _ =>
-    else if tree.qualifier.srcPos.isSynthetic && tree.qualifier.tpe.isStable || name.exists(_ != tree.symbol.name) then
+    else if isImportable || name.exists(_ != tree.symbol.name) then
       if !ignoreTree(tree) then
         resolveUsage(tree.symbol, name, tree.qualifier.tpe)
-    else
+    else if !ignoreTree(tree) then
       refUsage(tree.symbol)
     tree
 
@@ -304,7 +308,8 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         case none =>
 
     // Avoid spurious NoSymbol and also primary ctors which are never warned about.
-    if !sym.exists || sym.isPrimaryConstructor then return
+    // Selections C.this.toString should be already excluded, but backtopped here for eq, etc.
+    if !sym.exists || sym.isPrimaryConstructor || defn.topClasses(sym.owner) then return
 
     // Find the innermost, highest precedence. Contexts have no nesting levels but assume correctness.
     // If the sym is an enclosing definition (the owner of a context), it does not count toward usages.
@@ -442,7 +447,6 @@ object CheckUnused:
         if (tree.symbol ne NoSymbol) && !tree.name.isWildcard then
           defs.addOne((tree.symbol, tree.namePos))
       case _ =>
-        //println(s"OTHER ${tree.symbol}")
         if tree.symbol ne NoSymbol then
           defs.addOne((tree.symbol, tree.srcPos))
 

From 617efc92531624ca6af957829a98a8754478a588 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 24 Feb 2025 15:49:49 +0100
Subject: [PATCH 144/505] Fix stale symbol crash on classes with package owner

[Cherry-picked b5a31512de1352be73df52612e13d422b19f5eff]
---
 compiler/src/dotty/tools/dotc/typer/Namer.scala | 2 +-
 tests/pos-macros/i20449/Macro.scala             | 3 +++
 tests/pos-macros/i20449/Main.scala              | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos-macros/i20449/Macro.scala
 create mode 100644 tests/pos-macros/i20449/Main.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index cea045cecc35..4bdee42069d0 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -694,7 +694,7 @@ class Namer { typer: Typer =>
               enterSymbol(classConstructorCompanion(classSym.asClass))
             else
               for moduleSym <- companionVals do
-                if moduleSym.is(Module) && !moduleSym.isDefinedInCurrentRun then
+                if moduleSym.lastKnownDenotation.is(Module) && !moduleSym.isDefinedInCurrentRun then
                   val companion =
                     if needsConstructorProxies(classSym) then
                       classConstructorCompanion(classSym.asClass)
diff --git a/tests/pos-macros/i20449/Macro.scala b/tests/pos-macros/i20449/Macro.scala
new file mode 100644
index 000000000000..56c9a625e894
--- /dev/null
+++ b/tests/pos-macros/i20449/Macro.scala
@@ -0,0 +1,3 @@
+import scala.quoted.*
+transparent inline def getTypeInfo[T]() = ${ getTypeInfoImpl[T] }
+def getTypeInfoImpl[T: Type](using ctx: Quotes): Expr[Unit] = '{ () }
diff --git a/tests/pos-macros/i20449/Main.scala b/tests/pos-macros/i20449/Main.scala
new file mode 100644
index 000000000000..7c1a71c5598e
--- /dev/null
+++ b/tests/pos-macros/i20449/Main.scala
@@ -0,0 +1,6 @@
+
+class Wrapper1[A]
+val a = {
+  getTypeInfo[Any]()
+  val wrapper2 = Wrapper1[Any]()
+}
\ No newline at end of file

From dd924329020abf2230dc2a5b469319de6353b2f0 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 24 Feb 2025 15:52:09 +0100
Subject: [PATCH 145/505] Fix opaque type implementations being exposed when in
 type params

[Cherry-picked 09f13d58e169c957b4bb0c19722f1730dc208f63]
---
 .../dotty/tools/dotc/inlines/Inliner.scala    | 12 ++++-
 tests/pos-macros/i20449/Main.scala            |  2 +-
 tests/run-macros/i20449.check                 | 50 +++++++++++++++++++
 tests/run-macros/i20449/Macro_1.scala         | 29 +++++++++++
 tests/run-macros/i20449/Main_2.scala          | 41 +++++++++++++++
 5 files changed, 132 insertions(+), 2 deletions(-)
 create mode 100644 tests/run-macros/i20449.check
 create mode 100644 tests/run-macros/i20449/Macro_1.scala
 create mode 100644 tests/run-macros/i20449/Main_2.scala

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 7e9e4498e310..4404ae9f9ea4 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -399,7 +399,17 @@ class Inliner(val call: tpd.Tree)(using Context):
    *  type aliases, add proxy definitions to `opaqueProxies` that expose these aliases.
    */
   private def addOpaqueProxies(tp: Type, span: Span, forThisProxy: Boolean)(using Context): Unit =
-    tp.foreachPart {
+    val foreachTpPart =
+      (p: Type => Unit) =>
+        if forThisProxy then
+          // Performs operations on all parts of this type, outside of the applied type arguments
+          new ForeachAccumulator(p, StopAt.None) {
+            override def apply(x: Unit, tp: Type) = tp match
+              case AppliedType(tycon, _) => super.apply(x, tycon)
+              case other => super.apply(x, other)
+          }.apply((), tp)
+        else tp.foreachPart(p)
+    foreachTpPart {
       case ref: TermRef =>
         for cls <- ref.widen.baseClasses do
           if cls.containsOpaques
diff --git a/tests/pos-macros/i20449/Main.scala b/tests/pos-macros/i20449/Main.scala
index 7c1a71c5598e..c6f5c0b05b69 100644
--- a/tests/pos-macros/i20449/Main.scala
+++ b/tests/pos-macros/i20449/Main.scala
@@ -3,4 +3,4 @@ class Wrapper1[A]
 val a = {
   getTypeInfo[Any]()
   val wrapper2 = Wrapper1[Any]()
-}
\ No newline at end of file
+}
diff --git a/tests/run-macros/i20449.check b/tests/run-macros/i20449.check
new file mode 100644
index 000000000000..289b3f95c488
--- /dev/null
+++ b/tests/run-macros/i20449.check
@@ -0,0 +1,50 @@
+------ UserName.T - Directly -------
+Original: Main_2$package.UserName.T
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ UserName.T - Directly -------
+Original: Main_2$package.UserName
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ ForeignWrapper1[UserName.T] -------
+Original: Main_2$package.UserName.T
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ ForeignWrapper2[UserName.T] -------
+Original: Main_2$package.UserName.T
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ ForeignWrapper1[UserName] -------
+Original: Main_2$package.UserName
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ ForeignWrapper2[UserName] -------
+Original: Main_2$package.UserName
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ Wrapper1[UserName.T] -------
+Original: Main_2$package.UserName.T
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ Wrapper2[UserName.T] -------
+Original: Main_2$package.UserName.T
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ Wrapper1[UserName] -------
+Original: Main_2$package.UserName
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
+------ Wrapper2[UserName] -------
+Original: Main_2$package.UserName
+Dealias: Main_2$package.UserName.T
+Dealias dealias: Main_2$package.UserName.T
+    
diff --git a/tests/run-macros/i20449/Macro_1.scala b/tests/run-macros/i20449/Macro_1.scala
new file mode 100644
index 000000000000..74b1dce3c4d6
--- /dev/null
+++ b/tests/run-macros/i20449/Macro_1.scala
@@ -0,0 +1,29 @@
+import scala.quoted.*
+
+class ForeignWrapper1[-A] {
+  inline def getTypeInfo(inline source: String): String =
+    ${ getTypeInfoImpl[A]('source) }
+  def createWrapper2 = ForeignWrapper2(this)
+}
+
+class ForeignWrapper2[-A](val self: ForeignWrapper1[A]) {
+  inline def getTypeInfo(inline source: String): String =
+    ${getTypeInfoImpl[A]('source)}
+}
+
+transparent inline def getTypeInfo[T](inline source: String) =
+  ${ getTypeInfoImpl[T]('source) }
+
+def getTypeInfoImpl[T: Type](source: Expr[String])(using ctx: Quotes) : Expr[String] = {
+  import ctx.reflect.*
+
+  val tpe = TypeRepr.of[T]
+  val str =
+    s"""|------ ${source.valueOrAbort} -------
+       |Original: ${tpe.show}
+       |Dealias: ${tpe.dealias.show}
+       |Dealias dealias: ${tpe.dealias.dealias.show}
+    """.stripMargin
+
+  Expr(str)
+}
diff --git a/tests/run-macros/i20449/Main_2.scala b/tests/run-macros/i20449/Main_2.scala
new file mode 100644
index 000000000000..3d2991489c1b
--- /dev/null
+++ b/tests/run-macros/i20449/Main_2.scala
@@ -0,0 +1,41 @@
+object UserName {
+  opaque type T = String
+
+  def apply(s: String): T = s
+}
+
+type UserName = UserName.T
+
+class Wrapper1[-A] {
+  inline def getTypeInfo(inline source: String): String =
+    ${ getTypeInfoImpl[A]('source) }
+  def createWrapper2 = Wrapper2(this)
+}
+
+class Wrapper2[-A](val self: Wrapper1[A]) {
+  inline def getTypeInfo(inline source: String): String =
+    ${getTypeInfoImpl[A]('source)}
+}
+
+
+@main def Test() = {
+  println(getTypeInfo[UserName.T]("UserName.T - Directly"))
+  println(getTypeInfo[UserName]("UserName.T - Directly"))
+
+  val foreignWrapper = ForeignWrapper1[UserName.T]()
+  println(foreignWrapper.getTypeInfo("ForeignWrapper1[UserName.T]"))
+  println(foreignWrapper.createWrapper2.getTypeInfo("ForeignWrapper2[UserName.T]"))
+
+  val foreignWrapper2 = ForeignWrapper1[UserName]()
+  println(foreignWrapper2.getTypeInfo("ForeignWrapper1[UserName]"))
+  println(foreignWrapper2.createWrapper2.getTypeInfo("ForeignWrapper2[UserName]"))
+
+  val wrapper = Wrapper1[UserName.T]()
+  println(wrapper.getTypeInfo("Wrapper1[UserName.T]"))
+  println(wrapper.createWrapper2.getTypeInfo("Wrapper2[UserName.T]"))
+
+  val wrapper2 = Wrapper1[UserName]()
+  println(wrapper2.getTypeInfo("Wrapper1[UserName]"))
+  println(wrapper2.createWrapper2.getTypeInfo("Wrapper2[UserName]"))
+
+}

From 504574d94a76d57b94f87afca6f89b44950ceba0 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 3 Mar 2025 14:15:49 +0100
Subject: [PATCH 146/505] Add a comment explaining the stale symbol fix

[Cherry-picked 23911dfbbf1f92e41d6d43e50d1216889841858a]
---
 compiler/src/dotty/tools/dotc/typer/Namer.scala | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index 4bdee42069d0..a47a0a61c9d4 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -694,6 +694,12 @@ class Namer { typer: Typer =>
               enterSymbol(classConstructorCompanion(classSym.asClass))
             else
               for moduleSym <- companionVals do
+                // by not going through `.lastKnownDenotation` (instead using `.current`),
+                // we guarantee that the `moduleSym` will be brought forward to the current run,
+                // rendering `moduleSym.isDefinedInCurrentRun` as always true.
+                // We want to regenerate the companion instead of bringing it forward,
+                // as even if we are able to bring forward the object symbol,
+                // we might not be able to do the same with its stale module class symbol (see `tests/pos/i20449`)
                 if moduleSym.lastKnownDenotation.is(Module) && !moduleSym.isDefinedInCurrentRun then
                   val companion =
                     if needsConstructorProxies(classSym) then

From 8e6a37d04ef1ef827a6a47d82b43250884013c63 Mon Sep 17 00:00:00 2001
From: Felix Herrmann <felix@herrmann-koenigsberg.de>
Date: Mon, 7 Oct 2024 18:55:42 +0200
Subject: [PATCH 147/505] Fix #21721: make case TypeBlock(_, _) not match
 non-type Block

TypeBlocks are represented as normal Blocks in the Quotes API. The
current TypeTest for TypeBlock is exactly the same as the TypeTest for
Block, which means that case TypeBlock(_, _) matches every block.

The implementation of unapply on TypeBlockModule, however, gives back
(List[TypeDef], TypeTree). It constructs the List[TypeDef] by mapping
over every statement, turning it into a TypeDef by using a match
with the pattern

  case alias: TypeDef => alias

Since the TypeTest matches any Block and not only Blocks that are
TypeBlocks, the statemnts can be anything, not just TypeDefs, which lets
the whole case TypeBlock(_, _) pattern fail with a MatchError.

This commit fixes the problem by making the TypeTest check whether the
Block is a type (which in turns checks whether the blocks expression is
a type)

[Cherry-picked 147f5622f822d5084fe03420cb0e2a6d593856ff]
---
 .../src/scala/quoted/runtime/impl/QuotesImpl.scala   |  2 +-
 tests/pos/i21721/Macro.scala                         | 12 ++++++++++++
 tests/pos/i21721/Test.scala                          |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i21721/Macro.scala
 create mode 100644 tests/pos/i21721/Test.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index f5a201de1f2e..a1673f017cd7 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -1390,7 +1390,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object TypeBlockTypeTest extends TypeTest[Tree, TypeBlock]:
       def unapply(x: Tree): Option[TypeBlock & x.type] = x match
-        case tpt: (tpd.Block & x.type) => Some(tpt)
+        case tpt: (tpd.Block & x.type) if x.isType => Some(tpt)
         case _ => None
     end TypeBlockTypeTest
 
diff --git a/tests/pos/i21721/Macro.scala b/tests/pos/i21721/Macro.scala
new file mode 100644
index 000000000000..dfdbff6a659b
--- /dev/null
+++ b/tests/pos/i21721/Macro.scala
@@ -0,0 +1,12 @@
+import quoted.*
+
+object Macro:
+  inline def impl(inline expr: Any): Any =
+    ${implImpl('expr)}
+
+  def implImpl(expr: Expr[Any])(using q: Quotes): Expr[Any] =
+    import q.reflect.*
+    expr.asTerm.asInstanceOf[Inlined].body match
+      // this should not fail with a MatchError
+      case TypeBlock(_, _) => '{ "TypeBlock" }
+      case _ => '{ "Nothing" }
diff --git a/tests/pos/i21721/Test.scala b/tests/pos/i21721/Test.scala
new file mode 100644
index 000000000000..ebe91bae9ef4
--- /dev/null
+++ b/tests/pos/i21721/Test.scala
@@ -0,0 +1,5 @@
+object Test:
+  // give a Block(...) to the macro
+  Macro.impl:
+    val a = 3
+    a

From 87eff62a9c66158c7b6361babd573ccc211ebcf5 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 3 Mar 2025 12:28:04 +0000
Subject: [PATCH 148/505] Revert lambda cleanup (but keep remaining changes)

Reverts PR 21466, but keeps the other changes in that PR and in the
abandoned attempt that is PR 22031.

Fixes issue 21981, by virtue of rebasing.

[Cherry-picked 28c1ae3f75e06b82f6e9ec9000292fb93d3db366]
---
 .../tools/dotc/core/OrderingConstraint.scala  |  10 +-
 .../dotty/tools/dotc/typer/Inferencing.scala  | 252 +++++++++---------
 .../dotty/tools/dotc/typer/ProtoTypes.scala   |   7 -
 tests/pos/i21981.alt.scala                    |  24 ++
 tests/pos/i21981.contrak.scala                |  27 ++
 tests/pos/i21981.orig.scala                   |  29 ++
 tests/pos/i21981.scala                        |  24 ++
 7 files changed, 236 insertions(+), 137 deletions(-)
 create mode 100644 tests/pos/i21981.alt.scala
 create mode 100644 tests/pos/i21981.contrak.scala
 create mode 100644 tests/pos/i21981.orig.scala
 create mode 100644 tests/pos/i21981.scala

diff --git a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala
index c9b60ac051ad..78c717539763 100644
--- a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala
+++ b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala
@@ -263,9 +263,9 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
   private var coDeps: ReverseDeps = SimpleIdentityMap.empty
 
   /** A map that associates type parameters of this constraint with all other type
-   *  parameters that refer to them in their bounds covariantly, such that, if the
+   *  parameters that refer to them in their bounds contravariantly, such that, if the
    *  type parameter is instantiated to a smaller type, the constraint would be narrowed.
-   *  (i.e. solution set changes other than simply being made larger).
+   *  (i.e. solution set changes other than simply being made smaller).
    */
   private var contraDeps: ReverseDeps = SimpleIdentityMap.empty
 
@@ -368,7 +368,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
 
     /** Adjust reverse dependencies of all type parameters referenced by `bound`
      *  @param  isLower `bound` is a lower bound
-     *  @param  add     if true, add referenced variables to dependencoes, otherwise drop them.
+     *  @param  add     if true, add referenced variables to dependencies, otherwise drop them.
      */
     def adjustReferenced(bound: Type, isLower: Boolean, add: Boolean) =
       adjuster.variance = if isLower then 1 else -1
@@ -394,8 +394,8 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
           }
         case _ => false
 
-    /** Add or remove depenencies referenced in `bounds`.
-     *  @param add   if true, dependecies are added, otherwise they are removed
+    /** Add or remove dependencies referenced in `bounds`.
+     *  @param add   if true, dependencies are added, otherwise they are removed
      */
     def adjustBounds(bounds: TypeBounds, add: Boolean) =
       adjustReferenced(bounds.lo, isLower = true, add)
diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
index 7acc704fd00d..877c6d36d3e9 100644
--- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
@@ -604,7 +604,6 @@ trait Inferencing { this: Typer =>
             // This is needed because it could establish singleton type upper bounds. See i2998.scala.
 
         val tp = tree.tpe.widen
-        val vs = variances(tp, pt)
 
         // Avoid interpolating variables occurring in tree's type if typerstate has unreported errors.
         // Reason: The errors might reflect unsatisfiable constraints. In that
@@ -628,135 +627,138 @@ trait Inferencing { this: Typer =>
         //     val y: List[List[String]] = List(List(1))
         if state.reporter.hasUnreportedErrors then return tree
 
-        def constraint = state.constraint
-
-        trace(i"interpolateTypeVars($tree: ${tree.tpe}, $pt, $qualifying)", typr, (_: Any) => i"$qualifying\n$constraint\n${ctx.gadt}") {
-        //println(i"$constraint")
-        //println(i"${ctx.gadt}")
-
-        /** Values of this type report type variables to instantiate with variance indication:
-         *    +1  variable appears covariantly, can be instantiated from lower bound
-         *    -1  variable appears contravariantly, can be instantiated from upper bound
-         *     0  variable does not appear at all, can be instantiated from either bound
-         */
-        type ToInstantiate = List[(TypeVar, Int)]
-
-        val toInstantiate: ToInstantiate =
-          val buf = new mutable.ListBuffer[(TypeVar, Int)]
-          for tvar <- qualifying do
-            if !tvar.isInstantiated && constraint.contains(tvar) && tvar.nestingLevel >= ctx.nestingLevel then
-              constrainIfDependentParamRef(tvar, tree)
-              if !tvar.isInstantiated then
-                // isInstantiated needs to be checked again, since previous interpolations could already have
-                // instantiated `tvar` through unification.
-                val v = vs.computedVariance(tvar)
-                if v == null then buf += ((tvar, 0))
-                else if v.intValue != 0 then buf += ((tvar, v.intValue))
-                else comparing(cmp =>
-                  if !cmp.levelOK(tvar.nestingLevel, ctx.nestingLevel) then
-                    // Invariant: The type of a tree whose enclosing scope is level
-                    // N only contains type variables of level <= N.
-                    typr.println(i"instantiate nonvariant $tvar of level ${tvar.nestingLevel} to a type variable of level <= ${ctx.nestingLevel}, $constraint")
-                    cmp.atLevel(ctx.nestingLevel, tvar.origin)
-                  else
-                    typr.println(i"no interpolation for nonvariant $tvar in $state")
-                )
-          // constrainIfDependentParamRef could also have instantiated tvars added to buf before the check
-          buf.filterNot(_._1.isInstantiated).toList
-        end toInstantiate
-
-        def typeVarsIn(xs: ToInstantiate): TypeVars =
-          xs.foldLeft(SimpleIdentitySet.empty: TypeVars)((tvs, tvi) => tvs + tvi._1)
-
-        /** Filter list of proposed instantiations so that they don't constrain further
-         *  the current constraint.
-         */
-        def filterByDeps(tvs0: ToInstantiate): ToInstantiate =
-          val excluded =  // ignore dependencies from other variables that are being instantiated
-            typeVarsIn(tvs0)
-          def step(tvs: ToInstantiate): ToInstantiate = tvs match
-            case tvs @ (hd @ (tvar, v)) :: tvs1 =>
-              def aboveOK = !constraint.dependsOn(tvar, excluded, co = true)
-              def belowOK = !constraint.dependsOn(tvar, excluded, co = false)
-              if v == 0 && !aboveOK then
-                step((tvar, 1) :: tvs1)
-              else if v == 0 && !belowOK then
-                step((tvar, -1) :: tvs1)
-              else if v == -1 && !aboveOK || v == 1 && !belowOK then
-                typr.println(i"drop $tvar, $v in $tp, $pt, qualifying = ${qualifying.toList}, tvs0 = ${tvs0.toList}%, %, excluded = ${excluded.toList}, $constraint")
-                step(tvs1)
-              else // no conflict, keep the instantiation proposal
-                tvs.derivedCons(hd, step(tvs1))
-            case Nil =>
-              Nil
-          val tvs1 = step(tvs0)
-          if tvs1 eq tvs0 then tvs1
-          else filterByDeps(tvs1) // filter again with smaller excluded set
-        end filterByDeps
-
-        /** Instantiate all type variables in `tvs` in the indicated directions,
-         *  as described in the doc comment of `ToInstantiate`.
-         *  If a type variable A is instantiated from below, and there is another
-         *  type variable B in `buf` that is known to be smaller than A, wait and
-         *  instantiate all other type variables before trying to instantiate A again.
-         *  Dually, wait instantiating a type variable from above as long as it has
-         *  upper bounds in `buf`.
-         *
-         *  This is done to avoid loss of precision when forming unions. An example
-         *  is in i7558.scala:
-         *
-         *      type Tr[+V1, +O1 <: V1]
-         *      extension [V2, O2 <: V2](tr: Tr[V2, O2]) def sl: Tr[V2, O2] = ???
-         *      def as[V3, O3 <: V3](tr: Tr[V3, O3]) : Tr[V3, O3] = tr.sl
-         *
-         *   Here we interpolate at some point V2 and O2 given the constraint
-         *
-         *      V2 >: V3, O2 >: O3, O2 <: V2
-         *
-         *   where O3 and V3 are type refs with O3 <: V3.
-         *   If we interpolate V2 first to V3 | O2, the widenUnion algorithm will
-         *   instantiate O2 to V3, leading to the final constraint
-         *
-         *      V2 := V3, O2 := V3
-         *
-         *   But if we instantiate O2 first to O3, and V2 next to V3, we get the
-         *   more flexible instantiation
-         *
-         *      V2 := V3, O2 := O3
-         */
-        def doInstantiate(tvs: ToInstantiate): Unit =
-
-          /** Try to instantiate `tvs`, return any suspended type variables */
-          def tryInstantiate(tvs: ToInstantiate): ToInstantiate = tvs match
-            case (hd @ (tvar, v)) :: tvs1 =>
-              val fromBelow = v == 1 || (v == 0 && tvar.hasLowerBound)
-              typr.println(
-                i"interpolate${if v == 0 then " non-occurring" else ""} $tvar in $state in $tree: $tp, fromBelow = $fromBelow, $constraint")
-              if tvar.isInstantiated then
-                tryInstantiate(tvs1)
-              else
-                val suspend = tvs1.exists{ (following, _) =>
-                  if fromBelow
-                  then constraint.isLess(following.origin, tvar.origin)
-                  else constraint.isLess(tvar.origin, following.origin)
-                }
-                if suspend then
-                  typr.println(i"suspended: $hd")
-                  hd :: tryInstantiate(tvs1)
-                else
-                  tvar.instantiate(fromBelow)
-                  tryInstantiate(tvs1)
-            case Nil => Nil
-          if tvs.nonEmpty then doInstantiate(tryInstantiate(tvs))
-        end doInstantiate
-
-        doInstantiate(filterByDeps(toInstantiate))
-        }
+        instantiateTypeVars(tp, pt, qualifying, tree)
       }
     end if
     tree
   end interpolateTypeVars
 
+  def instantiateTypeVars(tp: Type, pt: Type, qualifying: List[TypeVar], tree: Tree = EmptyTree)(using Context): Unit =
+  trace(i"instantiateTypeVars($tp, $pt, $qualifying, $tree)", typr):
+    val state = ctx.typerState
+    def constraint = state.constraint
+
+    val vs = variances(tp, pt)
+
+    /** Values of this type report type variables to instantiate with variance indication:
+     *    +1  variable appears covariantly, can be instantiated from lower bound
+     *    -1  variable appears contravariantly, can be instantiated from upper bound
+     *     0  variable does not appear at all, can be instantiated from either bound
+     */
+    type ToInstantiate = List[(TypeVar, Int)]
+
+    val toInstantiate: ToInstantiate =
+      val buf = new mutable.ListBuffer[(TypeVar, Int)]
+      for tvar <- qualifying do
+        if !tvar.isInstantiated && constraint.contains(tvar) && tvar.nestingLevel >= ctx.nestingLevel then
+          constrainIfDependentParamRef(tvar, tree)
+          if !tvar.isInstantiated then
+            // isInstantiated needs to be checked again, since previous interpolations could already have
+            // instantiated `tvar` through unification.
+            val v = vs.computedVariance(tvar)
+            if v == null then buf += ((tvar, 0))
+            else if v.intValue != 0 then buf += ((tvar, v.intValue))
+            else comparing(cmp =>
+              if !cmp.levelOK(tvar.nestingLevel, ctx.nestingLevel) then
+                // Invariant: The type of a tree whose enclosing scope is level
+                // N only contains type variables of level <= N.
+                typr.println(i"instantiate nonvariant $tvar of level ${tvar.nestingLevel} to a type variable of level <= ${ctx.nestingLevel}, $constraint")
+                cmp.atLevel(ctx.nestingLevel, tvar.origin)
+              else
+                typr.println(i"no interpolation for nonvariant $tvar in $state")
+            )
+      // constrainIfDependentParamRef could also have instantiated tvars added to buf before the check
+      buf.filterNot(_._1.isInstantiated).toList
+    end toInstantiate
+
+    def typeVarsIn(xs: ToInstantiate): TypeVars =
+      xs.foldLeft(SimpleIdentitySet.empty: TypeVars)((tvs, tvi) => tvs + tvi._1)
+
+    /** Filter list of proposed instantiations so that they don't constrain further
+     *  the current constraint.
+     */
+    def filterByDeps(tvs0: ToInstantiate): ToInstantiate =
+      val excluded =  // ignore dependencies from other variables that are being instantiated
+        typeVarsIn(tvs0)
+      def step(tvs: ToInstantiate): ToInstantiate = tvs match
+        case tvs @ (hd @ (tvar, v)) :: tvs1 =>
+          def aboveOK = !constraint.dependsOn(tvar, excluded, co = true)
+          def belowOK = !constraint.dependsOn(tvar, excluded, co = false)
+          if v == 0 && !aboveOK then
+            step((tvar, 1) :: tvs1)
+          else if v == 0 && !belowOK then
+            step((tvar, -1) :: tvs1)
+          else if v == -1 && !aboveOK || v == 1 && !belowOK then
+            typr.println(i"drop $tvar, $v in $tp, $pt, qualifying = ${qualifying.toList}, tvs0 = ${tvs0.toList}%, %, excluded = ${excluded.toList}, $constraint")
+            step(tvs1)
+          else // no conflict, keep the instantiation proposal
+            tvs.derivedCons(hd, step(tvs1))
+        case Nil =>
+          Nil
+      val tvs1 = step(tvs0)
+      if tvs1 eq tvs0 then tvs1
+      else filterByDeps(tvs1) // filter again with smaller excluded set
+    end filterByDeps
+
+    /** Instantiate all type variables in `tvs` in the indicated directions,
+     *  as described in the doc comment of `ToInstantiate`.
+     *  If a type variable A is instantiated from below, and there is another
+     *  type variable B in `buf` that is known to be smaller than A, wait and
+     *  instantiate all other type variables before trying to instantiate A again.
+     *  Dually, wait instantiating a type variable from above as long as it has
+     *  upper bounds in `buf`.
+     *
+     *  This is done to avoid loss of precision when forming unions. An example
+     *  is in i7558.scala:
+     *
+     *      type Tr[+V1, +O1 <: V1]
+     *      extension [V2, O2 <: V2](tr: Tr[V2, O2]) def sl: Tr[V2, O2] = ???
+     *      def as[V3, O3 <: V3](tr: Tr[V3, O3]) : Tr[V3, O3] = tr.sl
+     *
+     *   Here we interpolate at some point V2 and O2 given the constraint
+     *
+     *      V2 >: V3, O2 >: O3, O2 <: V2
+     *
+     *   where O3 and V3 are type refs with O3 <: V3.
+     *   If we interpolate V2 first to V3 | O2, the widenUnion algorithm will
+     *   instantiate O2 to V3, leading to the final constraint
+     *
+     *      V2 := V3, O2 := V3
+     *
+     *   But if we instantiate O2 first to O3, and V2 next to V3, we get the
+     *   more flexible instantiation
+     *
+     *      V2 := V3, O2 := O3
+     */
+    def doInstantiate(tvs: ToInstantiate): Unit =
+
+      /** Try to instantiate `tvs`, return any suspended type variables */
+      def tryInstantiate(tvs: ToInstantiate): ToInstantiate = tvs match
+        case (hd @ (tvar, v)) :: tvs1 =>
+          val fromBelow = v == 1 || (v == 0 && tvar.hasLowerBound)
+          typr.println(
+            i"interpolate${if v == 0 then " non-occurring" else ""} $tvar in $state in $tree: $tp, fromBelow = $fromBelow, $constraint")
+          if tvar.isInstantiated then
+            tryInstantiate(tvs1)
+          else
+            val suspend = tvs1.exists{ (following, _) =>
+              if fromBelow
+              then constraint.isLess(following.origin, tvar.origin)
+              else constraint.isLess(tvar.origin, following.origin)
+            }
+            if suspend then
+              typr.println(i"suspended: $hd")
+              hd :: tryInstantiate(tvs1)
+            else
+              tvar.instantiate(fromBelow)
+              tryInstantiate(tvs1)
+        case Nil => Nil
+      if tvs.nonEmpty then doInstantiate(tryInstantiate(tvs))
+    end doInstantiate
+
+    doInstantiate(filterByDeps(toInstantiate))
+  end instantiateTypeVars
+
   /** If `tvar` represents a parameter of a dependent method type in the current `call`
    *  approximate it from below with the type of the actual argument. Skolemize that
    *  type if necessary to make it a Singleton.
diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
index 9694822bc0d5..89a2cbbfbc21 100644
--- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -69,13 +69,6 @@ object ProtoTypes {
                    |constraint was: ${ctx.typerState.constraint}
                    |constraint now: ${newctx.typerState.constraint}""")
             if result && (ctx.typerState.constraint ne newctx.typerState.constraint) then
-              // Remove all type lambdas and tvars introduced by testCompat
-              for tvar <- newctx.typerState.ownedVars do
-                inContext(newctx):
-                  if !tvar.isInstantiated then
-                    tvar.instantiate(fromBelow = false) // any direction
-
-              // commit any remaining changes in typer state
               newctx.typerState.commit()
             result
           case _ => testCompat
diff --git a/tests/pos/i21981.alt.scala b/tests/pos/i21981.alt.scala
new file mode 100644
index 000000000000..0662575757a8
--- /dev/null
+++ b/tests/pos/i21981.alt.scala
@@ -0,0 +1,24 @@
+trait Ops[F[_], A]:
+  def map0[B](f0: A => B): F[B] = ???
+
+trait Functor1[G[_]]
+
+trait Functor2[H[_]]
+
+trait Ref[I[_], +E]
+
+class Test:
+  given [J[_]](using J: Functor1[J]): Functor2[J] with
+    extension [K1, K2](jk: J[(K1, K2)])
+      def map2[L](f2: (K1, K2) => L): J[L] = ???
+
+  def t1[
+    M[_[t]],
+    N[_],
+  ](using N: Functor1[N]): Unit =
+
+    val x3: Ops[N, M[[t] =>> Ref[N, t]]] = ???
+
+    val x2: N[(M[N], M[[t] =>> Ref[N, t]])] = x3
+      .map0 { refs             => (???, refs) }
+      .map2 { case (not, refs) => (???, refs) }
diff --git a/tests/pos/i21981.contrak.scala b/tests/pos/i21981.contrak.scala
new file mode 100644
index 000000000000..6ce64e6d3ddf
--- /dev/null
+++ b/tests/pos/i21981.contrak.scala
@@ -0,0 +1,27 @@
+case class Inv[T](x: T)
+class Contra[-ContraParam](x: ContraParam)
+
+trait Ops[F[_], A]:
+  def map0[B](f0: A => Contra[B]): F[B] = ???
+
+trait Functor1[G[_]]
+
+trait Functor2[H[_]]
+
+trait Ref[I[_], +E]
+
+class Test:
+  given [J[_]](using J: Functor1[J]): Functor2[J] with
+    extension [K](jk: J[Contra[K]])
+      def map2[L](f2: K => L): J[L] = ???
+
+  def t1[
+    M[_[t]],
+    N[_],
+  ](using N: Functor1[N]): Unit =
+
+    val x3: Ops[N, M[[t] =>> Ref[N, t]]] = ???
+
+    val x2: N[(M[N], M[[t] =>> Ref[N, t]])] = x3
+      .map0 { refs             => Contra[Contra[(Nothing, M[[t] =>> Ref[N, t]])]](???) }
+      .map2 { case (not, refs) => (???, refs) }
diff --git a/tests/pos/i21981.orig.scala b/tests/pos/i21981.orig.scala
new file mode 100644
index 000000000000..c02eb4848649
--- /dev/null
+++ b/tests/pos/i21981.orig.scala
@@ -0,0 +1,29 @@
+object internal:
+  trait Functor[F[_]] {
+    extension [T](ft: F[T]) def map[T1](f: T => T1): F[T1]
+  }
+
+object cats:
+  trait Functor[F[_]]
+  object Functor:
+    trait Ops[F[_], A]:
+      def map[B](f: A => B): F[B] = ???
+    def toAllFunctorOps[F[_], A](target: F[A])(using Functor[F]): Ops[F, A] = ???
+
+given [F[_]](using cf: cats.Functor[F]): internal.Functor[F] with {
+  extension [T](ft: F[T]) def map[T1](f: T => T1): F[T1] = ???
+}
+
+trait Ref[F[_], +T]
+class MemoizingEvaluator[Input[_[_]], Output[_[_]], F[_]: cats.Functor] {
+  type OptionRef[T] = Ref[F, Option[T]]
+
+  def sequence[CaseClass[_[_]], G[_], H[_]](instance: CaseClass[[t] =>> G[H[t]]]): G[CaseClass[H]] = ???
+  def collectValues(input: Input[F]): F[(Input[F], Input[OptionRef])] = {
+    val refsF: Input[[t] =>> F[OptionRef[t]]] = ???
+    for {
+      refs <- cats.Functor.toAllFunctorOps(sequence[Input, F, OptionRef](refsF))
+      updating = ???
+    } yield (updating, refs)
+  }
+}
diff --git a/tests/pos/i21981.scala b/tests/pos/i21981.scala
new file mode 100644
index 000000000000..62962c7f1c56
--- /dev/null
+++ b/tests/pos/i21981.scala
@@ -0,0 +1,24 @@
+trait Ops[F[_], A]:
+  def map0[B](f0: A => B): F[B] = ???
+
+trait Functor1[G[_]]
+
+trait Functor2[H[_]]
+
+trait Ref[I[_], +E]
+
+class Test:
+  given [J[_]](using J: Functor1[J]): Functor2[J] with
+    extension [K](jk: J[K])
+      def map2[L](f2: K => L): J[L] = ???
+
+  def t1[
+    M[_[t]],
+    N[_],
+  ](using N: Functor1[N]): Unit =
+
+    val x3: Ops[N, M[[t] =>> Ref[N, t]]] = ???
+
+    val x2: N[(M[N], M[[t] =>> Ref[N, t]])] = x3
+      .map0 { refs             => (???, refs) }
+      .map2 { case (not, refs) => (???, refs) }

From 8b1007358fb9bfac1a4e2c60f5f2f3b84045ad82 Mon Sep 17 00:00:00 2001
From: Jan Chyb <48855024+jchyb@users.noreply.github.com>
Date: Tue, 4 Mar 2025 19:19:28 +0100
Subject: [PATCH 149/505] Try not to approximate prefixes when using memberType
 in reflect API (#22448)

To achieve this, we substitute This types in `member.info` referencing classSymbol with TypeReprs actual self (which may or may not be a This type)
Fixes #22424
---
 .../quoted/runtime/impl/QuotesImpl.scala      | 10 +++++++-
 tests/pos-macros/i22424/Macro_1.scala         | 25 +++++++++++++++++++
 tests/pos-macros/i22424/Test_2.scala          |  4 +++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos-macros/i22424/Macro_1.scala
 create mode 100644 tests/pos-macros/i22424/Test_2.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index a1673f017cd7..172b3a35aabb 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -1795,7 +1795,15 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
         def termSymbol: Symbol = self.termSymbol
         def isSingleton: Boolean = self.isSingleton
         def memberType(member: Symbol): TypeRepr =
-          member.info.asSeenFrom(self, member.owner)
+          // we replace thisTypes here to avoid resolving otherwise unstable prefixes into Nothing
+          val memberInfo =
+            if self.typeSymbol.isClassDef then
+              member.info.substThis(self.classSymbol.asClass, self)
+            else
+              member.info
+          memberInfo
+            .asSeenFrom(self, member.owner)
+
         def baseClasses: List[Symbol] = self.baseClasses
         def baseType(cls: Symbol): TypeRepr = self.baseType(cls)
         def derivesFrom(cls: Symbol): Boolean = self.derivesFrom(cls)
diff --git a/tests/pos-macros/i22424/Macro_1.scala b/tests/pos-macros/i22424/Macro_1.scala
new file mode 100644
index 000000000000..634cfb0055c7
--- /dev/null
+++ b/tests/pos-macros/i22424/Macro_1.scala
@@ -0,0 +1,25 @@
+
+import scala.quoted.*
+
+object MockMaker:
+  inline def inlineMock[T]: Unit = ${instance[T]}
+  transparent inline def transparentInlineMock[T]: Unit = ${instance[T]}
+
+  def instance[T: Type](using quotes: Quotes): Expr[Unit] =
+    import quotes.reflect._
+    val tpe = TypeRepr.of[T]
+    val symbol = tpe.typeSymbol.methodMember("innerTraitInOptions").head
+    tpe.memberType(symbol) match
+      case mt @ MethodType(_, args, _) =>
+        assert(args.head.typeSymbol != TypeRepr.of[Nothing].typeSymbol, "argument is incorrectly approximated")
+        val shownType = mt.show
+        val expectedType = "(x: m.Embedded#ATrait[scala.Predef.String, scala.Int])m.Embedded#ATrait[scala.Predef.String, scala.Int]"
+        assert(shownType == expectedType, s"Incorrect type shown. Obtained: $shownType, Expected: $expectedType")
+    '{()}
+
+trait PolymorphicTrait {
+  trait Embedded {
+    trait ATrait[A, B]
+    def innerTraitInOptions(x: ATrait[String, Int]): ATrait[String, Int]
+  }
+}
diff --git a/tests/pos-macros/i22424/Test_2.scala b/tests/pos-macros/i22424/Test_2.scala
new file mode 100644
index 000000000000..0a231d820381
--- /dev/null
+++ b/tests/pos-macros/i22424/Test_2.scala
@@ -0,0 +1,4 @@
+@main def Test =
+  val m = new PolymorphicTrait {}
+  MockMaker.inlineMock[m.Embedded]
+  MockMaker.transparentInlineMock[m.Embedded]

From 1cdc3cc4a8a7f1780974c725bf60a8a67be75654 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 18:01:37 +0200
Subject: [PATCH 150/505] Try not to approximate prefixes when using memberType
 in reflect API (#22448)

To achieve this, we substitute This types in `member.info` referencing classSymbol with TypeReprs actual self (which may or may not be a This type)
Fixes #22424
[Cherry-picked 26857506efef28e108a2c8d0a6c4ea766b47b033][modified]

From 0c57f8e8da5d5216866233f6acc2504dc55ea023 Mon Sep 17 00:00:00 2001
From: Daisy Li <li.daisy2003@gmail.com>
Date: Sun, 9 Feb 2025 11:34:45 -0500
Subject: [PATCH 151/505] Add error-checking when fetching rhs of ValOrDefDefs.

---
 .../tools/dotc/transform/init/Semantic.scala  | 49 ++++++++++++++-----
 .../dotty/tools/dotc/CompilationTests.scala   | 23 +++++++++
 tests/init/tasty-error/Main.scala             |  1 +
 tests/init/tasty-error/v0/A.scala             |  3 ++
 tests/init/tasty-error/v1/A.scala             |  3 ++
 tests/init/tasty-error/v1/B.scala             |  4 ++
 6 files changed, 70 insertions(+), 13 deletions(-)
 create mode 100644 tests/init/tasty-error/Main.scala
 create mode 100644 tests/init/tasty-error/v0/A.scala
 create mode 100644 tests/init/tasty-error/v1/A.scala
 create mode 100644 tests/init/tasty-error/v1/B.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
index 4548dccb598f..5d9b4f0e5ce0 100644
--- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
+++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
@@ -378,7 +378,7 @@ object Semantic:
 // ----- Checker State -----------------------------------
 
   /** The state that threads through the interpreter */
-  type Contextual[T] = (Context, Trace, Promoted, Cache.Data, Reporter) ?=> T
+  type Contextual[T] = (Context, Trace, Promoted, Cache.Data, Reporter, TreeCache.CacheData) ?=> T
 
 // ----- Error Handling -----------------------------------
 
@@ -443,6 +443,29 @@ object Semantic:
 
   inline def reporter(using r: Reporter): Reporter = r
 
+// ----- Cache for Trees -----------------------------
+
+  object TreeCache:
+    class CacheData:
+      private val emptyTrees = mutable.Set[ValOrDefDef]()
+
+      extension (tree: ValOrDefDef)
+        def getRhs(using Context): Tree =
+          def getTree: Tree =
+            val errorCount = ctx.reporter.errorCount
+            val rhs = tree.rhs
+
+            if (ctx.reporter.errorCount > errorCount)
+              emptyTrees.add(tree)
+              report.warning("Ignoring analyses of " + tree.name + " due to error in reading TASTy.")
+              EmptyTree
+            else
+              rhs
+
+          if (emptyTrees.contains(tree)) EmptyTree
+          else getTree
+  end TreeCache
+
 // ----- Operations on domains -----------------------------
   extension (a: Value)
     def join(b: Value): Value =
@@ -562,7 +585,7 @@ object Semantic:
         case ref: Ref =>
           val target = if needResolve then resolve(ref.klass, field) else field
           if target.is(Flags.Lazy) then
-            val rhs = target.defTree.asInstanceOf[ValDef].rhs
+            val rhs = target.defTree.asInstanceOf[ValDef].getRhs
             eval(rhs, ref, target.owner.asClass, cacheResult = true)
           else if target.exists then
             val obj = ref.objekt
@@ -577,7 +600,7 @@ object Semantic:
                 // return `Hot` here, errors are reported in checking `ThisRef`
                 Hot
               else if target.hasSource then
-                val rhs = target.defTree.asInstanceOf[ValOrDefDef].rhs
+                val rhs = target.defTree.asInstanceOf[ValOrDefDef].getRhs
                 eval(rhs, ref, target.owner.asClass, cacheResult = true)
               else
                 val error = CallUnknown(field)(trace)
@@ -701,7 +724,7 @@ object Semantic:
               else
                 reporter.reportAll(tryReporter.errors)
                 extendTrace(ddef) {
-                  eval(ddef.rhs, ref, cls, cacheResult = true)
+                  eval(ddef.getRhs, ref, cls, cacheResult = true)
                 }
             else if ref.canIgnoreMethodCall(target) then
               Hot
@@ -768,7 +791,7 @@ object Semantic:
               val tpl = cls.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template]
               extendTrace(cls.defTree) { init(tpl, ref, cls) }
             else
-              val initCall = ddef.rhs match
+              val initCall = ddef.getRhs match
                 case Block(call :: _, _) => call
                 case call => call
               extendTrace(ddef) { eval(initCall, ref, cls) }
@@ -787,7 +810,7 @@ object Semantic:
               extendTrace(cls.defTree) { eval(tpl, ref, cls, cacheResult = true) }
               ref
             else
-              extendTrace(ddef) { eval(ddef.rhs, ref, cls, cacheResult = true) }
+              extendTrace(ddef) { eval(ddef.getRhs, ref, cls, cacheResult = true) }
           else if ref.canIgnoreMethodCall(ctor) then
             Hot
           else
@@ -897,8 +920,7 @@ object Semantic:
 
               case Cold => Cold
 
-              case ref: Ref => eval(vdef.rhs, ref, enclosingClass, cacheResult = sym.is(Flags.Lazy))
-
+              case ref: Ref => eval(vdef.getRhs, ref, enclosingClass, cacheResult = sym.is(Flags.Lazy))
               case _ =>
                  report.error("[Internal error] unexpected this value when accessing local variable, sym = " + sym.show + ", thisValue = " + thisValue2.show + Trace.show, Trace.position)
                  Hot
@@ -1105,7 +1127,7 @@ object Semantic:
    *
    *  The class to be checked must be an instantiable concrete class.
    */
-  private def checkClass(classSym: ClassSymbol)(using Cache.Data, Context): Unit =
+  private def checkClass(classSym: ClassSymbol)(using Cache.Data, Context, TreeCache.CacheData): Unit =
     val thisRef = ThisRef(classSym)
     val tpl = classSym.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template]
 
@@ -1140,6 +1162,7 @@ object Semantic:
    */
   def checkClasses(classes: List[ClassSymbol])(using Context): Unit =
     given Cache.Data()
+    given TreeCache.CacheData()
     for classSym <- classes if isConcreteClass(classSym) do
       checkClass(classSym)
 
@@ -1298,7 +1321,7 @@ object Semantic:
           }
 
       case closureDef(ddef) =>
-        Fun(ddef.rhs, thisV, klass)
+        Fun(ddef.getRhs, thisV, klass)
 
       case PolyFun(body) =>
         Fun(body, thisV, klass)
@@ -1353,7 +1376,7 @@ object Semantic:
 
       case vdef : ValDef =>
         // local val definition
-        eval(vdef.rhs, thisV, klass)
+        eval(vdef.getRhs, thisV, klass)
 
       case ddef : DefDef =>
         // local method
@@ -1571,8 +1594,8 @@ object Semantic:
 
     // class body
     if thisV.isThisRef || !thisV.asInstanceOf[Warm].isPopulatingParams then tpl.body.foreach {
-      case vdef : ValDef if !vdef.symbol.is(Flags.Lazy) && !vdef.rhs.isEmpty =>
-        val res = eval(vdef.rhs, thisV, klass)
+      case vdef : ValDef if !vdef.symbol.is(Flags.Lazy) && !vdef.getRhs.isEmpty =>
+        val res = eval(vdef.getRhs, thisV, klass)
         // TODO: Improve promotion to avoid handling enum initialization specially
         //
         // The failing case is tests/init/pos/i12544.scala due to promotion failure.
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index 1b33c52416ea..e9562b016a74 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -235,6 +235,29 @@ class CompilationTests {
 
       tests.foreach(_.delete())
     }
+
+    /* This tests for errors in the program's TASTy trees.
+     * The test consists of three files: (a) v1/A, (b) v1/B, and (c) v0/A. (a) and (b) are
+     * compatible, but (b) and (c) are not. If (b) and (c) are compiled together, there should be
+     * an error when reading the files' TASTy trees. */
+    locally {
+      val tastyErrorGroup = TestGroup("checkInit/tasty-error")
+      val tastyErrorOptions = options.without("-Xfatal-warnings")
+
+      val a0Dir = defaultOutputDir + tastyErrorGroup + "/A/v0/A"
+      val a1Dir = defaultOutputDir + tastyErrorGroup + "/A/v1/A"
+      val b1Dir = defaultOutputDir + tastyErrorGroup + "/B/v1/B"
+
+      val tests = List(
+        compileFile("tests/init/tasty-error/v1/A.scala", tastyErrorOptions)(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/v1/B.scala", tastyErrorOptions.withClasspath(a1Dir))(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/v0/A.scala", tastyErrorOptions)(tastyErrorGroup),
+      ).map(_.keepOutput.checkCompile())
+
+      compileFile("tests/init/tasty-error/Main.scala", tastyErrorOptions.withClasspath(a0Dir).withClasspath(b1Dir))(tastyErrorGroup).checkExpectedErrors()
+
+      tests.foreach(_.delete())
+    }
   }
 
   // parallel backend tests
diff --git a/tests/init/tasty-error/Main.scala b/tests/init/tasty-error/Main.scala
new file mode 100644
index 000000000000..2b27dd2b0d1f
--- /dev/null
+++ b/tests/init/tasty-error/Main.scala
@@ -0,0 +1 @@
+class Main extends B{} // anypos-error
\ No newline at end of file
diff --git a/tests/init/tasty-error/v0/A.scala b/tests/init/tasty-error/v0/A.scala
new file mode 100644
index 000000000000..be8c7d214378
--- /dev/null
+++ b/tests/init/tasty-error/v0/A.scala
@@ -0,0 +1,3 @@
+class A {
+  def fail(a: Int, b: Int): Int = a
+}
\ No newline at end of file
diff --git a/tests/init/tasty-error/v1/A.scala b/tests/init/tasty-error/v1/A.scala
new file mode 100644
index 000000000000..fa2956d1de7e
--- /dev/null
+++ b/tests/init/tasty-error/v1/A.scala
@@ -0,0 +1,3 @@
+class A {
+  def fail(a: Int): Int = a
+}
\ No newline at end of file
diff --git a/tests/init/tasty-error/v1/B.scala b/tests/init/tasty-error/v1/B.scala
new file mode 100644
index 000000000000..3059f487db64
--- /dev/null
+++ b/tests/init/tasty-error/v1/B.scala
@@ -0,0 +1,4 @@
+class B {
+  val a: A = new A
+  val x = a.fail(0)
+}
\ No newline at end of file

From 074e40ea0571a7e6cb25c0efae07c57b4e1d9e6c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 18:03:44 +0200
Subject: [PATCH 152/505] Add error-checking when fetching rhs of ValOrDefDefs.

[Cherry-picked e80888176d5645b3c26075423e93454dc766b8e1][modified]

From ba16067f6276ce8103cb1e9de4c1e00bb0fb21dc Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Wed, 5 Mar 2025 12:12:13 +0100
Subject: [PATCH 153/505] Make sure TypeBlocks are not incorrectly matched
 against Blocks

[Cherry-picked 71044a8882fd9bd13d5b27834aa79f4096650318]
---
 .../src/scala/quoted/runtime/impl/QuotesImpl.scala    |  2 +-
 tests/{pos/i21721 => pos-macros/i21721-a}/Macro.scala |  0
 tests/{pos/i21721 => pos-macros/i21721-a}/Test.scala  |  0
 tests/pos-macros/i21721-b/Macro_1.scala               | 11 +++++++++++
 tests/pos-macros/i21721-b/Test_2.scala                |  1 +
 5 files changed, 13 insertions(+), 1 deletion(-)
 rename tests/{pos/i21721 => pos-macros/i21721-a}/Macro.scala (100%)
 rename tests/{pos/i21721 => pos-macros/i21721-a}/Test.scala (100%)
 create mode 100644 tests/pos-macros/i21721-b/Macro_1.scala
 create mode 100644 tests/pos-macros/i21721-b/Test_2.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index 172b3a35aabb..a666feace741 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -805,7 +805,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object BlockTypeTest extends TypeTest[Tree, Block]:
       def unapply(x: Tree): Option[Block & x.type] = x match
-        case x: (tpd.Block & x.type) => Some(x)
+        case x: (tpd.Block & x.type) if x.isTerm => Some(x)
         case _ => None
     end BlockTypeTest
 
diff --git a/tests/pos/i21721/Macro.scala b/tests/pos-macros/i21721-a/Macro.scala
similarity index 100%
rename from tests/pos/i21721/Macro.scala
rename to tests/pos-macros/i21721-a/Macro.scala
diff --git a/tests/pos/i21721/Test.scala b/tests/pos-macros/i21721-a/Test.scala
similarity index 100%
rename from tests/pos/i21721/Test.scala
rename to tests/pos-macros/i21721-a/Test.scala
diff --git a/tests/pos-macros/i21721-b/Macro_1.scala b/tests/pos-macros/i21721-b/Macro_1.scala
new file mode 100644
index 000000000000..aad7d6232c8f
--- /dev/null
+++ b/tests/pos-macros/i21721-b/Macro_1.scala
@@ -0,0 +1,11 @@
+import scala.quoted._
+
+inline def test(): Any = ${ testImpl }
+
+def testImpl(using Quotes): Expr[Any] =
+  import quotes.reflect._
+  TypeBlock(Nil, TypeTree.of[Int]) match
+    case Block(_, res) =>
+      res.asExpr // unexpected case - would crash here, as res of TypeBlock is not a term
+    case _ =>
+      '{()} // expected case
diff --git a/tests/pos-macros/i21721-b/Test_2.scala b/tests/pos-macros/i21721-b/Test_2.scala
new file mode 100644
index 000000000000..9b75f0ca5777
--- /dev/null
+++ b/tests/pos-macros/i21721-b/Test_2.scala
@@ -0,0 +1 @@
+@main def Test() = test()

From ddea9bbf7e79e6481da9a57206644d051e94fca5 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 24 Feb 2025 20:05:46 -0800
Subject: [PATCH 154/505] Nowarn non-private implicit val class params

Dowarn protected param accessor of given, which was probably widened.

[Cherry-picked 2cb2c9252b68abc66936705fa1496f736d338dbe]
---
 tests/warn/i15503f.scala | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/warn/i15503f.scala b/tests/warn/i15503f.scala
index 9d464bbc1973..79ee0a1767d4 100644
--- a/tests/warn/i15503f.scala
+++ b/tests/warn/i15503f.scala
@@ -43,3 +43,35 @@ object Unmatched:
       case Ident(name) =>
       case _ =>
     e
+
+trait Ctx
+case class K(i: Int)(using val ctx: Ctx) // nowarn
+class L(val i: Int)(using val ctx: Ctx) // nowarn
+class M(val i: Int)(using ctx: Ctx) // warn
+
+package givens:
+
+  trait X:
+    def doX: Int
+
+  trait Y:
+    def doY: String
+
+  given X:
+    def doX = 7
+
+  given X => Y: // warn protected param to given class
+    def doY = "7"
+  /* desugared. It is protected so that its type can be used in member defs without leaking.
+   * possibly it should be protected only for named parameters.
+      given class given_Y(using x$1: givens.X) extends Object(), givens.Y {
+        protected given val x$1: givens.X
+        def doY: String = "7"
+      }
+      final given def given_Y(using x$1: givens.X): givens.given_Y =
+        new givens.given_Y(using x$1)()
+  */
+
+  given namely: (x: X) => Y: // warn protected param to given class
+    def doY = "8"
+end givens

From 05fb7bc17163f0b861add6193da64a0ffdb995d3 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 27 Feb 2025 17:34:40 -0800
Subject: [PATCH 155/505] JLine 3.29.0 (was 3.27.1)

[Cherry-picked 064c3df24709e57b367122af7d5c8841cd62a691]
---
 project/Build.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 2da2345e28fd..a63df060a841 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -666,9 +666,9 @@ object Build {
       libraryDependencies ++= Seq(
         "org.scala-lang.modules" % "scala-asm" % "9.7.1-scala-1", // used by the backend
         Dependencies.compilerInterface,
-        "org.jline" % "jline-reader" % "3.27.1",   // used by the REPL
-        "org.jline" % "jline-terminal" % "3.27.1",
-        "org.jline" % "jline-terminal-jni" % "3.27.1", // needed for Windows
+        "org.jline" % "jline-reader" % "3.29.0",   // used by the REPL
+        "org.jline" % "jline-terminal" % "3.29.0",
+        "org.jline" % "jline-terminal-jni" % "3.29.0", // needed for Windows
         ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
       ),
 

From 86169a85b6ed891eb2bb6376d7bcfeb57a71a24d Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 4 Mar 2025 17:48:20 -0800
Subject: [PATCH 156/505] Rename on import is never wildcard

[Cherry-picked 977232cf3d919ccb6bf7c3fb93eda4b9241dac53]
---
 compiler/src/dotty/tools/dotc/transform/CheckUnused.scala | 5 ++++-
 tests/warn/i15503a.scala                                  | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 22d27cb61c66..a0ad1abb9724 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -275,8 +275,11 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         case sel :: sels =>
           val matches =
             if sel.isWildcard then
+              // if name is different from sym.name, it must be a rename on import, not a wildcard selector
+              !name.exists(_.toTermName != sym.name.toTermName)
               // the qualifier must have the target symbol as a member
-              hasAltMember(sym.name) && {
+              && hasAltMember(sym.name)
+              && {
                 if sel.isGiven then // Further check that the symbol is a given or implicit and conforms to the bound
                      sym.isOneOf(GivenOrImplicit)
                   && (sel.bound.isEmpty || sym.info.finalResultType <:< sel.boundTpe)
diff --git a/tests/warn/i15503a.scala b/tests/warn/i15503a.scala
index 40b6c75983bf..3707b18d316e 100644
--- a/tests/warn/i15503a.scala
+++ b/tests/warn/i15503a.scala
@@ -321,3 +321,10 @@ object Suppressed:
 object Suppressing:
   import Suppressed.* // no warn, see options
   def f = 42
+
+package i22692:
+  import javax.swing.*
+  import javax.swing.event as swingEvent // no warn, regression test for warning in 3.6
+
+  type b = AbstractButton
+  type t = swingEvent.AncestorListener

From fdf7cdc254edf3408a8d910ab8f7150aad04072d Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 23 Apr 2025 18:27:24 +0200
Subject: [PATCH 157/505] bugfix: Adjust givens to old syntax

---
 tests/warn/i15503f.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/warn/i15503f.scala b/tests/warn/i15503f.scala
index 79ee0a1767d4..76badc659fb9 100644
--- a/tests/warn/i15503f.scala
+++ b/tests/warn/i15503f.scala
@@ -57,10 +57,10 @@ package givens:
   trait Y:
     def doY: String
 
-  given X:
+  given X with
     def doX = 7
 
-  given X => Y: // warn protected param to given class
+  given (using X): Y with // warn protected param to given class
     def doY = "7"
   /* desugared. It is protected so that its type can be used in member defs without leaking.
    * possibly it should be protected only for named parameters.
@@ -72,6 +72,6 @@ package givens:
         new givens.given_Y(using x$1)()
   */
 
-  given namely: (x: X) => Y: // warn protected param to given class
+  given namely (using x: X): Y with // warn protected param to given class
     def doY = "8"
 end givens

From 0cdd9767101cc995d0ef513ec4a6d06e22f19b12 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sat, 8 Mar 2025 01:34:28 -0800
Subject: [PATCH 158/505] First cut at nowarn refinement members

---
 .../tools/dotc/transform/CheckUnused.scala    |  22 +-
 tests/semanticdb/metac.expect                 | 244 +++++++++---------
 tests/warn/i22681.scala                       |  17 ++
 3 files changed, 162 insertions(+), 121 deletions(-)
 create mode 100644 tests/warn/i22681.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index a0ad1abb9724..bb298b1bcc16 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -150,6 +150,9 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   override def prepareForValDef(tree: ValDef)(using Context): Context =
     if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
       refInfos.register(tree)
+    tree.tpt match
+    case RefinedTypeTree(_, refinements) => relax(tree.rhs, refinements)
+    case _ =>
     ctx
   override def transformValDef(tree: ValDef)(using Context): tree.type =
     traverseAnnotations(tree.symbol)
@@ -168,11 +171,15 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   override def prepareForDefDef(tree: DefDef)(using Context): Context =
     def trivial = tree.symbol.is(Deferred) || isUnconsuming(tree.rhs)
     def nontrivial = tree.symbol.isConstructor || tree.symbol.isAnonymousFunction
-    if !nontrivial && trivial then refInfos.skip.addOne(tree.symbol)
+    if !nontrivial && trivial then
+      refInfos.skip.addOne(tree.symbol)
     if tree.symbol.is(Inline) then
       refInfos.inliners += 1
     else if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
       refInfos.register(tree)
+    tree.tpt match
+    case RefinedTypeTree(_, refinements) => relax(tree.rhs, refinements)
+    case _ =>
     ctx
   override def transformDefDef(tree: DefDef)(using Context): tree.type =
     traverseAnnotations(tree.symbol)
@@ -447,7 +454,7 @@ object CheckUnused:
         if !tree.name.isInstanceOf[DerivedName] then
           pats.addOne((tree.symbol, tree.namePos))
       case tree: NamedDefTree =>
-        if (tree.symbol ne NoSymbol) && !tree.name.isWildcard then
+        if (tree.symbol ne NoSymbol) && !tree.name.isWildcard && !tree.hasAttachment(NoWarn) then
           defs.addOne((tree.symbol, tree.namePos))
       case _ =>
         if tree.symbol ne NoSymbol then
@@ -843,6 +850,17 @@ object CheckUnused:
         args.foreach(traverse)
       case tree => traverseChildren(tree)
 
+  // NoWarn members in tree that correspond to refinements; currently uses only names.
+  def relax(tree: Tree, refinements: List[Tree])(using Context): Unit =
+    val names = refinements.collect { case named: NamedDefTree => named.name }.toSet
+    val relaxer = new TreeTraverser:
+      def traverse(tree: Tree)(using Context) =
+        tree match
+        case tree: NamedDefTree if names(tree.name) => tree.withAttachment(NoWarn, ())
+        case _ =>
+        traverseChildren(tree)
+    relaxer.traverse(tree)
+
   extension (nm: Name)
     inline def exists(p: Name => Boolean): Boolean = nm.ne(nme.NO_NAME) && p(nm)
     inline def isWildcard: Boolean = nm == nme.WILDCARD || nm.is(WildcardParamName)
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 4e3dee9d79a6..4ea5386b4c50 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -56,23 +56,23 @@ Synthetics => 3 entries
 
 Symbols:
 advanced/C# => class C [typeparam T ] extends Object { self: C[T] => +3 decls }
-advanced/C#[T] => typeparam T 
+advanced/C#[T] => typeparam T
 advanced/C#`<init>`(). => primary ctor <init> [typeparam T ](): C[T]
 advanced/C#t(). => method t => T
 advanced/HKClass# => class HKClass [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]] extends Object { self: HKClass[F] => +3 decls }
 advanced/HKClass#[F] => typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]
-advanced/HKClass#[F][T] => typeparam T 
-advanced/HKClass#[F][U] => typeparam U 
+advanced/HKClass#[F][T] => typeparam T
+advanced/HKClass#[F][U] => typeparam U
 advanced/HKClass#`<init>`(). => primary ctor <init> [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]](): HKClass[F]
-advanced/HKClass#`<init>`().[F][T] => typeparam T 
-advanced/HKClass#`<init>`().[F][U] => typeparam U 
+advanced/HKClass#`<init>`().[F][T] => typeparam T
+advanced/HKClass#`<init>`().[F][U] => typeparam U
 advanced/HKClass#foo(). => method foo [typeparam T , typeparam U ](param x: F[T, U]): String
 advanced/HKClass#foo().(x) => param x: F[T, U]
-advanced/HKClass#foo().[T] => typeparam T 
-advanced/HKClass#foo().[U] => typeparam U 
+advanced/HKClass#foo().[T] => typeparam T
+advanced/HKClass#foo().[U] => typeparam U
 advanced/Structural# => class Structural extends Object { self: Structural => +6 decls }
 advanced/Structural#T# => trait T [typeparam A ] extends Object { self: T[A] => +4 decls }
-advanced/Structural#T#[A] => typeparam A 
+advanced/Structural#T#[A] => typeparam A
 advanced/Structural#T#`<init>`(). => primary ctor <init> [typeparam A ](): T[A]
 advanced/Structural#T#bar(). => method bar (param b: foo.B): Unit
 advanced/Structural#T#bar().(b) => param b: foo.B
@@ -286,8 +286,8 @@ Symbols:
 annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls }
 annot/Alias.A# => type A  = ClassAnnotation @param
 annot/Annotations# => @ClassAnnotation class Annotations [@TypeParameterAnnotation typeparam T ] extends Object { self: AnyRef & Annotations[T] => +6 decls }
-annot/Annotations#S# => @TypeAnnotation type S 
-annot/Annotations#[T] => @TypeParameterAnnotation typeparam T 
+annot/Annotations#S# => @TypeAnnotation type S
+annot/Annotations#[T] => @TypeParameterAnnotation typeparam T
 annot/Annotations#`<init>`(). => primary ctor <init> [@TypeParameterAnnotation typeparam T ](@ParameterAnnotation param x: T): Annotations[T]
 annot/Annotations#`<init>`().(x) => @ParameterAnnotation param x: T
 annot/Annotations#field. => @FieldAnnotation val method field Int
@@ -301,7 +301,7 @@ annot/B#throwing(). => @throws[Exception] method throwing => Nothing
 annot/B#x. => private[this] val method x Int
 annot/M. => @ObjectAnnotation final object M extends Object { self: M.type => +1 decls }
 annot/M.m(). => @MacroAnnotation macro m [typeparam TT ]: Int
-annot/M.m().[TT] => typeparam TT 
+annot/M.m().[TT] => typeparam TT
 annot/T# => @TraitAnnotation trait T extends Object { self: T => +1 decls }
 annot/T#`<init>`(). => primary ctor <init> (): T
 local0 => selfparam self: AnyRef
@@ -394,10 +394,10 @@ example/Anonymous#bar2. => val method bar2 Bar
 example/Anonymous#foo. => val method foo Foo
 example/Anonymous#locally(). => method locally [typeparam A ](param x: A): A
 example/Anonymous#locally().(x) => param x: A
-example/Anonymous#locally().[A] => typeparam A 
+example/Anonymous#locally().[A] => typeparam A
 example/Anonymous#m1(). => method m1 [typeparam T [type _ ]]: Nothing
 example/Anonymous#m1().[T] => typeparam T [type _ ]
-example/Anonymous#m1().[T][_] => type _ 
+example/Anonymous#m1().[T][_] => type _
 example/Anonymous#m2(). => method m2 => Map[_, List[_] forSome { type _  }] forSome { type _  }
 local0 => val local x: Function1[Int, Int]
 local1 => final class $anon extends Object with Foo { self: $anon => +1 decls }
@@ -632,7 +632,7 @@ classes/C11#foo(). => inline macro foo => Int
 classes/C12# => class C12 extends Object { self: C12 => +8 decls }
 classes/C12#Context# => class Context extends Object { self: Context => +2 decls }
 classes/C12#Context#Expr# => type Expr [typeparam T ]
-classes/C12#Context#Expr#[T] => typeparam T 
+classes/C12#Context#Expr#[T] => typeparam T
 classes/C12#Context#`<init>`(). => primary ctor <init> (): Context
 classes/C12#`<init>`(). => primary ctor <init> (): C12
 classes/C12#foo1(). => macro foo1 (param x: Int): Int
@@ -923,7 +923,7 @@ endmarkers/MultiCtor#`<init>`().(i) => val param i: Int
 endmarkers/MultiCtor#`<init>`(+1). => ctor <init> (): MultiCtor
 endmarkers/MultiCtor#i. => val method i Int
 endmarkers/Stuff# => trait Stuff [typeparam A ] extends Object { self: Stuff[A] => +3 decls }
-endmarkers/Stuff#[A] => typeparam A 
+endmarkers/Stuff#[A] => typeparam A
 endmarkers/Stuff#`<init>`(). => primary ctor <init> [typeparam A ](): Stuff[A]
 endmarkers/Stuff#do(). => abstract method do => A
 endmarkers/TestObj. => final object TestObj extends Object { self: TestObj.type => +2 decls }
@@ -1122,29 +1122,29 @@ _empty_/Enums.Directions.valueOf(). => method valueOf (param $name: String): Dir
 _empty_/Enums.Directions.valueOf().($name) => param $name: String
 _empty_/Enums.Directions.values(). => method values => Array[Directions]
 _empty_/Enums.Maybe# => abstract sealed enum class Maybe [covariant typeparam A ] extends Object with Enum { self: Maybe[A] => +2 decls }
-_empty_/Enums.Maybe#[A] => covariant typeparam A 
+_empty_/Enums.Maybe#[A] => covariant typeparam A
 _empty_/Enums.Maybe#`<init>`(). => primary ctor <init> [covariant typeparam A ](): Maybe[A]
 _empty_/Enums.Maybe. => final object Maybe extends Object { self: Maybe.type => +6 decls }
 _empty_/Enums.Maybe.Just# => final case enum class Just [covariant typeparam A ] extends Maybe[A] { self: Just[A] => +7 decls }
-_empty_/Enums.Maybe.Just#[A] => covariant typeparam A 
+_empty_/Enums.Maybe.Just#[A] => covariant typeparam A
 _empty_/Enums.Maybe.Just#_1(). => method _1 => A
 _empty_/Enums.Maybe.Just#`<init>`(). => primary ctor <init> [covariant typeparam A ](val param value: A): Just[A]
 _empty_/Enums.Maybe.Just#`<init>`().(value) => val param value: A
 _empty_/Enums.Maybe.Just#copy$default$1(). => method copy$default$1 [covariant typeparam A ]: A
-_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A 
+_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A
 _empty_/Enums.Maybe.Just#copy(). => method copy [covariant typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just#copy().(value) => param value: A
-_empty_/Enums.Maybe.Just#copy().[A] => typeparam A 
+_empty_/Enums.Maybe.Just#copy().[A] => typeparam A
 _empty_/Enums.Maybe.Just#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.Maybe.Just#value. => val method value A
 _empty_/Enums.Maybe.Just. => final object Just extends Object { self: Just.type => +4 decls }
 _empty_/Enums.Maybe.Just.apply(). => method apply [typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just.apply().(value) => param value: A
-_empty_/Enums.Maybe.Just.apply().[A] => typeparam A 
+_empty_/Enums.Maybe.Just.apply().[A] => typeparam A
 _empty_/Enums.Maybe.Just.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.Maybe.Just.unapply(). => method unapply [typeparam A ](param x$1: Just[A]): Just[A]
 _empty_/Enums.Maybe.Just.unapply().(x$1) => param x$1: Just[A]
-_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A 
+_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A
 _empty_/Enums.Maybe.None. => case val static enum method None Maybe[Nothing]
 _empty_/Enums.Maybe.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Maybe[_] forSome { type _  }
 _empty_/Enums.Maybe.fromOrdinal().(ordinal) => param ordinal: Int
@@ -1195,7 +1195,7 @@ _empty_/Enums.Suits.valueOf(). => method valueOf (param $name: String): Suits
 _empty_/Enums.Suits.valueOf().($name) => param $name: String
 _empty_/Enums.Suits.values(). => method values => Array[Suits]
 _empty_/Enums.Tag# => abstract sealed enum class Tag [typeparam A ] extends Object with Enum { self: Tag[A] => +2 decls }
-_empty_/Enums.Tag#[A] => typeparam A 
+_empty_/Enums.Tag#[A] => typeparam A
 _empty_/Enums.Tag#`<init>`(). => primary ctor <init> [typeparam A ](): Tag[A]
 _empty_/Enums.Tag. => final object Tag extends Object { self: Tag.type => +7 decls }
 _empty_/Enums.Tag.$values. => private[this] val method $values Array[Tag[_] forSome { type _  }]
@@ -1226,33 +1226,33 @@ _empty_/Enums.WeekDays.valueOf(). => method valueOf (param $name: String): WeekD
 _empty_/Enums.WeekDays.valueOf().($name) => param $name: String
 _empty_/Enums.WeekDays.values(). => method values => Array[WeekDays]
 _empty_/Enums.`<:<`# => abstract sealed enum class <:< [contravariant typeparam A , typeparam B ] extends Object with Enum { self: <:<[A, B] => +3 decls }
-_empty_/Enums.`<:<`#[A] => contravariant typeparam A 
-_empty_/Enums.`<:<`#[B] => typeparam B 
+_empty_/Enums.`<:<`#[A] => contravariant typeparam A
+_empty_/Enums.`<:<`#[B] => typeparam B
 _empty_/Enums.`<:<`#`<init>`(). => primary ctor <init> [contravariant typeparam A , typeparam B ](): <:<[A, B]
 _empty_/Enums.`<:<`. => final object <:< extends Object { self: <:<.type => +6 decls }
 _empty_/Enums.`<:<`.Refl# => final case enum class Refl [typeparam C ] extends <:<[C, C] { self: Refl[C] => +4 decls }
-_empty_/Enums.`<:<`.Refl#[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl#[C] => typeparam C
 _empty_/Enums.`<:<`.Refl#`<init>`(). => primary ctor <init> [typeparam C ](): Refl[C]
 _empty_/Enums.`<:<`.Refl#copy(). => method copy [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C
 _empty_/Enums.`<:<`.Refl#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.`<:<`.Refl. => final object Refl extends Object { self: Refl.type => +4 decls }
 _empty_/Enums.`<:<`.Refl.apply(). => method apply [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C
 _empty_/Enums.`<:<`.Refl.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.`<:<`.Refl.unapply(). => method unapply [typeparam C ](param x$1: Refl[C]): true
 _empty_/Enums.`<:<`.Refl.unapply().(x$1) => param x$1: Refl[C]
-_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C
 _empty_/Enums.`<:<`.`given_<:<_T_T`(). => final implicit given method given_<:<_T_T [typeparam T ]: <:<[T, T]
-_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T 
+_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T
 _empty_/Enums.`<:<`.fromOrdinal(). => method fromOrdinal (param ordinal: Int): <:<[_, _] forSome { type _ ; type _  }
 _empty_/Enums.`<:<`.fromOrdinal().(ordinal) => param ordinal: Int
 _empty_/Enums.some1. => val method some1 Option[Int]
 _empty_/Enums.unwrap(). => method unwrap [typeparam A , typeparam B ](param opt: Option[A])(implicit given param ev: <:<[A, Option[B]]): Option[B]
 _empty_/Enums.unwrap().(ev) => implicit given param ev: <:<[A, Option[B]]
 _empty_/Enums.unwrap().(opt) => param opt: Option[A]
-_empty_/Enums.unwrap().[A] => typeparam A 
-_empty_/Enums.unwrap().[B] => typeparam B 
+_empty_/Enums.unwrap().[A] => typeparam A
+_empty_/Enums.unwrap().[B] => typeparam B
 local0 => param x: Option[B]
 
 Occurrences:
@@ -1525,7 +1525,7 @@ Symbols:
 ext/DeckUsage. => final object DeckUsage extends Object { self: DeckUsage.type => +2 decls }
 ext/DeckUsage.deck. => val method deck Deck
 ext/Extension$package. => final package object ext extends Object { self: ext.type { opaque type Deck  } => +9 decls }
-ext/Extension$package.Deck# => opaque type Deck 
+ext/Extension$package.Deck# => opaque type Deck
 ext/Extension$package.Deck. => final object Deck extends Object { self: Deck.type => +2 decls }
 ext/Extension$package.Deck.fooSize(). => method fooSize (param data: Deck): Int
 ext/Extension$package.Deck.fooSize().(data) => param data: Deck
@@ -1539,18 +1539,18 @@ ext/Extension$package.foo().(s) => param s: String
 ext/Extension$package.readInto(). => method readInto [typeparam T ](param s: String)(implicit given param x$2: Read[T]): Option[T]
 ext/Extension$package.readInto().(s) => param s: String
 ext/Extension$package.readInto().(x$2) => implicit given param x$2: Read[T]
-ext/Extension$package.readInto().[T] => typeparam T 
+ext/Extension$package.readInto().[T] => typeparam T
 ext/Functor# => trait Functor [typeparam F [type _ ]] extends Object { self: Functor[F] => +3 decls }
 ext/Functor#[F] => typeparam F [type _ ]
-ext/Functor#[F][_] => type _ 
+ext/Functor#[F][_] => type _
 ext/Functor#`<init>`(). => primary ctor <init> [typeparam F [type _ ]](): Functor[F]
 ext/Functor#map(). => abstract method map [typeparam T , typeparam U ](param t: F[T])(param f: Function1[T, U]): F[U]
 ext/Functor#map().(f) => param f: Function1[T, U]
 ext/Functor#map().(t) => param t: F[T]
-ext/Functor#map().[T] => typeparam T 
-ext/Functor#map().[U] => typeparam U 
+ext/Functor#map().[T] => typeparam T
+ext/Functor#map().[U] => typeparam U
 ext/Read# => trait Read [covariant typeparam T ] extends Object { self: Read[T] => +3 decls }
-ext/Read#[T] => covariant typeparam T 
+ext/Read#[T] => covariant typeparam T
 ext/Read#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Read[T]
 ext/Read#fromString(). => abstract method fromString (param s: String): Option[T]
 ext/Read#fromString().(s) => param s: String
@@ -1731,7 +1731,7 @@ Synthetics => 3 entries
 Symbols:
 a/b/Givens. => final object Givens extends Object { self: Givens.type => +13 decls }
 a/b/Givens.Monoid# => trait Monoid [typeparam A ] extends Object { self: Monoid[A] => +4 decls }
-a/b/Givens.Monoid#[A] => typeparam A 
+a/b/Givens.Monoid#[A] => typeparam A
 a/b/Givens.Monoid#`<init>`(). => primary ctor <init> [typeparam A ](): Monoid[A]
 a/b/Givens.Monoid#combine(). => abstract method combine (param x: A)(param y: A): A
 a/b/Givens.Monoid#combine().(x) => param x: A
@@ -1739,7 +1739,7 @@ a/b/Givens.Monoid#combine().(y) => param y: A
 a/b/Givens.Monoid#empty(). => abstract method empty => A
 a/b/Givens.foo(). => method foo [typeparam A ](implicit given param A: Monoid[A]): A
 a/b/Givens.foo().(A) => implicit given param A: Monoid[A]
-a/b/Givens.foo().[A] => typeparam A 
+a/b/Givens.foo().[A] => typeparam A
 a/b/Givens.given_Monoid_String. => final implicit given object given_Monoid_String extends Object with Monoid[String] { self: given_Monoid_String.type => +3 decls }
 a/b/Givens.given_Monoid_String.combine(). => method combine (param x: String)(param y: String): String <: a/b/Givens.Monoid#combine().
 a/b/Givens.given_Monoid_String.combine().(x) => param x: String
@@ -1754,13 +1754,13 @@ a/b/Givens.int2String#apply().(x) => param x: Int
 a/b/Givens.int2String(). => final implicit given inline macro int2String => int2String
 a/b/Givens.sayGoodbye(). => method sayGoodbye [typeparam B ](param any: B): String
 a/b/Givens.sayGoodbye().(any) => param any: B
-a/b/Givens.sayGoodbye().[B] => typeparam B 
+a/b/Givens.sayGoodbye().[B] => typeparam B
 a/b/Givens.sayHello(). => method sayHello [typeparam A ](param any: A): String
 a/b/Givens.sayHello().(any) => param any: A
-a/b/Givens.sayHello().[A] => typeparam A 
+a/b/Givens.sayHello().[A] => typeparam A
 a/b/Givens.saySoLong(). => method saySoLong [typeparam B ](param any: B): String
 a/b/Givens.saySoLong().(any) => param any: B
-a/b/Givens.saySoLong().[B] => typeparam B 
+a/b/Givens.saySoLong().[B] => typeparam B
 a/b/Givens.soLong1. => val method soLong1 String
 
 Occurrences:
@@ -1868,7 +1868,7 @@ example/ImplicitConversion#tuple. => val method tuple Tuple2[Int, Int]
 example/ImplicitConversion#x. => val method x Int
 example/ImplicitConversion. => final object ImplicitConversion extends Object { self: ImplicitConversion.type => +6 decls }
 example/ImplicitConversion.newAny2stringadd# => final implicit class newAny2stringadd [typeparam A ] extends AnyVal { self: newAny2stringadd[A] => +4 decls }
-example/ImplicitConversion.newAny2stringadd#[A] => typeparam A 
+example/ImplicitConversion.newAny2stringadd#[A] => typeparam A
 example/ImplicitConversion.newAny2stringadd#`+`(). => method + (param other: String): String
 example/ImplicitConversion.newAny2stringadd#`+`().(other) => param other: String
 example/ImplicitConversion.newAny2stringadd#`<init>`(). => primary ctor <init> [typeparam A ](param self: A): newAny2stringadd[A]
@@ -1876,7 +1876,7 @@ example/ImplicitConversion.newAny2stringadd#`<init>`().(self) => param self: A
 example/ImplicitConversion.newAny2stringadd#self. => private val method self A
 example/ImplicitConversion.newAny2stringadd(). => final implicit method newAny2stringadd [typeparam A ](param self: A): newAny2stringadd[A]
 example/ImplicitConversion.newAny2stringadd().(self) => param self: A
-example/ImplicitConversion.newAny2stringadd().[A] => typeparam A 
+example/ImplicitConversion.newAny2stringadd().[A] => typeparam A
 example/ImplicitConversion.newAny2stringadd. => final object newAny2stringadd extends Object { self: newAny2stringadd.type => +2 decls }
 
 Occurrences:
@@ -2089,7 +2089,7 @@ givens/InventedNames$package.given_Double(). => final implicit given method give
 givens/InventedNames$package.given_Double().(x$1) => implicit given param x$1: Int
 givens/InventedNames$package.given_Float. => final implicit lazy val given method given_Float Float
 givens/InventedNames$package.given_List_T(). => final implicit given method given_List_T [typeparam T ]: List[T]
-givens/InventedNames$package.given_List_T().[T] => typeparam T 
+givens/InventedNames$package.given_List_T().[T] => typeparam T
 givens/InventedNames$package.given_String. => final implicit lazy val given method given_String String
 givens/InventedNames$package.given_X. => final implicit given object given_X extends Object with X { self: given_X.type => +2 decls }
 givens/InventedNames$package.given_X.doX(). => method doX => Int <: givens/X#doX().
@@ -2101,11 +2101,11 @@ givens/InventedNames$package.given_Y#x$1. => protected implicit val given method
 givens/InventedNames$package.given_Y(). => final implicit given method given_Y (implicit given param x$1: X): given_Y
 givens/InventedNames$package.given_Y().(x$1) => implicit given param x$1: X
 givens/InventedNames$package.given_Z_T# => implicit given class given_Z_T [typeparam T ] extends Object with Z[T] { self: given_Z_T[T] => +3 decls }
-givens/InventedNames$package.given_Z_T#[T] => typeparam T 
+givens/InventedNames$package.given_Z_T#[T] => typeparam T
 givens/InventedNames$package.given_Z_T#`<init>`(). => primary ctor <init> [typeparam T ](): given_Z_T[T]
 givens/InventedNames$package.given_Z_T#doZ(). => method doZ => List[T] <: givens/Z#doZ().
 givens/InventedNames$package.given_Z_T(). => final implicit given method given_Z_T [typeparam T ]: given_Z_T[T]
-givens/InventedNames$package.given_Z_T().[T] => typeparam T 
+givens/InventedNames$package.given_Z_T().[T] => typeparam T
 givens/InventedNames$package.intValue. => final implicit lazy val given method intValue Int
 givens/InventedNames$package.x. => val method x given_X.type
 givens/InventedNames$package.y. => val method y given_Y
@@ -2117,7 +2117,7 @@ givens/Y# => trait Y extends Object { self: Y => +2 decls }
 givens/Y#`<init>`(). => primary ctor <init> (): Y
 givens/Y#doY(). => abstract method doY => String
 givens/Z# => trait Z [typeparam T ] extends Object { self: Z[T] => +3 decls }
-givens/Z#[T] => typeparam T 
+givens/Z#[T] => typeparam T
 givens/Z#`<init>`(). => primary ctor <init> [typeparam T ](): Z[T]
 givens/Z#doZ(). => abstract method doZ => List[T]
 
@@ -2292,7 +2292,7 @@ Symbols:
 example/Local# => class Local extends Object { self: Local => +2 decls }
 example/Local#`<init>`(). => primary ctor <init> (): Local
 example/Local#a(). => method a (): Int
-local0 => typeparam A 
+local0 => typeparam A
 local1 => param a: A
 local2 => local id: [typeparam A ](param a: A): A
 
@@ -2357,10 +2357,10 @@ example/MatchType$package.Concat# => type Concat [typeparam Xs  <: Tuple, covari
 example/MatchType$package.Concat#[Xs] => typeparam Xs  <: Tuple
 example/MatchType$package.Concat#[Ys] => covariant typeparam Ys  <: Tuple
 example/MatchType$package.Elem# => type Elem [typeparam X ] = X match { String => Char, Array[t] => t, Iterable[t] => t }
-example/MatchType$package.Elem#[X] => typeparam X 
-local0 => type t 
-local1 => type t 
-local2 => type x 
+example/MatchType$package.Elem#[X] => typeparam X
+local0 => type t
+local1 => type t
+local2 => type x
 local3 => type xs  <: Tuple
 
 Occurrences:
@@ -2600,11 +2600,11 @@ Occurrences => 156 entries
 Symbols:
 example/Methods# => class Methods [typeparam T ] extends Object { self: Methods[T] => +44 decls }
 example/Methods#AList# => type AList [typeparam T ] = List[T]
-example/Methods#AList#[T] => typeparam T 
+example/Methods#AList#[T] => typeparam T
 example/Methods#List# => class List [typeparam T ] extends Object { self: List[T] => +2 decls }
-example/Methods#List#[T] => typeparam T 
+example/Methods#List#[T] => typeparam T
 example/Methods#List#`<init>`(). => primary ctor <init> [typeparam T ](): List[T]
-example/Methods#[T] => typeparam T 
+example/Methods#[T] => typeparam T
 example/Methods#`<init>`(). => primary ctor <init> [typeparam T ](): Methods[T]
 example/Methods#`m8().`(). => method m8(). (): Nothing
 example/Methods#`m9().`# => class m9(). extends Object { self: m9(). => +1 decls }
@@ -2632,7 +2632,7 @@ example/Methods#m7(). => method m7 [typeparam U ](param c: Methods[T], param l:
 example/Methods#m7().(c) => param c: Methods[T]
 example/Methods#m7().(evidence$1) => implicit param evidence$1: Ordering[U]
 example/Methods#m7().(l) => param l: List[U]
-example/Methods#m7().[U] => typeparam U 
+example/Methods#m7().[U] => typeparam U
 example/Methods#m9(). => method m9 (param x: m9().): Nothing
 example/Methods#m9().(x) => param x: m9().
 example/Methods#m10(). => method m10 (param x: List[T]): Nothing
@@ -2992,18 +2992,18 @@ Occurrences => 18 entries
 
 Symbols:
 _empty_/NewModifiers$package. => final package object _empty_ extends Object { self: _empty_.type { opaque type OpaqueB  } => +2 decls }
-_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB 
+_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB
 _empty_/NewModifiers. => final object NewModifiers extends Object { self: NewModifiers.type { opaque type A  } => +3 decls }
-_empty_/NewModifiers.A# => opaque type A 
+_empty_/NewModifiers.A# => opaque type A
 _empty_/NewModifiers.foo. => val inline method foo "foo"
 _empty_/NewModifiersClass# => opaque class NewModifiersClass extends Object { self: Any { opaque type C  } & NewModifiersClass => +5 decls }
-_empty_/NewModifiersClass#C# => opaque type C 
+_empty_/NewModifiersClass#C# => opaque type C
 _empty_/NewModifiersClass#Nested# => opaque class Nested extends Object { self: Any { opaque type NestedOpaque  } & Nested => +2 decls }
-_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque 
+_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque
 _empty_/NewModifiersClass#Nested#`<init>`(). => primary ctor <init> (): Nested
 _empty_/NewModifiersClass#`<init>`(). => primary ctor <init> (): NewModifiersClass
 _empty_/NewModifiersTrait# => opaque trait NewModifiersTrait extends Object { self: Any { opaque type D  } & NewModifiersTrait => +2 decls }
-_empty_/NewModifiersTrait#D# => opaque type D 
+_empty_/NewModifiersTrait#D# => opaque type D
 _empty_/NewModifiersTrait#`<init>`(). => primary ctor <init> (): NewModifiersTrait
 
 Occurrences:
@@ -3091,13 +3091,13 @@ Occurrences => 49 entries
 Symbols:
 prefixes/C# => class C extends Object { self: C => +6 decls }
 prefixes/C#N. => final object N extends Object { self: N.type => +2 decls }
-prefixes/C#N.U# => type U 
-prefixes/C#T# => type T 
+prefixes/C#N.U# => type U
+prefixes/C#T# => type T
 prefixes/C#`<init>`(). => primary ctor <init> (): C
 prefixes/C#k1(). => method k1 => U
 prefixes/C#m1(). => method m1 => T
 prefixes/M. => final object M extends Object { self: M.type => +3 decls }
-prefixes/M.T# => type T 
+prefixes/M.T# => type T
 prefixes/M.n1(). => method n1 => T
 prefixes/O. => final object O extends C { self: O.type => +2 decls }
 prefixes/O.o1(). => method o1 => O.this.T
@@ -3174,13 +3174,13 @@ Synthetics => 3 entries
 
 Symbols:
 example/C# => class C extends Object { self: C => +3 decls }
-example/C#T1# => type T1 
-example/C#T2# => type T2 
+example/C#T1# => type T1
+example/C#T2# => type T2
 example/C#`<init>`(). => primary ctor <init> (): C
 example/PickOneRefinement_1# => class PickOneRefinement_1 [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }] extends Object { self: PickOneRefinement_1[S] => +3 decls }
 example/PickOneRefinement_1#[S] => typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }
 example/PickOneRefinement_1#[S](as) => param as: T*
-example/PickOneRefinement_1#[S][T] => typeparam T 
+example/PickOneRefinement_1#[S][T] => typeparam T
 example/PickOneRefinement_1#`<init>`(). => primary ctor <init> [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }](): PickOneRefinement_1[S]
 example/PickOneRefinement_1#run(). => method run (param s: S, param as: String*): Option[String]
 example/PickOneRefinement_1#run().(as) => param as: String*
@@ -3189,7 +3189,7 @@ example/PolyHolder# => trait PolyHolder extends Object { self: PolyHolder => +2
 example/PolyHolder#`<init>`(). => primary ctor <init> (): PolyHolder
 example/PolyHolder#foo(). => abstract method foo [typeparam T ](param t: T): Any
 example/PolyHolder#foo().(t) => param t: T
-example/PolyHolder#foo().[T] => typeparam T 
+example/PolyHolder#foo().[T] => typeparam T
 example/RecOrRefined$package. => final package object example extends Object { self: example.type => +9 decls }
 example/RecOrRefined$package.C2# => type C2  = C { type T2  = T1 <: example/C#T2#; type T1  <: example/C#T1# }
 example/RecOrRefined$package.Person# => type Person  = Record { abstract val method age Int; abstract val method name String }
@@ -3203,9 +3203,9 @@ example/RecOrRefined$package.m4(). => method m4 (param x: PolyHolder { abstract
 example/RecOrRefined$package.m4().(x) => param x: PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5(). => method m5 [typeparam Z ](param x: Int): PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5().(x) => param x: Int
-example/RecOrRefined$package.m5().[Z] => typeparam Z 
+example/RecOrRefined$package.m5().[Z] => typeparam Z
 example/RecOrRefined$package.m6# => type m6 [typeparam X ] = PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
-example/RecOrRefined$package.m6#[X] => typeparam X 
+example/RecOrRefined$package.m6#[X] => typeparam X
 example/Record# => class Record extends Object with Selectable { self: Record => +4 decls }
 example/Record#`<init>`(). => primary ctor <init> (param elems: Tuple2[String, Any]*): Record
 example/Record#`<init>`().(elems) => param elems: Tuple2[String, Any]*
@@ -3217,9 +3217,9 @@ example/SpecialRefinement# => trait SpecialRefinement extends Object { self: Spe
 example/SpecialRefinement#`<init>`(). => primary ctor <init> (): SpecialRefinement
 example/SpecialRefinement#pickOne(). => abstract method pickOne [typeparam T ](param as: T*): Option[Any]
 example/SpecialRefinement#pickOne().(as) => param as: T*
-example/SpecialRefinement#pickOne().[T] => typeparam T 
+example/SpecialRefinement#pickOne().[T] => typeparam T
 local0 => abstract method pickOne [typeparam T ](param as: T*): Option[String]
-local1 => typeparam T 
+local1 => typeparam T
 local2 => param as: T*
 local3 => abstract method pickOne [typeparam T ](param as: T*): Option[String] <: example/SpecialRefinement#pickOne().
 local4 => abstract val method x Int
@@ -3227,14 +3227,14 @@ local5 => abstract val method x Int
 local6 => abstract method y => Int
 local7 => abstract val method x Int
 local8 => abstract method y => Int
-local9 => type z 
-local10 => typeparam T 
+local9 => type z
+local10 => typeparam T
 local11 => param t: T
 local12 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local13 => typeparam T 
+local13 => typeparam T
 local14 => param t: T
 local15 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local16 => typeparam T 
+local16 => typeparam T
 local17 => param t: T
 local18 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
 local19 => abstract val method name String
@@ -3456,6 +3456,7 @@ Text => empty
 Language => Scala
 Symbols => 12 entries
 Occurrences => 33 entries
+Diagnostics => 1 entries
 Synthetics => 4 entries
 
 Symbols:
@@ -3507,6 +3508,11 @@ Occurrences:
 [20:4..20:13): scalameta -> scala/reflect/Selectable#selectDynamic().
 [21:4..21:19): StructuralTypes -> example/StructuralTypes.
 
+Diagnostics:
+[14:20..14:23): [warning] Alphanumeric method foo is not declared infix; it should not be used as infix operator.
+Instead, use method syntax .foo(...) or backticked identifier `foo`.
+The latter can be rewritten automatically under -rewrite -source 3.4-migration.
+
 Synthetics:
 [12:2..12:6):user => reflectiveSelectable(*)
 [13:2..13:6):user => reflectiveSelectable(*)
@@ -3541,7 +3547,7 @@ example/Synthetic#Contexts.m4(). => method m4 => Nothing
 example/Synthetic#F# => class F extends Object { self: F => +1 decls }
 example/Synthetic#F#`<init>`(). => primary ctor <init> (): F
 example/Synthetic#J# => class J [typeparam T ] extends Object { self: J[T] => +4 decls }
-example/Synthetic#J#[T] => typeparam T 
+example/Synthetic#J#[T] => typeparam T
 example/Synthetic#J#`<init>`(). => primary ctor <init> [typeparam T ]()(implicit param evidence$1: Manifest[T]): J[T]
 example/Synthetic#J#`<init>`().(evidence$1) => implicit param evidence$1: Manifest[T]
 example/Synthetic#J#arr. => val method arr Array[T]
@@ -4250,11 +4256,11 @@ Occurrences => 18 entries
 Symbols:
 _empty_/Test_depmatch. => final object Test_depmatch extends Object { self: Test_depmatch.type => +4 decls }
 _empty_/Test_depmatch.Bar# => type Bar [typeparam T ] = T match { Unit => Unit }
-_empty_/Test_depmatch.Bar#[T] => typeparam T 
+_empty_/Test_depmatch.Bar#[T] => typeparam T
 _empty_/Test_depmatch.Foo# => type Foo  = Int { type U  }
 _empty_/Test_depmatch.baz(). => inline macro baz (param foo: Foo): Unit
 _empty_/Test_depmatch.baz().(foo) => param foo: Foo
-local0 => type U 
+local0 => type U
 local1 => val local v: Bar[foo.U]
 
 Occurrences:
@@ -4310,7 +4316,7 @@ Occurrences => 33 entries
 
 Symbols:
 exports/example/Codec# => trait Codec [typeparam T ] extends Object with Decoder[T] with Encoder[T] { self: Codec[T] => +6 decls }
-exports/example/Codec#[T] => typeparam T 
+exports/example/Codec#[T] => typeparam T
 exports/example/Codec#`<init>`(). => primary ctor <init> [typeparam T ](param decode: Decoder[T], param encode: Encoder[T]): Codec[T]
 exports/example/Codec#`<init>`().(decode) => param decode: Decoder[T]
 exports/example/Codec#`<init>`().(encode) => param encode: Encoder[T]
@@ -4321,12 +4327,12 @@ exports/example/Codec#encode(). => final method encode (param t: T): Array[Byte]
 exports/example/Codec#encode().(t) => param t: T
 exports/example/Codec#encode. => private[this] val method encode Encoder[T]
 exports/example/Decoder# => trait Decoder [covariant typeparam T ] extends Object { self: Decoder[T] => +3 decls }
-exports/example/Decoder#[T] => covariant typeparam T 
+exports/example/Decoder#[T] => covariant typeparam T
 exports/example/Decoder#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Decoder[T]
 exports/example/Decoder#decode(). => abstract method decode (param a: Array[Byte]): T
 exports/example/Decoder#decode().(a) => param a: Array[Byte]
 exports/example/Encoder# => trait Encoder [contravariant typeparam T ] extends Object { self: Encoder[T] => +3 decls }
-exports/example/Encoder#[T] => contravariant typeparam T 
+exports/example/Encoder#[T] => contravariant typeparam T
 exports/example/Encoder#`<init>`(). => primary ctor <init> [contravariant typeparam T ](): Encoder[T]
 exports/example/Encoder#encode(). => abstract method encode (param t: T): Array[Byte]
 exports/example/Encoder#encode().(t) => param t: T
@@ -4380,11 +4386,11 @@ Occurrences => 5 entries
 Symbols:
 exports/`exports-package$package`. => final package object exports extends Object { self: exports.type => +4 decls }
 exports/`exports-package$package`.Codec# => final type Codec [typeparam T ] = Codec[T]
-exports/`exports-package$package`.Codec#[T] => typeparam T 
+exports/`exports-package$package`.Codec#[T] => typeparam T
 exports/`exports-package$package`.Decoder# => final type Decoder [typeparam T ] = Decoder[T]
-exports/`exports-package$package`.Decoder#[T] => typeparam T 
+exports/`exports-package$package`.Decoder#[T] => typeparam T
 exports/`exports-package$package`.Encoder# => final type Encoder [typeparam T ] = Encoder[T]
-exports/`exports-package$package`.Encoder#[T] => typeparam T 
+exports/`exports-package$package`.Encoder#[T] => typeparam T
 
 Occurrences:
 [0:8..0:15): exports <- exports/
@@ -4426,35 +4432,35 @@ Occurrences => 54 entries
 
 Symbols:
 hk/EitherMonad# => class EitherMonad [typeparam T ] extends Object with Monad[[E] =>> Either[T, E]] { self: EitherMonad[T] => +2 decls }
-hk/EitherMonad#[E] => typeparam E 
-hk/EitherMonad#[T] => typeparam T 
+hk/EitherMonad#[E] => typeparam E
+hk/EitherMonad#[T] => typeparam T
 hk/EitherMonad#`<init>`(). => primary ctor <init> [typeparam T ](): EitherMonad[T]
-hk/EitherMonad#`<init>`().[E] => typeparam E 
+hk/EitherMonad#`<init>`().[E] => typeparam E
 hk/Monad# => trait Monad [typeparam M [type _ ]] extends Object { self: Monad[M] => +4 decls }
 hk/Monad#[M] => typeparam M [type _ ]
-hk/Monad#[M][_] => type _ 
+hk/Monad#[M][_] => type _
 hk/Monad#`<init>`(). => primary ctor <init> [typeparam M [type _ ]](): Monad[M]
 hk/Monad#flatMap(). => method flatMap [typeparam A , typeparam B ](param m: M[A])(param f: Function1[A, M[B]]): M[B]
 hk/Monad#flatMap().(f) => param f: Function1[A, M[B]]
 hk/Monad#flatMap().(m) => param m: M[A]
-hk/Monad#flatMap().[A] => typeparam A 
-hk/Monad#flatMap().[B] => typeparam B 
+hk/Monad#flatMap().[A] => typeparam A
+hk/Monad#flatMap().[B] => typeparam B
 hk/Monad#pure(). => method pure [typeparam A ](param a: A): M[A]
 hk/Monad#pure().(a) => param a: A
-hk/Monad#pure().[A] => typeparam A 
+hk/Monad#pure().[A] => typeparam A
 hk/hk$package. => final package object hk extends Object { self: hk.type => +5 decls }
 hk/hk$package.Id# => type Id [typeparam A ] = A
-hk/hk$package.Id#[A] => typeparam A 
+hk/hk$package.Id#[A] => typeparam A
 hk/hk$package.MapEither# => type MapEither [typeparam K ] = [L] =>> [R] =>> Map[K, Either[L, R]]
-hk/hk$package.MapEither#[K] => typeparam K 
-hk/hk$package.MapEither#[L] => typeparam L 
-hk/hk$package.MapEither#[R] => typeparam R 
+hk/hk$package.MapEither#[K] => typeparam K
+hk/hk$package.MapEither#[L] => typeparam L
+hk/hk$package.MapEither#[R] => typeparam R
 hk/hk$package.MapKV# => type MapKV [typeparam K ] = [V] =>> Map[K, V]
-hk/hk$package.MapKV#[K] => typeparam K 
-hk/hk$package.MapKV#[V] => typeparam V 
+hk/hk$package.MapKV#[K] => typeparam K
+hk/hk$package.MapKV#[V] => typeparam V
 hk/hk$package.MapV# => type MapV [type _ ] = [V] =>> Map[String, V]
-hk/hk$package.MapV#[V] => typeparam V 
-hk/hk$package.MapV#[_] => type _ 
+hk/hk$package.MapV#[V] => typeparam V
+hk/hk$package.MapV#[_] => type _
 
 Occurrences:
 [0:8..0:10): hk <- hk/
@@ -4794,11 +4800,11 @@ _empty_/Concrete#`<init>`(). => primary ctor <init> (): Concrete
 _empty_/Concrete#nullary2(). => method nullary2 => Int <: _empty_/NullaryTest#nullary2().
 _empty_/Concrete#nullary3(). => method nullary3 => List[Int] <: _empty_/NullaryTest#nullary3().
 _empty_/NullaryTest# => abstract class NullaryTest [typeparam T , typeparam m [typeparam s ]] extends Object { self: NullaryTest[T, m] => +9 decls }
-_empty_/NullaryTest#[T] => typeparam T 
+_empty_/NullaryTest#[T] => typeparam T
 _empty_/NullaryTest#[m] => typeparam m [typeparam s ]
-_empty_/NullaryTest#[m][s] => typeparam s 
+_empty_/NullaryTest#[m][s] => typeparam s
 _empty_/NullaryTest#`<init>`(). => primary ctor <init> [typeparam T , typeparam m [typeparam s ]](): NullaryTest[T, m]
-_empty_/NullaryTest#`<init>`().[m][s] => typeparam s 
+_empty_/NullaryTest#`<init>`().[m][s] => typeparam s
 _empty_/NullaryTest#nullary(). => method nullary => String
 _empty_/NullaryTest#nullary2(). => abstract method nullary2 => T
 _empty_/NullaryTest#nullary3(). => abstract method nullary3 => m[T]
@@ -5002,9 +5008,9 @@ flags/p/package.AA#x. => private[this] val method x Int
 flags/p/package.AA#y. => val method y Int
 flags/p/package.AA#z(). => var method z Int
 flags/p/package.C# => abstract class C [covariant typeparam T , contravariant typeparam U , typeparam V ] extends Object { self: C[T, U, V] => +10 decls }
-flags/p/package.C#[T] => covariant typeparam T 
-flags/p/package.C#[U] => contravariant typeparam U 
-flags/p/package.C#[V] => typeparam V 
+flags/p/package.C#[T] => covariant typeparam T
+flags/p/package.C#[U] => contravariant typeparam U
+flags/p/package.C#[V] => typeparam V
 flags/p/package.C#`<init>`(). => primary ctor <init> [covariant typeparam T , contravariant typeparam U , typeparam V ](param x: T, param y: U, param z: V): C[T, U, V]
 flags/p/package.C#`<init>`().(x) => param x: T
 flags/p/package.C#`<init>`().(y) => param y: U
@@ -5017,11 +5023,11 @@ flags/p/package.C#x. => private[this] val method x T
 flags/p/package.C#y. => private[this] val method y U
 flags/p/package.C#z. => private[this] val method z V
 flags/p/package.S# => class S [@specialized typeparam T ] extends Object { self: S[T] => +2 decls }
-flags/p/package.S#[T] => @specialized typeparam T 
+flags/p/package.S#[T] => @specialized typeparam T
 flags/p/package.S#`<init>`(). => primary ctor <init> [@specialized typeparam T ](): S[T]
 flags/p/package.T1# => type T1  = Int
 flags/p/package.T2# => type T2 [typeparam T ] = S[T]
-flags/p/package.T2#[T] => typeparam T 
+flags/p/package.T2#[T] => typeparam T
 flags/p/package.U# => type U  <: Int
 flags/p/package.V# => type V  >: Int
 flags/p/package.X. => final case object X extends Object with Product with Serializable { self: X.type => +1 decls }
@@ -5032,14 +5038,14 @@ flags/p/package.Z#`<init>`(). => primary ctor <init> (): Z
 flags/p/package.`y_=`(). => protected var method y_= (param x$1: Int): Unit
 flags/p/package.`y_=`().(x$1) => param x$1: Int
 flags/p/package.m(). => macro m [typeparam TT ]: Int
-flags/p/package.m().[TT] => typeparam TT 
+flags/p/package.m().[TT] => typeparam TT
 flags/p/package.x. => private[flags/p/] lazy val method x Int
 flags/p/package.xs1. => val method xs1 Nothing
 flags/p/package.y(). => protected implicit var method y Int
 flags/p/package.z(). => method z (param pp: Int): Int
 flags/p/package.z().(pp) => param pp: Int
 local0 => val local xs2: Nothing
-local1 => type t 
+local1 => type t
 
 Occurrences:
 [0:8..0:13): flags <- flags/
@@ -5154,7 +5160,7 @@ local3 => final class $anon extends Object { self: $anon => +2 decls }
 local5 => final class $anon extends M with N { self: $anon => +1 decls }
 local7 => method k => Int
 local8 => final class $anon extends M with N { self: $anon => +2 decls }
-local10 => typeparam T 
+local10 => typeparam T
 local11 => type L [typeparam T ] = List[T]
 types/B# => class B extends Object { self: B => +1 decls }
 types/B#`<init>`(). => primary ctor <init> (): B
@@ -5199,7 +5205,7 @@ types/Test.C#ClassInfoType2# => class ClassInfoType2 extends B { self: ClassInfo
 types/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init> (): ClassInfoType2
 types/Test.C#ClassInfoType2#x(). => method x => Int
 types/Test.C#ClassInfoType3# => trait ClassInfoType3 [typeparam T ] extends Object { self: ClassInfoType3[T] => +2 decls }
-types/Test.C#ClassInfoType3#[T] => typeparam T 
+types/Test.C#ClassInfoType3#[T] => typeparam T
 types/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init> [typeparam T ](): ClassInfoType3[T]
 types/Test.C#Either. => val method Either Either.type
 types/Test.C#MethodType. => final object MethodType extends Object { self: MethodType.type => +7 decls }
@@ -5209,7 +5215,7 @@ types/Test.C#MethodType.m5(). => method m5 (param x: Int): Int
 types/Test.C#MethodType.m5().(x) => param x: Int
 types/Test.C#MethodType.m6(). => method m6 [typeparam T ](param x: T): T
 types/Test.C#MethodType.m6().(x) => param x: T
-types/Test.C#MethodType.m6().[T] => typeparam T 
+types/Test.C#MethodType.m6().[T] => typeparam T
 types/Test.C#MethodType.x1(). => method x1 => Int
 types/Test.C#MethodType.x2(). => method x2 => Int
 types/Test.C#RepeatedType# => case class RepeatedType extends Object with Product with Serializable { self: RepeatedType => +4 decls }
@@ -5226,15 +5232,15 @@ types/Test.C#RepeatedType.toString(). => method toString => String <: scala/Any#
 types/Test.C#RepeatedType.unapplySeq(). => method unapplySeq (param x$1: RepeatedType): RepeatedType
 types/Test.C#RepeatedType.unapplySeq().(x$1) => param x$1: RepeatedType
 types/Test.C#TypeType. => final object TypeType extends Object { self: TypeType.type => +6 decls }
-types/Test.C#TypeType.T1# => type T1 
+types/Test.C#TypeType.T1# => type T1
 types/Test.C#TypeType.T4# => type T4  = C
 types/Test.C#TypeType.T5# => type T5 [typeparam U ] = U
-types/Test.C#TypeType.T5#[U] => typeparam U 
+types/Test.C#TypeType.T5#[U] => typeparam U
 types/Test.C#TypeType.m2(). => method m2 [typeparam T2  = C]: Nothing
 types/Test.C#TypeType.m2().[T2] => typeparam T2  = C
 types/Test.C#TypeType.m3(). => method m3 [typeparam M3 [type _ ]]: Nothing
 types/Test.C#TypeType.m3().[M3] => typeparam M3 [type _ ]
-types/Test.C#TypeType.m3().[M3][_] => type _ 
+types/Test.C#TypeType.m3().[M3][_] => type _
 types/Test.C#`<init>`(). => primary ctor <init> (): C
 types/Test.C#annType1. => val method annType1 T @ann[T]
 types/Test.C#annType2. => val method annType2 T @ann1 @ann2
@@ -5257,7 +5263,7 @@ types/Test.C#thisType1. => val method thisType1 C.this.type
 types/Test.C#thisType2. => val method thisType2 C.this.type
 types/Test.C#typeLambda1(). => method typeLambda1 [typeparam M [type _ ]]: Nothing
 types/Test.C#typeLambda1().[M] => typeparam M [type _ ]
-types/Test.C#typeLambda1().[M][_] => type _ 
+types/Test.C#typeLambda1().[M][_] => type _
 types/Test.C#typeRef1. => val method typeRef1 C
 types/Test.C#typeRef2. => val method typeRef2 p.C
 types/Test.C#typeRef3. => val method typeRef3 T#C
@@ -5282,7 +5288,7 @@ types/Test.N# => trait N extends Object { self: N => +2 decls }
 types/Test.N#`<init>`(). => primary ctor <init> (): N
 types/Test.N#n(). => method n => Int
 types/ann# => class ann [typeparam T ] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
-types/ann#[T] => typeparam T 
+types/ann#[T] => typeparam T
 types/ann#`<init>`(). => primary ctor <init> [typeparam T ](param x: T): ann[T]
 types/ann#`<init>`().(x) => param x: T
 types/ann#x. => private[this] val method x T
diff --git a/tests/warn/i22681.scala b/tests/warn/i22681.scala
new file mode 100644
index 000000000000..49ad9c19654d
--- /dev/null
+++ b/tests/warn/i22681.scala
@@ -0,0 +1,17 @@
+
+//> using options -Wunused:all
+
+trait T:
+  def t: Int
+
+class C:
+  def f: Runnable { def u: Int } = new Runnable with T:
+    private def v = 42 // avoid g judged too trivial to warn
+    def run() = ()
+    def g = v // LTS specific: no warn, althougheffectively private member is unused
+    def t = v // nowarn
+    def u = v // nowarn because leaked by refinement
+  val v: Runnable { def u: Int } = new Runnable:
+    private def v = 42 // avoid g judged too trivial to warn
+    def run() = ()
+    def u = v // nowarn because leaked by refinement

From f65d04f5b1a255e9ee31912f4814969e2645410d Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 25 Apr 2025 08:17:27 +0200
Subject: [PATCH 159/505] First cut at nowarn refinement members

[Cherry-picked 133dcb3bf765f43e160ea70699bc399f35fb96b4][modified]

From adab04ae4c9ddd8bd4898d59a744cec770a96840 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Wed, 18 Dec 2024 15:17:07 +0100
Subject: [PATCH 160/505] Make Ref.apply() return trees usable in the largest
 scope possible

Previously for symbols contained in objects (prefixed by, let's say,
'pre'), we would return:
* an Ident if pre contained only static
object and packages;
* Select(This(moduleClassSymbol), sym) if a prefix contained a class.

However, this meant that in the second case, the generated tree would
require the macro to be expanded inside of the object, even though it
should be enough to just expand inside of the innermost class.
This was unexpected and confusing, so it was changed to not return
innermost module classes wrapped with This().

[Cherry-picked 238ba458b491c06e9f492673607157619b61d007]
---
 compiler/src/dotty/tools/dotc/ast/tpd.scala   | 15 +++++++
 .../tools/dotc/core/SymDenotations.scala      |  1 -
 .../quoted/runtime/impl/QuotesImpl.scala      |  2 +-
 library/src/scala/quoted/Quotes.scala         |  6 ++-
 tests/pos-macros/i20349a/Macro_1.scala        | 11 +++++
 tests/pos-macros/i20349a/Test_2.scala         | 16 +++++++
 tests/pos-macros/i20349b/Macro_1.scala        | 43 +++++++++++++++++++
 tests/pos-macros/i20349b/Test_2.scala         | 14 ++++++
 8 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 tests/pos-macros/i20349a/Macro_1.scala
 create mode 100644 tests/pos-macros/i20349a/Test_2.scala
 create mode 100644 tests/pos-macros/i20349b/Macro_1.scala
 create mode 100644 tests/pos-macros/i20349b/Test_2.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
index c119dfd8d982..6ce8d93af76a 100644
--- a/compiler/src/dotty/tools/dotc/ast/tpd.scala
+++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -477,6 +477,21 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def ref(sym: Symbol)(using Context): Tree =
     ref(NamedType(sym.owner.thisType, sym.name, sym.denot))
 
+  // Like `ref`, but avoids wrapping innermost module class references with This(),
+  // instead mapping those to objects, so that the resulting trees can be used in
+  // largest scope possible (method added for macros)
+  def generalisedRef(sym: Symbol)(using Context): Tree =
+    // Removes ThisType from inner module classes, replacing those with references to objects
+    def simplifyThisTypePrefix(tpe: Type)(using Context): Type =
+      tpe match
+        case ThisType(tref @ TypeRef(prefix, _)) if tref.symbol.flags.is(Module) =>
+          TermRef(simplifyThisTypePrefix(prefix), tref.symbol.companionModule)
+        case TypeRef(prefix, designator) =>
+          TypeRef(simplifyThisTypePrefix(prefix), designator)
+        case _ =>
+          tpe
+    ref(NamedType(simplifyThisTypePrefix(sym.owner.thisType), sym.name, sym.denot))
+
   private def followOuterLinks(t: Tree)(using Context) = t match {
     case t: This if ctx.erasedTypes && !(t.symbol == ctx.owner.enclosingClass || t.symbol.isStaticOwner) =>
       // after erasure outer paths should be respected
diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
index 0e068eff2cfd..340197ffc4a0 100644
--- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -1945,7 +1945,6 @@ object SymDenotations {
 
     /** The this-type depends on the kind of class:
      *  - for a package class `p`:  ThisType(TypeRef(Noprefix, p))
-     *  - for a module class `m`: A term ref to m's source module.
      *  - for all other classes `c` with owner `o`: ThisType(TypeRef(o.thisType, c))
      */
     override def thisType(using Context): Type = {
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index a666feace741..b6d0eae2fbbb 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -454,7 +454,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
         withDefaultPos(tpd.ref(tp).asInstanceOf[tpd.RefTree])
       def apply(sym: Symbol): Ref =
         assert(sym.isTerm, s"expected a term symbol, but received $sym")
-        val refTree = tpd.ref(sym) match
+        val refTree = tpd.generalisedRef(sym) match
           case t @ tpd.This(ident) => // not a RefTree, so we need to work around this - issue #19732
             // ident in `This` can be a TypeIdent of sym, so we manually prepare the ref here,
             // knowing that the owner is actually `This`.
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
index c5d0022b6cf5..544e9119a770 100644
--- a/library/src/scala/quoted/Quotes.scala
+++ b/library/src/scala/quoted/Quotes.scala
@@ -878,10 +878,14 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       *  If `sym` refers to a class member `foo` in class `C`,
       *  returns a tree representing `C.this.foo`.
       *
+      *  If `sym` refers to an object member `foo` in object C, itself in prefix
+      *  `pre` (which might include `.this`, if it contains a class),
+      *  returns `pre.C.foo`.
+      *
       *  If `sym` refers to a local definition `foo`, returns
       *  a tree representing `foo`.
       *
-      *  @note In both cases, the constructed tree should only
+      *  @note In all cases, the constructed tree should only
       *  be spliced into the places where such accesses make sense.
       *  For example, it is incorrect to have `C.this.foo` outside
       *  the class body of `C`, or have `foo` outside the lexical
diff --git a/tests/pos-macros/i20349a/Macro_1.scala b/tests/pos-macros/i20349a/Macro_1.scala
new file mode 100644
index 000000000000..41c5083b328c
--- /dev/null
+++ b/tests/pos-macros/i20349a/Macro_1.scala
@@ -0,0 +1,11 @@
+import scala.quoted.*
+
+object Macros {
+  def valuesImpl[A: Type](using Quotes): Expr[Any] = {
+    import quotes.reflect.*
+    val symbol = TypeRepr.of[A].typeSymbol.fieldMember("value")
+    Ref(symbol).asExprOf[Any]
+  }
+
+  transparent inline def values[A]: Any = ${ valuesImpl[A] }
+}
diff --git a/tests/pos-macros/i20349a/Test_2.scala b/tests/pos-macros/i20349a/Test_2.scala
new file mode 100644
index 000000000000..4569c501e055
--- /dev/null
+++ b/tests/pos-macros/i20349a/Test_2.scala
@@ -0,0 +1,16 @@
+
+class Cls{
+  object a {
+    object domain {
+      val value = ""
+    }
+  }
+  Macros.values[a.domain.type]
+}
+
+object Test {
+  lazy val script = new Cls()
+  def main(args: Array[String]): Unit =
+    val _ = script.hashCode()
+    ???
+}
diff --git a/tests/pos-macros/i20349b/Macro_1.scala b/tests/pos-macros/i20349b/Macro_1.scala
new file mode 100644
index 000000000000..413274b4b516
--- /dev/null
+++ b/tests/pos-macros/i20349b/Macro_1.scala
@@ -0,0 +1,43 @@
+import scala.quoted.*
+
+object Macros {
+
+
+  def valuesImpl[A: Type](using quotes: Quotes): Expr[List[A]] = {
+    import quotes.*, quotes.reflect.*
+
+    extension (sym: Symbol)
+     def isPublic: Boolean = !sym.isNoSymbol &&
+          !(sym.flags.is(Flags.Private) || sym.flags.is(Flags.PrivateLocal) || sym.flags.is(Flags.Protected) ||
+            sym.privateWithin.isDefined || sym.protectedWithin.isDefined)
+
+    def isSealed[A: Type]: Boolean =
+      TypeRepr.of[A].typeSymbol.flags.is(Flags.Sealed)
+
+    def extractSealedSubtypes[A: Type]: List[Type[?]] = {
+      def extractRecursively(sym: Symbol): List[Symbol] =
+        if sym.flags.is(Flags.Sealed) then sym.children.flatMap(extractRecursively)
+        else if sym.flags.is(Flags.Enum) then List(sym.typeRef.typeSymbol)
+        else if sym.flags.is(Flags.Module) then List(sym.typeRef.typeSymbol.moduleClass)
+        else List(sym)
+
+      extractRecursively(TypeRepr.of[A].typeSymbol).distinct.map(typeSymbol =>
+        typeSymbol.typeRef.asType
+      )
+    }
+
+    if isSealed[A] then {
+      val refs = extractSealedSubtypes[A].flatMap { tpe =>
+        val sym = TypeRepr.of(using tpe).typeSymbol
+        val isCaseVal = sym.isPublic && sym.flags
+          .is(Flags.Case | Flags.Enum) && (sym.flags.is(Flags.JavaStatic) || sym.flags.is(Flags.StableRealizable))
+
+        if (isCaseVal) then List(Ref(sym).asExprOf[A])
+        else Nil
+      }
+      Expr.ofList(refs)
+    } else '{ Nil }
+  }
+
+  inline def values[A]: List[A] = ${ valuesImpl[A] }
+}
diff --git a/tests/pos-macros/i20349b/Test_2.scala b/tests/pos-macros/i20349b/Test_2.scala
new file mode 100644
index 000000000000..a392a636dc44
--- /dev/null
+++ b/tests/pos-macros/i20349b/Test_2.scala
@@ -0,0 +1,14 @@
+class Test {
+  object domain {
+    enum PaymentMethod:
+      case PayPal(email: String)
+      case Card(digits: Long, name: String)
+      case Cash
+  }
+  println(Macros.values[domain.PaymentMethod])
+}
+object Test {
+  lazy val script = new Test()
+  def main(args: Array[String]): Unit =
+    val _ = script.hashCode()
+}

From 1af6ec1aab7586c93765db7cb8bd1c4026fb091c Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 7 Mar 2025 10:48:54 -0800
Subject: [PATCH 161/505] Restore resolving prefixes of implicit Ident

---
 .../tools/dotc/transform/CheckUnused.scala    | 44 ++++++++++++-------
 tests/warn/i22681.scala                       |  2 +-
 tests/warn/i22744.scala                       | 35 +++++++++++++++
 3 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 tests/warn/i22744.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index bb298b1bcc16..61c18180420f 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -58,6 +58,12 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         || tree.srcPos.isZeroExtentSynthetic
         || refInfos.inlined.exists(_.sourcePos.contains(tree.srcPos.sourcePos))
       if resolving && !ignoreTree(tree) then
+        def loopOverPrefixes(prefix: Type, depth: Int): Unit =
+          if depth < 10 && prefix.exists && !prefix.classSymbol.isEffectiveRoot then
+            resolveUsage(prefix.classSymbol, nme.NO_NAME, NoPrefix)
+            loopOverPrefixes(prefix.normalizedPrefix, depth + 1)
+        if tree.srcPos.isZeroExtentSynthetic then
+          loopOverPrefixes(tree.typeOpt.normalizedPrefix, depth = 0)
         resolveUsage(tree.symbol, tree.name, tree.typeOpt.importPrefix.skipPackageObject)
     else if tree.hasType then
       resolveUsage(tree.tpe.classSymbol, tree.name, tree.tpe.importPrefix.skipPackageObject)
@@ -116,7 +122,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     tree
 
   override def prepareForMatch(tree: Match)(using Context): Context =
-    // exonerate case.pat against tree.selector (simple var pat only for now)
+    // allow case.pat against tree.selector (simple var pat only for now)
     tree.selector match
     case Ident(nm) => tree.cases.foreach(k => allowVariableBindings(List(nm), List(k.pat)))
     case _ =>
@@ -138,9 +144,9 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     refInfos.inlined.push(tree.call.srcPos)
     ctx
   override def transformInlined(tree: Inlined)(using Context): tree.type =
+    transformAllDeep(tree.expansion) // traverse expansion with nonempty inlined stack to avoid registering defs
     val _ = refInfos.inlined.pop()
-    if !tree.call.isEmpty && phaseMode.eq(PhaseMode.Aggregate) then
-      transformAllDeep(tree.call)
+    transformAllDeep(tree.call)
     tree
 
   override def prepareForBind(tree: Bind)(using Context): Context =
@@ -158,11 +164,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     traverseAnnotations(tree.symbol)
     if tree.name.startsWith("derived$") && tree.hasType then
       def loop(t: Tree): Unit = t match
-        case Ident(name)  =>
-          val target =
-            val ts0 = t.tpe.typeSymbol
-            if ts0.is(ModuleClass) then ts0.companionModule else ts0
-          resolveUsage(target, name, t.tpe.underlyingPrefix.skipPackageObject)
+        case Ident(name)  => resolveUsage(t.tpe.typeSymbol, name, t.tpe.underlyingPrefix.skipPackageObject)
         case Select(t, _) => loop(t)
         case _            =>
       tree.getAttachment(OriginalTypeClass).foreach(loop)
@@ -272,8 +274,9 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
    *  For Select, lint does not look up `<empty>.scala` (so top-level syms look like magic) but records `scala.Int`.
    *  For Ident, look-up finds the root import as usual. A competing import is OK because higher precedence.
    */
-  def resolveUsage(sym: Symbol, name: Name, prefix: Type)(using Context): Unit =
+  def resolveUsage(sym0: Symbol, name: Name, prefix: Type)(using Context): Unit =
     import PrecedenceLevels.*
+    val sym = sym0.userSymbol
 
     def matchingSelector(info: ImportInfo): ImportSelector | Null =
       val qtpe = info.site
@@ -319,7 +322,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
 
     // Avoid spurious NoSymbol and also primary ctors which are never warned about.
     // Selections C.this.toString should be already excluded, but backtopped here for eq, etc.
-    if !sym.exists || sym.isPrimaryConstructor || defn.topClasses(sym.owner) then return
+    if !sym.exists || sym.isPrimaryConstructor || sym.isEffectiveRoot || defn.topClasses(sym.owner) then return
 
     // Find the innermost, highest precedence. Contexts have no nesting levels but assume correctness.
     // If the sym is an enclosing definition (the owner of a context), it does not count toward usages.
@@ -454,11 +457,15 @@ object CheckUnused:
         if !tree.name.isInstanceOf[DerivedName] then
           pats.addOne((tree.symbol, tree.namePos))
       case tree: NamedDefTree =>
-        if (tree.symbol ne NoSymbol) && !tree.name.isWildcard && !tree.hasAttachment(NoWarn) then
-          defs.addOne((tree.symbol, tree.namePos))
+        if (tree.symbol ne NoSymbol)
+          && !tree.name.isWildcard
+          && !tree.hasAttachment(NoWarn)
+          && !tree.symbol.is(ModuleVal) // track only the ModuleClass using the object symbol, with correct namePos
+        then
+          defs.addOne((tree.symbol.userSymbol, tree.namePos))
       case _ =>
         if tree.symbol ne NoSymbol then
-          defs.addOne((tree.symbol, tree.srcPos))
+          defs.addOne((tree.symbol, tree.srcPos)) // TODO is this a code path
 
     val inlined = Stack.empty[SrcPos] // enclosing call.srcPos of inlined code (expansions)
     var inliners = 0 // depth of inline def (not inlined yet)
@@ -518,7 +525,7 @@ object CheckUnused:
     def checkPrivate(sym: Symbol, pos: SrcPos) =
       if ctx.settings.WunusedHas.privates
         && !sym.isPrimaryConstructor
-        && sym.is(Private, butNot = SelfName | Synthetic | CaseAccessor)
+        && !sym.isOneOf(SelfName | Synthetic | CaseAccessor)
         && !sym.name.is(BodyRetainerName)
         && !sym.isSerializationSupport
         && !(sym.is(Mutable) && sym.isSetter && sym.owner.is(Trait)) // tracks sym.underlyingSymbol sibling getter
@@ -763,7 +770,7 @@ object CheckUnused:
     for (sym, pos) <- infos.defs.iterator if !sym.hasAnnotation(defn.UnusedAnnot) do
       if infos.refs(sym) then
         checkUnassigned(sym, pos)
-      else if sym.is(Private, butNot = ParamAccessor) then
+      else if sym.isEffectivelyPrivate then
         checkPrivate(sym, pos)
       else if sym.is(Param, butNot = Given | Implicit) then
         checkParam(sym, pos)
@@ -903,6 +910,13 @@ object CheckUnused:
         val base = if owner.classInfo.selfInfo != NoType then owner.thisType else owner.info
         base.baseClasses.drop(1).iterator.exists(sym.overriddenSymbol(_).exists)
       }
+    def isEffectivelyPrivate: Boolean =
+      sym.is(Private, butNot = ParamAccessor)
+      || sym.owner.isAnonymousClass && !sym.nextOverriddenSymbol.exists
+    // pick the symbol the user wrote for purposes of tracking
+    inline def userSymbol: Symbol=
+      if sym.denot.is(ModuleClass) then sym.denot.companionModule else sym
+
   extension (sel: ImportSelector)
     def boundTpe: Type = sel.bound match
       case untpd.TypedSplice(tree) => tree.tpe
diff --git a/tests/warn/i22681.scala b/tests/warn/i22681.scala
index 49ad9c19654d..f8b535084f6c 100644
--- a/tests/warn/i22681.scala
+++ b/tests/warn/i22681.scala
@@ -8,7 +8,7 @@ class C:
   def f: Runnable { def u: Int } = new Runnable with T:
     private def v = 42 // avoid g judged too trivial to warn
     def run() = ()
-    def g = v // LTS specific: no warn, althougheffectively private member is unused
+    def g = v // warn, effectively private member is unused
     def t = v // nowarn
     def u = v // nowarn because leaked by refinement
   val v: Runnable { def u: Int } = new Runnable:
diff --git a/tests/warn/i22744.scala b/tests/warn/i22744.scala
new file mode 100644
index 000000000000..655a14b162ce
--- /dev/null
+++ b/tests/warn/i22744.scala
@@ -0,0 +1,35 @@
+
+//> using options -Wunused:privates -Werror
+
+object test {
+  private trait Foo[A] { val value: A }
+
+  private object Foo { // no warn prefix of implicit value
+    given int: Foo[Int] = new Foo[Int] { val value = 1 }
+  }
+
+  val i = summon[Foo[Int]].value
+}
+
+object supplement {
+  private trait Foo[A] { val value: A }
+
+  private object Foo { // no warn prefix of implicit value
+    given int: Foo[Int] = new Foo[Int] { val value = 1 }
+  }
+
+  private def fooValue[A](using f: Foo[A]): A = f.value
+
+  val i = fooValue[Int]
+}
+
+package p:
+  private trait Foo[A] { val value: A }
+
+  private object Foo { // no warn prefix of implicit value
+    given int: Foo[Int] = new Foo[Int] { val value = 1 }
+  }
+
+  private def fooValue[A](using f: Foo[A]): A = f.value
+
+  val i = fooValue[Int]

From f8cb874c715573d187f26ad5d4942ffcd4a26993 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 25 Apr 2025 08:22:25 +0200
Subject: [PATCH 162/505] Restore resolving prefixes of implicit Ident

[Cherry-picked d1852bf26f84cae03674755f77006b2ac6fe7e35][modified]

From b7bb55f30bf076d5a752b7ced918fc9b7fbb7c56 Mon Sep 17 00:00:00 2001
From: HarrisL2 <harris.yh.lau@gmail.com>
Date: Mon, 10 Mar 2025 06:19:15 -0400
Subject: [PATCH 163/505] Scaladoc tool: render `@deprecated` correctly even
 when named arguments weren't used (#21925)

Fixes #20118

Still need a test case for this issue using jsoup
[Cherry-picked 120f305b17afc72bacf33da85386a41665a568d6]
---
 scaladoc-testcases/src/tests/deprecated.scala | 63 +++++++++++++++----
 .../scaladoc/renderers/MemberRenderer.scala   |  7 ++-
 .../TranslatableSignaturesTestCases.scala     |  2 +
 3 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/scaladoc-testcases/src/tests/deprecated.scala b/scaladoc-testcases/src/tests/deprecated.scala
index 983ff7e012c7..f02f1363e9ea 100644
--- a/scaladoc-testcases/src/tests/deprecated.scala
+++ b/scaladoc-testcases/src/tests/deprecated.scala
@@ -2,22 +2,61 @@ package tests
 package deprecated
 
 class A:
-  def defInt: Int = 1
+  def defInt: Int
+    = 1
   @deprecated(message = "1")
-  def def1: 1 = 1
+  def def1: 1
+    = 1
   @deprecated("reason")
-  val valInt: Int = 1
-  val val1: 1 = 1
-  var varInt: Int = 1
-  var var1: 1 = 1
+  val valInt: Int
+    = 1
+  val val1: 1
+    = 1
+  var varInt: Int
+    = 1
+  var var1: 1
+    = 1
   class InnerA:
-    val innerVal: Int = 1
+    val innerVal: Int
+      = 1
 
 class B extends A:
   @deprecated(since = "1", message = "some reason")
-  def x: Int = 1
-  val y: Int = 1
+  def x: Int
+    = 1
+  val y: Int
+    = 1
 
-
-@java.lang.Deprecated
-class JavaDeprecated
+class C:
+  /** zero */
+  @deprecated
+  def noInfo: Int
+    = 0
+  /** one */
+  @deprecated()
+  def noInfo2: Int
+    = 0
+  /** two */
+  @deprecated("without names", "2.10.0")
+  def noNames: Int
+    = 0
+  /** three */
+  @deprecated(message = "with names", since = "2.10.0")
+  def withNames: Int
+    = 1
+  /** four */
+  @deprecated(since = "2.10.0", message = "backwards names")
+  def backwardNames: Int
+    = 2
+  /** five */
+  @deprecated("only message")
+  def onlyUnnamedMessage: Int
+    = 0
+  /** six */
+  @deprecated(message = "only named message")
+  def onlyNamedMessage: Int
+    = 1
+  /** seven */
+  @deprecated(since = "2.10.0")
+  def onlyNamedSince: Int
+    = 2
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala
index 7e5394b598fd..98479b8b95ea 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala
@@ -80,9 +80,12 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
         signatureRenderer.renderLink(stripQuotes(text), dri)
       case Annotation.UnresolvedParameter(_, value) => stripQuotes(value)
 
+    // named arguments might be used, so we can't always rely on the order of the parameters
     val (named, unnamed) = a.params.partition(_.name.nonEmpty)
-    val message = named.find(_.name.get == "message")
-    val since = named.find(_.name.get == "since")
+    val message: Option[Annotation.AnnotationParameter] =
+      named.find(_.name.get == "message").fold(unnamed.lift(0))(Some(_))
+    val since: Option[Annotation.AnnotationParameter] =
+      named.find(_.name.get == "since").fold(unnamed.lift(1))(Some(_))
 
     val content = (
       Seq(
diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
index b658bfcdedc0..78de0ce67124 100644
--- a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
@@ -55,6 +55,8 @@ class GivenSignatures extends SignatureTest("givenSignatures", SignatureTest.all
 
 class Annotations extends SignatureTest("annotations", SignatureTest.all)
 
+class Deprecated extends SignatureTest("deprecated", SignatureTest.all)
+
 class InheritanceLoop extends SignatureTest("inheritanceLoop", SignatureTest.all)
 
 class InheritedMembers extends SignatureTest("inheritedMembers2", SignatureTest.all.filter(_ != "class"),

From f76ccd37248839f9ea21cc2ce9890857c0d8929f Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 9 Jan 2025 15:12:03 -0500
Subject: [PATCH 164/505] Skeleton :require

[Cherry-picked f8cd3ba2dd9f03c061c94b370df3623eca16c2e5]
---
 compiler/src/dotty/tools/repl/ParseResult.scala      |  8 ++++++++
 compiler/src/dotty/tools/repl/ReplDriver.scala       | 12 ++++++++++++
 .../test/dotty/tools/repl/TabcompleteTests.scala     |  1 +
 3 files changed, 21 insertions(+)

diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala
index dd4c5d80a9e1..da5ae8807d99 100644
--- a/compiler/src/dotty/tools/repl/ParseResult.scala
+++ b/compiler/src/dotty/tools/repl/ParseResult.scala
@@ -52,6 +52,13 @@ object Load {
   val command: String = ":load"
 }
 
+/** `:require <path>` adds a jar to the classpath 
+ */
+case class Require(path: String) extends Command
+object Require {
+  val command: String = ":require"
+}
+
 /** `:kind <type>` display the kind of a type. see also :help kind
  */
 case class KindOf(expr: String) extends Command
@@ -153,6 +160,7 @@ object ParseResult {
     Imports.command -> (_  => Imports),
     KindOf.command -> (arg => KindOf(arg)),
     Load.command -> (arg => Load(arg)),
+    Require.command -> (arg => Require(arg)),
     TypeOf.command -> (arg => TypeOf(arg)),
     DocOf.command -> (arg => DocOf(arg)),
     Settings.command -> (arg => Settings(arg)),
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 114fa607f945..123e13c09a27 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -513,6 +513,18 @@ class ReplDriver(settings: Array[String],
         state
       }
 
+    case Require(path) =>
+      val file = new JFile(path)
+      if (file.exists) {
+//        val contents = Using(scala.io.Source.fromFile(file, StandardCharsets.UTF_8.name))(_.mkString).get
+//        run(contents)
+        ???
+      }
+      else {
+        out.println(s"""Couldn't find file "${file.getCanonicalPath}"""")
+        state
+      }
+
     case KindOf(expr) =>
       out.println(s"""The :kind command is not currently supported.""")
       state
diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
index a881b828ec75..3cfe976d8169 100644
--- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala
+++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
@@ -218,6 +218,7 @@ class TabcompleteTests extends ReplTest {
         ":imports",
         ":kind",
         ":load",
+        ":require",
         ":quit",
         ":reset",
         ":settings",

From 4c9e2bd911a2b1b8010232275d3e1561e4860a67 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 9 Jan 2025 17:11:09 -0500
Subject: [PATCH 165/505] find class names, need to add URL to loader

[Cherry-picked d528014801d4c1a31f1b21393b143545bfdf7da0]
---
 .../src/dotty/tools/repl/ParseResult.scala    |  2 +-
 .../src/dotty/tools/repl/ReplDriver.scala     | 43 +++++++++++++++----
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala
index da5ae8807d99..409572aeacf6 100644
--- a/compiler/src/dotty/tools/repl/ParseResult.scala
+++ b/compiler/src/dotty/tools/repl/ParseResult.scala
@@ -52,7 +52,7 @@ object Load {
   val command: String = ":load"
 }
 
-/** `:require <path>` adds a jar to the classpath 
+/** `:require <path>` adds a jar to the classpath
  */
 case class Require(path: String) extends Command
 object Require {
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 123e13c09a27..a572e952ac5f 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -38,6 +38,7 @@ import org.jline.reader.*
 import scala.annotation.tailrec
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.*
+import scala.tools.asm.ClassReader
 import scala.util.control.NonFatal
 import scala.util.Using
 
@@ -514,16 +515,40 @@ class ReplDriver(settings: Array[String],
       }
 
     case Require(path) =>
-      val file = new JFile(path)
-      if (file.exists) {
-//        val contents = Using(scala.io.Source.fromFile(file, StandardCharsets.UTF_8.name))(_.mkString).get
-//        run(contents)
-        ???
-      }
-      else {
-        out.println(s"""Couldn't find file "${file.getCanonicalPath}"""")
+      val f = new JFile(path)
+      val jarFile = AbstractFile.getDirectory(path)
+      if (!f.exists || jarFile == null)
+        out.println(s"""Cannot add "$path" to classpath.""")
+        state
+      else
+        def flatten(f: AbstractFile): Iterator[AbstractFile] =
+          if (f.isClassContainer) f.iterator.flatMap(flatten)
+          else Iterator(f)
+
+        val entries = flatten(jarFile)
+
+        def classNameOf(classFile: AbstractFile): String = {
+          val input = classFile.input
+          try {
+            val reader = new ClassReader(input)
+            reader.getClassName.replace('/', '.')
+          } finally {
+            input.close()
+          }
+        }
+
+        val clsl = rendering.classLoader()(using state.context)
+
+//        def alreadyDefined(clsName: String) = classLoader.tryToLoadClass(clsName).isDefined
+//        val existingClass = entries.filter(_.ext.isClass).map(classNameOf).find(alreadyDefined)
+
+//        if (existingClass.nonEmpty) out.println(s"The path '$f' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
+//        else {
+//          intp.addUrlsToClassPath(f.toURI.toURL)
+//          out.println(s"Added '$path' to classpath.")
+//          out.println("Added '%s'. Your new classpath is:\n\"%s\"".format(f.path, intp.classPathString))
+//        }
         state
-      }
 
     case KindOf(expr) =>
       out.println(s"""The :kind command is not currently supported.""")

From b58c3b99f9fa504ccba15261d8e3361807697557 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 9 Jan 2025 17:42:09 -0500
Subject: [PATCH 166/505] Attempt to update class loader, not successful

[Cherry-picked f4968e795b31970a0fc7f553a8f96ceebaaa482b]
---
 compiler/src/dotty/tools/repl/ReplDriver.scala | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index a572e952ac5f..1c81db694406 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -537,8 +537,15 @@ class ReplDriver(settings: Array[String],
           }
         }
 
+        // TODO: no idea how to access and reload the class paths
+        val newClassPath = state.context.platform.classPath(using state.context).asURLs :+ f.toURI.toURL
+        println(s"new class path=${newClassPath.mkString(", ")}")
         val clsl = rendering.classLoader()(using state.context)
+        val newClsl = fromURLsParallelCapable(newClassPath, clsl)
+        println(s"newClsl getResource=${newClsl.getURLs.toList}")
+        newClsl.asContext(state.context)
 
+//        Scala 2:
 //        def alreadyDefined(clsName: String) = classLoader.tryToLoadClass(clsName).isDefined
 //        val existingClass = entries.filter(_.ext.isClass).map(classNameOf).find(alreadyDefined)
 

From 597d6b115a293291fa13cef5d027515710ba66b3 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Fri, 10 Jan 2025 17:41:03 -0500
Subject: [PATCH 167/505] Add updateClassPath + reset rootctx

[Cherry-picked b8034c231de2e95fa4e0c9dfb08d991af05d30d4]
---
 .../tools/dotc/config/JavaPlatform.scala      |  6 +++
 .../dotty/tools/dotc/config/Platform.scala    |  1 +
 .../src/dotty/tools/repl/ReplDriver.scala     | 53 +++++++++++--------
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
index 884e40e97d96..549398e0f7cf 100644
--- a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
+++ b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
@@ -27,6 +27,12 @@ class JavaPlatform extends Platform {
       case _ => false
     })
 
+  def addToClassPath(cPath: ClassPath): Unit = currentClassPath.get match {
+    case AggregateClassPath(entries) =>
+      currentClassPath = Some(AggregateClassPath(entries :+ cPath))
+    case cp: ClassPath =>
+      currentClassPath = Some(AggregateClassPath(cp :: cPath :: Nil))
+  }
   /** Update classpath with a substituted subentry */
   def updateClassPath(subst: Map[ClassPath, ClassPath]): Unit = currentClassPath.get match {
     case AggregateClassPath(entries) =>
diff --git a/compiler/src/dotty/tools/dotc/config/Platform.scala b/compiler/src/dotty/tools/dotc/config/Platform.scala
index db05996d98fd..48ee781ccb2a 100644
--- a/compiler/src/dotty/tools/dotc/config/Platform.scala
+++ b/compiler/src/dotty/tools/dotc/config/Platform.scala
@@ -20,6 +20,7 @@ abstract class Platform {
 
   /** Update classpath with a substitution that maps entries to entries */
   def updateClassPath(subst: Map[ClassPath, ClassPath]): Unit
+  def addToClassPath(cPath: ClassPath): Unit
 
   /** Any platform-specific phases. */
   //def platformPhases: List[SubComponent]
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 1c81db694406..4c6fb3851089 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -1,17 +1,16 @@
 package dotty.tools.repl
 
 import scala.language.unsafeNulls
-
-import java.io.{File => JFile, PrintStream}
+import java.io.{PrintStream, File as JFile}
 import java.nio.charset.StandardCharsets
-
 import dotty.tools.dotc.ast.Trees.*
 import dotty.tools.dotc.ast.{tpd, untpd}
+import dotty.tools.dotc.classpath.{AggregateClassPath, ClassPathFactory, ZipAndJarClassPathFactory}
 import dotty.tools.dotc.config.CommandLineParser.tokenize
 import dotty.tools.dotc.config.Properties.{javaVersion, javaVmName, simpleVersionString}
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.*
-import dotty.tools.dotc.core.Phases.{unfusedPhases, typerPhase}
+import dotty.tools.dotc.core.Phases.{typerPhase, unfusedPhases}
 import dotty.tools.dotc.core.Denotations.Denotation
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Mode
@@ -537,24 +536,36 @@ class ReplDriver(settings: Array[String],
           }
         }
 
-        // TODO: no idea how to access and reload the class paths
-        val newClassPath = state.context.platform.classPath(using state.context).asURLs :+ f.toURI.toURL
-        println(s"new class path=${newClassPath.mkString(", ")}")
-        val clsl = rendering.classLoader()(using state.context)
-        val newClsl = fromURLsParallelCapable(newClassPath, clsl)
-        println(s"newClsl getResource=${newClsl.getURLs.toList}")
-        newClsl.asContext(state.context)
-
-//        Scala 2:
-//        def alreadyDefined(clsName: String) = classLoader.tryToLoadClass(clsName).isDefined
-//        val existingClass = entries.filter(_.ext.isClass).map(classNameOf).find(alreadyDefined)
-
-//        if (existingClass.nonEmpty) out.println(s"The path '$f' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
-//        else {
-//          intp.addUrlsToClassPath(f.toURI.toURL)
+        def alreadyDefined(clsName: String) = state.context.platform.classPath(using state.context).findClassFile(clsName).isDefined
+        val existingClass = entries.filter(_.ext.isClass).map(classNameOf).find(alreadyDefined)
+        if (existingClass.nonEmpty)
+          out.println(s"The path '$f' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
+        else
+//          val cp = state.context.platform.classPath(using state.context).asClassPathString
+//          println(s"CURRENT CP STRING: $cp")
+//          val newCP = s"$cp${JFile.pathSeparator}$path"
+//          println(s"UPDATED CP: $newCP")
+
+          // add to compiler class path
+          println(s"INIT state classPath = ${state.context.platform.classPath(using state.context).asClassPathString}")
+          val cpCP = ClassPathFactory.newClassPath(jarFile)(using state.context)
+          state.context.platform.addToClassPath(cpCP)
+          println(s"classPath after add = ${state.context.platform.classPath(using state.context).asClassPathString}")
+
+          // create initial context
+          rootCtx = setupRootCtx(Array(), rootCtx)
+          state.copy(context = rootCtx)
+
+
+          // new class loader
+//          val newClassPath = state.context.platform.classPath(using state.context).asURLs :+ f.toURI.toURL
+//          val oldCL = rendering.classLoader()(using state.context)
+//          val newCL = fromURLsParallelCapable(newClassPath, oldCL)
+//          println(s"new CL class path = ${newCL.getURLs.toList}")
+//          println(s"\nclass name = ${cpCP.className}")
+//          rendering.myClassLoader = new AbstractFileClassLoader(state.context.settings.outputDir.default, newCL)
 //          out.println(s"Added '$path' to classpath.")
-//          out.println("Added '%s'. Your new classpath is:\n\"%s\"".format(f.path, intp.classPathString))
-//        }
+          println(s"after setupRootCtx classPath = ${state.context.platform.classPath(using state.context).asClassPathString}")
         state
 
     case KindOf(expr) =>

From b024bd6b8e73c4cd9c42616d2fa4020829850700 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Fri, 10 Jan 2025 17:58:38 -0500
Subject: [PATCH 168/505] updated state with classpath

[Cherry-picked 800356babcdeaf99ff599a1f1c021417cfdfb517]
---
 .../src/dotty/tools/repl/ReplDriver.scala     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 4c6fb3851089..9b16b5629a73 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -540,21 +540,23 @@ class ReplDriver(settings: Array[String],
         val existingClass = entries.filter(_.ext.isClass).map(classNameOf).find(alreadyDefined)
         if (existingClass.nonEmpty)
           out.println(s"The path '$f' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
+          state
         else
-//          val cp = state.context.platform.classPath(using state.context).asClassPathString
+          val cp = state.context.platform.classPath(using state.context).asClassPathString
 //          println(s"CURRENT CP STRING: $cp")
-//          val newCP = s"$cp${JFile.pathSeparator}$path"
-//          println(s"UPDATED CP: $newCP")
+          val newCP = s"$cp${JFile.pathSeparator}$path"
+          println(s"UPDATED CP: $newCP")
 
           // add to compiler class path
-          println(s"INIT state classPath = ${state.context.platform.classPath(using state.context).asClassPathString}")
-          val cpCP = ClassPathFactory.newClassPath(jarFile)(using state.context)
-          state.context.platform.addToClassPath(cpCP)
-          println(s"classPath after add = ${state.context.platform.classPath(using state.context).asClassPathString}")
+//          println(s"INIT state classPath = ${state.context.platform.classPath(using state.context).asClassPathString}")
+//          val cpCP = ClassPathFactory.newClassPath(jarFile)(using state.context)
+//          state.context.platform.addToClassPath(cpCP)
+//          println(s"classPath after add = ${state.context.platform.classPath(using state.context).asClassPathString}")
 
-          // create initial context
-          rootCtx = setupRootCtx(Array(), rootCtx)
-          state.copy(context = rootCtx)
+          // recreate initial context
+          rootCtx = setupRootCtx(Array(), rootCtx.fresh.setSetting(rootCtx.settings.classpath, newCP))
+          val s = state.copy(context = rootCtx)
+          println(s"after setupRootCtx classPath = ${s.context.platform.classPath(using s.context).asClassPathString}")
 
 
           // new class loader
@@ -565,13 +567,11 @@ class ReplDriver(settings: Array[String],
 //          println(s"\nclass name = ${cpCP.className}")
 //          rendering.myClassLoader = new AbstractFileClassLoader(state.context.settings.outputDir.default, newCL)
 //          out.println(s"Added '$path' to classpath.")
-          println(s"after setupRootCtx classPath = ${state.context.platform.classPath(using state.context).asClassPathString}")
-        state
+          s
 
     case KindOf(expr) =>
       out.println(s"""The :kind command is not currently supported.""")
       state
-
     case TypeOf(expr) =>
       expr match {
         case "" => out.println(s":type <expression>")

From 7d2774d2cd82308227a1aed271e0da8bc0ee9c3f Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Mon, 13 Jan 2025 10:37:36 -0500
Subject: [PATCH 169/505] fix test order

[Cherry-picked f79588b5e55a499ab5c9b50d6137605c5fa4d914]
---
 compiler/test/dotty/tools/repl/TabcompleteTests.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
index 3cfe976d8169..75ecb03b95d7 100644
--- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala
+++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
@@ -218,8 +218,8 @@ class TabcompleteTests extends ReplTest {
         ":imports",
         ":kind",
         ":load",
-        ":require",
         ":quit",
+        ":require",
         ":reset",
         ":settings",
         ":sh",

From fb1187dc0b87a7465e2d74c8c488e457745a22b1 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Mon, 13 Jan 2025 11:35:40 -0500
Subject: [PATCH 170/505] working but state lost

[Cherry-picked 0fad93965cce76c2c54367430a37ca631ad94432]
---
 compiler/src/dotty/tools/repl/ReplDriver.scala | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 9b16b5629a73..3b6180cecd1b 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -554,18 +554,14 @@ class ReplDriver(settings: Array[String],
 //          println(s"classPath after add = ${state.context.platform.classPath(using state.context).asClassPathString}")
 
           // recreate initial context
-          rootCtx = setupRootCtx(Array(), rootCtx.fresh.setSetting(rootCtx.settings.classpath, newCP))
+          resetToInitial(List("-classpath", newCP))
+//          rootCtx = setupRootCtx(Array(), rootCtx.fresh.setSetting(rootCtx.settings.classpath, newCP))
           val s = state.copy(context = rootCtx)
-          println(s"after setupRootCtx classPath = ${s.context.platform.classPath(using s.context).asClassPathString}")
-
 
           // new class loader
-//          val newClassPath = state.context.platform.classPath(using state.context).asURLs :+ f.toURI.toURL
-//          val oldCL = rendering.classLoader()(using state.context)
-//          val newCL = fromURLsParallelCapable(newClassPath, oldCL)
-//          println(s"new CL class path = ${newCL.getURLs.toList}")
-//          println(s"\nclass name = ${cpCP.className}")
-//          rendering.myClassLoader = new AbstractFileClassLoader(state.context.settings.outputDir.default, newCL)
+          val oldCL = rendering.classLoader()(using state.context)
+          val newCL = fromURLsParallelCapable(s.context.platform.classPath(using s.context).asURLs, oldCL)
+          rendering.myClassLoader = new AbstractFileClassLoader(state.context.settings.outputDir.default, newCL)
 //          out.println(s"Added '$path' to classpath.")
           s
 

From 098f2dd00bd6134409815561c27bd9505d78bdf1 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Wed, 15 Jan 2025 15:36:31 -0500
Subject: [PATCH 171/505] Clean up impl

---
 .../dotc/classpath/AggregateClassPath.scala   |  7 ++-
 .../tools/dotc/config/JavaPlatform.scala      |  4 +-
 .../dotty/tools/dotc/config/Platform.scala    |  6 ++-
 .../src/dotty/tools/dotc/core/Contexts.scala  |  6 ++-
 .../dotty/tools/dotc/core/Definitions.scala   |  2 +-
 .../src/dotty/tools/repl/ReplDriver.scala     | 54 ++++++++++---------
 6 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala b/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala
index 51b261583feb..699e2f438e4e 100644
--- a/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala
+++ b/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala
@@ -51,8 +51,11 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
       case (_, s) => s
     }
   }
-
-  override def asURLs: Seq[URL] = aggregates.flatMap(_.asURLs)
+  override def asURLs: Seq[URL] =
+    aggregates.flatMap {
+      case v: VirtualDirectoryClassPath => Seq()
+      case a => a.asURLs
+    }
 
   override def asClassPathStrings: Seq[String] = aggregates.map(_.asClassPathString).distinct
 
diff --git a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
index 549398e0f7cf..80deb207be0c 100644
--- a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
+++ b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
@@ -27,14 +27,14 @@ class JavaPlatform extends Platform {
       case _ => false
     })
 
-  def addToClassPath(cPath: ClassPath): Unit = currentClassPath.get match {
+  def addToClassPath(cPath: ClassPath)(using Context): Unit = classPath match {
     case AggregateClassPath(entries) =>
       currentClassPath = Some(AggregateClassPath(entries :+ cPath))
     case cp: ClassPath =>
       currentClassPath = Some(AggregateClassPath(cp :: cPath :: Nil))
   }
   /** Update classpath with a substituted subentry */
-  def updateClassPath(subst: Map[ClassPath, ClassPath]): Unit = currentClassPath.get match {
+  def updateClassPath(subst: Map[ClassPath, ClassPath])(using Context): Unit = classPath match {
     case AggregateClassPath(entries) =>
       currentClassPath = Some(AggregateClassPath(entries map (e => subst.getOrElse(e, e))))
     case cp: ClassPath =>
diff --git a/compiler/src/dotty/tools/dotc/config/Platform.scala b/compiler/src/dotty/tools/dotc/config/Platform.scala
index 48ee781ccb2a..6c3542bc2e6c 100644
--- a/compiler/src/dotty/tools/dotc/config/Platform.scala
+++ b/compiler/src/dotty/tools/dotc/config/Platform.scala
@@ -19,8 +19,10 @@ abstract class Platform {
   def classPath(using Context): ClassPath
 
   /** Update classpath with a substitution that maps entries to entries */
-  def updateClassPath(subst: Map[ClassPath, ClassPath]): Unit
-  def addToClassPath(cPath: ClassPath): Unit
+  def updateClassPath(subst: Map[ClassPath, ClassPath])(using Context): Unit
+
+  /** Add new entry to classpath */
+  def addToClassPath(cPath: ClassPath)(using Context): Unit
 
   /** Any platform-specific phases. */
   //def platformPhases: List[SubComponent]
diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala
index 8c09a3f24fa0..075de9e934fe 100644
--- a/compiler/src/dotty/tools/dotc/core/Contexts.scala
+++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala
@@ -35,6 +35,7 @@ import scala.annotation.internal.sharable
 import DenotTransformers.DenotTransformer
 import dotty.tools.dotc.profile.Profiler
 import dotty.tools.dotc.sbt.interfaces.{IncrementalCallback, ProgressCallback}
+import dotty.tools.dotc.classpath.ClassPathFactory
 import util.Property.Key
 import util.Store
 import plugins.*
@@ -897,8 +898,11 @@ object Contexts {
     /** Initializes the `ContextBase` with a starting context.
      *  This initializes the `platform` and the `definitions`.
      */
-    def initialize()(using Context): Unit = {
+    def initialize(previousOutputDir: Option[AbstractFile] = None)(using Context): Unit = {
       _platform = newPlatform
+      previousOutputDir.foreach(cp =>
+        _platform.nn.addToClassPath(ClassPathFactory.newClassPath(cp))
+      )
       definitions.init()
     }
 
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
index da57315e15ff..5c7d3786bd7e 100644
--- a/compiler/src/dotty/tools/dotc/core/Definitions.scala
+++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -2150,7 +2150,7 @@ class Definitions {
 
   private var isInitialized = false
 
-  def init()(using Context): Unit = {
+  def init(require: Boolean = false)(using Context): Unit = {
     this.initCtx = ctx
     if (!isInitialized) {
       // force initialization of every symbol that is synthesized or hijacked by the compiler
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 3b6180cecd1b..02ff35523637 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -1,16 +1,16 @@
 package dotty.tools.repl
 
 import scala.language.unsafeNulls
-import java.io.{PrintStream, File as JFile}
+import java.io.{File => JFile, PrintStream}
 import java.nio.charset.StandardCharsets
 import dotty.tools.dotc.ast.Trees.*
 import dotty.tools.dotc.ast.{tpd, untpd}
-import dotty.tools.dotc.classpath.{AggregateClassPath, ClassPathFactory, ZipAndJarClassPathFactory}
+import dotty.tools.dotc.classpath.ClassPathFactory
 import dotty.tools.dotc.config.CommandLineParser.tokenize
 import dotty.tools.dotc.config.Properties.{javaVersion, javaVmName, simpleVersionString}
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.*
-import dotty.tools.dotc.core.Phases.{typerPhase, unfusedPhases}
+import dotty.tools.dotc.core.Phases.{unfusedPhases, typerPhase}
 import dotty.tools.dotc.core.Denotations.Denotation
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Mode
@@ -88,12 +88,12 @@ class ReplDriver(settings: Array[String],
     setupRootCtx(this.settings ++ settings, rootCtx)
   }
 
-  private def setupRootCtx(settings: Array[String], rootCtx: Context) = {
+  private def setupRootCtx(settings: Array[String], rootCtx: Context, previousOutputDir: Option[AbstractFile] = None) = {
     setup(settings, rootCtx) match
       case Some((files, ictx)) => inContext(ictx) {
         shouldStart = true
         if files.nonEmpty then out.println(i"Ignoring spurious arguments: $files%, %")
-        ictx.base.initialize()
+        ictx.base.initialize(previousOutputDir)
         ictx
       }
       case None =>
@@ -526,43 +526,47 @@ class ReplDriver(settings: Array[String],
 
         val entries = flatten(jarFile)
 
-        def classNameOf(classFile: AbstractFile): String = {
+        def tryClassLoad(classFile: AbstractFile): Option[String] = {
           val input = classFile.input
           try {
             val reader = new ClassReader(input)
-            reader.getClassName.replace('/', '.')
-          } finally {
+            val clsName = reader.getClassName.replace('/', '.')
+            rendering.myClassLoader.loadClass(clsName)
+            Some(clsName)
+          } catch
+            case _: ClassNotFoundException => None
+          finally {
             input.close()
           }
         }
 
-        def alreadyDefined(clsName: String) = state.context.platform.classPath(using state.context).findClassFile(clsName).isDefined
-        val existingClass = entries.filter(_.ext.isClass).map(classNameOf).find(alreadyDefined)
+        val existingClass = entries.filter(_.ext.isClass).find(tryClassLoad(_).isDefined)
         if (existingClass.nonEmpty)
           out.println(s"The path '$f' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
           state
         else
           val cp = state.context.platform.classPath(using state.context).asClassPathString
-//          println(s"CURRENT CP STRING: $cp")
           val newCP = s"$cp${JFile.pathSeparator}$path"
-          println(s"UPDATED CP: $newCP")
 
           // add to compiler class path
-//          println(s"INIT state classPath = ${state.context.platform.classPath(using state.context).asClassPathString}")
-//          val cpCP = ClassPathFactory.newClassPath(jarFile)(using state.context)
-//          state.context.platform.addToClassPath(cpCP)
-//          println(s"classPath after add = ${state.context.platform.classPath(using state.context).asClassPathString}")
-
-          // recreate initial context
-          resetToInitial(List("-classpath", newCP))
-//          rootCtx = setupRootCtx(Array(), rootCtx.fresh.setSetting(rootCtx.settings.classpath, newCP))
+          val prevOutputDir = rootCtx.settings.outputDir.valueIn(rootCtx.settingsState)
+          val ctxToUse = initCtx.fresh.setSetting(rootCtx.settings.classpath, newCP)
+          rootCtx = setupRootCtx(
+            Array(),
+            ctxToUse,
+            previousOutputDir = Some(prevOutputDir)
+          )
           val s = state.copy(context = rootCtx)
 
-          // new class loader
-          val oldCL = rendering.classLoader()(using state.context)
-          val newCL = fromURLsParallelCapable(s.context.platform.classPath(using s.context).asURLs, oldCL)
-          rendering.myClassLoader = new AbstractFileClassLoader(state.context.settings.outputDir.default, newCL)
-//          out.println(s"Added '$path' to classpath.")
+          // new class loader with previous output dir and specified jar
+          val prevClassLoader = rendering.classLoader()(using state.context)
+          val jarClassLoader = fromURLsParallelCapable(
+            ClassPathFactory.newClassPath(jarFile)(using rootCtx).asURLs, prevClassLoader)
+          val replOutputClassLoader = new AbstractFileClassLoader(
+            prevOutputDir, jarClassLoader)
+          rendering.myClassLoader = new AbstractFileClassLoader(
+            rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), replOutputClassLoader)
+          out.println(s"Added '$path' to classpath.")
           s
 
     case KindOf(expr) =>

From 57f6fb0c64c3e1117981aa9df2ac0fb5dc8a7134 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 25 Apr 2025 08:35:34 +0200
Subject: [PATCH 172/505] Clean up impl

[Cherry-picked 7b0ba9f4df0ff9c84deeb854876a8b15cb4dbb5f][modified]

From 563e169f89c11a195a6f3c5eb01c2ffd64391996 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Wed, 15 Jan 2025 16:49:36 -0500
Subject: [PATCH 173/505] further cleanup, reuse dir (bug w double import)

[Cherry-picked 1ac09e6276fe8fd003b5fa55dd3f754da44b6457]
---
 .../src/dotty/tools/repl/ReplDriver.scala     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 02ff35523637..30e53f67c4cc 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -514,9 +514,8 @@ class ReplDriver(settings: Array[String],
       }
 
     case Require(path) =>
-      val f = new JFile(path)
       val jarFile = AbstractFile.getDirectory(path)
-      if (!f.exists || jarFile == null)
+      if (jarFile == null)
         out.println(s"""Cannot add "$path" to classpath.""")
         state
       else
@@ -542,15 +541,17 @@ class ReplDriver(settings: Array[String],
 
         val existingClass = entries.filter(_.ext.isClass).find(tryClassLoad(_).isDefined)
         if (existingClass.nonEmpty)
-          out.println(s"The path '$f' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
+          out.println(s"The path '$path' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
           state
         else
-          val cp = state.context.platform.classPath(using state.context).asClassPathString
-          val newCP = s"$cp${JFile.pathSeparator}$path"
+          val prevClassPath = state.context.platform.classPath(using state.context).asClassPathString
+          val newClassPath = s"$prevClassPath${JFile.pathSeparator}$path"
 
           // add to compiler class path
           val prevOutputDir = rootCtx.settings.outputDir.valueIn(rootCtx.settingsState)
-          val ctxToUse = initCtx.fresh.setSetting(rootCtx.settings.classpath, newCP)
+          val ctxToUse = initCtx.fresh
+            .setSetting(rootCtx.settings.classpath, newClassPath)
+            .setSetting(rootCtx.settings.outputDir, prevOutputDir) // reuse virtual output directory
           rootCtx = setupRootCtx(
             Array(),
             ctxToUse,
@@ -562,10 +563,11 @@ class ReplDriver(settings: Array[String],
           val prevClassLoader = rendering.classLoader()(using state.context)
           val jarClassLoader = fromURLsParallelCapable(
             ClassPathFactory.newClassPath(jarFile)(using rootCtx).asURLs, prevClassLoader)
-          val replOutputClassLoader = new AbstractFileClassLoader(
-            prevOutputDir, jarClassLoader)
+//          val replOutputClassLoader = new AbstractFileClassLoader(
+//            prevOutputDir, jarClassLoader)
           rendering.myClassLoader = new AbstractFileClassLoader(
-            rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), replOutputClassLoader)
+            rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), jarClassLoader) //replOutputClassLoader)
+          println(s"new classpath: ${s.context.platform.classPath(using s.context)}")
           out.println(s"Added '$path' to classpath.")
           s
 

From f8e599054898e7ae57f5570904f8b3166862c91e Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Wed, 15 Jan 2025 17:36:52 -0500
Subject: [PATCH 174/505] Add simple tests

[Cherry-picked 2babf5ca588ce12bb203d8a51a8bb1fc6b104874]
---
 compiler/src/dotty/tools/repl/ReplDriver.scala |  5 +----
 compiler/test-resources/repl/require-command   | 13 +++++++++++++
 compiler/test-resources/repl/require-errors    |  8 ++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 compiler/test-resources/repl/require-command
 create mode 100644 compiler/test-resources/repl/require-errors

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 30e53f67c4cc..136b019a33ea 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -563,11 +563,8 @@ class ReplDriver(settings: Array[String],
           val prevClassLoader = rendering.classLoader()(using state.context)
           val jarClassLoader = fromURLsParallelCapable(
             ClassPathFactory.newClassPath(jarFile)(using rootCtx).asURLs, prevClassLoader)
-//          val replOutputClassLoader = new AbstractFileClassLoader(
-//            prevOutputDir, jarClassLoader)
           rendering.myClassLoader = new AbstractFileClassLoader(
-            rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), jarClassLoader) //replOutputClassLoader)
-          println(s"new classpath: ${s.context.platform.classPath(using s.context)}")
+            rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), jarClassLoader)
           out.println(s"Added '$path' to classpath.")
           s
 
diff --git a/compiler/test-resources/repl/require-command b/compiler/test-resources/repl/require-command
new file mode 100644
index 000000000000..1af49ccff6fb
--- /dev/null
+++ b/compiler/test-resources/repl/require-command
@@ -0,0 +1,13 @@
+scala> val z = 1
+val z: Int = 1
+
+scala>:require sbt-test/source-dependencies/canon/actual/a.jar
+Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
+
+scala> import A.x
+
+scala> x
+val res0: Int = 3
+
+scala> z
+val res1: Int = 1
diff --git a/compiler/test-resources/repl/require-errors b/compiler/test-resources/repl/require-errors
new file mode 100644
index 000000000000..8e26c673f9b3
--- /dev/null
+++ b/compiler/test-resources/repl/require-errors
@@ -0,0 +1,8 @@
+scala>:require path/does/not/exist
+Cannot add "path/does/not/exist" to classpath.
+
+scala>:require sbt-test/source-dependencies/canon/actual/a.jar
+Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
+
+scala>:require sbt-test/source-dependencies/canon/actual/a.jar
+The path 'sbt-test/source-dependencies/canon/actual/a.jar' cannot be loaded, it contains a classfile that already exists on the classpath: sbt-test/source-dependencies/canon/actual/a.jar(A.class)

From 585b78aa0446222d8c0cafc95502156004893c9e Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Wed, 15 Jan 2025 22:13:47 -0500
Subject: [PATCH 175/505] Handle out of sync imports after require + tests

[Cherry-picked 4d1e2b02d0b66fc397b1dd2ddafa55c39f0e0295]
---
 .../src/dotty/tools/repl/ReplCompiler.scala   |   6 +++-
 compiler/test-resources/jars/MyLibrary.scala  |  10 ++++++
 compiler/test-resources/jars/MyLibrary2.scala |  10 ++++++
 compiler/test-resources/jars/mylibrary.jar    | Bin 0 -> 3399 bytes
 compiler/test-resources/jars/mylibrary2.jar   | Bin 0 -> 3435 bytes
 compiler/test-resources/repl/require-multiple |  32 ++++++++++++++++++
 6 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 compiler/test-resources/jars/MyLibrary.scala
 create mode 100644 compiler/test-resources/jars/MyLibrary2.scala
 create mode 100644 compiler/test-resources/jars/mylibrary.jar
 create mode 100644 compiler/test-resources/jars/mylibrary2.jar
 create mode 100644 compiler/test-resources/repl/require-multiple

diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala
index e34bb229a727..1ec2d230f7e9 100644
--- a/compiler/src/dotty/tools/repl/ReplCompiler.scala
+++ b/compiler/src/dotty/tools/repl/ReplCompiler.scala
@@ -46,7 +46,11 @@ class ReplCompiler extends Compiler:
       /** Import previous runs and user defined imports */
       override protected def rootContext(using Context): Context = {
         def importContext(imp: tpd.Import)(using Context) =
-          ctx.importContext(imp, imp.symbol)
+          // TODO: only when context has changed?
+          val typer = ctx.typer
+          typer.index(imp)
+          val imp2 = typer.typed(imp).asInstanceOf[tpd.Import]
+          ctx.importContext(imp2, imp2.symbol)
 
         def importPreviousRun(id: Int)(using Context) = {
           // we first import the wrapper object id
diff --git a/compiler/test-resources/jars/MyLibrary.scala b/compiler/test-resources/jars/MyLibrary.scala
new file mode 100644
index 000000000000..8dda1938608a
--- /dev/null
+++ b/compiler/test-resources/jars/MyLibrary.scala
@@ -0,0 +1,10 @@
+// MyLibrary.scala
+package mylibrary
+
+object Utils:
+  def greet(name: String): String = s"Hello, $name!"
+
+class Calculator:
+  def add(x: Int, y: Int): Int = x + y
+  def subtract(x: Int, y: Int): Int = x - y
+
diff --git a/compiler/test-resources/jars/MyLibrary2.scala b/compiler/test-resources/jars/MyLibrary2.scala
new file mode 100644
index 000000000000..2fdfa6c09b5d
--- /dev/null
+++ b/compiler/test-resources/jars/MyLibrary2.scala
@@ -0,0 +1,10 @@
+// MyLibrary2.scala
+package mylibrary2
+
+object Utils2:
+  def greet(name: String): String = s"Hello, $name!"
+
+class Calculator2:
+  def add(x: Int, y: Int): Int = x + y
+  def subtract(x: Int, y: Int): Int = x - y
+
diff --git a/compiler/test-resources/jars/mylibrary.jar b/compiler/test-resources/jars/mylibrary.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5378fdcc0f7209b1d0ad4a34dd71e19120bcb74d
GIT binary patch
literal 3399
zcmbVPc{r5a8y+TOEJ@axZ|or^V_yr!Fky@=i9{J`vBxkaQq!QO#88QB!$_7$MT@P*
zzBLn}1sO6SpOOiM_|4RJMSaU3zvsQ)>pJhbp65Q#Ip;plxnD;#aGeAI3<d*Q&#HR>
z)|dcb9ROp!+X7+hfYMrS2LONoM>Ic}>%se%o8!L*OK?1X24gH7Y*E%OyEQQ=Hm0+~
z9*xlKT8~D+>79&w&e}bCOjekt9Y(_z(-l#?PB3i}I-b7e=oe`f)v<iI@tCyasI*Ed
zKr&z^>{A%e_Z+-(se_iB5x6fm2SEUUlUMU^6X5g$f+7R`e8R9{ky@*{{_gk3FMddD
z;K7JMY<NhR=D|QL4wvPCLGwCEn1z_j7<9CCrg-!??9<PnSc_c|1ylJhJS#JjA8j3f
zf>XWjRXKH}LhyBkpx^>e>4M_7_;LEUo#!lb5ck1sK0E4h%+Pio8A`jOTvOc<0Zkuj
z+o^3ckr43u1Pl2YSn!wV=%CDf$QL38t-?+CK!?To&4%+P$b#WZwbN-9Wxb1hz7$rj
zLI))l7*g-3BVB5o7xTeb*uS*5_yOc4;#->er$3eNTGFP-_SXq-yFH%6s<V#zKFVuB
z<iJ(*DBn(L)+pyl&fbTK@Q$4oG7m$#JzI!2Iv+cg9Z4#ibEv9C*9V7f!z*?bwOyvA
zbf~AQ>4BlSRrB!!TQ&*=Na*=FA=7=Zug{pKf}yOAo~yz+V(qc*eRI7X1A&HFgX!<@
zy^1Z}u`7bl+DEL9G?riCX@8^FdX8Rm>ci<dU3gLQh4q%QyRwp6J}%0e>SvdXOp9cY
zI^?;OvdGzZ`T!3AV8G$k|FKQsSX_AIp+rW&b8kosdz87tY#Y46m(Dz7yNS=@lk}dD
z`V$#^Z8qYq8+2~gMGhH-bT<}E8X9?3SGsz36<txBqqv1Ay=jc9J+CIg@E_3xZrHFP
zI)}mj788;r;xMcJp=Y-*C9Y}4=d1k$YWCLj===W9F4JBLXokb<G3{tRd>#HdVNZk6
z=c-GA@+olL-HaV&hkysVF@skLrFqrhG(zV#C9L9fz^p4K!n&R+n5$F1&jgg~lFwtk
zWsB$l@MKrG;<TbMB1OOCS!J-aPfJO)p)(s<WNCy`DcYM|>MtFRB(6&@U@5sh=v+Dk
z^BD{`=(mcukuw)-qf1R+516zTcyrtFb$=XPa%INp(~Q%}$tu=(91$4W>#wi>JYrhQ
z)Qxw6`1x^Tn{qHBD!KlK2<d1W`bs##w2nc&e>E~aWv2Y#q3#%+(5<9CR`NAlv#%zv
z`kB~ja*}wd?Ux-fTD6zA*Lbq;U&$KC{)j;9`QiPvm(t6Qhb|g?_#p2s6ZE7dZGE<2
z&R5dL?SXUWmP;^L)y|B|SoYIs&80SxR|?DV$JMjrL+><azEvN~pNH*&HuV3=2dh}&
zdAo8ZR3u^g0GA2Lrw_lV=P+TO^Zq*%q<%TDuHk-xIOQLQ^^$Wyh?s?hSwlnI6#V>E
zkCMtt_uSjFgqYk<L|3YS&8GVT^89Jf{NlZIHQ>weOSZPkpZLE}6OQAJFvRAEZFKs8
z$=E;?V=(7&-3q|5$t8ZtJI{9~&MY*Ew+N*ol#q9G33yy`ej)fC4qiowQ*Q8qT&?RD
z^9WPf&Q27Q>K1;~oG(}O=cOvoP*6!%bm;EWdwtY;#$0+Jnp5aqAO<9b)qV#E6Ebu@
z263j5WORJzs^L~IZJvaZEez4sCBpQb2;e6NVabnz#YLV)3~BU21{PW-7e$Z(KNy~G
zw#&RGYcsU1XZa>6ZW1+eww^FTbwU*TwV^f|LAp;Ntaju{6H0fWZyzXGg6653np0k<
zzPp{BbmP51&@et_i6L6Pq-s}r_@LyZZ+}4UmB;r|X`uARbI9RY2!3Tt=&k*@V;eG1
zAI*XL7!*r9C?+=DNJ9!&en}Sj%7DGFZzq3D($@Cg8=K!G^2_E9WemeAb~(u7!cys>
z+C!o=($Kci>(SuY0>W#=>08w!SM}#7Qqx7`x~*I&<`Z6qn^aw#C8&=HN*l&UyRUT_
z)fzOhZdcff3MkTc$alTB0(c5c>>Z`I!D0;=^}?h%iLW7Q5COb}5{4Y$o*>|=+)!wS
zyyInKe`kp$uRdk0(tx=o+ODQ=OH=kr$5whh)N2~FoDgOOofO(vk%<l2uPbXOwaG)n
z5C5S4ojhzE6`2j_CHoJPES5lAzSVvxWN2`zP80CI_$K*xzWt!vw%L#u<{%JA9JCPy
zS{`W6?99(=%(MIUETuEk2M<D_K!jV3cdfo<Hr9lnTFJlFGb)A$9i})B*~y=Gt{oX|
z%(Oy*`ab9N^oXHA2J7Wx6PYP_oi*VB7<)wu?dbiYa=l~Py5)-t)v*f?i?wyZUnyJ4
z-(i_P%y+&_U*<5@`=Iw2@7*sDsCy>c#Tg2Hc$SU6nBp?1i#sFJC)&a!+bGBihshEZ
zf#N_RAXuAs7EsCS$D^=oof;jSZ(^u3?H_cIIRx0#(5V1cPKUTdW6x9okOi(I2`{s5
zLaX{S?ML*Dw82D)9~bW#6fIzivl=G<c|QMXy}lP|1Q}y5junkR-q+ZucTTQ}N+Lsy
zq2?ZeKEla1g#*vtQKM5-`Uk7FA2nkxN36WI^DB}-bQfQN^9r4Hv^PGc<AgK~8&=lI
zHa#&xv+{DjZ1S{ov4%~ziC{(Vbt~AU(>XF%MlYjx$RdY>FFZPnegMlUs)(#yq+5Tq
z=S!$-MQqGGk#Y#dr=hH9prLaM;%J~91xZXk>4)j%^@kTiRUzUh#E3MX;LN^2{>}`l
zxUy>3^^CbOs3X-|cu~oQbdyegq@^teRT7YD0jHhv3_Cx-hbEhlNa7wHk`(<XNo^V=
zQ36eaEs7RqtQTA&DwjT$Qj|P=M{Qy05hd7E-NN5f!HSpI5Sk;Mye=Nbk8@NwXzpg_
zr9p(f-P`xLo&T$d<gv69o~hGnldwGp&d4dwADv>AP?n=Z1)PnOy)To4a_dbuC-cW-
zdzuw$J>Ji&2cNEySYH@XUM8N((yAn$<Qb47D1%d5-L=MJ;Kw%AXf(DO#H%oU65pyU
z4V@MbY(6I_bJ%ZcP^vU2<crfAt@_V9W>Ax3S*1rzh&8R5#a87F(WVZ@w!6LE2vg+Z
zcLw{fy+alUMHNU+-AV2*K<?Ed23KciU22~oU-ZA6L?T;4pXzQMop3Dk%E*`?vkS3D
z%%aTU(#U(`&%qwsVbAJJ4YH0z@7260R7ktlb*FZ$*MBbWTFm9b&0)EcUlINfALWq}
z7u^<L6c^Ma{xR-e_MqzSxj$-mx{4FxC@=3{zh-3Fk8i$rJP+(2GyBmnCZDZmhexLu
zm8xBEJ%j9j>9xgP_NoF#)_qJSfZbJR^eBfa;>|ACoxS-gUqtrY!mGeNg}2{Sv1#t%
zyRPuL<eG0yy!%!{;(hhp#f8J_IH-$>lbQSSH#ZZV8Z*{+MM8`!I(>sv7pA`}5*}U&
zz^@va)BWAJ8u?fIDSEkz*%AF~=vv*%RmiJm#%cZxU89$|2!eor*SD((G){A^+Fc!)
zt9RE*EUw;NwFyphHSTxyyLJX#oV6G9uQ+7Rn*1Zq_mlrS&f3Duz0OzdI%h>!an@e$
zzhkT|M%<FKYJ&WK!}w9Ke}`DR&%Z)!<@`|mmWJkEGvNbqM*?%64V*bE330#v2hW#C
A9smFU

literal 0
HcmV?d00001

diff --git a/compiler/test-resources/jars/mylibrary2.jar b/compiler/test-resources/jars/mylibrary2.jar
new file mode 100644
index 0000000000000000000000000000000000000000..3f82cd4fe58ef13d73960eb3f632321b11c3e81a
GIT binary patch
literal 3435
zcmbVPc{r5a8y-tD!;GvklM#)vBxBzqvQ9G?TT)F~Lv~^+lVq1Y`z~ZcgltL4E<zNe
zEG3bYQ9?qf-%Nei7kyvfAHV0l-s?Ko`##Too^#G~?sFd#114r302mAgkS|LU09%X&
zzzo3anQNhOMi}XD-2ea+z{CIqrh72{<!187U>=&s-@$k-BOFHWh`AIVvxM*MF*HC+
zJ!LaMOZ4^jSDVRD<R_-RrS$QVIQ-LdCCsepRQS7${Z6ZVBBC>736&YXU2phAQUSYM
z7rhs}8GhtonP2cyo7MyUrRTs30MPPE|7`#e+Fy5)o3ov_tv5+d`d6~QJ0i9_>e#xS
zKIdjj^z@dKI_+lb<C9~AH()g7QTNn9DE2(+jv-J)Yr=E}%E9{J&`L%<ujg6p-uA?I
z2e=>i<vzVytXG<+M|Bz$e6Or~0ds7i1T=rmXWoCNVQFpY%gzb#N$9lcoL}k$(gTM7
zIF``grm3JH1N85juYbL?P<GaV%~FjbG*}~$<)i0s=aVaMZ`4r9cTKKqh)@v-tvSeJ
z4^Q@*z{4cozG^}w1*`20A-LDNpn+dBl?x3Hszu&1@lr!&IZoV#>J9SWPkY+st(SIE
z1F!F>$#U_OFYb`wth+LTxlfVr(wp$|JiwX}2g}%lPl*pk)v3hw&>WQd7a`N(H(fTk
z^Ccp)P;E@{o(ANKwr=b0AwyNlZKGNlzrcg3VEA&+X9><+?(Wd;FMW>(gO##eE}U7f
zSF+vzWbi>SQkI3k-N#H-s<3pZX)Z@^{l)h=hvXx|yRt%6H5xNFH#<EIsr@PU+xAIB
z_Rtmv1l|RKk*pa2099IP{a*`3wDlp99O52F51R0F_*8%L^qRT#0t=C!8XzYG=ZQxR
zg$Y3`GKAm*%u9P6hn}xkSq-!o=JXW}_SNjl4xYlAR`S;cL$th<*Ew}{Gg@jhiy<u?
z)2;PQetq@oqiRD%cP&j5f*jvQFLjKxE-#*V{b7BvY%t53`P7R;qzk-lVm34Tl@SrH
zjrqsi?bm(clN0hU0=?0GJ68|9q*%g-x$a#Fgm*OvbMXS22$lop$500)Id?PM&#>iC
zA?-1#xeJb6*ObnbQn=)l&527)bvi?WBRfm)DVbI4<m(=j7b!n}t;~gws1pLqD4a$f
ztLvR}U_!nmDvs%fW0eG>>|F(XJ8G93nCH{PKe+46L<OvQE>GsJzE$jb>H`5?uR2=l
zTu7amUp?;pq=Fp4(UDYKKM}^7Hi{zekhVyKFTP`7KWQ<0L%%iTPKy5hHQh(3xo%<U
zl#7epRn@H_7E<306vSFGH!v5`O=I)E)NTvM{tLWho%f#xY*x`H-cNoO`S|gpEuy^j
zN(9>;2xy}{;!wp(__u1s*9Bgua-r0UxVX^V4}5MM{tw4^j6=k&Pxmb(`wXlH6~(+}
z`;yE?XbM^gXjWmutn$$d!a=ucwv$#6Uuo~33j(%%=N=_GyZOkWe(u^>GfPh{Egto@
zE0D1vq=ie_vuAc;m&=e}wWmUk7O-H2@335DGJL1dCI#o+6_E0fj7nT(+Aw{n)>F8b
z0#nWy$+$n0?KfY)PF=a03+VQJ82=$Q+0D89u*ix^yo*WqNgHT}{I`VrQGS+n<Eq>r
znzgfS_r>VHatEX96Rmv>SRlC8=a?bvnSdv6qvVg*e(jl>Ej{?OB(2&UR*t|L1N-5V
zVUv+e{17EBFBn(LO@s`2=ct74a74@5cx_dD5f$1ehGtr@`n<~%G9b-Uy0o15&Ej}O
z=@ly>zt*y~oO~|66wts*T+Mfq{p-SnbW;`cOESfVu7o=YZRl|OV-U{xcapa`o!+0@
z-_f(zrFBZZ#GUkQFgo8{ARqlAc96r2S+XIgkWg0{&L;OU)};HDrLk?2;pArHCsnB5
z_Y@Vg3Kic#biqn|kUQA~rN$Hxm7y%j<#Rj4QfH*#)ntW$z*m7;r%DO+1&?7@md%#l
zS9$*4Uqh3siC2R&GQmcheVotV=m;sWQ9M?4Uh-DlSi9zy{(eFhufQ;y^ehT4n~|6Y
z+hpS*=_;p<$BaMvAX|R9Kqm$ZW&skezsz9tLX(RseYM6>H6&iq2*u8>ONXCfZ^I)|
zS{^q0kjb3v1z(u!9hH<Gc0Ugw*Ayf}>niod3rxgzBoWUA*E)U~hpkkv`S6@~a;S4w
z>-^SWFPGelcTON5c*&9#V8;<71!qjwDG4hAE`aDICub1ahNkgPH`9NW9N)i{+|P<r
zTlRde0R#fMft(m%%Zu*pUh?(!>-xf*PZE2x?S#(*F&JRbt@bM2&FuCDqW^dDEy^3N
z^FYVEV$U1w=9N}wz3q&U!c49gO<i1AghMjJ*|iP4aHft{_i9B8IfO$v!owuypokdg
zT;n&Xe2sF67${OBUH=vdb{BT{09*y`>kAu(4c7-sYG8o8GaJd~7-0Ft#=!MA=5@UY
zp(~2*vMMMpEGXnumrYl5dvhy*F-B8evrLl!=;CIGl4o>|!$TVgW3W}_z#$oVFe6SB
zXaU?Sgl?YrUjEAX)EfnzfYUX44G)1p+j!)Ullb$C*0OopjA;JnHvRWG`$5_0_(O)=
zXL&m3b0Q<<MFlz@Yhjr|ptw{8+3*Msi6m5-;I!BQ?+2wTpqotNP2)|x1pWPa9cBq;
zdJ~!)`joI1T{hXB55sVF*)YVt^y0%pq(Q&=^|i)%s<gDV_^iGtm!71Ho4bd5;{b)f
zQJ*O2;IX4G04X<{<N8@-zLyaukT8b4Tglu51!J)_fg@tFw}!b)6lKO>aS5Y1{1Bsy
zTrpe}*5<?<)PnSgptym0KL*(%Qm~KlYfB2n3NZghaN=a8GI<^n6Y6(1ThA2g2ugd`
zaiN9F-pI}_ol<o~X0U_3TQbfjNK0}FfP?lggEyRlDT_O>;U`d08Ud=s{8t@?4xnr#
zgIe;_`=hapZEQg!!V_A#rF*1#TVfX_sn*jWm#&b!(vKUaJ^@hqQ*(p%w5(v=Uz1D%
z2!v2nRObkDOm1H5L9y4Shm7y+rleU(2IC+HrJpj?vOZ($t=gEzm`DeYiB70sxc0b#
zUK;Q42u%wUZ|u7bJJo)+A=GG7x!Lhjar53(ij`;L=(Br*(|DFD%gC%EYfp`})WNps
z-bzDewcbv<^d#LK=Xr)%Z@L&wopV+qkKQ>$AZFp~*;IL!k?-zMN2Y4BS?kRm>=_|A
ziLw)zq-+)k{@VACL=PMunmgNn?Z&jWxUv6S(X&2aP5)K=42yMg^d#cwR5T^%0rjZF
z`9}s1VvbFXJgM4<Dybg{#t9J1iRGzyQf!GS$a|T*-_N{k({F^_d_C{U?Zl+#Iw#MM
zR@XVRN?bnok#hM)p?7zCVPdJ|{-~5I6?ZDDGX>X`nD*KAtIizfXMaT!o)?Q$A0EyX
zTt8XCy<TpB7@{t<^Lak@cTIkw<Iraw!5&xOrgnsN;mA6E<971<nwyA{J(8PiMTp(w
z<%@!Jj(B7N)GnoQ#L^F)!obJ_*e;%FpMMx#Ja4zZ)i7O3n;2{l-70A5()pLE)0%&W
zZV}RS1XjSGh3_wf7Fu(g4F1(MT?lVgUUVV+%VufKErI`##ajnKN7{O1Z%0a^P0JsU
zevrWLNL!hhe#HMWGHqJ7AZ<JFe@EHMO>_qOWqhE2LHWtyzk_UD@a-T5v@6FyQjz*=
UJUf8&-oUhHH*M@{^s5Nqf37t~djJ3c

literal 0
HcmV?d00001

diff --git a/compiler/test-resources/repl/require-multiple b/compiler/test-resources/repl/require-multiple
new file mode 100644
index 000000000000..34faa564d37d
--- /dev/null
+++ b/compiler/test-resources/repl/require-multiple
@@ -0,0 +1,32 @@
+scala> val z = 1
+val z: Int = 1
+
+scala>:require compiler/test-resources/jars/mylibrary.jar
+Added 'compiler/test-resources/jars/mylibrary.jar' to classpath.
+
+scala> import mylibrary.Utils
+
+scala> Utils.greet("Alice")
+val res0: String = Hello, Alice!
+
+scala>:require compiler/test-resources/jars/mylibrary2.jar
+Added 'compiler/test-resources/jars/mylibrary2.jar' to classpath.
+
+scala> import mylibrary2.Utils2
+
+scala> Utils2.greet("Alice")
+val res1: String = Hello, Alice!
+
+scala> Utils.greet("Alice")
+val res2: String = Hello, Alice!
+
+scala> import mylibrary.Utils.greet
+
+scala> greet("Tom")
+val res3: String = Hello, Tom!
+
+scala> Utils.greet("Alice")
+val res4: String = Hello, Alice!
+
+scala> z
+val res5: Int = 1

From ab9475eea0ef91c13672d85019dc61fd5ae6ea19 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 16 Jan 2025 13:05:05 -0500
Subject: [PATCH 176/505] slightly cleaner tests

[Cherry-picked 78bf30b8a4449f31552f0d49109608242973a5f0]
---
 compiler/test-resources/jars/MyLibrary.scala  |  10 ++++------
 compiler/test-resources/jars/MyLibrary2.scala |  11 +++++------
 compiler/test-resources/jars/mylibrary.jar    | Bin 3399 -> 2309 bytes
 compiler/test-resources/jars/mylibrary2.jar   | Bin 3435 -> 2336 bytes
 compiler/test-resources/repl/require-multiple |   2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/compiler/test-resources/jars/MyLibrary.scala b/compiler/test-resources/jars/MyLibrary.scala
index 8dda1938608a..cc492696c139 100644
--- a/compiler/test-resources/jars/MyLibrary.scala
+++ b/compiler/test-resources/jars/MyLibrary.scala
@@ -1,10 +1,8 @@
-// MyLibrary.scala
+/**
+ * JAR used for testing repl :require
+ * Generated using: mkdir out; scalac -d out MyLibrary.scala; jar cf mylibrary.jar -C out .
+ */
 package mylibrary
 
 object Utils:
   def greet(name: String): String = s"Hello, $name!"
-
-class Calculator:
-  def add(x: Int, y: Int): Int = x + y
-  def subtract(x: Int, y: Int): Int = x - y
-
diff --git a/compiler/test-resources/jars/MyLibrary2.scala b/compiler/test-resources/jars/MyLibrary2.scala
index 2fdfa6c09b5d..ca288fcfbf85 100644
--- a/compiler/test-resources/jars/MyLibrary2.scala
+++ b/compiler/test-resources/jars/MyLibrary2.scala
@@ -1,10 +1,9 @@
-// MyLibrary2.scala
+/**
+ * JAR used for testing repl :require
+ * Generated using: mkdir out2; scalac -d out MyLibrary2.scala; jar cf mylibrary2.jar -C out2 .
+ */
 package mylibrary2
 
 object Utils2:
-  def greet(name: String): String = s"Hello, $name!"
-
-class Calculator2:
-  def add(x: Int, y: Int): Int = x + y
-  def subtract(x: Int, y: Int): Int = x - y
+  def greet(name: String): String = s"Greetings, $name!"
 
diff --git a/compiler/test-resources/jars/mylibrary.jar b/compiler/test-resources/jars/mylibrary.jar
index 5378fdcc0f7209b1d0ad4a34dd71e19120bcb74d..4537e10ee4910923d760abced82b45e96367d257 100644
GIT binary patch
delta 1741
zcmY+Fc{CgN7RQ5(rHOs5T`cX(v<T8#hf>jLFp&<mH_}F#p`%D^8Db|AG(sdzseS9S
zRy4d;LxiFujkam+Vp_^rTH5K9!NVVK`hMr!^ZlK3fA{>(x#xcFcTh7^Nfw2a0IC3_
zrKJJ6VdfNBTZscXpL!^x#s@;J1HuSFo%iPa8(97UB-Jf{y?5%Gj=u2QDOOnK`|Bw(
zrJ=8lxs~%RWAvi4N`w^0;kc^?9_a(@q0!MPo5iU_{`B3)J$nGuz=f>9U#hPlV;nXL
zAPth=fXJ0~e@lE;mG4e|gojR0GL5)c?c$1A1^;Mc$4#1&+8B6zqTbefT#L}rH4pY_
z+MTc8YUj*(FJAaj!*q4T3BlJW<c+m~q(E}$sH12BQQQ3WcBHDIw$WU7D`n`}8Z>>|
zYvkNR<s{x@+D}kg<0h|gH#9J-CHss~VqZ&UX@$}v&dmZWhyN@5im02yE{`hz3xi?^
zJKpFQXn~iS)gTZ7iG!#n;GQ)V?Sj3O#n!zdk((F!*=T%5XO!LdyOY2ZJ&aoanATi;
z`zi|so$|ZicE;pG@+F{7*7V+a`wJ~>cD6^=&AX{hlgBBgUe>&)TBnp_+VXT<#^IY=
z0d7(u*|x(zIQ<#9#FG`XOp#XXIZwTqXxiv~OtVQPwKe7m{EGrX#zO+HDMCHqeH*^^
zT-H*@zM5F;lr;9A2!wlW^>GA2!d3U#P@P%TF9|=BM=pg^^_8&V7?EPrno7#IFo*ON
zoA~r+3x0Hcfwtji*)j@7-6$e0kULLCAuRH3mESOfvE;XAd*_y(qAjNSk5rJIOI6&*
zie-G5Go`S#giIGpl?O|oI>T(ZGY_kEkPCGkjOy{}TqYqR;d1N~#d7TnC+%T5vnZsL
zbOQEf%L#D+fF}U}{NHd<)ul`bxcpwvJ|~5&y;NbQe+{I-DJP*7CLrA*&o^Yah~`qc
z=+pQi|H7KWj~;R0zTUI)39oKK+&^K`V(5g>jUCHPR{S0yil|ocAyC7iZA?vc{8gx_
zQw9dAZeeAC<n~@^EDS6k4tt!FEZB^P<QcIWyrIWpJu4mE?gW(9OcS2(83sR$X*!8A
z%-Nm0rt)bbBeVk)n-urDrAlsgP&Z@nr9p33sRJ}kogW-gxyBL==*;wUrG)Ii<<#pr
zXO8ykcD74SvEn@c&4SB~1`B+5%)Pa*H*;L6@RT0f$cM?(w7Wle-eC1zmx&ZRXvY*R
ze0~K00N98fv;*`NY*aVt;{>F;vX@HMB6*-6PBP^^x}_0&ncY!Mgq?*{v~#UWqIm|-
z8MgA(rdNVXF9!Up;Jg4EP>goPI4R`Hm_)e0P$)6UV&8f<n#nYEe_;T(xfe6Kx3lP&
zUi{Y5HHbm(Hzx(yP1sHFAAHI-Lp?PPWP9y7sm{#U4h4PmEb4uiPY6`+B_8t&J;!lY
zLQ5!dbH%(R?o&k?4J6@@C(CQoZil47atF;dPAnk8e!IbWc*^QLR;j5goKPkPKQfSF
zmR1zE0%q8W8&Z-BG1ti{<G&ei4|%i#8C1G;1#1edlJF&jVXO!-r{mVJL{Zmwsd_(*
zO+@ITL)1u>{JS8+@<6(HH3H~tWNxkfIbQL53|rBB8)&f-^YV8dgbgdh?cDqI);dZu
zn>dJ*k#Fk>c`NfyF`6kX`wp~RfF#}OBLbNj5z49yHbnAvd^D@P=i{%6PwP3GXsdD|
zr`y?==J@K!vR{<lH--AX5N=TUb^|BxeY=8T$x&Jg$%c?$@}96K+j>+F8bz;RU1WB2
zvew+<gVKg(-n?AkPcr$@TX7T{A0j6EOWd8P!g@}=cz}U-sW2|+wtPe9D#NGaIpP{g
z&h?RW_iDn8Q_wmW)5iSiW6no#RwH55V=i4jk=GhM$`E+FKgKt`Z1irsu1g6f8dCoJ
zP_bk`Pa;Hn1v=q-a^zNnTKrka;4Rlm+LKJ$+miaVg$)zi6~86FCi;eEW0gynaAjDx
z@n%vpUHSy@3#~Xj-k}3`)jrWKw|w~`-*YFs$}Cw>SF}=#O$A+wynGcOifsXe|1@j6
z>Z_%kIP*F<e<C|CedCd1o+N(G`UM|R<({-5bh~pJG30<&bI(jzv>xuXtU}GQF1<L7
zWQ@><Da*ZM>yL*iqE+br?%p3|)%u>Intig@_XC9#6ITKJ&p4<skoBQgM1UL*wHXB0
z-}esxueX8PJ_i4sB><HQHj+7bbjS#m16CFHlc2r=8y;4E{hR7PW&5`rAXQUVPfijb
N2_WoK6(x0${V(Kl8gu{v

literal 3399
zcmbVPc{r5a8y+TOEJ@axZ|or^V_yr!Fky@=i9{J`vBxkaQq!QO#88QB!$_7$MT@P*
zzBLn}1sO6SpOOiM_|4RJMSaU3zvsQ)>pJhbp65Q#Ip;plxnD;#aGeAI3<d*Q&#HR>
z)|dcb9ROp!+X7+hfYMrS2LONoM>Ic}>%se%o8!L*OK?1X24gH7Y*E%OyEQQ=Hm0+~
z9*xlKT8~D+>79&w&e}bCOjekt9Y(_z(-l#?PB3i}I-b7e=oe`f)v<iI@tCyasI*Ed
zKr&z^>{A%e_Z+-(se_iB5x6fm2SEUUlUMU^6X5g$f+7R`e8R9{ky@*{{_gk3FMddD
z;K7JMY<NhR=D|QL4wvPCLGwCEn1z_j7<9CCrg-!??9<PnSc_c|1ylJhJS#JjA8j3f
zf>XWjRXKH}LhyBkpx^>e>4M_7_;LEUo#!lb5ck1sK0E4h%+Pio8A`jOTvOc<0Zkuj
z+o^3ckr43u1Pl2YSn!wV=%CDf$QL38t-?+CK!?To&4%+P$b#WZwbN-9Wxb1hz7$rj
zLI))l7*g-3BVB5o7xTeb*uS*5_yOc4;#->er$3eNTGFP-_SXq-yFH%6s<V#zKFVuB
z<iJ(*DBn(L)+pyl&fbTK@Q$4oG7m$#JzI!2Iv+cg9Z4#ibEv9C*9V7f!z*?bwOyvA
zbf~AQ>4BlSRrB!!TQ&*=Na*=FA=7=Zug{pKf}yOAo~yz+V(qc*eRI7X1A&HFgX!<@
zy^1Z}u`7bl+DEL9G?riCX@8^FdX8Rm>ci<dU3gLQh4q%QyRwp6J}%0e>SvdXOp9cY
zI^?;OvdGzZ`T!3AV8G$k|FKQsSX_AIp+rW&b8kosdz87tY#Y46m(Dz7yNS=@lk}dD
z`V$#^Z8qYq8+2~gMGhH-bT<}E8X9?3SGsz36<txBqqv1Ay=jc9J+CIg@E_3xZrHFP
zI)}mj788;r;xMcJp=Y-*C9Y}4=d1k$YWCLj===W9F4JBLXokb<G3{tRd>#HdVNZk6
z=c-GA@+olL-HaV&hkysVF@skLrFqrhG(zV#C9L9fz^p4K!n&R+n5$F1&jgg~lFwtk
zWsB$l@MKrG;<TbMB1OOCS!J-aPfJO)p)(s<WNCy`DcYM|>MtFRB(6&@U@5sh=v+Dk
z^BD{`=(mcukuw)-qf1R+516zTcyrtFb$=XPa%INp(~Q%}$tu=(91$4W>#wi>JYrhQ
z)Qxw6`1x^Tn{qHBD!KlK2<d1W`bs##w2nc&e>E~aWv2Y#q3#%+(5<9CR`NAlv#%zv
z`kB~ja*}wd?Ux-fTD6zA*Lbq;U&$KC{)j;9`QiPvm(t6Qhb|g?_#p2s6ZE7dZGE<2
z&R5dL?SXUWmP;^L)y|B|SoYIs&80SxR|?DV$JMjrL+><azEvN~pNH*&HuV3=2dh}&
zdAo8ZR3u^g0GA2Lrw_lV=P+TO^Zq*%q<%TDuHk-xIOQLQ^^$Wyh?s?hSwlnI6#V>E
zkCMtt_uSjFgqYk<L|3YS&8GVT^89Jf{NlZIHQ>weOSZPkpZLE}6OQAJFvRAEZFKs8
z$=E;?V=(7&-3q|5$t8ZtJI{9~&MY*Ew+N*ol#q9G33yy`ej)fC4qiowQ*Q8qT&?RD
z^9WPf&Q27Q>K1;~oG(}O=cOvoP*6!%bm;EWdwtY;#$0+Jnp5aqAO<9b)qV#E6Ebu@
z263j5WORJzs^L~IZJvaZEez4sCBpQb2;e6NVabnz#YLV)3~BU21{PW-7e$Z(KNy~G
zw#&RGYcsU1XZa>6ZW1+eww^FTbwU*TwV^f|LAp;Ntaju{6H0fWZyzXGg6653np0k<
zzPp{BbmP51&@et_i6L6Pq-s}r_@LyZZ+}4UmB;r|X`uARbI9RY2!3Tt=&k*@V;eG1
zAI*XL7!*r9C?+=DNJ9!&en}Sj%7DGFZzq3D($@Cg8=K!G^2_E9WemeAb~(u7!cys>
z+C!o=($Kci>(SuY0>W#=>08w!SM}#7Qqx7`x~*I&<`Z6qn^aw#C8&=HN*l&UyRUT_
z)fzOhZdcff3MkTc$alTB0(c5c>>Z`I!D0;=^}?h%iLW7Q5COb}5{4Y$o*>|=+)!wS
zyyInKe`kp$uRdk0(tx=o+ODQ=OH=kr$5whh)N2~FoDgOOofO(vk%<l2uPbXOwaG)n
z5C5S4ojhzE6`2j_CHoJPES5lAzSVvxWN2`zP80CI_$K*xzWt!vw%L#u<{%JA9JCPy
zS{`W6?99(=%(MIUETuEk2M<D_K!jV3cdfo<Hr9lnTFJlFGb)A$9i})B*~y=Gt{oX|
z%(Oy*`ab9N^oXHA2J7Wx6PYP_oi*VB7<)wu?dbiYa=l~Py5)-t)v*f?i?wyZUnyJ4
z-(i_P%y+&_U*<5@`=Iw2@7*sDsCy>c#Tg2Hc$SU6nBp?1i#sFJC)&a!+bGBihshEZ
zf#N_RAXuAs7EsCS$D^=oof;jSZ(^u3?H_cIIRx0#(5V1cPKUTdW6x9okOi(I2`{s5
zLaX{S?ML*Dw82D)9~bW#6fIzivl=G<c|QMXy}lP|1Q}y5junkR-q+ZucTTQ}N+Lsy
zq2?ZeKEla1g#*vtQKM5-`Uk7FA2nkxN36WI^DB}-bQfQN^9r4Hv^PGc<AgK~8&=lI
zHa#&xv+{DjZ1S{ov4%~ziC{(Vbt~AU(>XF%MlYjx$RdY>FFZPnegMlUs)(#yq+5Tq
z=S!$-MQqGGk#Y#dr=hH9prLaM;%J~91xZXk>4)j%^@kTiRUzUh#E3MX;LN^2{>}`l
zxUy>3^^CbOs3X-|cu~oQbdyegq@^teRT7YD0jHhv3_Cx-hbEhlNa7wHk`(<XNo^V=
zQ36eaEs7RqtQTA&DwjT$Qj|P=M{Qy05hd7E-NN5f!HSpI5Sk;Mye=Nbk8@NwXzpg_
zr9p(f-P`xLo&T$d<gv69o~hGnldwGp&d4dwADv>AP?n=Z1)PnOy)To4a_dbuC-cW-
zdzuw$J>Ji&2cNEySYH@XUM8N((yAn$<Qb47D1%d5-L=MJ;Kw%AXf(DO#H%oU65pyU
z4V@MbY(6I_bJ%ZcP^vU2<crfAt@_V9W>Ax3S*1rzh&8R5#a87F(WVZ@w!6LE2vg+Z
zcLw{fy+alUMHNU+-AV2*K<?Ed23KciU22~oU-ZA6L?T;4pXzQMop3Dk%E*`?vkS3D
z%%aTU(#U(`&%qwsVbAJJ4YH0z@7260R7ktlb*FZ$*MBbWTFm9b&0)EcUlINfALWq}
z7u^<L6c^Ma{xR-e_MqzSxj$-mx{4FxC@=3{zh-3Fk8i$rJP+(2GyBmnCZDZmhexLu
zm8xBEJ%j9j>9xgP_NoF#)_qJSfZbJR^eBfa;>|ACoxS-gUqtrY!mGeNg}2{Sv1#t%
zyRPuL<eG0yy!%!{;(hhp#f8J_IH-$>lbQSSH#ZZV8Z*{+MM8`!I(>sv7pA`}5*}U&
zz^@va)BWAJ8u?fIDSEkz*%AF~=vv*%RmiJm#%cZxU89$|2!eor*SD((G){A^+Fc!)
zt9RE*EUw;NwFyphHSTxyyLJX#oV6G9uQ+7Rn*1Zq_mlrS&f3Duz0OzdI%h>!an@e$
zzhkT|M%<FKYJ&WK!}w9Ke}`DR&%Z)!<@`|mmWJkEGvNbqM*?%64V*bE330#v2hW#C
A9smFU

diff --git a/compiler/test-resources/jars/mylibrary2.jar b/compiler/test-resources/jars/mylibrary2.jar
index 3f82cd4fe58ef13d73960eb3f632321b11c3e81a..1d6584bdf54595bba4c982dbe24e703d1a50fccd 100644
GIT binary patch
delta 1763
zcmZWqdpOgJAD+3)*w$flD_ez-%iNhAbD7JLi5<;t$mCXX(3xD0YDj1z^F`vgjENH`
zbZ|Jr+!C@7N<}VFE^*ML(0=KU-_!5;eV*s@ynnoZe4gih-uLq^A1slElS#rND3G|g
zI4JY1E(?wq-Uo+-Z@^RC2cS+wlW{&=+6qPJ>hj4QQ*sOWbA0^FwKg}YJ>nc>Sy}Z+
z`g7GwiZo({XH?%x>1@qNUbc-iBi^DvCV0XSZuIbERP+MR^zBsK>h9;gIkk9=BE2^d
zfA=Vq`y7*waxkex!F7{g9Tz-8--^3jF<~k*Ib@mTr^j@7eGYo8S+o7$42C9*1AQ(3
z%)hX;WWa|<GtAeyxm3fnsq*Ey_&43xAt;y!+voQ88fyh;b7%&fPNafv-j0t6(ZinG
z=%)m*$1aNP09ou9on-8q#E4GL@+Lp)OAsZs%<i;0r1RW%D@&87d7yj^ts&Ta&ONDp
z!D@y(Z$&N`s}Equd%+lsZPH3A!)aW%O3t&I9G#R(=*<I_jpd)p<dhe;lJp}?PFN33
z=1%ck{`B<d!CP;oJJ}A=f(N_B6navuXZZ3_0?pXp*+Fwc#tjSBVvS*?j=9NSU<Tn-
ztswtHKjz;jxzE-3ptlK2A#5yRJ<RZ(IN$2EQ2JKidw-|Z5pxD&;h>V)dR&S(OO8!8
zq*Tq{q_{uG{cJWlg6#Cq50MyEYaRIQaeyQ9Or)~<MrssdPhsz=7t(vrE=`2>gA_<u
z=KUL3{CO$D)ob((F*YA4R2nWi@(~@Y-GQ~w6KPK9$s^n9GpVOgFFtjP4EPFIBg|9!
zuO3RU>xlp=(s?B3xZBH5amZIs<erdU+%ajlEjCygB;~UL{Or<>@t2%Ncaf8a%1&m0
z#!^G3|FGK?B9kEEF)uJ^T`&m569$3)$7q0uxH7{()Q?UN%xHJ&B%>a-3y(@Rgmi@6
z>n^#Po|JxlJ6OX{9WAfJzjM4fv6%w2$y|ttm=^k%a0zUToIQTj@0|iKns@8<ExK{b
zno&H)jJRp^Y;n{ch~85t@$YL|ibShgaBAkw)_;0>n`w}s(b8px<3<m7gq*0AE~D5r
ztujP<?elI&7JUfsmu0)+pUYMvyCXixi#q?3D3{G@6FyV{H=M@d5^7`dYNHrg9VRU$
zEgD(%ma=&!9WoQsc~JK7EJkLOjJl9qR*enE>~vEF-4pNSux@d8n5rKowCX*4R<5YI
zhYugXw_5x)buYrxQn0UzWXoy7DhMPEvK0D%Su_{~N2H&8@0uwR8Jvtj%q|>J0W0fh
zpDTs3>?>iaDublhV?W)C=9_2YA6@4E7OhRzXejA%$#Jorwq)fdG_gwbGO#vCC{z+y
zBqp8~?lT}9ZWjmyuw1u$GLeCJREJhrSokmDtz#pHS4wyp81HoWrSh=I-z8cYlcWI}
zBQj+*ZQ5o|%Rq&8bV_U?zPt8Jf%6!5B>-o)RBGh9`3JN;D35kyRu3kY)+|N+D^zz4
zo}QIzbKa@Hpu!4%Rc{(?MGQS_{ke{7&nfQqP&`VDqOV`s_#rFt@d?N5A?kv{WBx{$
zK8a{U(;YDDknW;i23ue%8YUD~618L*wl|AEE<fBfwZ9>rWKWC0Ev*x?xDm><Eoi{=
zxx48-V4PG@Ai*8;=#+;@!F9Vp=z+Q-+M?0BqZ_H?QxEvdHB3?_w@&_0N*|q)`Bp`L
zb-s_X`+1|~m~I#N3CXXRnlM_JT>rPqRHzsqk1GUUm(pU*V24@*rjuekQ!^PaVI*#c
zVlQdCvrE<E21FM3c;rQ|bA4mOOwT9pB**aG)t<LrPb`8yt}8voAv+{ChSg_OeonXx
z_7ZX(40(VZgir>49SmrCN^}AcqOG8R=9|U?Je))oDVPE!BDlPPGpytc(I2E<xns*K
z%{N-4Zu*(Z<=O6BJ-c_`d55vpS?{|c+I$3Ca?sZjGM?du^|CeLo4Z{P1Z!?UD0F>O
zB>F@3R&|bJEP8Ax!P|7LAA9%Wp4M&gEb(7YR(ZxM*9MmRod5Ag$%?CUL)6MUQu~K$
zeOK3P6~~UcK+3ZqwGet{=~kBe%9{n7LG;T)_7;uKSYPyPb-Em_xa7n+?aR5+w2a{Q
zsN>snL{G7|LcJy$Hzh7|3dsx?2XlXol)I7x6@qN*uF0Rj2=6;ux~h1$`fJX&zb=_1
z1V(}WTPc8pB<@>_T$8l;hP{%;QeRtz`u%T^2M{ntpbe$~-Dke#1DJ-%fN8=&9SjLb
jz@-oG6W^ba1ARXLPzyr=&Ts@m3?v3h{+g>K$UgrcNC6eZ

literal 3435
zcmbVPc{r5a8y-tD!;GvklM#)vBxBzqvQ9G?TT)F~Lv~^+lVq1Y`z~ZcgltL4E<zNe
zEG3bYQ9?qf-%Nei7kyvfAHV0l-s?Ko`##Too^#G~?sFd#114r302mAgkS|LU09%X&
zzzo3anQNhOMi}XD-2ea+z{CIqrh72{<!187U>=&s-@$k-BOFHWh`AIVvxM*MF*HC+
zJ!LaMOZ4^jSDVRD<R_-RrS$QVIQ-LdCCsepRQS7${Z6ZVBBC>736&YXU2phAQUSYM
z7rhs}8GhtonP2cyo7MyUrRTs30MPPE|7`#e+Fy5)o3ov_tv5+d`d6~QJ0i9_>e#xS
zKIdjj^z@dKI_+lb<C9~AH()g7QTNn9DE2(+jv-J)Yr=E}%E9{J&`L%<ujg6p-uA?I
z2e=>i<vzVytXG<+M|Bz$e6Or~0ds7i1T=rmXWoCNVQFpY%gzb#N$9lcoL}k$(gTM7
zIF``grm3JH1N85juYbL?P<GaV%~FjbG*}~$<)i0s=aVaMZ`4r9cTKKqh)@v-tvSeJ
z4^Q@*z{4cozG^}w1*`20A-LDNpn+dBl?x3Hszu&1@lr!&IZoV#>J9SWPkY+st(SIE
z1F!F>$#U_OFYb`wth+LTxlfVr(wp$|JiwX}2g}%lPl*pk)v3hw&>WQd7a`N(H(fTk
z^Ccp)P;E@{o(ANKwr=b0AwyNlZKGNlzrcg3VEA&+X9><+?(Wd;FMW>(gO##eE}U7f
zSF+vzWbi>SQkI3k-N#H-s<3pZX)Z@^{l)h=hvXx|yRt%6H5xNFH#<EIsr@PU+xAIB
z_Rtmv1l|RKk*pa2099IP{a*`3wDlp99O52F51R0F_*8%L^qRT#0t=C!8XzYG=ZQxR
zg$Y3`GKAm*%u9P6hn}xkSq-!o=JXW}_SNjl4xYlAR`S;cL$th<*Ew}{Gg@jhiy<u?
z)2;PQetq@oqiRD%cP&j5f*jvQFLjKxE-#*V{b7BvY%t53`P7R;qzk-lVm34Tl@SrH
zjrqsi?bm(clN0hU0=?0GJ68|9q*%g-x$a#Fgm*OvbMXS22$lop$500)Id?PM&#>iC
zA?-1#xeJb6*ObnbQn=)l&527)bvi?WBRfm)DVbI4<m(=j7b!n}t;~gws1pLqD4a$f
ztLvR}U_!nmDvs%fW0eG>>|F(XJ8G93nCH{PKe+46L<OvQE>GsJzE$jb>H`5?uR2=l
zTu7amUp?;pq=Fp4(UDYKKM}^7Hi{zekhVyKFTP`7KWQ<0L%%iTPKy5hHQh(3xo%<U
zl#7epRn@H_7E<306vSFGH!v5`O=I)E)NTvM{tLWho%f#xY*x`H-cNoO`S|gpEuy^j
zN(9>;2xy}{;!wp(__u1s*9Bgua-r0UxVX^V4}5MM{tw4^j6=k&Pxmb(`wXlH6~(+}
z`;yE?XbM^gXjWmutn$$d!a=ucwv$#6Uuo~33j(%%=N=_GyZOkWe(u^>GfPh{Egto@
zE0D1vq=ie_vuAc;m&=e}wWmUk7O-H2@335DGJL1dCI#o+6_E0fj7nT(+Aw{n)>F8b
z0#nWy$+$n0?KfY)PF=a03+VQJ82=$Q+0D89u*ix^yo*WqNgHT}{I`VrQGS+n<Eq>r
znzgfS_r>VHatEX96Rmv>SRlC8=a?bvnSdv6qvVg*e(jl>Ej{?OB(2&UR*t|L1N-5V
zVUv+e{17EBFBn(LO@s`2=ct74a74@5cx_dD5f$1ehGtr@`n<~%G9b-Uy0o15&Ej}O
z=@ly>zt*y~oO~|66wts*T+Mfq{p-SnbW;`cOESfVu7o=YZRl|OV-U{xcapa`o!+0@
z-_f(zrFBZZ#GUkQFgo8{ARqlAc96r2S+XIgkWg0{&L;OU)};HDrLk?2;pArHCsnB5
z_Y@Vg3Kic#biqn|kUQA~rN$Hxm7y%j<#Rj4QfH*#)ntW$z*m7;r%DO+1&?7@md%#l
zS9$*4Uqh3siC2R&GQmcheVotV=m;sWQ9M?4Uh-DlSi9zy{(eFhufQ;y^ehT4n~|6Y
z+hpS*=_;p<$BaMvAX|R9Kqm$ZW&skezsz9tLX(RseYM6>H6&iq2*u8>ONXCfZ^I)|
zS{^q0kjb3v1z(u!9hH<Gc0Ugw*Ayf}>niod3rxgzBoWUA*E)U~hpkkv`S6@~a;S4w
z>-^SWFPGelcTON5c*&9#V8;<71!qjwDG4hAE`aDICub1ahNkgPH`9NW9N)i{+|P<r
zTlRde0R#fMft(m%%Zu*pUh?(!>-xf*PZE2x?S#(*F&JRbt@bM2&FuCDqW^dDEy^3N
z^FYVEV$U1w=9N}wz3q&U!c49gO<i1AghMjJ*|iP4aHft{_i9B8IfO$v!owuypokdg
zT;n&Xe2sF67${OBUH=vdb{BT{09*y`>kAu(4c7-sYG8o8GaJd~7-0Ft#=!MA=5@UY
zp(~2*vMMMpEGXnumrYl5dvhy*F-B8evrLl!=;CIGl4o>|!$TVgW3W}_z#$oVFe6SB
zXaU?Sgl?YrUjEAX)EfnzfYUX44G)1p+j!)Ullb$C*0OopjA;JnHvRWG`$5_0_(O)=
zXL&m3b0Q<<MFlz@Yhjr|ptw{8+3*Msi6m5-;I!BQ?+2wTpqotNP2)|x1pWPa9cBq;
zdJ~!)`joI1T{hXB55sVF*)YVt^y0%pq(Q&=^|i)%s<gDV_^iGtm!71Ho4bd5;{b)f
zQJ*O2;IX4G04X<{<N8@-zLyaukT8b4Tglu51!J)_fg@tFw}!b)6lKO>aS5Y1{1Bsy
zTrpe}*5<?<)PnSgptym0KL*(%Qm~KlYfB2n3NZghaN=a8GI<^n6Y6(1ThA2g2ugd`
zaiN9F-pI}_ol<o~X0U_3TQbfjNK0}FfP?lggEyRlDT_O>;U`d08Ud=s{8t@?4xnr#
zgIe;_`=hapZEQg!!V_A#rF*1#TVfX_sn*jWm#&b!(vKUaJ^@hqQ*(p%w5(v=Uz1D%
z2!v2nRObkDOm1H5L9y4Shm7y+rleU(2IC+HrJpj?vOZ($t=gEzm`DeYiB70sxc0b#
zUK;Q42u%wUZ|u7bJJo)+A=GG7x!Lhjar53(ij`;L=(Br*(|DFD%gC%EYfp`})WNps
z-bzDewcbv<^d#LK=Xr)%Z@L&wopV+qkKQ>$AZFp~*;IL!k?-zMN2Y4BS?kRm>=_|A
ziLw)zq-+)k{@VACL=PMunmgNn?Z&jWxUv6S(X&2aP5)K=42yMg^d#cwR5T^%0rjZF
z`9}s1VvbFXJgM4<Dybg{#t9J1iRGzyQf!GS$a|T*-_N{k({F^_d_C{U?Zl+#Iw#MM
zR@XVRN?bnok#hM)p?7zCVPdJ|{-~5I6?ZDDGX>X`nD*KAtIizfXMaT!o)?Q$A0EyX
zTt8XCy<TpB7@{t<^Lak@cTIkw<Iraw!5&xOrgnsN;mA6E<971<nwyA{J(8PiMTp(w
z<%@!Jj(B7N)GnoQ#L^F)!obJ_*e;%FpMMx#Ja4zZ)i7O3n;2{l-70A5()pLE)0%&W
zZV}RS1XjSGh3_wf7Fu(g4F1(MT?lVgUUVV+%VufKErI`##ajnKN7{O1Z%0a^P0JsU
zevrWLNL!hhe#HMWGHqJ7AZ<JFe@EHMO>_qOWqhE2LHWtyzk_UD@a-T5v@6FyQjz*=
UJUf8&-oUhHH*M@{^s5Nqf37t~djJ3c

diff --git a/compiler/test-resources/repl/require-multiple b/compiler/test-resources/repl/require-multiple
index 34faa564d37d..3803234141d6 100644
--- a/compiler/test-resources/repl/require-multiple
+++ b/compiler/test-resources/repl/require-multiple
@@ -15,7 +15,7 @@ Added 'compiler/test-resources/jars/mylibrary2.jar' to classpath.
 scala> import mylibrary2.Utils2
 
 scala> Utils2.greet("Alice")
-val res1: String = Hello, Alice!
+val res1: String = Greetings, Alice!
 
 scala> Utils.greet("Alice")
 val res2: String = Hello, Alice!

From 7febea66b19cc730625ab440305ee12905188426 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Thu, 13 Feb 2025 23:53:46 +0000
Subject: [PATCH 177/505] Fix :require adding classes/pkgs

---
 .../dotc/classpath/AggregateClassPath.scala   |  6 +---
 .../tools/dotc/config/JavaPlatform.scala      |  3 +-
 .../dotty/tools/dotc/config/Platform.scala    |  2 +-
 .../src/dotty/tools/dotc/core/Contexts.scala  |  6 +---
 .../dotty/tools/dotc/core/Definitions.scala   |  2 +-
 .../dotty/tools/dotc/core/SymbolLoaders.scala | 29 ++++++++++++++-
 .../src/dotty/tools/repl/ReplCompiler.scala   |  6 +---
 .../src/dotty/tools/repl/ReplDriver.scala     | 35 +++++++++----------
 compiler/test/dotty/tools/repl/ReplTest.scala |  5 +--
 9 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala b/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala
index 699e2f438e4e..ec04eb3db8a1 100644
--- a/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala
+++ b/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala
@@ -51,11 +51,7 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
       case (_, s) => s
     }
   }
-  override def asURLs: Seq[URL] =
-    aggregates.flatMap {
-      case v: VirtualDirectoryClassPath => Seq()
-      case a => a.asURLs
-    }
+  override def asURLs: Seq[URL] = aggregates.flatMap(_.asURLs)
 
   override def asClassPathStrings: Seq[String] = aggregates.map(_.asClassPathString).distinct
 
diff --git a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
index 80deb207be0c..7f6b5025cea6 100644
--- a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
+++ b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
@@ -33,8 +33,9 @@ class JavaPlatform extends Platform {
     case cp: ClassPath =>
       currentClassPath = Some(AggregateClassPath(cp :: cPath :: Nil))
   }
+
   /** Update classpath with a substituted subentry */
-  def updateClassPath(subst: Map[ClassPath, ClassPath])(using Context): Unit = classPath match {
+  def updateClassPath(subst: Map[ClassPath, ClassPath]): Unit = currentClassPath.get match {
     case AggregateClassPath(entries) =>
       currentClassPath = Some(AggregateClassPath(entries map (e => subst.getOrElse(e, e))))
     case cp: ClassPath =>
diff --git a/compiler/src/dotty/tools/dotc/config/Platform.scala b/compiler/src/dotty/tools/dotc/config/Platform.scala
index 6c3542bc2e6c..798c9f449f9a 100644
--- a/compiler/src/dotty/tools/dotc/config/Platform.scala
+++ b/compiler/src/dotty/tools/dotc/config/Platform.scala
@@ -19,7 +19,7 @@ abstract class Platform {
   def classPath(using Context): ClassPath
 
   /** Update classpath with a substitution that maps entries to entries */
-  def updateClassPath(subst: Map[ClassPath, ClassPath])(using Context): Unit
+  def updateClassPath(subst: Map[ClassPath, ClassPath]): Unit
 
   /** Add new entry to classpath */
   def addToClassPath(cPath: ClassPath)(using Context): Unit
diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala
index 075de9e934fe..8c09a3f24fa0 100644
--- a/compiler/src/dotty/tools/dotc/core/Contexts.scala
+++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala
@@ -35,7 +35,6 @@ import scala.annotation.internal.sharable
 import DenotTransformers.DenotTransformer
 import dotty.tools.dotc.profile.Profiler
 import dotty.tools.dotc.sbt.interfaces.{IncrementalCallback, ProgressCallback}
-import dotty.tools.dotc.classpath.ClassPathFactory
 import util.Property.Key
 import util.Store
 import plugins.*
@@ -898,11 +897,8 @@ object Contexts {
     /** Initializes the `ContextBase` with a starting context.
      *  This initializes the `platform` and the `definitions`.
      */
-    def initialize(previousOutputDir: Option[AbstractFile] = None)(using Context): Unit = {
+    def initialize()(using Context): Unit = {
       _platform = newPlatform
-      previousOutputDir.foreach(cp =>
-        _platform.nn.addToClassPath(ClassPathFactory.newClassPath(cp))
-      )
       definitions.init()
     }
 
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
index 5c7d3786bd7e..da57315e15ff 100644
--- a/compiler/src/dotty/tools/dotc/core/Definitions.scala
+++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -2150,7 +2150,7 @@ class Definitions {
 
   private var isInitialized = false
 
-  def init(require: Boolean = false)(using Context): Unit = {
+  def init()(using Context): Unit = {
     this.initCtx = ctx
     if (!isInitialized) {
       // force initialization of every symbol that is synthesized or hijacked by the compiler
diff --git a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala
index a0b3460d06e4..bcb61ca47b3e 100644
--- a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala
@@ -7,6 +7,7 @@ import java.nio.channels.ClosedByInterruptException
 
 import scala.util.control.NonFatal
 
+import dotty.tools.dotc.classpath.PackageNameUtils
 import dotty.tools.io.{ ClassPath, ClassRepresentation, AbstractFile, NoAbstractFile }
 import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
 
@@ -265,7 +266,7 @@ object SymbolLoaders {
 
     def maybeModuleClass(classRep: ClassRepresentation): Boolean = classRep.name.last == '$'
 
-    private def enterClasses(root: SymDenotation, packageName: String, flat: Boolean)(using Context) = {
+    def enterClasses(root: SymDenotation, packageName: String, flat: Boolean)(using Context) = {
       def isAbsent(classRep: ClassRepresentation) =
         !root.unforcedDecls.lookup(classRep.name.toTypeName).exists
 
@@ -309,6 +310,32 @@ object SymbolLoaders {
         }
     }
   }
+
+  def mergeNewEntries(
+    packageClass: ClassSymbol, fullPackageName: String,
+    jarClasspath: ClassPath, fullClasspath: ClassPath,
+  )(using Context): Unit =
+    if jarClasspath.classes(fullPackageName).nonEmpty then
+      // if the package contains classes in jarClasspath, the package is invalidated (or removed if there are no more classes in it)
+      val packageVal = packageClass.sourceModule.asInstanceOf[TermSymbol]
+      if packageClass.isRoot then
+        val loader = new PackageLoader(packageVal, fullClasspath)
+        loader.enterClasses(defn.EmptyPackageClass, fullPackageName, flat = false)
+        loader.enterClasses(defn.EmptyPackageClass, fullPackageName, flat = true)
+      else if packageClass.ownersIterator.contains(defn.ScalaPackageClass) then
+        () // skip
+      else if fullClasspath.hasPackage(fullPackageName) then
+        packageClass.info = new PackageLoader(packageVal, fullClasspath)
+      else
+        packageClass.owner.info.decls.openForMutations.unlink(packageVal)
+    else
+      for p <- jarClasspath.packages(fullPackageName) do
+        val subPackageName = PackageNameUtils.separatePkgAndClassNames(p.name)._2.toTermName
+        val subPackage = packageClass.info.decl(subPackageName).orElse:
+          // package does not exist in symbol table, create a new symbol
+          enterPackage(packageClass, subPackageName, (module, modcls) => new PackageLoader(module, fullClasspath))
+        mergeNewEntries(subPackage.asSymDenotation.moduleClass.asClass, p.name, jarClasspath, fullClasspath)
+  end mergeNewEntries
 }
 
 /** A lazy type that completes itself by calling parameter doComplete.
diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala
index 1ec2d230f7e9..e34bb229a727 100644
--- a/compiler/src/dotty/tools/repl/ReplCompiler.scala
+++ b/compiler/src/dotty/tools/repl/ReplCompiler.scala
@@ -46,11 +46,7 @@ class ReplCompiler extends Compiler:
       /** Import previous runs and user defined imports */
       override protected def rootContext(using Context): Context = {
         def importContext(imp: tpd.Import)(using Context) =
-          // TODO: only when context has changed?
-          val typer = ctx.typer
-          typer.index(imp)
-          val imp2 = typer.typed(imp).asInstanceOf[tpd.Import]
-          ctx.importContext(imp2, imp2.symbol)
+          ctx.importContext(imp, imp.symbol)
 
         def importPreviousRun(id: Int)(using Context) = {
           // we first import the wrapper object id
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 136b019a33ea..180612830c6e 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -1,8 +1,10 @@
 package dotty.tools.repl
 
 import scala.language.unsafeNulls
+
 import java.io.{File => JFile, PrintStream}
 import java.nio.charset.StandardCharsets
+
 import dotty.tools.dotc.ast.Trees.*
 import dotty.tools.dotc.ast.{tpd, untpd}
 import dotty.tools.dotc.classpath.ClassPathFactory
@@ -20,6 +22,7 @@ import dotty.tools.dotc.core.NameOps.*
 import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.StdNames.*
 import dotty.tools.dotc.core.Symbols.{Symbol, defn}
+import dotty.tools.dotc.core.SymbolLoaders
 import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.interactive.Completion
 import dotty.tools.dotc.printing.SyntaxHighlighting
@@ -69,6 +72,7 @@ case class State(objectIndex: Int,
                  quiet: Boolean,
                  context: Context):
   def validObjectIndexes = (1 to objectIndex).filterNot(invalidObjectIndexes.contains(_))
+  //def copy() = this
 
 /** Main REPL instance, orchestrating input, compilation and presentation */
 class ReplDriver(settings: Array[String],
@@ -88,12 +92,12 @@ class ReplDriver(settings: Array[String],
     setupRootCtx(this.settings ++ settings, rootCtx)
   }
 
-  private def setupRootCtx(settings: Array[String], rootCtx: Context, previousOutputDir: Option[AbstractFile] = None) = {
+  private def setupRootCtx(settings: Array[String], rootCtx: Context) = {
     setup(settings, rootCtx) match
       case Some((files, ictx)) => inContext(ictx) {
         shouldStart = true
         if files.nonEmpty then out.println(i"Ignoring spurious arguments: $files%, %")
-        ictx.base.initialize(previousOutputDir)
+        ictx.base.initialize()
         ictx
       }
       case None =>
@@ -543,30 +547,23 @@ class ReplDriver(settings: Array[String],
         if (existingClass.nonEmpty)
           out.println(s"The path '$path' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
           state
-        else
-          val prevClassPath = state.context.platform.classPath(using state.context).asClassPathString
-          val newClassPath = s"$prevClassPath${JFile.pathSeparator}$path"
+        else inContext(state.context):
+          val jarClassPath = ClassPathFactory.newClassPath(jarFile)
+          val prevOutputDir = ctx.settings.outputDir.value
 
           // add to compiler class path
-          val prevOutputDir = rootCtx.settings.outputDir.valueIn(rootCtx.settingsState)
-          val ctxToUse = initCtx.fresh
-            .setSetting(rootCtx.settings.classpath, newClassPath)
-            .setSetting(rootCtx.settings.outputDir, prevOutputDir) // reuse virtual output directory
-          rootCtx = setupRootCtx(
-            Array(),
-            ctxToUse,
-            previousOutputDir = Some(prevOutputDir)
-          )
-          val s = state.copy(context = rootCtx)
+          ctx.platform.addToClassPath(jarClassPath)
+          SymbolLoaders.mergeNewEntries(defn.RootClass, ClassPath.RootPackage, jarClassPath, ctx.platform.classPath)
 
           // new class loader with previous output dir and specified jar
-          val prevClassLoader = rendering.classLoader()(using state.context)
+          val prevClassLoader = rendering.classLoader()
           val jarClassLoader = fromURLsParallelCapable(
-            ClassPathFactory.newClassPath(jarFile)(using rootCtx).asURLs, prevClassLoader)
+            jarClassPath.asURLs, prevClassLoader)
           rendering.myClassLoader = new AbstractFileClassLoader(
-            rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), jarClassLoader)
+            prevOutputDir, jarClassLoader)
+
           out.println(s"Added '$path' to classpath.")
-          s
+          state
 
     case KindOf(expr) =>
       out.println(s"""The :kind command is not currently supported.""")
diff --git a/compiler/test/dotty/tools/repl/ReplTest.scala b/compiler/test/dotty/tools/repl/ReplTest.scala
index 8fbf635c9a17..b630ef0c2b82 100644
--- a/compiler/test/dotty/tools/repl/ReplTest.scala
+++ b/compiler/test/dotty/tools/repl/ReplTest.scala
@@ -94,10 +94,7 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na
         FileDiff.dump(checkFile.toPath.toString, actualOutput)
         println(s"Wrote updated script file to $checkFile")
       else
-        println("expected =========>")
-        println(expectedOutput.mkString(EOL))
-        println("actual ===========>")
-        println(actualOutput.mkString(EOL))
+        println(dotc.util.DiffUtil.mkColoredHorizontalLineDiff(actualOutput.mkString(EOL), expectedOutput.mkString(EOL)))
 
         fail(s"Error in script $name, expected output did not match actual")
     end if

From a40d3880bca16cc69899861d40e247297125e89a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 25 Apr 2025 08:36:37 +0200
Subject: [PATCH 178/505] Fix :require adding classes/pkgs

[Cherry-picked 9a6067993748c659b7c76c5361993335ef5a13a9][modified]

From e9be78e8269afe6a03854cbef7284d9a62bf57d5 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Wed, 26 Feb 2025 10:36:30 +0100
Subject: [PATCH 179/505] Rename :require to :jar and deprecate :require

[Cherry-picked 4649d5e7abe5fe968621f700369df90dd22ea6b4]
---
 .../src/dotty/tools/repl/ParseResult.scala    | 10 +++++-
 .../src/dotty/tools/repl/ReplDriver.scala     |  4 +++
 compiler/test-resources/jars/MyLibrary.scala  |  2 +-
 compiler/test-resources/jars/MyLibrary2.scala |  2 +-
 compiler/test-resources/repl/require-command  | 13 --------
 compiler/test-resources/repl/require-errors   |  8 -----
 compiler/test-resources/repl/require-multiple | 32 -------------------
 .../dotty/tools/repl/TabcompleteTests.scala   |  1 +
 8 files changed, 16 insertions(+), 56 deletions(-)
 delete mode 100644 compiler/test-resources/repl/require-command
 delete mode 100644 compiler/test-resources/repl/require-errors
 delete mode 100644 compiler/test-resources/repl/require-multiple

diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala
index 409572aeacf6..2b7740152fa4 100644
--- a/compiler/src/dotty/tools/repl/ParseResult.scala
+++ b/compiler/src/dotty/tools/repl/ParseResult.scala
@@ -52,13 +52,20 @@ object Load {
   val command: String = ":load"
 }
 
-/** `:require <path>` adds a jar to the classpath
+/** `:require` is a deprecated alias for :jar`
  */
 case class Require(path: String) extends Command
 object Require {
   val command: String = ":require"
 }
 
+/** `:jar <path>` adds a jar to the classpath
+ */
+case class JarCmd(path: String) extends Command
+object JarCmd {
+  val command: String = ":jar"
+}
+
 /** `:kind <type>` display the kind of a type. see also :help kind
  */
 case class KindOf(expr: String) extends Command
@@ -158,6 +165,7 @@ object ParseResult {
     Help.command -> (_  => Help),
     Reset.command -> (arg  => Reset(arg)),
     Imports.command -> (_  => Imports),
+    JarCmd.command -> (arg => JarCmd(arg)),
     KindOf.command -> (arg => KindOf(arg)),
     Load.command -> (arg => Load(arg)),
     Require.command -> (arg => Require(arg)),
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 180612830c6e..599db1994d7d 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -518,6 +518,10 @@ class ReplDriver(settings: Array[String],
       }
 
     case Require(path) =>
+      out.println(":require has been deprecated and replaced with :jar. Please use :jar")
+      state
+
+    case JarCmd(path) =>
       val jarFile = AbstractFile.getDirectory(path)
       if (jarFile == null)
         out.println(s"""Cannot add "$path" to classpath.""")
diff --git a/compiler/test-resources/jars/MyLibrary.scala b/compiler/test-resources/jars/MyLibrary.scala
index cc492696c139..bd752d2df864 100644
--- a/compiler/test-resources/jars/MyLibrary.scala
+++ b/compiler/test-resources/jars/MyLibrary.scala
@@ -1,5 +1,5 @@
 /**
- * JAR used for testing repl :require
+ * JAR used for testing repl :jar
  * Generated using: mkdir out; scalac -d out MyLibrary.scala; jar cf mylibrary.jar -C out .
  */
 package mylibrary
diff --git a/compiler/test-resources/jars/MyLibrary2.scala b/compiler/test-resources/jars/MyLibrary2.scala
index ca288fcfbf85..df5a944c0bcf 100644
--- a/compiler/test-resources/jars/MyLibrary2.scala
+++ b/compiler/test-resources/jars/MyLibrary2.scala
@@ -1,5 +1,5 @@
 /**
- * JAR used for testing repl :require
+ * JAR used for testing repl :jar
  * Generated using: mkdir out2; scalac -d out MyLibrary2.scala; jar cf mylibrary2.jar -C out2 .
  */
 package mylibrary2
diff --git a/compiler/test-resources/repl/require-command b/compiler/test-resources/repl/require-command
deleted file mode 100644
index 1af49ccff6fb..000000000000
--- a/compiler/test-resources/repl/require-command
+++ /dev/null
@@ -1,13 +0,0 @@
-scala> val z = 1
-val z: Int = 1
-
-scala>:require sbt-test/source-dependencies/canon/actual/a.jar
-Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
-
-scala> import A.x
-
-scala> x
-val res0: Int = 3
-
-scala> z
-val res1: Int = 1
diff --git a/compiler/test-resources/repl/require-errors b/compiler/test-resources/repl/require-errors
deleted file mode 100644
index 8e26c673f9b3..000000000000
--- a/compiler/test-resources/repl/require-errors
+++ /dev/null
@@ -1,8 +0,0 @@
-scala>:require path/does/not/exist
-Cannot add "path/does/not/exist" to classpath.
-
-scala>:require sbt-test/source-dependencies/canon/actual/a.jar
-Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
-
-scala>:require sbt-test/source-dependencies/canon/actual/a.jar
-The path 'sbt-test/source-dependencies/canon/actual/a.jar' cannot be loaded, it contains a classfile that already exists on the classpath: sbt-test/source-dependencies/canon/actual/a.jar(A.class)
diff --git a/compiler/test-resources/repl/require-multiple b/compiler/test-resources/repl/require-multiple
deleted file mode 100644
index 3803234141d6..000000000000
--- a/compiler/test-resources/repl/require-multiple
+++ /dev/null
@@ -1,32 +0,0 @@
-scala> val z = 1
-val z: Int = 1
-
-scala>:require compiler/test-resources/jars/mylibrary.jar
-Added 'compiler/test-resources/jars/mylibrary.jar' to classpath.
-
-scala> import mylibrary.Utils
-
-scala> Utils.greet("Alice")
-val res0: String = Hello, Alice!
-
-scala>:require compiler/test-resources/jars/mylibrary2.jar
-Added 'compiler/test-resources/jars/mylibrary2.jar' to classpath.
-
-scala> import mylibrary2.Utils2
-
-scala> Utils2.greet("Alice")
-val res1: String = Greetings, Alice!
-
-scala> Utils.greet("Alice")
-val res2: String = Hello, Alice!
-
-scala> import mylibrary.Utils.greet
-
-scala> greet("Tom")
-val res3: String = Hello, Tom!
-
-scala> Utils.greet("Alice")
-val res4: String = Hello, Alice!
-
-scala> z
-val res5: Int = 1
diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
index 75ecb03b95d7..d8518e9f41dc 100644
--- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala
+++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
@@ -216,6 +216,7 @@ class TabcompleteTests extends ReplTest {
         ":exit",
         ":help",
         ":imports",
+        ":jar",
         ":kind",
         ":load",
         ":quit",

From 49a57104b192aad75c0f7c4136a975213d089a4a Mon Sep 17 00:00:00 2001
From: anna herlihy <herlihyap@gmail.com>
Date: Tue, 4 Mar 2025 12:54:24 +0100
Subject: [PATCH 180/505] Update compiler/src/dotty/tools/repl/ReplDriver.scala
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Oliver Bračevac <bracevac@users.noreply.github.com>
[Cherry-picked 46aef8759adfd970d062e4980ab0bb6e82f0d6fc]
---
 compiler/src/dotty/tools/repl/ReplDriver.scala | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 599db1994d7d..6311f310e88a 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -72,7 +72,6 @@ case class State(objectIndex: Int,
                  quiet: Boolean,
                  context: Context):
   def validObjectIndexes = (1 to objectIndex).filterNot(invalidObjectIndexes.contains(_))
-  //def copy() = this
 
 /** Main REPL instance, orchestrating input, compilation and presentation */
 class ReplDriver(settings: Array[String],

From b1264fb30064ee5fa1f6a66ae129b7a259c322f1 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Tue, 4 Mar 2025 13:00:15 +0100
Subject: [PATCH 181/505] re-add tests

[Cherry-picked 7b142b821126771a6a986f9ad998f870f8f5d356]
---
 compiler/test-resources/repl/jar-command  | 13 +++++++++
 compiler/test-resources/repl/jar-errors   | 11 ++++++++
 compiler/test-resources/repl/jar-multiple | 32 +++++++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 compiler/test-resources/repl/jar-command
 create mode 100644 compiler/test-resources/repl/jar-errors
 create mode 100644 compiler/test-resources/repl/jar-multiple

diff --git a/compiler/test-resources/repl/jar-command b/compiler/test-resources/repl/jar-command
new file mode 100644
index 000000000000..b0ded22d3654
--- /dev/null
+++ b/compiler/test-resources/repl/jar-command
@@ -0,0 +1,13 @@
+scala> val z = 1
+val z: Int = 1
+
+scala>:jar sbt-test/source-dependencies/canon/actual/a.jar
+Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
+
+scala> import A.x
+
+scala> x
+val res0: Int = 3
+
+scala> z
+val res1: Int = 1
diff --git a/compiler/test-resources/repl/jar-errors b/compiler/test-resources/repl/jar-errors
new file mode 100644
index 000000000000..53a3ba965c94
--- /dev/null
+++ b/compiler/test-resources/repl/jar-errors
@@ -0,0 +1,11 @@
+scala>:jar path/does/not/exist
+Cannot add "path/does/not/exist" to classpath.
+
+scala>:jar sbt-test/source-dependencies/canon/actual/a.jar
+Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
+
+scala>:jar sbt-test/source-dependencies/canon/actual/a.jar
+The path 'sbt-test/source-dependencies/canon/actual/a.jar' cannot be loaded, it contains a classfile that already exists on the classpath: sbt-test/source-dependencies/canon/actual/a.jar(A.class)
+
+scala>:require sbt-test/source-dependencies/canon/actual/a.jar
+:require has been deprecated and replaced with :jar. Please use :jar
\ No newline at end of file
diff --git a/compiler/test-resources/repl/jar-multiple b/compiler/test-resources/repl/jar-multiple
new file mode 100644
index 000000000000..453ccc40dbf6
--- /dev/null
+++ b/compiler/test-resources/repl/jar-multiple
@@ -0,0 +1,32 @@
+scala> val z = 1
+val z: Int = 1
+
+scala>:jar compiler/test-resources/jars/mylibrary.jar
+Added 'compiler/test-resources/jars/mylibrary.jar' to classpath.
+
+scala> import mylibrary.Utils
+
+scala> Utils.greet("Alice")
+val res0: String = Hello, Alice!
+
+scala>:jar compiler/test-resources/jars/mylibrary2.jar
+Added 'compiler/test-resources/jars/mylibrary2.jar' to classpath.
+
+scala> import mylibrary2.Utils2
+
+scala> Utils2.greet("Alice")
+val res1: String = Greetings, Alice!
+
+scala> Utils.greet("Alice")
+val res2: String = Hello, Alice!
+
+scala> import mylibrary.Utils.greet
+
+scala> greet("Tom")
+val res3: String = Hello, Tom!
+
+scala> Utils.greet("Alice")
+val res4: String = Hello, Alice!
+
+scala> z
+val res5: Int = 1

From f14495b2c7d56a530817df4d01b34d63d77e4779 Mon Sep 17 00:00:00 2001
From: anna herlihy <herlihyap@gmail.com>
Date: Mon, 10 Mar 2025 13:23:25 +0100
Subject: [PATCH 182/505] Update compiler/src/dotty/tools/repl/ReplDriver.scala

Co-authored-by: Piotr Chabelski <ged.subfan@gmail.com>
[Cherry-picked 4bb08f7c7fe315a7281879a01d6a8d200b40df29]
---
 compiler/src/dotty/tools/repl/ReplDriver.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 6311f310e88a..825c78e8ee7a 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -517,7 +517,7 @@ class ReplDriver(settings: Array[String],
       }
 
     case Require(path) =>
-      out.println(":require has been deprecated and replaced with :jar. Please use :jar")
+      out.println(":require is no longer supported, but has been replaced with :jar. Please use :jar")
       state
 
     case JarCmd(path) =>

From bf8d90322fe1515d5d15e3cb823a904fda3cb367 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Mon, 10 Mar 2025 13:33:23 +0100
Subject: [PATCH 183/505] Add wrapper around :jar to avoid crashing repl on
 invalid jar

[Cherry-picked 42c4e89c738042f32690de7a2a70fad68bfeb213]
---
 .../src/dotty/tools/repl/ReplDriver.scala     | 50 ++++++++++---------
 compiler/test-resources/repl/jar-errors       |  2 +-
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 825c78e8ee7a..f32b1fd5281c 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -530,8 +530,6 @@ class ReplDriver(settings: Array[String],
           if (f.isClassContainer) f.iterator.flatMap(flatten)
           else Iterator(f)
 
-        val entries = flatten(jarFile)
-
         def tryClassLoad(classFile: AbstractFile): Option[String] = {
           val input = classFile.input
           try {
@@ -546,27 +544,33 @@ class ReplDriver(settings: Array[String],
           }
         }
 
-        val existingClass = entries.filter(_.ext.isClass).find(tryClassLoad(_).isDefined)
-        if (existingClass.nonEmpty)
-          out.println(s"The path '$path' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
-          state
-        else inContext(state.context):
-          val jarClassPath = ClassPathFactory.newClassPath(jarFile)
-          val prevOutputDir = ctx.settings.outputDir.value
-
-          // add to compiler class path
-          ctx.platform.addToClassPath(jarClassPath)
-          SymbolLoaders.mergeNewEntries(defn.RootClass, ClassPath.RootPackage, jarClassPath, ctx.platform.classPath)
-
-          // new class loader with previous output dir and specified jar
-          val prevClassLoader = rendering.classLoader()
-          val jarClassLoader = fromURLsParallelCapable(
-            jarClassPath.asURLs, prevClassLoader)
-          rendering.myClassLoader = new AbstractFileClassLoader(
-            prevOutputDir, jarClassLoader)
-
-          out.println(s"Added '$path' to classpath.")
-          state
+        try {
+          val entries = flatten(jarFile)
+
+          val existingClass = entries.filter(_.ext.isClass).find(tryClassLoad(_).isDefined)
+          if (existingClass.nonEmpty)
+            out.println(s"The path '$path' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
+          else inContext(state.context):
+            val jarClassPath = ClassPathFactory.newClassPath(jarFile)
+            val prevOutputDir = ctx.settings.outputDir.value
+
+            // add to compiler class path
+            ctx.platform.addToClassPath(jarClassPath)
+            SymbolLoaders.mergeNewEntries(defn.RootClass, ClassPath.RootPackage, jarClassPath, ctx.platform.classPath)
+
+            // new class loader with previous output dir and specified jar
+            val prevClassLoader = rendering.classLoader()
+            val jarClassLoader = fromURLsParallelCapable(
+              jarClassPath.asURLs, prevClassLoader)
+            rendering.myClassLoader = new AbstractFileClassLoader(
+              prevOutputDir, jarClassLoader)
+
+            out.println(s"Added '$path' to classpath.")
+        } catch {
+          case e: Throwable =>
+            out.println(s"Failed to load '$path' to classpath: ${e.getMessage}")
+        }
+        state
 
     case KindOf(expr) =>
       out.println(s"""The :kind command is not currently supported.""")
diff --git a/compiler/test-resources/repl/jar-errors b/compiler/test-resources/repl/jar-errors
index 53a3ba965c94..7d5720fcb233 100644
--- a/compiler/test-resources/repl/jar-errors
+++ b/compiler/test-resources/repl/jar-errors
@@ -8,4 +8,4 @@ scala>:jar sbt-test/source-dependencies/canon/actual/a.jar
 The path 'sbt-test/source-dependencies/canon/actual/a.jar' cannot be loaded, it contains a classfile that already exists on the classpath: sbt-test/source-dependencies/canon/actual/a.jar(A.class)
 
 scala>:require sbt-test/source-dependencies/canon/actual/a.jar
-:require has been deprecated and replaced with :jar. Please use :jar
\ No newline at end of file
+:require is no longer supported, but has been replaced with :jar. Please use :jar
\ No newline at end of file

From 7317ab60985764184c77dd80a04ec7c891b81ab2 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 7 Mar 2025 13:06:55 -0800
Subject: [PATCH 184/505] Ignore params to default arg getters

---
 .../tools/dotc/transform/CheckUnused.scala    |  6 ++++--
 tests/warn/i22746.scala                       | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 tests/warn/i22746.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 61c18180420f..17d5a07bf18e 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -8,7 +8,8 @@ import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.{Name, SimpleName, DerivedName, TermName, termName}
 import dotty.tools.dotc.core.NameOps.{isAnonymousFunctionName, isReplWrapperName, isContextFunction}
-import dotty.tools.dotc.core.NameKinds.{BodyRetainerName, ContextBoundParamName, ContextFunctionParamName, WildcardParamName}
+import dotty.tools.dotc.core.NameKinds.{
+  BodyRetainerName, ContextBoundParamName, ContextFunctionParamName, DefaultGetterName, WildcardParamName}
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols.{ClassSymbol, NoSymbol, Symbol, defn, isDeprecated, requiredClass, requiredModule}
 import dotty.tools.dotc.core.Types.*
@@ -173,7 +174,8 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   override def prepareForDefDef(tree: DefDef)(using Context): Context =
     def trivial = tree.symbol.is(Deferred) || isUnconsuming(tree.rhs)
     def nontrivial = tree.symbol.isConstructor || tree.symbol.isAnonymousFunction
-    if !nontrivial && trivial then
+    def isDefault = tree.symbol.name.is(DefaultGetterName)
+    if !nontrivial && trivial || isDefault then
       refInfos.skip.addOne(tree.symbol)
     if tree.symbol.is(Inline) then
       refInfos.inliners += 1
diff --git a/tests/warn/i22746.scala b/tests/warn/i22746.scala
new file mode 100644
index 000000000000..79576f5924be
--- /dev/null
+++ b/tests/warn/i22746.scala
@@ -0,0 +1,21 @@
+
+//> using options -Wunused:all -Werror
+
+import java.time.ZonedDateTime
+
+trait Foo[A] {
+  def apply(a: A, t: ZonedDateTime): A
+}
+
+extension [A](a: A)(using f: Foo[A]) {
+  def foo(t: ZonedDateTime = ZonedDateTime.now): A = f(a, t)
+}
+
+def test[I, A](in: I)(
+  run: I => Either[Throwable, A],
+  onErr: Throwable => Throwable = identity[Throwable]
+): Either[Throwable, A] =
+  run(in) match {
+    case Left(t) => Left(onErr(t))
+    case r @ Right(_) => r
+  }

From 8900b86d0c6f4fd5d061953628f8b7838c432e5a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 25 Apr 2025 08:37:27 +0200
Subject: [PATCH 185/505] Ignore params to default arg getters

[Cherry-picked 77c3efb2db41802338d05da15cbb65a015e07be5][modified]

From 9ea521a0a051fc564c3f5bc549460346cf7ca006 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sat, 8 Mar 2025 00:08:35 -0800
Subject: [PATCH 186/505] Lazy val def member is pattern var

---
 compiler/src/dotty/tools/dotc/ast/Desugar.scala           | 4 +++-
 compiler/src/dotty/tools/dotc/transform/CheckUnused.scala | 8 ++++----
 tests/warn/i15503d.scala                                  | 6 ++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
index 0666cea91f20..0f4421698240 100644
--- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -14,11 +14,11 @@ import config.Feature.{sourceVersion, migrateTo3, enabled}
 import config.SourceVersion.*
 import collection.mutable.ListBuffer
 import reporting.*
-import annotation.constructorOnly
 import printing.Formatting.hl
 import config.Printers
 
 import scala.annotation.internal.sharable
+import scala.annotation.{unchecked as _, *}
 import dotty.tools.dotc.util.SrcPos
 
 object desugar {
@@ -1255,6 +1255,7 @@ object desugar {
                 DefDef(named.name.asTermName, Nil, tpt, selector(n))
                   .withMods(mods &~ Lazy)
                   .withSpan(named.span)
+                  .withAttachment(PatternVar, ())
               else
                 valDef(
                   ValDef(named.name.asTermName, tpt, selector(n))
@@ -1557,6 +1558,7 @@ object desugar {
     mayNeedSetter
   }
 
+  @unused
   private def derivedDefDef(original: Tree, named: NameTree, tpt: Tree, rhs: Tree, mods: Modifiers)(implicit src: SourceFile) =
     DefDef(named.name.asTermName, Nil, tpt, rhs)
       .withMods(mods)
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 17d5a07bf18e..4b0e11c33759 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -455,11 +455,11 @@ object CheckUnused:
       case tree: Bind =>
         if !tree.name.isInstanceOf[DerivedName] && !tree.name.is(WildcardParamName) && !tree.hasAttachment(NoWarn) then
           pats.addOne((tree.symbol, tree.namePos))
-      case tree: ValDef if tree.hasAttachment(PatternVar) =>
-        if !tree.name.isInstanceOf[DerivedName] then
-          pats.addOne((tree.symbol, tree.namePos))
       case tree: NamedDefTree =>
-        if (tree.symbol ne NoSymbol)
+        if tree.hasAttachment(PatternVar) then
+          if !tree.name.isInstanceOf[DerivedName] then
+            pats.addOne((tree.symbol, tree.namePos))
+        else if (tree.symbol ne NoSymbol)
           && !tree.name.isWildcard
           && !tree.hasAttachment(NoWarn)
           && !tree.symbol.is(ModuleVal) // track only the ModuleClass using the object symbol, with correct namePos
diff --git a/tests/warn/i15503d.scala b/tests/warn/i15503d.scala
index 2981986daff6..1e1adca51b46 100644
--- a/tests/warn/i15503d.scala
+++ b/tests/warn/i15503d.scala
@@ -115,3 +115,9 @@ object `mutable patvar in for`:
 class `unset var requires -Wunused`:
   private var i = 0 // no warn as we didn't ask for it
   def f = println(i)
+
+class `i22743 lazy vals are defs`:
+  def f: (Int, String) = (42, "hello, world")
+  lazy val (i, s) = f // no warn because def is neither local nor private
+  val (j, t) = f // existing no warn for val with attachment
+  private lazy val (k, u) = f // warn // warn a warning so nice, they warn it twice

From 09fb930b5cda94ceaee065fd819a9f6f8943c914 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 25 Apr 2025 08:38:00 +0200
Subject: [PATCH 187/505] Lazy val def member is pattern var

[Cherry-picked 40ca110c8ceb9610477a2647645d309fd91534c4][modified]

From b713012241f8c0b07cb2841fc8e35d68e10146a8 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Mon, 10 Mar 2025 16:24:24 -0700
Subject: [PATCH 188/505] Dealias before checking for member in lint (#22708)

Fixes #22705
Fixes #22706
Fixes #22727

Follow-up to https://github.com/scala/scala3/pull/22502 by inserting a
`dealias` when arriving at `target` type.

Refactored the body of `hidden` to make it easier to read. Adjusted the
doc for the same reason.

As a reminder to self, the original reason for special handling of
aliases was due to subclassing, but overrides are excluded. (One could
restore that warning for edge cases.)

The long doc explaining the handling of leading implicits is moved to
the end (as an appendix).

Despite best efforts, I was unable to make the doc longer than the code.
[Cherry-picked d36249284e79f33a897e3e53ea3967606f09c40c]
---
 .../dotty/tools/dotc/typer/RefChecks.scala    | 55 +++++++++----------
 tests/warn/ext-override.scala                 |  2 +-
 tests/warn/i16743.scala                       |  2 +-
 tests/warn/i22232.scala                       |  5 ++
 tests/warn/i22705.scala                       | 28 ++++++++++
 tests/warn/i22706.scala                       | 30 ++++++++++
 tests/warn/i22727.scala                       | 14 +++++
 7 files changed, 106 insertions(+), 30 deletions(-)
 create mode 100644 tests/warn/i22705.scala
 create mode 100644 tests/warn/i22706.scala
 create mode 100644 tests/warn/i22727.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
index 70daeb600708..3393378617d6 100644
--- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
@@ -1033,14 +1033,24 @@ object RefChecks {
   end checkUnaryMethods
 
   /** Check that an extension method is not hidden, i.e., that it is callable as an extension method.
+   *
+   *  For example, it is not possible to define a type-safe extension `contains` for `Set`,
+   *  since for any parameter type, the existing `contains` method will compile and would be used.
    *
    *  An extension method is hidden if it does not offer a parameter that is not subsumed
    *  by the corresponding parameter of the member with the same name (or of all alternatives of an overload).
    *
-   *  This check is suppressed if this method is an override.
+   *  This check is suppressed if the method is an override. (Because the type of the receiver
+   *  may be narrower in the override.)
    *
-   *  For example, it is not possible to define a type-safe extension `contains` for `Set`,
-   *  since for any parameter type, the existing `contains` method will compile and would be used.
+   *  If the extension method is nullary, it is always hidden by a member of the same name.
+   *  (Either the member is nullary, or the reference is taken as the eta-expansion of the member.)
+   *
+   *  This check is in lieu of a more expensive use-site check that an application failed to use an extension.
+   *  That check would account for accessibility and opacity. As a limitation, this check considers
+   *  only public members for which corresponding method parameters are either both opaque types or both not.
+   *  It is intended to warn if the receiver type from a third-party library has been augmented with a member
+   *  that nullifies an existing extension.
    *
    *  If the member has a leading implicit parameter list, then the extension method must also have
    *  a leading implicit parameter list. The reason is that if the implicit arguments are inferred,
@@ -1051,15 +1061,7 @@ object RefChecks {
    *  If the member does not have a leading implicit parameter list, then the argument cannot be explicitly
    *  supplied with `using`, as typechecking would fail. But the extension method may have leading implicit
    *  parameters, which are necessarily supplied implicitly in the application. The first non-implicit
-   *  parameters of the extension method must be distinguishable from the member parameters, as described.
-   *
-   *  If the extension method is nullary, it is always hidden by a member of the same name.
-   *  (Either the member is nullary, or the reference is taken as the eta-expansion of the member.)
-   *
-   *  This check is in lieu of a more expensive use-site check that an application failed to use an extension.
-   *  That check would account for accessibility and opacity. As a limitation, this check considers
-   *  only public members, a target receiver that is not an alias, and corresponding method parameters
-   *  that are either both opaque types or both not.
+   *  parameters of the extension method must be distinguishable from the member parameters, as described above.
    */
   def checkExtensionMethods(sym: Symbol)(using Context): Unit =
     if sym.is(Extension) then
@@ -1067,26 +1069,23 @@ object RefChecks {
         def explicit = Applications.stripImplicit(tp.stripPoly, wildcardOnly = true)
         def hasImplicitParams = tp.stripPoly match { case mt: MethodType => mt.isImplicitMethod case _ => false }
       val explicitInfo = sym.info.explicit // consider explicit value params
-      val target = explicitInfo.firstParamTypes.head.typeSymbol.info // required for extension method, the putative receiver
+      val target0 = explicitInfo.firstParamTypes.head // required for extension method, the putative receiver
+      val target = target0.dealiasKeepOpaques.typeSymbol.info
       val methTp = explicitInfo.resultType // skip leading implicits and the "receiver" parameter
+      def memberMatchesMethod(member: Denotation) =
+        val memberIsImplicit = member.info.hasImplicitParams
+        val paramTps =
+          if memberIsImplicit then methTp.stripPoly.firstParamTypes
+          else methTp.explicit.firstParamTypes
+        inline def paramsCorrespond =
+          val memberParamTps = member.info.stripPoly.firstParamTypes
+          memberParamTps.corresponds(paramTps): (m, x) =>
+            m.typeSymbol.denot.isOpaqueAlias == x.typeSymbol.denot.isOpaqueAlias && (x frozen_<:< m)
+        paramTps.isEmpty || memberIsImplicit && !methTp.hasImplicitParams || paramsCorrespond
       def hidden =
         target.nonPrivateMember(sym.name)
         .filterWithPredicate: member =>
-          member.symbol.isPublic && {
-            val memberIsImplicit = member.info.hasImplicitParams
-            val paramTps =
-              if memberIsImplicit then methTp.stripPoly.firstParamTypes
-              else methTp.explicit.firstParamTypes
-
-            paramTps.isEmpty || memberIsImplicit && !methTp.hasImplicitParams || {
-              val memberParamTps = member.info.stripPoly.firstParamTypes
-              !memberParamTps.isEmpty
-              && memberParamTps.lengthCompare(paramTps) == 0
-              && memberParamTps.lazyZip(paramTps).forall: (m, x) =>
-                m.typeSymbol.denot.isOpaqueAlias == x.typeSymbol.denot.isOpaqueAlias
-                && (x frozen_<:< m)
-            }
-          }
+          member.symbol.isPublic && memberMatchesMethod(member)
         .exists
       if sym.is(HasDefaultParams) then
         val getterDenot =
diff --git a/tests/warn/ext-override.scala b/tests/warn/ext-override.scala
index d08439e13c9a..32277083bd60 100644
--- a/tests/warn/ext-override.scala
+++ b/tests/warn/ext-override.scala
@@ -1,4 +1,4 @@
-//> using options -Xfatal-warnings
+//> using options -Werror
 
 trait Foo[T]:
   extension (x: T)
diff --git a/tests/warn/i16743.scala b/tests/warn/i16743.scala
index e8860aeabaae..213e22ff4cb4 100644
--- a/tests/warn/i16743.scala
+++ b/tests/warn/i16743.scala
@@ -66,7 +66,7 @@ trait DungeonDweller:
 trait SadDungeonDweller:
   def f[A](x: Dungeon.IArray[A]) = 27 // x.length // just to confirm, length is not a member
 
-trait Quote:
+trait Quote: // see tests/warn/ext-override.scala
   type Tree <: AnyRef
   given TreeMethods: TreeMethods
   trait TreeMethods:
diff --git a/tests/warn/i22232.scala b/tests/warn/i22232.scala
index 79b8317a7329..f94e413920a2 100644
--- a/tests/warn/i22232.scala
+++ b/tests/warn/i22232.scala
@@ -23,6 +23,7 @@ object Upperbound3:
 object NonUpperbound1:
   opaque type MyString[+T] = String
   extension (arr: MyString[Byte]) def length: Int = 0 // nowarn
+
 object NonUpperbound2:
   opaque type MyString[+T] = String
   extension [T <: MyString[Byte]](arr: T) def length2: Int = 0 // nowarn
@@ -30,3 +31,7 @@ object NonUpperbound2:
 object NonUpperbound3:
   opaque type MyString[+T] = String
   extension [T](arr: T) def length: Int = 0 // nowarn
+
+object NonUpperbound4:
+  opaque type MyString = String
+  extension (arr: MyString) def length: Int = 0 // nowarn
diff --git a/tests/warn/i22705.scala b/tests/warn/i22705.scala
new file mode 100644
index 000000000000..d30c1b310201
--- /dev/null
+++ b/tests/warn/i22705.scala
@@ -0,0 +1,28 @@
+//> using options -Werror
+
+object Native {
+  class Obj:
+    def f: String = "F"
+}
+
+object Types {
+
+  opaque type Node = Native.Obj
+
+  type S = Node
+
+  object S:
+    def apply(): S = new Node
+
+  extension (s: S)
+    def f: String = "S"
+}
+
+import Types.*
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    val v: S = S()
+    println(v.f)
+  }
+}
diff --git a/tests/warn/i22706.scala b/tests/warn/i22706.scala
new file mode 100644
index 000000000000..5bd642020e1c
--- /dev/null
+++ b/tests/warn/i22706.scala
@@ -0,0 +1,30 @@
+//> using options -Werror
+
+object Native {
+  class O {
+    def f: String = "F"
+  }
+  class M extends O
+}
+
+object Types {
+  opaque type N = Native.O
+  opaque type GS = Native.M
+
+  type S = N | GS
+
+  object S:
+    def apply(): S = new N
+
+  extension (s: S)
+    def f: String = "S"
+}
+
+import Types.*
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    val v: S = S()
+    println(v.f)
+  }
+}
diff --git a/tests/warn/i22727.scala b/tests/warn/i22727.scala
new file mode 100644
index 000000000000..c7b1240c7e6b
--- /dev/null
+++ b/tests/warn/i22727.scala
@@ -0,0 +1,14 @@
+//> using options -Werror
+
+object Main {
+  type IXY = (Int, Int)
+
+  extension (xy: IXY) {
+    def map(f: Int => Int): (Int, Int) = (f(xy._1), f(xy._2))
+  }
+
+  def main(args: Array[String]): Unit = {
+    val a = (0, 1)
+    println(a)
+  }
+}

From 5d6a1510a1939d7f49eef34ade72969aa4a923ae Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 10 Mar 2025 08:03:33 -0700
Subject: [PATCH 189/505] No warn param of overriding method

[Cherry-picked 825baf93209fba022dfa11ed2055849f7c622bcd]
---
 .../src/dotty/tools/dotc/transform/CheckUnused.scala   |  1 +
 tests/warn/i15503e.scala                               |  4 ++--
 tests/warn/i22742.scala                                | 10 ++++++++++
 tests/warn/scala2-t11681.scala                         |  2 +-
 tests/warn/unused-params.scala                         |  4 ++--
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 tests/warn/i22742.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 4b0e11c33759..005ce5ba3f64 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -573,6 +573,7 @@ object CheckUnused:
       end checkExplicit
       // begin
       if !infos.skip(m)
+        && !m.nextOverriddenSymbol.exists
         && !allowed
       then
         checkExplicit()
diff --git a/tests/warn/i15503e.scala b/tests/warn/i15503e.scala
index 2fafec339ac1..63a9dea163d4 100644
--- a/tests/warn/i15503e.scala
+++ b/tests/warn/i15503e.scala
@@ -70,10 +70,10 @@ package foo.test.i16865:
   trait Bar extends Foo
 
   object Ex extends Bar:
-    def fn(a: Int, b: Int): Int = b + 3 // warn
+    def fn(a: Int, b: Int): Int = b + 3 // no warn (override)
 
   object Ex2 extends Bar:
-    override def fn(a: Int, b: Int): Int = b + 3 // warn
+    override def fn(a: Int, b: Int): Int = b + 3 // no warn (override)
 
 final class alpha(externalName: String) extends StaticAnnotation // no warn annotation arg
 
diff --git a/tests/warn/i22742.scala b/tests/warn/i22742.scala
new file mode 100644
index 000000000000..0927d29e1a05
--- /dev/null
+++ b/tests/warn/i22742.scala
@@ -0,0 +1,10 @@
+//> using options -Wunused:all -Werror
+
+trait Foldable[F[_]]:
+  def foldLeft[A, B](fa: F[A], b: B)(f: (B, A) => B): B
+
+type Id[A] = A
+
+given foldableId: Foldable[Id] =
+  new Foldable[Id]:
+    def foldLeft[A, B](fa: Id[A], b: B)(f: (B, A) => B): B = b
diff --git a/tests/warn/scala2-t11681.scala b/tests/warn/scala2-t11681.scala
index 5d752777f64c..507b58bf2277 100644
--- a/tests/warn/scala2-t11681.scala
+++ b/tests/warn/scala2-t11681.scala
@@ -23,7 +23,7 @@ trait BadAPI extends InterFace {
     a
   }
   override def call(a: Int,
-                    b: String, // warn now
+                    b: String, // no warn (override)
                     c: Double): Int = {
     println(c)
     a
diff --git a/tests/warn/unused-params.scala b/tests/warn/unused-params.scala
index 5ef339c942ac..3266f3957247 100644
--- a/tests/warn/unused-params.scala
+++ b/tests/warn/unused-params.scala
@@ -23,7 +23,7 @@ trait BadAPI extends InterFace {
     a
   }
   override def call(a: Int,
-                    b: String, // warn
+                    b: String, // no warn (override)
                     c: Double): Int = {
     println(c)
     a
@@ -136,7 +136,7 @@ trait BadMix { self: InterFace =>
 }
 
 class Unequal {
-  override def equals(other: Any) = toString.nonEmpty   // warn
+  override def equals(other: Any) = toString.nonEmpty   // no warn (override)
 }
 
 class Seriously {

From 81a38ab04e1f5aa4c64b62db07c7ebab4557e6e0 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 25 Apr 2025 08:42:14 +0200
Subject: [PATCH 190/505] chore: Fix compilation issue after backport conflict

---
 .../src/dotty/tools/repl/ReplDriver.scala     |   2 +-
 tests/semanticdb/metac.expect                 | 244 +++++++++---------
 2 files changed, 120 insertions(+), 126 deletions(-)

diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index f32b1fd5281c..cfbacf0589e1 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -547,7 +547,7 @@ class ReplDriver(settings: Array[String],
         try {
           val entries = flatten(jarFile)
 
-          val existingClass = entries.filter(_.ext.isClass).find(tryClassLoad(_).isDefined)
+          val existingClass = entries.filter(_.extension == "class").find(tryClassLoad(_).isDefined)
           if (existingClass.nonEmpty)
             out.println(s"The path '$path' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
           else inContext(state.context):
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 4ea5386b4c50..4e3dee9d79a6 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -56,23 +56,23 @@ Synthetics => 3 entries
 
 Symbols:
 advanced/C# => class C [typeparam T ] extends Object { self: C[T] => +3 decls }
-advanced/C#[T] => typeparam T
+advanced/C#[T] => typeparam T 
 advanced/C#`<init>`(). => primary ctor <init> [typeparam T ](): C[T]
 advanced/C#t(). => method t => T
 advanced/HKClass# => class HKClass [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]] extends Object { self: HKClass[F] => +3 decls }
 advanced/HKClass#[F] => typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]
-advanced/HKClass#[F][T] => typeparam T
-advanced/HKClass#[F][U] => typeparam U
+advanced/HKClass#[F][T] => typeparam T 
+advanced/HKClass#[F][U] => typeparam U 
 advanced/HKClass#`<init>`(). => primary ctor <init> [typeparam F [typeparam T ] <: [U] =>> Tuple2[U, T]](): HKClass[F]
-advanced/HKClass#`<init>`().[F][T] => typeparam T
-advanced/HKClass#`<init>`().[F][U] => typeparam U
+advanced/HKClass#`<init>`().[F][T] => typeparam T 
+advanced/HKClass#`<init>`().[F][U] => typeparam U 
 advanced/HKClass#foo(). => method foo [typeparam T , typeparam U ](param x: F[T, U]): String
 advanced/HKClass#foo().(x) => param x: F[T, U]
-advanced/HKClass#foo().[T] => typeparam T
-advanced/HKClass#foo().[U] => typeparam U
+advanced/HKClass#foo().[T] => typeparam T 
+advanced/HKClass#foo().[U] => typeparam U 
 advanced/Structural# => class Structural extends Object { self: Structural => +6 decls }
 advanced/Structural#T# => trait T [typeparam A ] extends Object { self: T[A] => +4 decls }
-advanced/Structural#T#[A] => typeparam A
+advanced/Structural#T#[A] => typeparam A 
 advanced/Structural#T#`<init>`(). => primary ctor <init> [typeparam A ](): T[A]
 advanced/Structural#T#bar(). => method bar (param b: foo.B): Unit
 advanced/Structural#T#bar().(b) => param b: foo.B
@@ -286,8 +286,8 @@ Symbols:
 annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls }
 annot/Alias.A# => type A  = ClassAnnotation @param
 annot/Annotations# => @ClassAnnotation class Annotations [@TypeParameterAnnotation typeparam T ] extends Object { self: AnyRef & Annotations[T] => +6 decls }
-annot/Annotations#S# => @TypeAnnotation type S
-annot/Annotations#[T] => @TypeParameterAnnotation typeparam T
+annot/Annotations#S# => @TypeAnnotation type S 
+annot/Annotations#[T] => @TypeParameterAnnotation typeparam T 
 annot/Annotations#`<init>`(). => primary ctor <init> [@TypeParameterAnnotation typeparam T ](@ParameterAnnotation param x: T): Annotations[T]
 annot/Annotations#`<init>`().(x) => @ParameterAnnotation param x: T
 annot/Annotations#field. => @FieldAnnotation val method field Int
@@ -301,7 +301,7 @@ annot/B#throwing(). => @throws[Exception] method throwing => Nothing
 annot/B#x. => private[this] val method x Int
 annot/M. => @ObjectAnnotation final object M extends Object { self: M.type => +1 decls }
 annot/M.m(). => @MacroAnnotation macro m [typeparam TT ]: Int
-annot/M.m().[TT] => typeparam TT
+annot/M.m().[TT] => typeparam TT 
 annot/T# => @TraitAnnotation trait T extends Object { self: T => +1 decls }
 annot/T#`<init>`(). => primary ctor <init> (): T
 local0 => selfparam self: AnyRef
@@ -394,10 +394,10 @@ example/Anonymous#bar2. => val method bar2 Bar
 example/Anonymous#foo. => val method foo Foo
 example/Anonymous#locally(). => method locally [typeparam A ](param x: A): A
 example/Anonymous#locally().(x) => param x: A
-example/Anonymous#locally().[A] => typeparam A
+example/Anonymous#locally().[A] => typeparam A 
 example/Anonymous#m1(). => method m1 [typeparam T [type _ ]]: Nothing
 example/Anonymous#m1().[T] => typeparam T [type _ ]
-example/Anonymous#m1().[T][_] => type _
+example/Anonymous#m1().[T][_] => type _ 
 example/Anonymous#m2(). => method m2 => Map[_, List[_] forSome { type _  }] forSome { type _  }
 local0 => val local x: Function1[Int, Int]
 local1 => final class $anon extends Object with Foo { self: $anon => +1 decls }
@@ -632,7 +632,7 @@ classes/C11#foo(). => inline macro foo => Int
 classes/C12# => class C12 extends Object { self: C12 => +8 decls }
 classes/C12#Context# => class Context extends Object { self: Context => +2 decls }
 classes/C12#Context#Expr# => type Expr [typeparam T ]
-classes/C12#Context#Expr#[T] => typeparam T
+classes/C12#Context#Expr#[T] => typeparam T 
 classes/C12#Context#`<init>`(). => primary ctor <init> (): Context
 classes/C12#`<init>`(). => primary ctor <init> (): C12
 classes/C12#foo1(). => macro foo1 (param x: Int): Int
@@ -923,7 +923,7 @@ endmarkers/MultiCtor#`<init>`().(i) => val param i: Int
 endmarkers/MultiCtor#`<init>`(+1). => ctor <init> (): MultiCtor
 endmarkers/MultiCtor#i. => val method i Int
 endmarkers/Stuff# => trait Stuff [typeparam A ] extends Object { self: Stuff[A] => +3 decls }
-endmarkers/Stuff#[A] => typeparam A
+endmarkers/Stuff#[A] => typeparam A 
 endmarkers/Stuff#`<init>`(). => primary ctor <init> [typeparam A ](): Stuff[A]
 endmarkers/Stuff#do(). => abstract method do => A
 endmarkers/TestObj. => final object TestObj extends Object { self: TestObj.type => +2 decls }
@@ -1122,29 +1122,29 @@ _empty_/Enums.Directions.valueOf(). => method valueOf (param $name: String): Dir
 _empty_/Enums.Directions.valueOf().($name) => param $name: String
 _empty_/Enums.Directions.values(). => method values => Array[Directions]
 _empty_/Enums.Maybe# => abstract sealed enum class Maybe [covariant typeparam A ] extends Object with Enum { self: Maybe[A] => +2 decls }
-_empty_/Enums.Maybe#[A] => covariant typeparam A
+_empty_/Enums.Maybe#[A] => covariant typeparam A 
 _empty_/Enums.Maybe#`<init>`(). => primary ctor <init> [covariant typeparam A ](): Maybe[A]
 _empty_/Enums.Maybe. => final object Maybe extends Object { self: Maybe.type => +6 decls }
 _empty_/Enums.Maybe.Just# => final case enum class Just [covariant typeparam A ] extends Maybe[A] { self: Just[A] => +7 decls }
-_empty_/Enums.Maybe.Just#[A] => covariant typeparam A
+_empty_/Enums.Maybe.Just#[A] => covariant typeparam A 
 _empty_/Enums.Maybe.Just#_1(). => method _1 => A
 _empty_/Enums.Maybe.Just#`<init>`(). => primary ctor <init> [covariant typeparam A ](val param value: A): Just[A]
 _empty_/Enums.Maybe.Just#`<init>`().(value) => val param value: A
 _empty_/Enums.Maybe.Just#copy$default$1(). => method copy$default$1 [covariant typeparam A ]: A
-_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A
+_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A 
 _empty_/Enums.Maybe.Just#copy(). => method copy [covariant typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just#copy().(value) => param value: A
-_empty_/Enums.Maybe.Just#copy().[A] => typeparam A
+_empty_/Enums.Maybe.Just#copy().[A] => typeparam A 
 _empty_/Enums.Maybe.Just#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.Maybe.Just#value. => val method value A
 _empty_/Enums.Maybe.Just. => final object Just extends Object { self: Just.type => +4 decls }
 _empty_/Enums.Maybe.Just.apply(). => method apply [typeparam A ](param value: A): Just[A]
 _empty_/Enums.Maybe.Just.apply().(value) => param value: A
-_empty_/Enums.Maybe.Just.apply().[A] => typeparam A
+_empty_/Enums.Maybe.Just.apply().[A] => typeparam A 
 _empty_/Enums.Maybe.Just.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.Maybe.Just.unapply(). => method unapply [typeparam A ](param x$1: Just[A]): Just[A]
 _empty_/Enums.Maybe.Just.unapply().(x$1) => param x$1: Just[A]
-_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A
+_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A 
 _empty_/Enums.Maybe.None. => case val static enum method None Maybe[Nothing]
 _empty_/Enums.Maybe.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Maybe[_] forSome { type _  }
 _empty_/Enums.Maybe.fromOrdinal().(ordinal) => param ordinal: Int
@@ -1195,7 +1195,7 @@ _empty_/Enums.Suits.valueOf(). => method valueOf (param $name: String): Suits
 _empty_/Enums.Suits.valueOf().($name) => param $name: String
 _empty_/Enums.Suits.values(). => method values => Array[Suits]
 _empty_/Enums.Tag# => abstract sealed enum class Tag [typeparam A ] extends Object with Enum { self: Tag[A] => +2 decls }
-_empty_/Enums.Tag#[A] => typeparam A
+_empty_/Enums.Tag#[A] => typeparam A 
 _empty_/Enums.Tag#`<init>`(). => primary ctor <init> [typeparam A ](): Tag[A]
 _empty_/Enums.Tag. => final object Tag extends Object { self: Tag.type => +7 decls }
 _empty_/Enums.Tag.$values. => private[this] val method $values Array[Tag[_] forSome { type _  }]
@@ -1226,33 +1226,33 @@ _empty_/Enums.WeekDays.valueOf(). => method valueOf (param $name: String): WeekD
 _empty_/Enums.WeekDays.valueOf().($name) => param $name: String
 _empty_/Enums.WeekDays.values(). => method values => Array[WeekDays]
 _empty_/Enums.`<:<`# => abstract sealed enum class <:< [contravariant typeparam A , typeparam B ] extends Object with Enum { self: <:<[A, B] => +3 decls }
-_empty_/Enums.`<:<`#[A] => contravariant typeparam A
-_empty_/Enums.`<:<`#[B] => typeparam B
+_empty_/Enums.`<:<`#[A] => contravariant typeparam A 
+_empty_/Enums.`<:<`#[B] => typeparam B 
 _empty_/Enums.`<:<`#`<init>`(). => primary ctor <init> [contravariant typeparam A , typeparam B ](): <:<[A, B]
 _empty_/Enums.`<:<`. => final object <:< extends Object { self: <:<.type => +6 decls }
 _empty_/Enums.`<:<`.Refl# => final case enum class Refl [typeparam C ] extends <:<[C, C] { self: Refl[C] => +4 decls }
-_empty_/Enums.`<:<`.Refl#[C] => typeparam C
+_empty_/Enums.`<:<`.Refl#[C] => typeparam C 
 _empty_/Enums.`<:<`.Refl#`<init>`(). => primary ctor <init> [typeparam C ](): Refl[C]
 _empty_/Enums.`<:<`.Refl#copy(). => method copy [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C
+_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C 
 _empty_/Enums.`<:<`.Refl#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
 _empty_/Enums.`<:<`.Refl. => final object Refl extends Object { self: Refl.type => +4 decls }
 _empty_/Enums.`<:<`.Refl.apply(). => method apply [typeparam C ](): Refl[C]
-_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C
+_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C 
 _empty_/Enums.`<:<`.Refl.toString(). => method toString => String <: scala/Any#toString().
 _empty_/Enums.`<:<`.Refl.unapply(). => method unapply [typeparam C ](param x$1: Refl[C]): true
 _empty_/Enums.`<:<`.Refl.unapply().(x$1) => param x$1: Refl[C]
-_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C
+_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C 
 _empty_/Enums.`<:<`.`given_<:<_T_T`(). => final implicit given method given_<:<_T_T [typeparam T ]: <:<[T, T]
-_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T
+_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T 
 _empty_/Enums.`<:<`.fromOrdinal(). => method fromOrdinal (param ordinal: Int): <:<[_, _] forSome { type _ ; type _  }
 _empty_/Enums.`<:<`.fromOrdinal().(ordinal) => param ordinal: Int
 _empty_/Enums.some1. => val method some1 Option[Int]
 _empty_/Enums.unwrap(). => method unwrap [typeparam A , typeparam B ](param opt: Option[A])(implicit given param ev: <:<[A, Option[B]]): Option[B]
 _empty_/Enums.unwrap().(ev) => implicit given param ev: <:<[A, Option[B]]
 _empty_/Enums.unwrap().(opt) => param opt: Option[A]
-_empty_/Enums.unwrap().[A] => typeparam A
-_empty_/Enums.unwrap().[B] => typeparam B
+_empty_/Enums.unwrap().[A] => typeparam A 
+_empty_/Enums.unwrap().[B] => typeparam B 
 local0 => param x: Option[B]
 
 Occurrences:
@@ -1525,7 +1525,7 @@ Symbols:
 ext/DeckUsage. => final object DeckUsage extends Object { self: DeckUsage.type => +2 decls }
 ext/DeckUsage.deck. => val method deck Deck
 ext/Extension$package. => final package object ext extends Object { self: ext.type { opaque type Deck  } => +9 decls }
-ext/Extension$package.Deck# => opaque type Deck
+ext/Extension$package.Deck# => opaque type Deck 
 ext/Extension$package.Deck. => final object Deck extends Object { self: Deck.type => +2 decls }
 ext/Extension$package.Deck.fooSize(). => method fooSize (param data: Deck): Int
 ext/Extension$package.Deck.fooSize().(data) => param data: Deck
@@ -1539,18 +1539,18 @@ ext/Extension$package.foo().(s) => param s: String
 ext/Extension$package.readInto(). => method readInto [typeparam T ](param s: String)(implicit given param x$2: Read[T]): Option[T]
 ext/Extension$package.readInto().(s) => param s: String
 ext/Extension$package.readInto().(x$2) => implicit given param x$2: Read[T]
-ext/Extension$package.readInto().[T] => typeparam T
+ext/Extension$package.readInto().[T] => typeparam T 
 ext/Functor# => trait Functor [typeparam F [type _ ]] extends Object { self: Functor[F] => +3 decls }
 ext/Functor#[F] => typeparam F [type _ ]
-ext/Functor#[F][_] => type _
+ext/Functor#[F][_] => type _ 
 ext/Functor#`<init>`(). => primary ctor <init> [typeparam F [type _ ]](): Functor[F]
 ext/Functor#map(). => abstract method map [typeparam T , typeparam U ](param t: F[T])(param f: Function1[T, U]): F[U]
 ext/Functor#map().(f) => param f: Function1[T, U]
 ext/Functor#map().(t) => param t: F[T]
-ext/Functor#map().[T] => typeparam T
-ext/Functor#map().[U] => typeparam U
+ext/Functor#map().[T] => typeparam T 
+ext/Functor#map().[U] => typeparam U 
 ext/Read# => trait Read [covariant typeparam T ] extends Object { self: Read[T] => +3 decls }
-ext/Read#[T] => covariant typeparam T
+ext/Read#[T] => covariant typeparam T 
 ext/Read#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Read[T]
 ext/Read#fromString(). => abstract method fromString (param s: String): Option[T]
 ext/Read#fromString().(s) => param s: String
@@ -1731,7 +1731,7 @@ Synthetics => 3 entries
 Symbols:
 a/b/Givens. => final object Givens extends Object { self: Givens.type => +13 decls }
 a/b/Givens.Monoid# => trait Monoid [typeparam A ] extends Object { self: Monoid[A] => +4 decls }
-a/b/Givens.Monoid#[A] => typeparam A
+a/b/Givens.Monoid#[A] => typeparam A 
 a/b/Givens.Monoid#`<init>`(). => primary ctor <init> [typeparam A ](): Monoid[A]
 a/b/Givens.Monoid#combine(). => abstract method combine (param x: A)(param y: A): A
 a/b/Givens.Monoid#combine().(x) => param x: A
@@ -1739,7 +1739,7 @@ a/b/Givens.Monoid#combine().(y) => param y: A
 a/b/Givens.Monoid#empty(). => abstract method empty => A
 a/b/Givens.foo(). => method foo [typeparam A ](implicit given param A: Monoid[A]): A
 a/b/Givens.foo().(A) => implicit given param A: Monoid[A]
-a/b/Givens.foo().[A] => typeparam A
+a/b/Givens.foo().[A] => typeparam A 
 a/b/Givens.given_Monoid_String. => final implicit given object given_Monoid_String extends Object with Monoid[String] { self: given_Monoid_String.type => +3 decls }
 a/b/Givens.given_Monoid_String.combine(). => method combine (param x: String)(param y: String): String <: a/b/Givens.Monoid#combine().
 a/b/Givens.given_Monoid_String.combine().(x) => param x: String
@@ -1754,13 +1754,13 @@ a/b/Givens.int2String#apply().(x) => param x: Int
 a/b/Givens.int2String(). => final implicit given inline macro int2String => int2String
 a/b/Givens.sayGoodbye(). => method sayGoodbye [typeparam B ](param any: B): String
 a/b/Givens.sayGoodbye().(any) => param any: B
-a/b/Givens.sayGoodbye().[B] => typeparam B
+a/b/Givens.sayGoodbye().[B] => typeparam B 
 a/b/Givens.sayHello(). => method sayHello [typeparam A ](param any: A): String
 a/b/Givens.sayHello().(any) => param any: A
-a/b/Givens.sayHello().[A] => typeparam A
+a/b/Givens.sayHello().[A] => typeparam A 
 a/b/Givens.saySoLong(). => method saySoLong [typeparam B ](param any: B): String
 a/b/Givens.saySoLong().(any) => param any: B
-a/b/Givens.saySoLong().[B] => typeparam B
+a/b/Givens.saySoLong().[B] => typeparam B 
 a/b/Givens.soLong1. => val method soLong1 String
 
 Occurrences:
@@ -1868,7 +1868,7 @@ example/ImplicitConversion#tuple. => val method tuple Tuple2[Int, Int]
 example/ImplicitConversion#x. => val method x Int
 example/ImplicitConversion. => final object ImplicitConversion extends Object { self: ImplicitConversion.type => +6 decls }
 example/ImplicitConversion.newAny2stringadd# => final implicit class newAny2stringadd [typeparam A ] extends AnyVal { self: newAny2stringadd[A] => +4 decls }
-example/ImplicitConversion.newAny2stringadd#[A] => typeparam A
+example/ImplicitConversion.newAny2stringadd#[A] => typeparam A 
 example/ImplicitConversion.newAny2stringadd#`+`(). => method + (param other: String): String
 example/ImplicitConversion.newAny2stringadd#`+`().(other) => param other: String
 example/ImplicitConversion.newAny2stringadd#`<init>`(). => primary ctor <init> [typeparam A ](param self: A): newAny2stringadd[A]
@@ -1876,7 +1876,7 @@ example/ImplicitConversion.newAny2stringadd#`<init>`().(self) => param self: A
 example/ImplicitConversion.newAny2stringadd#self. => private val method self A
 example/ImplicitConversion.newAny2stringadd(). => final implicit method newAny2stringadd [typeparam A ](param self: A): newAny2stringadd[A]
 example/ImplicitConversion.newAny2stringadd().(self) => param self: A
-example/ImplicitConversion.newAny2stringadd().[A] => typeparam A
+example/ImplicitConversion.newAny2stringadd().[A] => typeparam A 
 example/ImplicitConversion.newAny2stringadd. => final object newAny2stringadd extends Object { self: newAny2stringadd.type => +2 decls }
 
 Occurrences:
@@ -2089,7 +2089,7 @@ givens/InventedNames$package.given_Double(). => final implicit given method give
 givens/InventedNames$package.given_Double().(x$1) => implicit given param x$1: Int
 givens/InventedNames$package.given_Float. => final implicit lazy val given method given_Float Float
 givens/InventedNames$package.given_List_T(). => final implicit given method given_List_T [typeparam T ]: List[T]
-givens/InventedNames$package.given_List_T().[T] => typeparam T
+givens/InventedNames$package.given_List_T().[T] => typeparam T 
 givens/InventedNames$package.given_String. => final implicit lazy val given method given_String String
 givens/InventedNames$package.given_X. => final implicit given object given_X extends Object with X { self: given_X.type => +2 decls }
 givens/InventedNames$package.given_X.doX(). => method doX => Int <: givens/X#doX().
@@ -2101,11 +2101,11 @@ givens/InventedNames$package.given_Y#x$1. => protected implicit val given method
 givens/InventedNames$package.given_Y(). => final implicit given method given_Y (implicit given param x$1: X): given_Y
 givens/InventedNames$package.given_Y().(x$1) => implicit given param x$1: X
 givens/InventedNames$package.given_Z_T# => implicit given class given_Z_T [typeparam T ] extends Object with Z[T] { self: given_Z_T[T] => +3 decls }
-givens/InventedNames$package.given_Z_T#[T] => typeparam T
+givens/InventedNames$package.given_Z_T#[T] => typeparam T 
 givens/InventedNames$package.given_Z_T#`<init>`(). => primary ctor <init> [typeparam T ](): given_Z_T[T]
 givens/InventedNames$package.given_Z_T#doZ(). => method doZ => List[T] <: givens/Z#doZ().
 givens/InventedNames$package.given_Z_T(). => final implicit given method given_Z_T [typeparam T ]: given_Z_T[T]
-givens/InventedNames$package.given_Z_T().[T] => typeparam T
+givens/InventedNames$package.given_Z_T().[T] => typeparam T 
 givens/InventedNames$package.intValue. => final implicit lazy val given method intValue Int
 givens/InventedNames$package.x. => val method x given_X.type
 givens/InventedNames$package.y. => val method y given_Y
@@ -2117,7 +2117,7 @@ givens/Y# => trait Y extends Object { self: Y => +2 decls }
 givens/Y#`<init>`(). => primary ctor <init> (): Y
 givens/Y#doY(). => abstract method doY => String
 givens/Z# => trait Z [typeparam T ] extends Object { self: Z[T] => +3 decls }
-givens/Z#[T] => typeparam T
+givens/Z#[T] => typeparam T 
 givens/Z#`<init>`(). => primary ctor <init> [typeparam T ](): Z[T]
 givens/Z#doZ(). => abstract method doZ => List[T]
 
@@ -2292,7 +2292,7 @@ Symbols:
 example/Local# => class Local extends Object { self: Local => +2 decls }
 example/Local#`<init>`(). => primary ctor <init> (): Local
 example/Local#a(). => method a (): Int
-local0 => typeparam A
+local0 => typeparam A 
 local1 => param a: A
 local2 => local id: [typeparam A ](param a: A): A
 
@@ -2357,10 +2357,10 @@ example/MatchType$package.Concat# => type Concat [typeparam Xs  <: Tuple, covari
 example/MatchType$package.Concat#[Xs] => typeparam Xs  <: Tuple
 example/MatchType$package.Concat#[Ys] => covariant typeparam Ys  <: Tuple
 example/MatchType$package.Elem# => type Elem [typeparam X ] = X match { String => Char, Array[t] => t, Iterable[t] => t }
-example/MatchType$package.Elem#[X] => typeparam X
-local0 => type t
-local1 => type t
-local2 => type x
+example/MatchType$package.Elem#[X] => typeparam X 
+local0 => type t 
+local1 => type t 
+local2 => type x 
 local3 => type xs  <: Tuple
 
 Occurrences:
@@ -2600,11 +2600,11 @@ Occurrences => 156 entries
 Symbols:
 example/Methods# => class Methods [typeparam T ] extends Object { self: Methods[T] => +44 decls }
 example/Methods#AList# => type AList [typeparam T ] = List[T]
-example/Methods#AList#[T] => typeparam T
+example/Methods#AList#[T] => typeparam T 
 example/Methods#List# => class List [typeparam T ] extends Object { self: List[T] => +2 decls }
-example/Methods#List#[T] => typeparam T
+example/Methods#List#[T] => typeparam T 
 example/Methods#List#`<init>`(). => primary ctor <init> [typeparam T ](): List[T]
-example/Methods#[T] => typeparam T
+example/Methods#[T] => typeparam T 
 example/Methods#`<init>`(). => primary ctor <init> [typeparam T ](): Methods[T]
 example/Methods#`m8().`(). => method m8(). (): Nothing
 example/Methods#`m9().`# => class m9(). extends Object { self: m9(). => +1 decls }
@@ -2632,7 +2632,7 @@ example/Methods#m7(). => method m7 [typeparam U ](param c: Methods[T], param l:
 example/Methods#m7().(c) => param c: Methods[T]
 example/Methods#m7().(evidence$1) => implicit param evidence$1: Ordering[U]
 example/Methods#m7().(l) => param l: List[U]
-example/Methods#m7().[U] => typeparam U
+example/Methods#m7().[U] => typeparam U 
 example/Methods#m9(). => method m9 (param x: m9().): Nothing
 example/Methods#m9().(x) => param x: m9().
 example/Methods#m10(). => method m10 (param x: List[T]): Nothing
@@ -2992,18 +2992,18 @@ Occurrences => 18 entries
 
 Symbols:
 _empty_/NewModifiers$package. => final package object _empty_ extends Object { self: _empty_.type { opaque type OpaqueB  } => +2 decls }
-_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB
+_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB 
 _empty_/NewModifiers. => final object NewModifiers extends Object { self: NewModifiers.type { opaque type A  } => +3 decls }
-_empty_/NewModifiers.A# => opaque type A
+_empty_/NewModifiers.A# => opaque type A 
 _empty_/NewModifiers.foo. => val inline method foo "foo"
 _empty_/NewModifiersClass# => opaque class NewModifiersClass extends Object { self: Any { opaque type C  } & NewModifiersClass => +5 decls }
-_empty_/NewModifiersClass#C# => opaque type C
+_empty_/NewModifiersClass#C# => opaque type C 
 _empty_/NewModifiersClass#Nested# => opaque class Nested extends Object { self: Any { opaque type NestedOpaque  } & Nested => +2 decls }
-_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque
+_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque 
 _empty_/NewModifiersClass#Nested#`<init>`(). => primary ctor <init> (): Nested
 _empty_/NewModifiersClass#`<init>`(). => primary ctor <init> (): NewModifiersClass
 _empty_/NewModifiersTrait# => opaque trait NewModifiersTrait extends Object { self: Any { opaque type D  } & NewModifiersTrait => +2 decls }
-_empty_/NewModifiersTrait#D# => opaque type D
+_empty_/NewModifiersTrait#D# => opaque type D 
 _empty_/NewModifiersTrait#`<init>`(). => primary ctor <init> (): NewModifiersTrait
 
 Occurrences:
@@ -3091,13 +3091,13 @@ Occurrences => 49 entries
 Symbols:
 prefixes/C# => class C extends Object { self: C => +6 decls }
 prefixes/C#N. => final object N extends Object { self: N.type => +2 decls }
-prefixes/C#N.U# => type U
-prefixes/C#T# => type T
+prefixes/C#N.U# => type U 
+prefixes/C#T# => type T 
 prefixes/C#`<init>`(). => primary ctor <init> (): C
 prefixes/C#k1(). => method k1 => U
 prefixes/C#m1(). => method m1 => T
 prefixes/M. => final object M extends Object { self: M.type => +3 decls }
-prefixes/M.T# => type T
+prefixes/M.T# => type T 
 prefixes/M.n1(). => method n1 => T
 prefixes/O. => final object O extends C { self: O.type => +2 decls }
 prefixes/O.o1(). => method o1 => O.this.T
@@ -3174,13 +3174,13 @@ Synthetics => 3 entries
 
 Symbols:
 example/C# => class C extends Object { self: C => +3 decls }
-example/C#T1# => type T1
-example/C#T2# => type T2
+example/C#T1# => type T1 
+example/C#T2# => type T2 
 example/C#`<init>`(). => primary ctor <init> (): C
 example/PickOneRefinement_1# => class PickOneRefinement_1 [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }] extends Object { self: PickOneRefinement_1[S] => +3 decls }
 example/PickOneRefinement_1#[S] => typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }
 example/PickOneRefinement_1#[S](as) => param as: T*
-example/PickOneRefinement_1#[S][T] => typeparam T
+example/PickOneRefinement_1#[S][T] => typeparam T 
 example/PickOneRefinement_1#`<init>`(). => primary ctor <init> [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }](): PickOneRefinement_1[S]
 example/PickOneRefinement_1#run(). => method run (param s: S, param as: String*): Option[String]
 example/PickOneRefinement_1#run().(as) => param as: String*
@@ -3189,7 +3189,7 @@ example/PolyHolder# => trait PolyHolder extends Object { self: PolyHolder => +2
 example/PolyHolder#`<init>`(). => primary ctor <init> (): PolyHolder
 example/PolyHolder#foo(). => abstract method foo [typeparam T ](param t: T): Any
 example/PolyHolder#foo().(t) => param t: T
-example/PolyHolder#foo().[T] => typeparam T
+example/PolyHolder#foo().[T] => typeparam T 
 example/RecOrRefined$package. => final package object example extends Object { self: example.type => +9 decls }
 example/RecOrRefined$package.C2# => type C2  = C { type T2  = T1 <: example/C#T2#; type T1  <: example/C#T1# }
 example/RecOrRefined$package.Person# => type Person  = Record { abstract val method age Int; abstract val method name String }
@@ -3203,9 +3203,9 @@ example/RecOrRefined$package.m4(). => method m4 (param x: PolyHolder { abstract
 example/RecOrRefined$package.m4().(x) => param x: PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5(). => method m5 [typeparam Z ](param x: Int): PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
 example/RecOrRefined$package.m5().(x) => param x: Int
-example/RecOrRefined$package.m5().[Z] => typeparam Z
+example/RecOrRefined$package.m5().[Z] => typeparam Z 
 example/RecOrRefined$package.m6# => type m6 [typeparam X ] = PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
-example/RecOrRefined$package.m6#[X] => typeparam X
+example/RecOrRefined$package.m6#[X] => typeparam X 
 example/Record# => class Record extends Object with Selectable { self: Record => +4 decls }
 example/Record#`<init>`(). => primary ctor <init> (param elems: Tuple2[String, Any]*): Record
 example/Record#`<init>`().(elems) => param elems: Tuple2[String, Any]*
@@ -3217,9 +3217,9 @@ example/SpecialRefinement# => trait SpecialRefinement extends Object { self: Spe
 example/SpecialRefinement#`<init>`(). => primary ctor <init> (): SpecialRefinement
 example/SpecialRefinement#pickOne(). => abstract method pickOne [typeparam T ](param as: T*): Option[Any]
 example/SpecialRefinement#pickOne().(as) => param as: T*
-example/SpecialRefinement#pickOne().[T] => typeparam T
+example/SpecialRefinement#pickOne().[T] => typeparam T 
 local0 => abstract method pickOne [typeparam T ](param as: T*): Option[String]
-local1 => typeparam T
+local1 => typeparam T 
 local2 => param as: T*
 local3 => abstract method pickOne [typeparam T ](param as: T*): Option[String] <: example/SpecialRefinement#pickOne().
 local4 => abstract val method x Int
@@ -3227,14 +3227,14 @@ local5 => abstract val method x Int
 local6 => abstract method y => Int
 local7 => abstract val method x Int
 local8 => abstract method y => Int
-local9 => type z
-local10 => typeparam T
+local9 => type z 
+local10 => typeparam T 
 local11 => param t: T
 local12 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local13 => typeparam T
+local13 => typeparam T 
 local14 => param t: T
 local15 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
-local16 => typeparam T
+local16 => typeparam T 
 local17 => param t: T
 local18 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
 local19 => abstract val method name String
@@ -3456,7 +3456,6 @@ Text => empty
 Language => Scala
 Symbols => 12 entries
 Occurrences => 33 entries
-Diagnostics => 1 entries
 Synthetics => 4 entries
 
 Symbols:
@@ -3508,11 +3507,6 @@ Occurrences:
 [20:4..20:13): scalameta -> scala/reflect/Selectable#selectDynamic().
 [21:4..21:19): StructuralTypes -> example/StructuralTypes.
 
-Diagnostics:
-[14:20..14:23): [warning] Alphanumeric method foo is not declared infix; it should not be used as infix operator.
-Instead, use method syntax .foo(...) or backticked identifier `foo`.
-The latter can be rewritten automatically under -rewrite -source 3.4-migration.
-
 Synthetics:
 [12:2..12:6):user => reflectiveSelectable(*)
 [13:2..13:6):user => reflectiveSelectable(*)
@@ -3547,7 +3541,7 @@ example/Synthetic#Contexts.m4(). => method m4 => Nothing
 example/Synthetic#F# => class F extends Object { self: F => +1 decls }
 example/Synthetic#F#`<init>`(). => primary ctor <init> (): F
 example/Synthetic#J# => class J [typeparam T ] extends Object { self: J[T] => +4 decls }
-example/Synthetic#J#[T] => typeparam T
+example/Synthetic#J#[T] => typeparam T 
 example/Synthetic#J#`<init>`(). => primary ctor <init> [typeparam T ]()(implicit param evidence$1: Manifest[T]): J[T]
 example/Synthetic#J#`<init>`().(evidence$1) => implicit param evidence$1: Manifest[T]
 example/Synthetic#J#arr. => val method arr Array[T]
@@ -4256,11 +4250,11 @@ Occurrences => 18 entries
 Symbols:
 _empty_/Test_depmatch. => final object Test_depmatch extends Object { self: Test_depmatch.type => +4 decls }
 _empty_/Test_depmatch.Bar# => type Bar [typeparam T ] = T match { Unit => Unit }
-_empty_/Test_depmatch.Bar#[T] => typeparam T
+_empty_/Test_depmatch.Bar#[T] => typeparam T 
 _empty_/Test_depmatch.Foo# => type Foo  = Int { type U  }
 _empty_/Test_depmatch.baz(). => inline macro baz (param foo: Foo): Unit
 _empty_/Test_depmatch.baz().(foo) => param foo: Foo
-local0 => type U
+local0 => type U 
 local1 => val local v: Bar[foo.U]
 
 Occurrences:
@@ -4316,7 +4310,7 @@ Occurrences => 33 entries
 
 Symbols:
 exports/example/Codec# => trait Codec [typeparam T ] extends Object with Decoder[T] with Encoder[T] { self: Codec[T] => +6 decls }
-exports/example/Codec#[T] => typeparam T
+exports/example/Codec#[T] => typeparam T 
 exports/example/Codec#`<init>`(). => primary ctor <init> [typeparam T ](param decode: Decoder[T], param encode: Encoder[T]): Codec[T]
 exports/example/Codec#`<init>`().(decode) => param decode: Decoder[T]
 exports/example/Codec#`<init>`().(encode) => param encode: Encoder[T]
@@ -4327,12 +4321,12 @@ exports/example/Codec#encode(). => final method encode (param t: T): Array[Byte]
 exports/example/Codec#encode().(t) => param t: T
 exports/example/Codec#encode. => private[this] val method encode Encoder[T]
 exports/example/Decoder# => trait Decoder [covariant typeparam T ] extends Object { self: Decoder[T] => +3 decls }
-exports/example/Decoder#[T] => covariant typeparam T
+exports/example/Decoder#[T] => covariant typeparam T 
 exports/example/Decoder#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Decoder[T]
 exports/example/Decoder#decode(). => abstract method decode (param a: Array[Byte]): T
 exports/example/Decoder#decode().(a) => param a: Array[Byte]
 exports/example/Encoder# => trait Encoder [contravariant typeparam T ] extends Object { self: Encoder[T] => +3 decls }
-exports/example/Encoder#[T] => contravariant typeparam T
+exports/example/Encoder#[T] => contravariant typeparam T 
 exports/example/Encoder#`<init>`(). => primary ctor <init> [contravariant typeparam T ](): Encoder[T]
 exports/example/Encoder#encode(). => abstract method encode (param t: T): Array[Byte]
 exports/example/Encoder#encode().(t) => param t: T
@@ -4386,11 +4380,11 @@ Occurrences => 5 entries
 Symbols:
 exports/`exports-package$package`. => final package object exports extends Object { self: exports.type => +4 decls }
 exports/`exports-package$package`.Codec# => final type Codec [typeparam T ] = Codec[T]
-exports/`exports-package$package`.Codec#[T] => typeparam T
+exports/`exports-package$package`.Codec#[T] => typeparam T 
 exports/`exports-package$package`.Decoder# => final type Decoder [typeparam T ] = Decoder[T]
-exports/`exports-package$package`.Decoder#[T] => typeparam T
+exports/`exports-package$package`.Decoder#[T] => typeparam T 
 exports/`exports-package$package`.Encoder# => final type Encoder [typeparam T ] = Encoder[T]
-exports/`exports-package$package`.Encoder#[T] => typeparam T
+exports/`exports-package$package`.Encoder#[T] => typeparam T 
 
 Occurrences:
 [0:8..0:15): exports <- exports/
@@ -4432,35 +4426,35 @@ Occurrences => 54 entries
 
 Symbols:
 hk/EitherMonad# => class EitherMonad [typeparam T ] extends Object with Monad[[E] =>> Either[T, E]] { self: EitherMonad[T] => +2 decls }
-hk/EitherMonad#[E] => typeparam E
-hk/EitherMonad#[T] => typeparam T
+hk/EitherMonad#[E] => typeparam E 
+hk/EitherMonad#[T] => typeparam T 
 hk/EitherMonad#`<init>`(). => primary ctor <init> [typeparam T ](): EitherMonad[T]
-hk/EitherMonad#`<init>`().[E] => typeparam E
+hk/EitherMonad#`<init>`().[E] => typeparam E 
 hk/Monad# => trait Monad [typeparam M [type _ ]] extends Object { self: Monad[M] => +4 decls }
 hk/Monad#[M] => typeparam M [type _ ]
-hk/Monad#[M][_] => type _
+hk/Monad#[M][_] => type _ 
 hk/Monad#`<init>`(). => primary ctor <init> [typeparam M [type _ ]](): Monad[M]
 hk/Monad#flatMap(). => method flatMap [typeparam A , typeparam B ](param m: M[A])(param f: Function1[A, M[B]]): M[B]
 hk/Monad#flatMap().(f) => param f: Function1[A, M[B]]
 hk/Monad#flatMap().(m) => param m: M[A]
-hk/Monad#flatMap().[A] => typeparam A
-hk/Monad#flatMap().[B] => typeparam B
+hk/Monad#flatMap().[A] => typeparam A 
+hk/Monad#flatMap().[B] => typeparam B 
 hk/Monad#pure(). => method pure [typeparam A ](param a: A): M[A]
 hk/Monad#pure().(a) => param a: A
-hk/Monad#pure().[A] => typeparam A
+hk/Monad#pure().[A] => typeparam A 
 hk/hk$package. => final package object hk extends Object { self: hk.type => +5 decls }
 hk/hk$package.Id# => type Id [typeparam A ] = A
-hk/hk$package.Id#[A] => typeparam A
+hk/hk$package.Id#[A] => typeparam A 
 hk/hk$package.MapEither# => type MapEither [typeparam K ] = [L] =>> [R] =>> Map[K, Either[L, R]]
-hk/hk$package.MapEither#[K] => typeparam K
-hk/hk$package.MapEither#[L] => typeparam L
-hk/hk$package.MapEither#[R] => typeparam R
+hk/hk$package.MapEither#[K] => typeparam K 
+hk/hk$package.MapEither#[L] => typeparam L 
+hk/hk$package.MapEither#[R] => typeparam R 
 hk/hk$package.MapKV# => type MapKV [typeparam K ] = [V] =>> Map[K, V]
-hk/hk$package.MapKV#[K] => typeparam K
-hk/hk$package.MapKV#[V] => typeparam V
+hk/hk$package.MapKV#[K] => typeparam K 
+hk/hk$package.MapKV#[V] => typeparam V 
 hk/hk$package.MapV# => type MapV [type _ ] = [V] =>> Map[String, V]
-hk/hk$package.MapV#[V] => typeparam V
-hk/hk$package.MapV#[_] => type _
+hk/hk$package.MapV#[V] => typeparam V 
+hk/hk$package.MapV#[_] => type _ 
 
 Occurrences:
 [0:8..0:10): hk <- hk/
@@ -4800,11 +4794,11 @@ _empty_/Concrete#`<init>`(). => primary ctor <init> (): Concrete
 _empty_/Concrete#nullary2(). => method nullary2 => Int <: _empty_/NullaryTest#nullary2().
 _empty_/Concrete#nullary3(). => method nullary3 => List[Int] <: _empty_/NullaryTest#nullary3().
 _empty_/NullaryTest# => abstract class NullaryTest [typeparam T , typeparam m [typeparam s ]] extends Object { self: NullaryTest[T, m] => +9 decls }
-_empty_/NullaryTest#[T] => typeparam T
+_empty_/NullaryTest#[T] => typeparam T 
 _empty_/NullaryTest#[m] => typeparam m [typeparam s ]
-_empty_/NullaryTest#[m][s] => typeparam s
+_empty_/NullaryTest#[m][s] => typeparam s 
 _empty_/NullaryTest#`<init>`(). => primary ctor <init> [typeparam T , typeparam m [typeparam s ]](): NullaryTest[T, m]
-_empty_/NullaryTest#`<init>`().[m][s] => typeparam s
+_empty_/NullaryTest#`<init>`().[m][s] => typeparam s 
 _empty_/NullaryTest#nullary(). => method nullary => String
 _empty_/NullaryTest#nullary2(). => abstract method nullary2 => T
 _empty_/NullaryTest#nullary3(). => abstract method nullary3 => m[T]
@@ -5008,9 +5002,9 @@ flags/p/package.AA#x. => private[this] val method x Int
 flags/p/package.AA#y. => val method y Int
 flags/p/package.AA#z(). => var method z Int
 flags/p/package.C# => abstract class C [covariant typeparam T , contravariant typeparam U , typeparam V ] extends Object { self: C[T, U, V] => +10 decls }
-flags/p/package.C#[T] => covariant typeparam T
-flags/p/package.C#[U] => contravariant typeparam U
-flags/p/package.C#[V] => typeparam V
+flags/p/package.C#[T] => covariant typeparam T 
+flags/p/package.C#[U] => contravariant typeparam U 
+flags/p/package.C#[V] => typeparam V 
 flags/p/package.C#`<init>`(). => primary ctor <init> [covariant typeparam T , contravariant typeparam U , typeparam V ](param x: T, param y: U, param z: V): C[T, U, V]
 flags/p/package.C#`<init>`().(x) => param x: T
 flags/p/package.C#`<init>`().(y) => param y: U
@@ -5023,11 +5017,11 @@ flags/p/package.C#x. => private[this] val method x T
 flags/p/package.C#y. => private[this] val method y U
 flags/p/package.C#z. => private[this] val method z V
 flags/p/package.S# => class S [@specialized typeparam T ] extends Object { self: S[T] => +2 decls }
-flags/p/package.S#[T] => @specialized typeparam T
+flags/p/package.S#[T] => @specialized typeparam T 
 flags/p/package.S#`<init>`(). => primary ctor <init> [@specialized typeparam T ](): S[T]
 flags/p/package.T1# => type T1  = Int
 flags/p/package.T2# => type T2 [typeparam T ] = S[T]
-flags/p/package.T2#[T] => typeparam T
+flags/p/package.T2#[T] => typeparam T 
 flags/p/package.U# => type U  <: Int
 flags/p/package.V# => type V  >: Int
 flags/p/package.X. => final case object X extends Object with Product with Serializable { self: X.type => +1 decls }
@@ -5038,14 +5032,14 @@ flags/p/package.Z#`<init>`(). => primary ctor <init> (): Z
 flags/p/package.`y_=`(). => protected var method y_= (param x$1: Int): Unit
 flags/p/package.`y_=`().(x$1) => param x$1: Int
 flags/p/package.m(). => macro m [typeparam TT ]: Int
-flags/p/package.m().[TT] => typeparam TT
+flags/p/package.m().[TT] => typeparam TT 
 flags/p/package.x. => private[flags/p/] lazy val method x Int
 flags/p/package.xs1. => val method xs1 Nothing
 flags/p/package.y(). => protected implicit var method y Int
 flags/p/package.z(). => method z (param pp: Int): Int
 flags/p/package.z().(pp) => param pp: Int
 local0 => val local xs2: Nothing
-local1 => type t
+local1 => type t 
 
 Occurrences:
 [0:8..0:13): flags <- flags/
@@ -5160,7 +5154,7 @@ local3 => final class $anon extends Object { self: $anon => +2 decls }
 local5 => final class $anon extends M with N { self: $anon => +1 decls }
 local7 => method k => Int
 local8 => final class $anon extends M with N { self: $anon => +2 decls }
-local10 => typeparam T
+local10 => typeparam T 
 local11 => type L [typeparam T ] = List[T]
 types/B# => class B extends Object { self: B => +1 decls }
 types/B#`<init>`(). => primary ctor <init> (): B
@@ -5205,7 +5199,7 @@ types/Test.C#ClassInfoType2# => class ClassInfoType2 extends B { self: ClassInfo
 types/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init> (): ClassInfoType2
 types/Test.C#ClassInfoType2#x(). => method x => Int
 types/Test.C#ClassInfoType3# => trait ClassInfoType3 [typeparam T ] extends Object { self: ClassInfoType3[T] => +2 decls }
-types/Test.C#ClassInfoType3#[T] => typeparam T
+types/Test.C#ClassInfoType3#[T] => typeparam T 
 types/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init> [typeparam T ](): ClassInfoType3[T]
 types/Test.C#Either. => val method Either Either.type
 types/Test.C#MethodType. => final object MethodType extends Object { self: MethodType.type => +7 decls }
@@ -5215,7 +5209,7 @@ types/Test.C#MethodType.m5(). => method m5 (param x: Int): Int
 types/Test.C#MethodType.m5().(x) => param x: Int
 types/Test.C#MethodType.m6(). => method m6 [typeparam T ](param x: T): T
 types/Test.C#MethodType.m6().(x) => param x: T
-types/Test.C#MethodType.m6().[T] => typeparam T
+types/Test.C#MethodType.m6().[T] => typeparam T 
 types/Test.C#MethodType.x1(). => method x1 => Int
 types/Test.C#MethodType.x2(). => method x2 => Int
 types/Test.C#RepeatedType# => case class RepeatedType extends Object with Product with Serializable { self: RepeatedType => +4 decls }
@@ -5232,15 +5226,15 @@ types/Test.C#RepeatedType.toString(). => method toString => String <: scala/Any#
 types/Test.C#RepeatedType.unapplySeq(). => method unapplySeq (param x$1: RepeatedType): RepeatedType
 types/Test.C#RepeatedType.unapplySeq().(x$1) => param x$1: RepeatedType
 types/Test.C#TypeType. => final object TypeType extends Object { self: TypeType.type => +6 decls }
-types/Test.C#TypeType.T1# => type T1
+types/Test.C#TypeType.T1# => type T1 
 types/Test.C#TypeType.T4# => type T4  = C
 types/Test.C#TypeType.T5# => type T5 [typeparam U ] = U
-types/Test.C#TypeType.T5#[U] => typeparam U
+types/Test.C#TypeType.T5#[U] => typeparam U 
 types/Test.C#TypeType.m2(). => method m2 [typeparam T2  = C]: Nothing
 types/Test.C#TypeType.m2().[T2] => typeparam T2  = C
 types/Test.C#TypeType.m3(). => method m3 [typeparam M3 [type _ ]]: Nothing
 types/Test.C#TypeType.m3().[M3] => typeparam M3 [type _ ]
-types/Test.C#TypeType.m3().[M3][_] => type _
+types/Test.C#TypeType.m3().[M3][_] => type _ 
 types/Test.C#`<init>`(). => primary ctor <init> (): C
 types/Test.C#annType1. => val method annType1 T @ann[T]
 types/Test.C#annType2. => val method annType2 T @ann1 @ann2
@@ -5263,7 +5257,7 @@ types/Test.C#thisType1. => val method thisType1 C.this.type
 types/Test.C#thisType2. => val method thisType2 C.this.type
 types/Test.C#typeLambda1(). => method typeLambda1 [typeparam M [type _ ]]: Nothing
 types/Test.C#typeLambda1().[M] => typeparam M [type _ ]
-types/Test.C#typeLambda1().[M][_] => type _
+types/Test.C#typeLambda1().[M][_] => type _ 
 types/Test.C#typeRef1. => val method typeRef1 C
 types/Test.C#typeRef2. => val method typeRef2 p.C
 types/Test.C#typeRef3. => val method typeRef3 T#C
@@ -5288,7 +5282,7 @@ types/Test.N# => trait N extends Object { self: N => +2 decls }
 types/Test.N#`<init>`(). => primary ctor <init> (): N
 types/Test.N#n(). => method n => Int
 types/ann# => class ann [typeparam T ] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
-types/ann#[T] => typeparam T
+types/ann#[T] => typeparam T 
 types/ann#`<init>`(). => primary ctor <init> [typeparam T ](param x: T): ann[T]
 types/ann#`<init>`().(x) => param x: T
 types/ann#x. => private[this] val method x T

From 2834aae04bb38bc6f919b715f0a5787c476386c6 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 27 Feb 2025 12:56:44 -0800
Subject: [PATCH 191/505] Suppression toString

[Cherry-picked 3e61bd9007ee852c0e26dcec5c517f76b1e5d2dc]
---
 compiler/src/dotty/tools/dotc/reporting/WConf.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/reporting/WConf.scala b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
index fd5c7cc0dbeb..95e9652c796c 100644
--- a/compiler/src/dotty/tools/dotc/reporting/WConf.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
@@ -139,8 +139,10 @@ object WConf:
 class Suppression(val annotPos: SourcePosition, filters: List[MessageFilter], val start: Int, val end: Int, val verbose: Boolean):
   private[this] var _used = false
   def used: Boolean = _used
-  def markUsed(): Unit = { _used = true }
-
+  def markUsed(): Unit =
+    _used = true
   def matches(dia: Diagnostic): Boolean =
     val pos = dia.pos
     pos.exists && start <= pos.start && pos.end <= end && filters.forall(_.matches(dia))
+
+  override def toString = s"Suppress in ${annotPos.source} $start..$end [${filters.mkString(", ")}]"

From 808818f9aa86046a2e9164cdf00f76576590c584 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 27 Feb 2025 09:04:11 -0800
Subject: [PATCH 192/505] Register nowarn when inlining

---
 compiler/src/dotty/tools/dotc/Run.scala       | 28 +++++++++++++--
 .../dotty/tools/dotc/inlines/Inliner.scala    | 15 +++++++-
 .../dotty/tools/dotc/inlines/Inlines.scala    |  6 ++++
 .../src/dotty/tools/dotc/typer/Typer.scala    | 34 +++++--------------
 tests/warn/i22672/lib_1.scala                 | 15 ++++++++
 tests/warn/i22672/usage_2.scala               | 13 +++++++
 6 files changed, 82 insertions(+), 29 deletions(-)
 create mode 100644 tests/warn/i22672/lib_1.scala
 create mode 100644 tests/warn/i22672/usage_2.scala

diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala
index 7dace14ac068..79b49653746b 100644
--- a/compiler/src/dotty/tools/dotc/Run.scala
+++ b/compiler/src/dotty/tools/dotc/Run.scala
@@ -17,15 +17,15 @@ import Phases.{unfusedPhases, Phase}
 import sbt.interfaces.ProgressCallback
 
 import util.*
-import reporting.{Suppression, Action, Profile, ActiveProfile, NoProfile}
-import reporting.Diagnostic
-import reporting.Diagnostic.Warning
+import reporting.{Suppression, Action, Profile, ActiveProfile, MessageFilter, NoProfile, WConf}
+import reporting.Diagnostic, Diagnostic.Warning
 import rewrites.Rewrites
 import profile.Profiler
 import printing.XprintMode
 import typer.ImplicitRunInfo
 import config.Feature
 import StdNames.nme
+import Spans.Span
 
 import java.io.{BufferedWriter, OutputStreamWriter}
 import java.nio.charset.StandardCharsets
@@ -37,6 +37,8 @@ import scala.io.Codec
 import Run.Progress
 import scala.compiletime.uninitialized
 import dotty.tools.dotc.transform.MegaPhase
+import dotty.tools.dotc.util.chaining.*
+import java.util.{Timer, TimerTask}
 
 /** A compiler run. Exports various methods to compile source files */
 class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with ConstraintRunInfo {
@@ -97,6 +99,26 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
           Action.Warning
       }
 
+    def registerNowarn(annotPos: SourcePosition, range: Span)(conf: String, pos: SrcPos)(using Context): Unit =
+      var verbose = false
+      val filters = conf match
+        case "" =>
+          List(MessageFilter.Any)
+        case "none" =>
+          List(MessageFilter.None)
+        case "verbose" | "v" =>
+          verbose = true
+          List(MessageFilter.Any)
+        case conf =>
+          WConf.parseFilters(conf).left.map: parseErrors =>
+            report.warning(s"Invalid message filter\n${parseErrors.mkString("\n")}", pos)
+            List(MessageFilter.None)
+          .merge
+      addSuppression:
+        Suppression(annotPos, filters, range.start, range.end, verbose)
+          .tap: sup =>
+            if filters == List(MessageFilter.None) then sup.markUsed() // invalid suppressions, don't report as unused
+
     def addSuppression(sup: Suppression): Unit =
       val suppressions = mySuppressions.getOrElseUpdate(sup.annotPos.source, ListBuffer.empty)
       if sup.start != sup.end && suppressions.forall(x => x.start != sup.start || x.end != sup.end) then
diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 4404ae9f9ea4..686f49aa9248 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -98,7 +98,8 @@ object Inliner:
 
   // InlinerMap is a TreeTypeMap with special treatment for inlined arguments:
   // They are generally left alone (not mapped further, and if they wrap a type
-  // the type Inlined wrapper gets dropped
+  // the type Inlined wrapper gets dropped.
+  // As a side effect, register @nowarn annotations from annotated expressions.
   private class InlinerMap(
       typeMap: Type => Type,
       treeMap: Tree => Tree,
@@ -115,6 +116,18 @@ object Inliner:
       ConservativeTreeCopier()
     ):
 
+    override def transform(tree: Tree)(using Context): Tree =
+      tree match
+      case Typed(expr, tpt) =>
+        tpt.tpe match
+        case AnnotatedType(_, annot) if annot.hasSymbol(defn.NowarnAnnot) =>
+          val argPos = annot.argument(0).getOrElse(tree).sourcePos
+          val conf = annot.argumentConstantString(0).getOrElse("")
+          ctx.run.nn.suppressions.registerNowarn(tree.sourcePos, expr.span)(conf, argPos)
+        case _ =>
+      case _ =>
+      super.transform(tree)
+
     override def copy(
         typeMap: Type => Type,
         treeMap: Tree => Tree,
diff --git a/compiler/src/dotty/tools/dotc/inlines/Inlines.scala b/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
index e9ac2b92a488..598c3c91ea2f 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
@@ -23,6 +23,7 @@ import collection.mutable
 import reporting.{NotConstant, trace}
 import util.Spans.Span
 import dotty.tools.dotc.core.Periods.PhaseId
+import dotty.tools.dotc.util.chaining.*
 
 /** Support for querying inlineable methods and for inlining calls to such methods */
 object Inlines:
@@ -44,6 +45,11 @@ object Inlines:
   def bodyToInline(sym: SymDenotation)(using Context): Tree =
     if hasBodyToInline(sym) then
       sym.getAnnotation(defn.BodyAnnot).get.tree
+        .tap: body =>
+          for annot <- sym.getAnnotation(defn.NowarnAnnot) do
+            val argPos = annot.argument(0).getOrElse(annot.tree).sourcePos
+            val conf = annot.argumentConstantString(0).getOrElse("")
+            ctx.run.nn.suppressions.registerNowarn(annot.tree.sourcePos, body.span)(conf, argPos)
     else
       EmptyTree
 
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index 42a0c24c9f24..bdf1151e9b35 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2486,31 +2486,15 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
   def registerNowarn(tree: Tree, mdef: untpd.Tree)(using Context): Unit =
     val annot = Annotations.Annotation(tree)
-    def argPos = annot.argument(0).getOrElse(tree).sourcePos
-    var verbose = false
-    val filters = annot.argumentConstantString(0) match
-      case None => annot.argument(0) match
-        case Some(t: Select) if t.name.is(DefaultGetterName) =>
-          // default argument used for `@nowarn` and `@nowarn()`
-          List(MessageFilter.Any)
-        case _ =>
-          report.warning(s"filter needs to be a compile-time constant string", argPos)
-          List(MessageFilter.None)
-      case Some("") =>
-        List(MessageFilter.Any)
-      case Some("verbose") | Some("v") =>
-        verbose = true
-        List(MessageFilter.Any)
-      case Some(s) =>
-        WConf.parseFilters(s).left.map(parseErrors =>
-          report.warning (s"Invalid message filter\n${parseErrors.mkString ("\n")}", argPos)
-            List(MessageFilter.None)
-        ).merge
-    val range = mdef.sourcePos
-    val sup = Suppression(tree.sourcePos, filters, range.start, range.end, verbose)
-    // invalid suppressions, don't report as unused
-    if filters == List(MessageFilter.None) then sup.markUsed()
-    ctx.run.nn.suppressions.addSuppression(sup)
+    val argPos = annot.argument(0).getOrElse(tree).sourcePos
+    val conf = annot.argumentConstantString(0).getOrElse:
+      annot.argument(0) match
+      case Some(t: Select) if t.name.is(DefaultGetterName) =>
+        "" // default argument used for `@nowarn` and `@nowarn()`
+      case _ =>
+        report.warning(s"filter needs to be a compile-time constant string", argPos)
+        "none" // not a -Wconf filter, mapped to MessageFilter.None by registerNowarn
+    ctx.run.nn.suppressions.registerNowarn(tree.sourcePos, mdef.span)(conf, argPos)
 
   def typedValDef(vdef: untpd.ValDef, sym: Symbol)(using Context): Tree = ctx.profiler.onTypedDef(sym) {
     val ValDef(name, tpt, _) = vdef
diff --git a/tests/warn/i22672/lib_1.scala b/tests/warn/i22672/lib_1.scala
new file mode 100644
index 000000000000..19e36e61a556
--- /dev/null
+++ b/tests/warn/i22672/lib_1.scala
@@ -0,0 +1,15 @@
+
+package p
+
+import annotation.*
+
+@deprecated("old api", since="1.0")
+def g = 42
+
+//@deprecated("new api", since="1.0")
+@nowarn("cat=deprecation")
+inline def f =
+  g
+
+transparent inline def body =
+  g: @nowarn
diff --git a/tests/warn/i22672/usage_2.scala b/tests/warn/i22672/usage_2.scala
new file mode 100644
index 000000000000..39c0550b8fd4
--- /dev/null
+++ b/tests/warn/i22672/usage_2.scala
@@ -0,0 +1,13 @@
+
+//> using options -deprecation
+
+package q
+
+def test = p.f // inline f is nowarn
+
+def bodily = p.body // transparent inline with annotated body
+
+@deprecated("do I even know how it works", since="0.1")
+def huh = "hello"
+
+def failing = huh // warn

From 5abed37491aa7b39bee9b83a2373ec8543f19314 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sat, 26 Apr 2025 10:58:03 +0200
Subject: [PATCH 193/505] Register nowarn when inlining

[Cherry-picked 3c18222f1bf2040e8d07626be3a39bcd60bbfa49][modified]

From 8f7101fb9795d1c5daea046707421dcc25c8d43a Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 10 Mar 2025 11:41:13 -0700
Subject: [PATCH 194/505] Handle multiple annotations

[Cherry-picked daf88c77b8272b11b9206993fd18db1dcc5a5843]
---
 .../src/dotty/tools/dotc/inlines/Inliner.scala  | 17 +++++++++++------
 tests/warn/i22672/lib_1.scala                   |  5 +++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 686f49aa9248..50eaa0f57e38 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -119,12 +119,17 @@ object Inliner:
     override def transform(tree: Tree)(using Context): Tree =
       tree match
       case Typed(expr, tpt) =>
-        tpt.tpe match
-        case AnnotatedType(_, annot) if annot.hasSymbol(defn.NowarnAnnot) =>
-          val argPos = annot.argument(0).getOrElse(tree).sourcePos
-          val conf = annot.argumentConstantString(0).getOrElse("")
-          ctx.run.nn.suppressions.registerNowarn(tree.sourcePos, expr.span)(conf, argPos)
-        case _ =>
+        def loop(tpe: Type): Unit =
+          tpe match
+          case AnnotatedType(parent, annot) =>
+            if annot.hasSymbol(defn.NowarnAnnot) then
+              val argPos = annot.argument(0).getOrElse(tree).sourcePos
+              val conf = annot.argumentConstantString(0).getOrElse("")
+              ctx.run.nn.suppressions.registerNowarn(tree.sourcePos, expr.span)(conf, argPos)
+            else
+              loop(parent)
+          case _ =>
+        loop(tpt.tpe)
       case _ =>
       super.transform(tree)
 
diff --git a/tests/warn/i22672/lib_1.scala b/tests/warn/i22672/lib_1.scala
index 19e36e61a556..722f2ae03899 100644
--- a/tests/warn/i22672/lib_1.scala
+++ b/tests/warn/i22672/lib_1.scala
@@ -1,7 +1,7 @@
 
 package p
 
-import annotation.*
+import annotation.{unchecked as _, *}
 
 @deprecated("old api", since="1.0")
 def g = 42
@@ -12,4 +12,5 @@ inline def f =
   g
 
 transparent inline def body =
-  g: @nowarn
+  g: @nowarn @unchecked
+  g: @unchecked @nowarn

From be7c9bbdbf26cec20c389f8f1849ec98f0a20839 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 10 Mar 2025 15:18:22 -0700
Subject: [PATCH 195/505] Collect nowarn symbols instead of skipping them

[Cherry-picked d0a11e021d65ce6801fe9f86365f25f4cd1a0e59]
---
 .../src/dotty/tools/dotc/transform/CheckUnused.scala  | 11 ++++++++---
 tests/warn/i15503d.scala                              |  2 +-
 tests/warn/t13095.scala                               | 10 ++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 tests/warn/t13095.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 005ce5ba3f64..4d071618ac71 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -441,6 +441,7 @@ object CheckUnused:
     val refs = mutable.Set.empty[Symbol]              // references
     val asss = mutable.Set.empty[Symbol]              // targets of assignment
     val skip = mutable.Set.empty[Symbol]              // methods to skip (don't warn about their params)
+    val nowarn = mutable.Set.empty[Symbol]            // marked @nowarn
     val imps = new IdentityHashMap[Import, Unit]         // imports
     val sels = new IdentityHashMap[ImportSelector, Unit] // matched selectors
     def register(tree: Tree)(using Context): Unit = if inlined.isEmpty then
@@ -453,7 +454,9 @@ object CheckUnused:
         then
           imps.put(imp, ())
       case tree: Bind =>
-        if !tree.name.isInstanceOf[DerivedName] && !tree.name.is(WildcardParamName) && !tree.hasAttachment(NoWarn) then
+        if !tree.name.isInstanceOf[DerivedName] && !tree.name.is(WildcardParamName) then
+          if tree.hasAttachment(NoWarn) then
+            nowarn.addOne(tree.symbol)
           pats.addOne((tree.symbol, tree.namePos))
       case tree: NamedDefTree =>
         if tree.hasAttachment(PatternVar) then
@@ -461,9 +464,10 @@ object CheckUnused:
             pats.addOne((tree.symbol, tree.namePos))
         else if (tree.symbol ne NoSymbol)
           && !tree.name.isWildcard
-          && !tree.hasAttachment(NoWarn)
           && !tree.symbol.is(ModuleVal) // track only the ModuleClass using the object symbol, with correct namePos
         then
+          if tree.hasAttachment(NoWarn) then
+            nowarn.addOne(tree.symbol)
           defs.addOne((tree.symbol.userSymbol, tree.namePos))
       case _ =>
         if tree.symbol ne NoSymbol then
@@ -531,6 +535,7 @@ object CheckUnused:
         && !sym.name.is(BodyRetainerName)
         && !sym.isSerializationSupport
         && !(sym.is(Mutable) && sym.isSetter && sym.owner.is(Trait)) // tracks sym.underlyingSymbol sibling getter
+        && !infos.nowarn(sym)
       then
         warnAt(pos)(UnusedSymbol.privateMembers)
 
@@ -627,7 +632,7 @@ object CheckUnused:
       val byPos = infos.pats.groupMap(uniformPos(_, _))((sym, pos) => sym)
       for (pos, syms) <- byPos if pos.span.exists && !syms.exists(_.hasAnnotation(defn.UnusedAnnot)) do
         if !syms.exists(infos.refs(_)) then
-          if !syms.exists(v => !v.isLocal && !v.is(Private)) then
+          if !syms.exists(v => !v.isLocal && !v.is(Private) || infos.nowarn(v)) then
             warnAt(pos)(UnusedSymbol.patVars)
         else if syms.exists(_.is(Mutable)) then // check unassigned var
           val sym = // recover the original
diff --git a/tests/warn/i15503d.scala b/tests/warn/i15503d.scala
index 1e1adca51b46..073b340637fa 100644
--- a/tests/warn/i15503d.scala
+++ b/tests/warn/i15503d.scala
@@ -22,7 +22,7 @@ case class K(i: Int, j: Int)
 
 class C(c0: Option[Int], k0: K):
   private val Some(c) = c0: @unchecked  // warn valdef from pattern
-  private val K(i, j) = k0              // warn // warn valdefs from pattern (RHS patvars are NoWarn)
+  private val K(i, j) = k0              // nowarn (name of case class element is nowarn)
   val K(v, w) = k0                      // nowarn nonprivate
   private val K(r, s) = k0              // warn // warn valdefs from pattern
   def f(x: Option[Int]) = x match
diff --git a/tests/warn/t13095.scala b/tests/warn/t13095.scala
new file mode 100644
index 000000000000..0634f4ed903d
--- /dev/null
+++ b/tests/warn/t13095.scala
@@ -0,0 +1,10 @@
+//> using options -Wunused:patvars -Werror
+
+case class A(x: Int, y: Int)
+
+object Main {
+  for {
+    a <- List.empty[A]
+    A(x, y) = a
+  } yield x + y
+}

From 19a0db602f259b8762f96baf6639a3cafdf697cf Mon Sep 17 00:00:00 2001
From: Daniel Thoma <dthoma@gmx.net>
Date: Thu, 20 Feb 2025 22:30:18 +0100
Subject: [PATCH 196/505] Fixes #15736

Box native instantiated method return type if sam method return type
is not a primitive type to satisfy conditions specified in
  https://docs.oracle.com/javase/8/docs/api/java/lang/invoke/LambdaMetafactory.html
Condition is not enforced by JVM but by Android ART.

[Cherry-picked 24d8ecbf6d498d58e35e53910bf2ec6de8d0e060]
---
 .../tools/backend/jvm/BCodeBodyBuilder.scala   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
index 9c270482c6d4..836f5040b26e 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
@@ -1773,8 +1773,6 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       val returnUnit = lambdaTarget.info.resultType.typeSymbol == defn.UnitClass
       val functionalInterfaceDesc: String = generatedType.descriptor
       val desc = capturedParamsTypes.map(tpe => toTypeKind(tpe)).mkString(("("), "", ")") + functionalInterfaceDesc
-      // TODO specialization
-      val instantiatedMethodType = new MethodBType(lambdaParamTypes.map(p => toTypeKind(p)), toTypeKind(lambdaTarget.info.resultType)).toASMType
 
       val samMethod = atPhase(erasurePhase) {
         val samMethods = toDenot(functionalInterface).info.possibleSamMethods.toList
@@ -1787,7 +1785,21 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       }
 
       val methodName = samMethod.javaSimpleName
-      val samMethodType = asmMethodType(samMethod).toASMType
+      val samMethodBType = asmMethodType(samMethod)
+      val samMethodType = samMethodBType.toASMType
+
+      def boxInstantiated(instantiatedType: BType, samType: BType): BType =
+        if(!samType.isPrimitive && instantiatedType.isPrimitive)
+          boxedClassOfPrimitive(instantiatedType.asPrimitiveBType)
+        else instantiatedType
+      // TODO specialization
+      val instantiatedMethodBType = new MethodBType(
+        lambdaParamTypes.map(p =>  toTypeKind(p)),
+        boxInstantiated(toTypeKind(lambdaTarget.info.resultType), samMethodBType.returnType)
+      )
+
+      val instantiatedMethodType = instantiatedMethodBType.toASMType
+
       // scala/bug#10334: make sure that a lambda object for `T => U` has a method `apply(T)U`, not only the `(Object)Object`
       // version. Using the lambda a structural type `{def apply(t: T): U}` causes a reflective lookup for this method.
       val needsGenericBridge = samMethodType != instantiatedMethodType

From af0e3add1c852a075a6ddbaa4ce9e254573392dd Mon Sep 17 00:00:00 2001
From: rochala <rochala@tutanota.com>
Date: Wed, 27 Sep 2023 12:26:20 +0200
Subject: [PATCH 197/505] Add enum type param support in sourceSymbol

[Cherry-picked 62e3af5feb89e5ee7a0047f1cf0d4cda61ccb409]
---
 .../src/dotty/tools/dotc/core/Symbols.scala   | 16 +++++++--
 .../tools/dotc/interactive/Interactive.scala  |  1 +
 .../tools/languageserver/DefinitionTest.scala | 34 +++++++++++++++++++
 .../tests/definition/PcDefinitionSuite.scala  | 27 +++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala
index 893392794a51..e2cc098398e9 100644
--- a/compiler/src/dotty/tools/dotc/core/Symbols.scala
+++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala
@@ -323,13 +323,25 @@ object Symbols extends SymUtils {
         targets.match
           case (tp: NamedType) :: _ => tp.symbol.sourceSymbol
           case _                    => this
-      else if (denot.is(Synthetic)) {
+      else if denot.is(Synthetic) then
         val linked = denot.linkedClass
         if (linked.exists && !linked.is(Synthetic))
           linked
         else
           denot.owner.sourceSymbol
-      }
+      else if (
+        denot.is(TypeParam) &&
+        denot.maybeOwner.maybeOwner.isAllOf(EnumCase) &&
+        denot.maybeOwner.isPrimaryConstructor
+      ) then
+        val enclosingEnumCase = denot.maybeOwner.maybeOwner
+        val caseTypeParam = enclosingEnumCase.typeParams.find(_.name == denot.name)
+        if caseTypeParam.exists(_.is(Synthetic)) then
+          val enumClass = enclosingEnumCase.info.firstParent.typeSymbol
+          val sourceTypeParam = enumClass.typeParams.find(_.name == denot.name)
+          sourceTypeParam.getOrElse(this)
+        else
+          caseTypeParam.getOrElse(this)
       else if (denot.isPrimaryConstructor)
         denot.owner.sourceSymbol
       else this
diff --git a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala
index a03ae502f2f1..f1db0c949cef 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala
@@ -144,6 +144,7 @@ object Interactive {
 
     (  sym == tree.symbol
     || sym.exists && sym == tree.symbol.sourceSymbol
+    || sym.exists && sym.sourceSymbol == tree.symbol
     || !include.isEmpty && sym.name == tree.symbol.name && sym.maybeOwner != tree.symbol.maybeOwner
        && (  include.isOverridden && overrides(sym, tree.symbol)
           || include.isOverriding && overrides(tree.symbol, sym)
diff --git a/language-server/test/dotty/tools/languageserver/DefinitionTest.scala b/language-server/test/dotty/tools/languageserver/DefinitionTest.scala
index ddacd0c868e0..d6de3d971e2b 100644
--- a/language-server/test/dotty/tools/languageserver/DefinitionTest.scala
+++ b/language-server/test/dotty/tools/languageserver/DefinitionTest.scala
@@ -378,4 +378,38 @@ class DefinitionTest {
     .definition(m3 to m4, Nil)
     .definition(m5 to m6, Nil)
     .definition(m7 to m8, Nil)
+
+  @Test def typeParam: Unit = {
+    code"""|class Foo[${m1}T${m2}]:
+           |  def test: ${m3}T${m4}"""
+      .definition(m3 to m4, List(m1 to m2))
+  }
+
+  @Test def enumTypeParam: Unit = {
+    code"""|enum Test[${m1}T${m2}]:
+           |  case EnumCase(value: ${m3}T${m4})"""
+      .definition(m3 to m4, List(m1 to m2))
+  }
+
+  @Test def extMethodTypeParam: Unit = {
+    code"""extension [${m1}T${m2}](string: String) def xxxx(y: ${m3}T${m4}) = ???"""
+      .definition(m3 to m4, List(m1 to m2))
+  }
+
+  @Test def typeParamCovariant: Unit = {
+    code"""|class Foo[+${m1}T${m2}]:
+           |  def test: ${m3}T${m4}"""
+      .definition(m3 to m4, List(m1 to m2))
+  }
+
+  @Test def enumTypeParamCovariant: Unit = {
+    code"""|enum Test[+${m1}T${m2}]:
+           |  case EnumCase(value: ${m3}T${m4})"""
+      .definition(m3 to m4, List(m1 to m2))
+  }
+
+  @Test def extMethodTypeParamCovariant: Unit = {
+    code"""extension [+${m1}T${m2}](string: String) def xxxx(y: ${m3}T${m4}) = ???"""
+      .definition(m3 to m4, List(m1 to m2))
+  }
 }
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
index fab21ffdee0a..2075cdfb03fe 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
@@ -478,6 +478,33 @@ class PcDefinitionSuite extends BasePcDefinitionSuite:
          |""".stripMargin
     )
 
+  @Test def `enum-class-type-param` =
+    check(
+      """|
+         |enum Options[<<AA>>]:
+         |  case Some(x: A@@A)
+         |  case None extends Options[Nothing]
+         |""".stripMargin
+    )
+
+  @Test def `enum-class-type-param-covariant` =
+    check(
+      """|
+         |enum Options[+<<AA>>]:
+         |  case Some(x: A@@A)
+         |  case None extends Options[Nothing]
+         |""".stripMargin
+    )
+
+  @Test def `enum-class-type-param-duplicate` =
+    check(
+      """|
+         |enum Testing[AA]:
+         |  case Some[<<AA>>](x: A@@A) extends Testing[AA]
+         |  case None extends Testing[Nothing]
+         |""".stripMargin
+    )
+
   @Test def `derives-def` =
     check(
       """|

From 9c0b91d24b8602743147a04995d2e3a57d7b84c0 Mon Sep 17 00:00:00 2001
From: Piotr Chabelski <ged.subfan@gmail.com>
Date: Fri, 14 Mar 2025 07:44:50 +0100
Subject: [PATCH 198/505] Add support for running the `test` sub-command with
 the bisect script (#22796)

Example usage:

```bash
scala project/scripts/bisect.scala --jvm 17 -- --bootstrapped --releases 3.6.4-RC1-bin-20241120-bd07317-NIGHTLY... test smth.test.scala
```

`smth.test.scala`
```scala
//> using dep org.scalameta::munit::1.1.0
//> using platform js

class MyTests extends munit.FunSuite {
  test("foo") {
    assert(2 + 2 == 4)
  }
}
```

Allowed to bisect https://github.com/scala/scala3/issues/22794
[Cherry-picked c9eaa14115c2654db4f54294b0571bc28a6051a4]
---
 project/scripts/bisect.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/project/scripts/bisect.scala b/project/scripts/bisect.scala
index d920dfd528a1..fb53807f62b6 100755
--- a/project/scripts/bisect.scala
+++ b/project/scripts/bisect.scala
@@ -20,6 +20,7 @@ val usageMessage = """
   |The <validation-command> should be one of:
   |* compile <arg1> <arg2> ...
   |* run <arg1> <arg2> ...
+  |* test <arg1> <arg2> ...
   |* <custom-validation-script-path>
   |
   |The arguments for 'compile' and 'run' should be paths to the source file(s) and optionally additional options passed directly to scala-cli.
@@ -100,6 +101,7 @@ object ScriptOptions:
 enum ValidationCommand:
   case Compile(args: Seq[String])
   case Run(args: Seq[String])
+  case Test(args: Seq[String])
   case CustomValidationScript(scriptFile: File)
 
   def validationScript: File = this match
@@ -107,6 +109,8 @@ enum ValidationCommand:
       ValidationScript.tmpScalaCliScript(command = "compile", args)
     case Run(args) =>
       ValidationScript.tmpScalaCliScript(command = "run", args)
+    case Test(args) =>
+      ValidationScript.tmpScalaCliScript(command = "test", args)
     case CustomValidationScript(scriptFile) =>
       ValidationScript.copiedFrom(scriptFile)
 
@@ -114,6 +118,7 @@ object ValidationCommand:
   def fromArgs(args: Seq[String]) = args match
     case Seq("compile", commandArgs*) => Compile(commandArgs)
     case Seq("run", commandArgs*) => Run(commandArgs)
+    case Seq("test", commandArgs*) => Test(commandArgs)
     case Seq(path) => CustomValidationScript(new File(path))
 
 

From 96e3684ef36e017efc1f9ed9f3bb16cde202696d Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 11 Mar 2025 15:44:06 +0100
Subject: [PATCH 199/505] fix: go to def should lead to all: apply, object and
 class

---
 .../dotty/tools/pc/MetalsInteractive.scala    | 13 ++-
 .../dotty/tools/pc/PcDefinitionProvider.scala | 80 ++++++++-----------
 .../tests/definition/PcDefinitionSuite.scala  | 72 +++++++++++++++++
 3 files changed, 118 insertions(+), 47 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
index dc4fa0446715..f5de56711118 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
@@ -100,9 +100,9 @@ object MetalsInteractive:
       pos: SourcePosition,
       indexed: IndexedContext,
       skipCheckOnName: Boolean = false
-  ): List[Symbol] =
+  )(using Context): List[Symbol] =
     enclosingSymbolsWithExpressionType(path, pos, indexed, skipCheckOnName)
-      .map(_._1)
+      .map(_._1.sourceSymbol)
 
   /**
    * Returns the list of tuple enclosing symbol and
@@ -203,6 +203,15 @@ object MetalsInteractive:
           case _ =>
             Nil
 
+      case head :: (sel @ Select(_, name)) :: _
+        if head.sourcePos.encloses(sel.sourcePos) && (name == StdNames.nme.apply || name == StdNames.nme.unapply) =>
+          val optObjectSymbol = List(head.symbol).filter(sym => !(sym.is(Synthetic) && sym.is(Module)))
+          val classSymbol = head.symbol.companionClass
+          val optApplySymbol = List(sel.symbol).filter(sym => !sym.is(Synthetic))
+          val symbols = optObjectSymbol ++ (classSymbol :: optApplySymbol)
+          symbols.collect:
+            case sym if sym.exists => (sym, sym.info, None)
+
       case path @ head :: tail =>
         if head.symbol.is(Exported) then
           val sym = head.symbol.sourceSymbol
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
index 8ff43ba07358..9fbaa8dcd16d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
@@ -79,7 +79,7 @@ class PcDefinitionProvider(
       .untypedPath(pos.span)
       .collect { case t: untpd.Tree => t }
 
-    definitionsForSymbol(untpdPath.headOption.map(_.symbol).toList, uri, pos)
+    definitionsForSymbols(untpdPath.headOption.map(_.symbol).toList, uri, pos)
   end fallbackToUntyped
 
   private def findDefinitions(
@@ -89,7 +89,7 @@ class PcDefinitionProvider(
       uri: URI,
   ): DefinitionResult =
     import indexed.ctx
-    definitionsForSymbol(
+    definitionsForSymbols(
       MetalsInteractive.enclosingSymbols(path, pos, indexed),
       uri,
       pos
@@ -113,68 +113,58 @@ class PcDefinitionProvider(
       case Nil =>
         path.headOption match
           case Some(value: Literal) =>
-            definitionsForSymbol(List(value.typeOpt.widen.typeSymbol), uri, pos)
+            definitionsForSymbols(List(value.typeOpt.widen.typeSymbol), uri, pos)
           case _ => DefinitionResultImpl.empty
       case _ =>
-        definitionsForSymbol(typeSymbols, uri, pos)
-
+        definitionsForSymbols(typeSymbols, uri, pos)
   end findTypeDefinitions
 
-  private def definitionsForSymbol(
+  private def definitionsForSymbols(
       symbols: List[Symbol],
       uri: URI,
       pos: SourcePosition
   )(using ctx: Context): DefinitionResult =
-    symbols match
-      case symbols @ (sym :: other) =>
-        val isLocal = sym.source == pos.source
-        if isLocal then
-          val include = Include.definitions | Include.local
-          val (exportedDefs, otherDefs) =
-            Interactive.findTreesMatching(driver.openedTrees(uri), include, sym)
-              .partition(_.tree.symbol.is(Exported))
-
-          otherDefs.headOption.orElse(exportedDefs.headOption)  match
-            case Some(srcTree) =>
-              val pos = srcTree.namePos
-              if pos.exists then
-                  val loc = new Location(params.uri().toString(), pos.toLsp)
-                  DefinitionResultImpl(
-                    SemanticdbSymbols.symbolName(sym),
-                    List(loc).asJava,
-                  )
-              else DefinitionResultImpl.empty
-            case None =>
-              DefinitionResultImpl.empty
-        else
-          val res = new ArrayList[Location]()
-          semanticSymbolsSorted(symbols)
-            .foreach { sym =>
-              res.addAll(search.definition(sym, params.uri()))
-            }
-          DefinitionResultImpl(
-            SemanticdbSymbols.symbolName(sym),
-            res
-          )
-        end if
+    semanticSymbolsSorted(symbols) match
       case Nil => DefinitionResultImpl.empty
-    end match
-  end definitionsForSymbol
+      case syms @ ((_, headSym) :: tail) =>
+        val locations = syms.flatMap:
+          case (sym, semanticdbSymbol) =>
+            locationsForSymbol(sym, semanticdbSymbol, uri, pos)
+        DefinitionResultImpl(headSym, locations.asJava)
+
+  private def locationsForSymbol(
+      symbol: Symbol,
+      semanticdbSymbol: String,
+      uri: URI,
+      pos: SourcePosition
+  )(using ctx: Context): List[Location] =
+    val isLocal = symbol.source == pos.source
+    if isLocal then
+      val trees = driver.openedTrees(uri)
+      val include = Include.definitions | Include.local
+      val (exportedDefs, otherDefs) =
+        Interactive.findTreesMatching(trees, include, symbol)
+          .partition(_.tree.symbol.is(Exported))
+      otherDefs.headOption.orElse(exportedDefs.headOption).collect:
+        case srcTree if srcTree.namePos.exists =>
+          new Location(params.uri().toString(), srcTree.namePos.toLsp)
+      .toList
+    else search.definition(semanticdbSymbol, uri).asScala.toList
 
   def semanticSymbolsSorted(
       syms: List[Symbol]
-  )(using ctx: Context): List[String] =
+  )(using ctx: Context): List[(Symbol, String)] =
     syms
-      .map { sym =>
+      .collect { case sym if sym.exists =>
         // in case of having the same type and teerm symbol
         // term comes first
         // used only for ordering symbols that come from `Import`
         val termFlag =
           if sym.is(ModuleClass) then sym.sourceModule.isTerm
           else sym.isTerm
-        (termFlag, SemanticdbSymbols.symbolName(sym))
+        (termFlag, sym.sourceSymbol, SemanticdbSymbols.symbolName(sym))
       }
-      .sorted
-      .map(_._2)
+      .sortBy { case (termFlag, _, name) => (termFlag, name) }
+      .map(_.tail)
 
 end PcDefinitionProvider
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
index 2075cdfb03fe..a3f09b97d3f8 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
@@ -531,3 +531,75 @@ class PcDefinitionSuite extends BasePcDefinitionSuite:
          |val a = MyIntOut(1).un@@even
          |""".stripMargin,
     )
+
+  @Test def `object` =
+    check(
+      """|package a
+         |object <<Bar>> {
+         |  def foo = 42
+         |}
+         |val m = B@@ar.foo
+         |""".stripMargin
+    )
+
+  @Test def i7267 =
+    check(
+      """|package a
+        |trait Foo {
+        |  def someNum: Int
+        |  def <<apply>>(i: Int): Unit = println(someNum)
+        |}
+        |object <<Bar>> extends Foo {
+        |  def someNum = 42
+        |}
+        |
+        |object Test {
+        |  B@@ar(2)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `i7267-2` =
+    check(
+      """|package b
+        |trait Foo {
+        |  def someNum: Int
+        |  def <<unapply>>(i: Int): Option[Int] = Some(i)
+        |}
+        |object <<Bar>> extends Foo {
+        |  def someNum = 42
+        |}
+        |
+        |object Test {
+        |  Bar.someNum match {
+        |    case B@@ar(1) => ???
+        |    case _ =>
+        |  }
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `i7267-3` =
+    check(
+      """|package c
+        |case class <<Bar>>()
+        |object <<Bar>>
+        |object O {
+        |  val a = B@@ar()
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `i7267-4` =
+    check(
+      """|package d
+        |class <<Bar>>()
+        |object <<Bar>> {
+        |  def <<apply>>(): Bar = new Bar()
+        |}
+        |object O {
+        |  val a = B@@ar()
+        |}
+        |""".stripMargin
+    )
+

From 3c90b9109d7f2891e04b796d71d90b25696764d6 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sat, 26 Apr 2025 10:59:51 +0200
Subject: [PATCH 200/505] fix: go to def should lead to all: apply, object and
 class

[Cherry-picked 6785da26a167126e207e3da6f835b94780522e71][modified]

From 3a8f0f983b5be60373ebb711090b9d0af26bac83 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Fri, 14 Mar 2025 01:49:45 +0100
Subject: [PATCH 201/505] chore: add support for 'abstract override' modifier

[Cherry-picked b941fc1e286a0eff8018f067f0136ee675805e75]
---
 scaladoc/src/dotty/tools/scaladoc/api.scala          | 1 +
 scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scaladoc/src/dotty/tools/scaladoc/api.scala b/scaladoc/src/dotty/tools/scaladoc/api.scala
index 8ff40644fac2..878de14b3393 100644
--- a/scaladoc/src/dotty/tools/scaladoc/api.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/api.scala
@@ -43,6 +43,7 @@ enum Modifier(val name: String, val prefix: Boolean):
   case Open extends Modifier("open", true)
   case Transparent extends Modifier("transparent", true)
   case Infix extends Modifier("infix", true)
+  case AbsOverride extends Modifier("abstract override", true)
 
 case class ExtensionTarget(name: String, typeParams: Seq[TypeParameter], argsLists: Seq[TermParameterList], signature: Signature, dri: DRI, position: Long)
 case class ImplicitConversion(from: DRI, to: DRI)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
index 5bc1b98a7fff..969b1d6462c2 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
@@ -98,7 +98,8 @@ object SymOps:
         Flags.Open -> Modifier.Open,
         Flags.Override -> Modifier.Override,
         Flags.Case -> Modifier.Case,
-        Flags.Opaque -> Modifier.Opaque
+        Flags.Opaque -> Modifier.Opaque,
+        Flags.AbsOverride -> Modifier.AbsOverride,
       ).collect {
         case (flag, mod) if sym.flags.is(flag) => mod
       }

From d1877e41f9cffa3aad9eee90ca48f548a4a22e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Fornal?=
 <24961583+Florian3k@users.noreply.github.com>
Date: Sat, 15 Mar 2025 17:45:13 +0100
Subject: [PATCH 202/505] Scaladoc: fix generation of unique header ids
 (#22779)

This PR fixes the generation of unique header id's.

Previously, the id's were deduplicated globally, now they are
deduplicated only within one page.
Custom logic for that was removed, we now rely on `HeaderIdGenerator`
from flexmark.
[Cherry-picked 8734fbd664c8f91a3845925fa27c5a87cb8d98b1]
---
 .../markdown/SectionRenderingExtension.scala        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SectionRenderingExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SectionRenderingExtension.scala
index f2b2546c11ad..072591ea57bc 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SectionRenderingExtension.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SectionRenderingExtension.scala
@@ -26,21 +26,17 @@ object SectionRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
   def rendererOptions(opt: MutableDataHolder): Unit = ()
 
   case class AnchorLink(link: String) extends BlankLine(BasedSequence.EmptyBasedSequence())
-  object SectionHandler extends CustomNodeRenderer[Section]:
-    val repeatedIds: mutable.Map[(NodeRendererContext, String), Int] = mutable.Map()
+  class SectionHandler extends CustomNodeRenderer[Section]:
     val idGenerator = new HeaderIdGenerator.Factory().create()
+    idGenerator.setResolveDupes(true)
     override def render(node: Section, c: NodeRendererContext, html: HtmlWriter): Unit =
       val Section(header, body) = node
-      val headerText = header.getText.toString
-      val idSuffix = repeatedIds.getOrElseUpdate((c, headerText), 0)
-      val ifSuffixStr = if(idSuffix == 0) then "" else idSuffix.toString
-      repeatedIds.update((c, headerText), idSuffix + 1)
 
       /* #19524 flexmark's `HeaderIdGenerator` does not appear to be thread-safe,
        * so we protect its usage with a full `synchronize`.
        */
       val id = idGenerator.synchronized {
-        idGenerator.getId(headerText + ifSuffixStr)
+        idGenerator.getId(header.getText)
       }
 
       val anchor = AnchorLink(s"#$id")
@@ -68,13 +64,12 @@ object SectionRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
   object Render extends NodeRenderer:
     override def getNodeRenderingHandlers: JSet[NodeRenderingHandler[_]] =
       JSet(
-        new NodeRenderingHandler(classOf[Section], SectionHandler),
+        new NodeRenderingHandler(classOf[Section], new SectionHandler),
         new NodeRenderingHandler(classOf[AnchorLink], AnchorLinkHandler)
       )
 
   object Factory extends NodeRendererFactory:
     override def apply(options: DataHolder): NodeRenderer = Render
 
-
   def extend(htmlRendererBuilder: HtmlRenderer.Builder, tpe: String): Unit =
     htmlRendererBuilder.nodeRendererFactory(Factory)

From e7f088e4891b9a06d376d8d2e2af4017abc35632 Mon Sep 17 00:00:00 2001
From: Quentin Bernet <quentin.bernet@bluewin.ch>
Date: Thu, 13 Mar 2025 12:39:46 +0100
Subject: [PATCH 203/505] Move type-projection file

This commit only exists to avoid git being confused, it is not independent of the following commit !
---
 .../{dropped-features => changed-features}/type-projection.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename docs/_docs/reference/{dropped-features => changed-features}/type-projection.md (92%)

diff --git a/docs/_docs/reference/dropped-features/type-projection.md b/docs/_docs/reference/changed-features/type-projection.md
similarity index 92%
rename from docs/_docs/reference/dropped-features/type-projection.md
rename to docs/_docs/reference/changed-features/type-projection.md
index 08b5ffb34eca..2c3e82ce99b8 100644
--- a/docs/_docs/reference/dropped-features/type-projection.md
+++ b/docs/_docs/reference/changed-features/type-projection.md
@@ -9,7 +9,7 @@ and `A` names a type member of `T`.
 
 Scala 3 disallows this if `T` is an abstract type (class types and type aliases
 are fine). This change was made because unrestricted type projection
-is [unsound](https://github.com/lampepfl/dotty/issues/1050).
+is [unsound](https://github.com/scala/scala3/issues/1050).
 
 This restriction rules out the [type-level encoding of a combinator
 calculus](https://michid.wordpress.com/2010/01/29/scala-type-level-encoding-of-the-ski-calculus/).

From c18c223c9684e027218285bfc0d1022401081e34 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sat, 26 Apr 2025 11:00:40 +0200
Subject: [PATCH 204/505] Move type-projection file

This commit only exists to avoid git being confused, it is not independent of the following commit !

[Cherry-picked 3d1d012c2191f24e77290aebae587deaa3fdf91d][modified]

From 0ef884eefec2c05465818396b9455a48e7868d07 Mon Sep 17 00:00:00 2001
From: Quentin Bernet <quentin.bernet@bluewin.ch>
Date: Thu, 13 Mar 2025 13:03:20 +0100
Subject: [PATCH 205/505] Reword reference article about type projection so
 that it highlights what is allowed

Was previously focused on what was forbidden/dangerous which made it feel like an unsafe feature

[Cherry-picked bb1a94634074a7c1d8a2704ea353fc946b50d58c]
---
 .../changed-features/type-projection.md       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/_docs/reference/changed-features/type-projection.md b/docs/_docs/reference/changed-features/type-projection.md
index 2c3e82ce99b8..32c56029ce51 100644
--- a/docs/_docs/reference/changed-features/type-projection.md
+++ b/docs/_docs/reference/changed-features/type-projection.md
@@ -1,18 +1,21 @@
 ---
 layout: doc-page
-title: "Dropped: General Type Projection"
-nightlyOf: https://docs.scala-lang.org/scala3/reference/dropped-features/type-projection.html
+title: "Tightened Type Projection"
+nightlyOf: https://docs.scala-lang.org/scala3/reference/changed-features/type-projection.html
 ---
 
-Scala so far allowed general type projection `T#A` where `T` is an arbitrary type
-and `A` names a type member of `T`.
+Scala 2 allowed general type projection `T#A` where `T` is an arbitrary type and `A` names a type member of `T`.
+This turns out to be [unsound](https://github.com/scala/scala3/issues/1050) (at least when combined with other Scala 3 features).
 
-Scala 3 disallows this if `T` is an abstract type (class types and type aliases
-are fine). This change was made because unrestricted type projection
-is [unsound](https://github.com/scala/scala3/issues/1050).
-
-This restriction rules out the [type-level encoding of a combinator
-calculus](https://michid.wordpress.com/2010/01/29/scala-type-level-encoding-of-the-ski-calculus/).
+To remedy this, Scala 3 only allows type projection if `T` is a concrete type (any type which is not abstract), an example for such a type would be a class type (`class T`).
+A type is abstract if it is:
+* An abstract type member (`type T` without `= SomeType`)
+* A type parameter (`[T]`)
+* An alias to an abstract type (`type T = SomeAbstactType`).
+There are no restriction on `A` appart from the fact it has to be a member type of `T`, for example a subclass (`class T { class A }`).
 
 To rewrite code using type projections on abstract types, consider using
 path-dependent types or implicit parameters.
+
+This restriction rules out the [type-level encoding of a combinator
+calculus](https://michid.wordpress.com/2010/01/29/scala-type-level-encoding-of-the-ski-calculus/).
\ No newline at end of file

From c61d0b4fe3a2945287f5ea7e5dbd6f8730777bba Mon Sep 17 00:00:00 2001
From: Quentin Bernet <quentin.bernet@bluewin.ch>
Date: Sat, 15 Mar 2025 18:04:17 +0100
Subject: [PATCH 206/505] Re-move type-projection

[Cherry-picked f963f17a9fa5c11a8ba22c12c31506858bb5832a]
---
 .../{changed-features => dropped-features}/type-projection.md     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/_docs/reference/{changed-features => dropped-features}/type-projection.md (100%)

diff --git a/docs/_docs/reference/changed-features/type-projection.md b/docs/_docs/reference/dropped-features/type-projection.md
similarity index 100%
rename from docs/_docs/reference/changed-features/type-projection.md
rename to docs/_docs/reference/dropped-features/type-projection.md

From 99117640a96541b74e2f264edcdaaa7a54d4753f Mon Sep 17 00:00:00 2001
From: Quentin Bernet <quentin.bernet@bluewin.ch>
Date: Sat, 15 Mar 2025 18:07:59 +0100
Subject: [PATCH 207/505] De-rename the page

[Cherry-picked 126fc253fd22a089c3e8d109f4a3e4958d02310c]
---
 docs/_docs/reference/dropped-features/type-projection.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/reference/dropped-features/type-projection.md b/docs/_docs/reference/dropped-features/type-projection.md
index 32c56029ce51..3dbba9d9fa89 100644
--- a/docs/_docs/reference/dropped-features/type-projection.md
+++ b/docs/_docs/reference/dropped-features/type-projection.md
@@ -1,7 +1,7 @@
 ---
 layout: doc-page
-title: "Tightened Type Projection"
-nightlyOf: https://docs.scala-lang.org/scala3/reference/changed-features/type-projection.html
+title: "Dropped: General Type Projection"
+nightlyOf: https://docs.scala-lang.org/scala3/reference/dropped-features/type-projection.html
 ---
 
 Scala 2 allowed general type projection `T#A` where `T` is an arbitrary type and `A` names a type member of `T`.

From 671e601beaf938ab3bd2dec2a50c295034c615d3 Mon Sep 17 00:00:00 2001
From: Quentin Bernet <quentin.bernet@bluewin.ch>
Date: Sat, 15 Mar 2025 18:08:10 +0100
Subject: [PATCH 208/505] Fix typo

[Cherry-picked a9830ea1334195cb433cece929215dafa92d6857]
---
 docs/_docs/reference/dropped-features/type-projection.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/reference/dropped-features/type-projection.md b/docs/_docs/reference/dropped-features/type-projection.md
index 3dbba9d9fa89..9b9f643ceb6e 100644
--- a/docs/_docs/reference/dropped-features/type-projection.md
+++ b/docs/_docs/reference/dropped-features/type-projection.md
@@ -11,8 +11,8 @@ To remedy this, Scala 3 only allows type projection if `T` is a concrete type (a
 A type is abstract if it is:
 * An abstract type member (`type T` without `= SomeType`)
 * A type parameter (`[T]`)
-* An alias to an abstract type (`type T = SomeAbstactType`).
-There are no restriction on `A` appart from the fact it has to be a member type of `T`, for example a subclass (`class T { class A }`).
+* An alias to an abstract type (`type T = SomeAbstractType`).
+There are no restriction on `A` apart from the fact it has to be a member type of `T`, for example a subclass (`class T { class A }`).
 
 To rewrite code using type projections on abstract types, consider using
 path-dependent types or implicit parameters.

From f5503ada0ec98177d6f015ada5ea9be840e7ae23 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sat, 15 Mar 2025 19:35:00 +0100
Subject: [PATCH 209/505] feature: Skip auto importing symbols we know are
 wrong in current context

[Cherry-picked 9f2280566e1a0804961d96e5937c11fc4be5a470]
---
 .../dotty/tools/pc/AutoImportsProvider.scala  | 30 ++++++++-
 .../dotty/tools/pc/PcDefinitionProvider.scala |  2 +-
 .../pc/tests/edit/AutoImportsSuite.scala      | 63 +++++++++++++++++++
 3 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
index e35556ad11c9..d30ab813f9f2 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
@@ -10,6 +10,7 @@ import scala.meta.pc.*
 
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Symbols.*
+import dotty.tools.dotc.core.StdNames.*
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
@@ -17,6 +18,7 @@ import dotty.tools.pc.completions.CompletionPos
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
+import dotty.tools.dotc.core.Flags.Method
 
 final class AutoImportsProvider(
     search: SymbolSearch,
@@ -47,6 +49,17 @@ final class AutoImportsProvider(
     )
     import indexedContext.ctx
 
+
+    def correctInTreeContext(sym: Symbol) = path match
+      case (_: Ident) :: (sel: Select) :: _ =>
+        sym.info.allMembers.exists(_.name == sel.name)
+      case (_: Ident) :: (_: Apply) :: _ if !sym.is(Method) =>
+        def applyInObject =
+          sym.companionModule.info.allMembers.exists(_.name == nme.apply)
+        def applyInClass = sym.info.allMembers.exists(_.name == nme.apply)
+        applyInClass || applyInObject
+      case _ => true
+
     val isSeen = mutable.Set.empty[String]
     val symbols = List.newBuilder[Symbol]
     def visit(sym: Symbol): Boolean =
@@ -90,13 +103,24 @@ final class AutoImportsProvider(
         end match
       end mkEdit
 
-      for
+      val all = for
         sym <- results
         edits <- mkEdit(sym)
-      yield AutoImportsResultImpl(
+      yield (AutoImportsResultImpl(
         sym.owner.showFullName,
         edits.asJava
-      )
+      ), sym)
+
+      all match
+        case (onlyResult, _) :: Nil => List(onlyResult)
+        case Nil => Nil
+        case moreResults =>
+          val moreExact = moreResults.filter { case (_, sym) =>
+            correctInTreeContext(sym)
+          }
+          if moreExact.nonEmpty then moreExact.map(_._1)
+          else moreResults.map(_._1)
+
     else List.empty
     end if
   end autoImports
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
index 9fbaa8dcd16d..a2e9b05e0610 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
@@ -149,7 +149,7 @@ class PcDefinitionProvider(
         case srcTree if srcTree.namePos.exists =>
           new Location(params.uri().toString(), srcTree.namePos.toLsp)
       .toList
-    else search.definition(semanticdbSymbol, uri).asScala.toList
+    else search.definition(semanticdbSymbol, uri).nn.asScala.toList
 
   def semanticSymbolsSorted(
       syms: List[Symbol]
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImportsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImportsSuite.scala
index 3bb5bfea7bc0..bf568bc0636b 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImportsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImportsSuite.scala
@@ -12,6 +12,69 @@ class AutoImportsSuite extends BaseAutoImportsSuite:
          |  <<Future>>.successful(2)
          |}
          |""".stripMargin,
+      """|scala.concurrent
+         |""".stripMargin
+    )
+
+  @Test def `basic-apply` =
+    check(
+      """|object A {
+          |  <<Future>>(2)
+          |}
+          |""".stripMargin,
+      """|scala.concurrent
+         |""".stripMargin,
+    )
+
+  @Test def `basic-function-apply` =
+    check(
+      """|
+          |object ForgeFor{
+          |  def importMe(): Int = ???
+          |}
+          |object ForgeFor2{
+          |  case class importMe()
+          |}
+          |
+          |
+          |object test2 {
+          |  <<importMe>>()
+          |}
+          |""".stripMargin,
+      """|ForgeFor2
+         |ForgeFor
+         |""".stripMargin
+    )
+
+  @Test def `basic-apply-wrong` =
+    check(
+      """|object A {
+          |  new <<Future>>(2)
+          |}
+          |""".stripMargin,
+      """|scala.concurrent
+         |java.util.concurrent
+         |""".stripMargin
+    )
+
+  @Test def `basic-fuzzy` =
+    check(
+      """|object A {
+          |  <<Future>>.thisMethodDoesntExist(2)
+          |}
+          |""".stripMargin,
+      """|scala.concurrent
+         |java.util.concurrent
+         |""".stripMargin
+    )
+
+  @Test def `typed-simple` =
+    check(
+      """|object A {
+          |  import scala.concurrent.Promise
+          |  val fut: <<Future>> = Promise[Unit]().future
+          |}
+          |""".stripMargin,
       """|scala.concurrent
          |java.util.concurrent
          |""".stripMargin

From f3239d679cf72731e9977d7f9782b981337c84f7 Mon Sep 17 00:00:00 2001
From: Jan Chyb <48855024+jchyb@users.noreply.github.com>
Date: Mon, 17 Mar 2025 12:57:44 +0100
Subject: [PATCH 210/505] Fail compilation if multiple conflicting top-level
 private defs/vals are in the same package (#22759)

Now the private top level definitions act basically the same as package
private (which is the same behavior as private objects/classes),
as that is what the reference implies, and it helps us avoid ambiguous
method/value selections.
---
 compiler/src/dotty/tools/dotc/typer/Namer.scala | 12 ++++++------
 tests/neg/i22721.check                          |  6 ++++++
 tests/neg/i22721/test1.scala                    |  4 ++++
 tests/neg/i22721/test2.scala                    |  4 ++++
 tests/neg/toplevel-overload/moredefs_1.scala    |  2 +-
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 tests/neg/i22721.check
 create mode 100644 tests/neg/i22721/test1.scala
 create mode 100644 tests/neg/i22721/test2.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index a47a0a61c9d4..542ea04442ff 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -131,7 +131,7 @@ class Namer { typer: Typer =>
    *  The logic here is very subtle and fragile due to the fact that
    *  we are not allowed to force anything.
    */
-  def checkNoConflict(name: Name, isPrivate: Boolean, span: Span)(using Context): Name =
+  def checkNoConflict(name: Name, span: Span)(using Context): Name =
     val owner = ctx.owner
     var conflictsDetected = false
 
@@ -166,7 +166,7 @@ class Namer { typer: Typer =>
       def preExisting = ctx.effectiveScope.lookup(name)
       if (!owner.isClass || name.isTypeName) && preExisting.exists then
         conflict(preExisting)
-      else if owner.isPackageObject && !isPrivate && name != nme.CONSTRUCTOR then
+      else if owner.isPackageObject && name != nme.CONSTRUCTOR then
         checkNoConflictIn(owner.owner)
         for pkgObj <- pkgObjs(owner.owner) if pkgObj != owner do
           checkNoConflictIn(pkgObj)
@@ -242,7 +242,7 @@ class Namer { typer: Typer =>
     tree match {
       case tree: TypeDef if tree.isClassDef =>
         val flags = checkFlags(tree.mods.flags)
-        val name = checkNoConflict(tree.name, flags.is(Private), tree.span).asTypeName
+        val name = checkNoConflict(tree.name, tree.span).asTypeName
         val cls =
           createOrRefine[ClassSymbol](tree, name, flags, ctx.owner,
             cls => adjustIfModule(new ClassCompleter(cls, tree)(ctx), tree),
@@ -251,7 +251,7 @@ class Namer { typer: Typer =>
         cls
       case tree: MemberDef =>
         var flags = checkFlags(tree.mods.flags)
-        val name = checkNoConflict(tree.name, flags.is(Private), tree.span)
+        val name = checkNoConflict(tree.name, tree.span)
         tree match
           case tree: ValOrDefDef =>
             if tree.isInstanceOf[ValDef] && !flags.is(Param) && name.endsWith("_=") then
@@ -1217,7 +1217,7 @@ class Namer { typer: Typer =>
           val hasDefaults = sym.hasDefaultParams // compute here to ensure HasDefaultParams and NoDefaultParams flags are set
           val forwarder =
             if mbr.isType then
-              val forwarderName = checkNoConflict(alias.toTypeName, isPrivate = false, span)
+              val forwarderName = checkNoConflict(alias.toTypeName, span)
               var target = pathType.select(sym)
               if target.typeParams.nonEmpty then
                 target = target.EtaExpand(target.typeParams)
@@ -1271,7 +1271,7 @@ class Namer { typer: Typer =>
                   (EmptyFlags, mbrInfo)
               var mbrFlags = MandatoryExportTermFlags | maybeStable | (sym.flags & RetainedExportTermFlags)
               if pathMethod.exists then mbrFlags |= ExtensionMethod
-              val forwarderName = checkNoConflict(alias, isPrivate = false, span)
+              val forwarderName = checkNoConflict(alias, span)
               newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)
 
           forwarder.info = avoidPrivateLeaks(forwarder)
diff --git a/tests/neg/i22721.check b/tests/neg/i22721.check
new file mode 100644
index 000000000000..44b0749f3262
--- /dev/null
+++ b/tests/neg/i22721.check
@@ -0,0 +1,6 @@
+-- [E161] Naming Error: tests/neg/i22721/test2.scala:3:12 --------------------------------------------------------------
+3 |private def foobar: Int = 0 // error
+  |^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |foobar is already defined as method foobar in tests/neg/i22721/test1.scala
+  |
+  |Note that overloaded methods must all be defined in the same group of toplevel definitions
diff --git a/tests/neg/i22721/test1.scala b/tests/neg/i22721/test1.scala
new file mode 100644
index 000000000000..b3f1b1fba690
--- /dev/null
+++ b/tests/neg/i22721/test1.scala
@@ -0,0 +1,4 @@
+package example
+
+private def foobar: String = "foo"
+object test1 { def x = foobar }
diff --git a/tests/neg/i22721/test2.scala b/tests/neg/i22721/test2.scala
new file mode 100644
index 000000000000..c70a42894dcd
--- /dev/null
+++ b/tests/neg/i22721/test2.scala
@@ -0,0 +1,4 @@
+package example
+
+private def foobar: Int = 0 // error
+object test2 { def x = foobar }
diff --git a/tests/neg/toplevel-overload/moredefs_1.scala b/tests/neg/toplevel-overload/moredefs_1.scala
index 5ba8cfc52078..74cdd3ac1bb6 100644
--- a/tests/neg/toplevel-overload/moredefs_1.scala
+++ b/tests/neg/toplevel-overload/moredefs_1.scala
@@ -2,4 +2,4 @@ trait B
 
 def f(x: B) = s"B" // error: has already been compiled
 
-private def g(): Unit = () // OK, since it is private
\ No newline at end of file
+private def g(): Unit = () // error: has already been compiled (def is visible in package)
\ No newline at end of file

From 7b68a5eaaf3d3c9bd0c49ab623b668befa4e9522 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 12:52:29 +0200
Subject: [PATCH 211/505] Fail compilation if multiple conflicting top-level
 private defs/vals are in the same package (#22759)

Now the private top level definitions act basically the same as package
private (which is the same behavior as private objects/classes),
as that is what the reference implies, and it helps us avoid ambiguous
method/value selections.
[Cherry-picked 8fe16fe17819ebd172dd7bb4ed1d8f9080e78f16][modified]

From 1d321be85efe59423c706a78f6f5af0fb063c365 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Mon, 17 Mar 2025 18:39:27 +0100
Subject: [PATCH 212/505] Show the Autofill completion case as what would be
 auto-filled (#22819)

Partial Fix for scalameta/metals#7274

We have in our completion provider an option to automatically fill a
case class constructor with named parameters:

```scala
case class A(x: Int, y: Int)

val a = A(@@)
          ^^ // would fill in here
val a = A(x = ???, y = ???)
          //  ^^^      ^^^  cursor marks added, so tabs can be used to move between the fields
```

However previously it was labeled `Autofill with default values`, which
would never pass editors' filters based on the
current state of input (most likely the name of a field).
The only way to find this option was to type something matching the
`Autofill with default values` label, which explains the
`auto` in the above issue.

We now provide the actual provided fields as the label, so the above
would show `x = ???, y = ???` instead, which is both
more intuitive for the user, and more friendly to editors.
[Cherry-picked 744ba922a1729e7670a0db6de981932e60b2b56e]
---
 .../tools/pc/completions/CompletionValue.scala      |  4 ++--
 .../tools/pc/completions/NamedArgCompletions.scala  |  9 ++++++++-
 .../pc/tests/completion/CompletionArgSuite.scala    | 13 +++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala
index 90b285bffb3a..05d97972d76e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala
@@ -261,13 +261,13 @@ object CompletionValue:
   end NamedArg
 
   case class Autofill(
-      value: String
+      value: String,
+      override val label: String,
   ) extends CompletionValue:
     override def completionItemKind(using Context): CompletionItemKind =
       CompletionItemKind.Enum
     override def completionItemDataKind: Integer = CompletionSource.OverrideKind.ordinal
     override def insertText: Option[String] = Some(value)
-    override def label: String = "Autofill with default values"
 
   case class Keyword(label: String, override val insertText: Option[String])
       extends CompletionValue:
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
index dd3a910beb4f..a21706b9e36e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
@@ -339,9 +339,16 @@ object NamedArgCompletions:
               s"${param.nameBackticked.replace("$", "$$")} = $${${index + 1}${findDefaultValue(param)}}"
           }
           .mkString(", ")
+        val labelText = allParams
+          .collect {
+            case param if !param.symbol.is(Flags.HasDefault) =>
+              s"${param.nameBackticked.replace("$", "$$")} = ???"
+          }
+          .mkString(", ")
         List(
           CompletionValue.Autofill(
-            editText
+            editText,
+            labelText,
           )
         )
       else List.empty
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
index dc81d2596c6f..e5f2d31ad808 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
@@ -1128,3 +1128,16 @@ class CompletionArgSuite extends BaseCompletionSuite:
       """x: Int
         |x = : Any""".stripMargin,
     )
+
+  @Test def `autofill-arguments-case-class` =
+    check(
+      """
+        |case class A(x: Int, y: Int)
+        |
+        |def main() =
+        |  A(x@@)
+        |""".stripMargin,
+      """x = : Int
+        |x = ???, y = ???""".stripMargin,
+      // this looks strange due to the Autofill message belonging to the description
+    )

From 8929cc8ffc343e38865ffbfd46fa856e14050512 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 19 Mar 2025 09:46:10 +0100
Subject: [PATCH 213/505] Ignore ending `$` when looking at end marker names
 (#22798)

## Fix scalameta/metals#7246

- Add a test for renaming local objects
- Drop ending `$` marker when looking for end marker names


[Cherry-picked 8027996fa50b0861983c466082df0eed6efba687]
---
 .../src/main/dotty/tools/pc/PcCollector.scala       |  2 +-
 .../dotty/tools/pc/tests/edit/PcRenameSuite.scala   | 11 +++++++++++
 .../tools/pc/tests/tokens/SemanticTokensSuite.scala | 13 +++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
index 1ebfd405768e..f3fd7c8738d5 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
@@ -315,7 +315,7 @@ object EndMarker:
   def getPosition(df: NamedDefTree, pos: SourcePosition, sourceText: String)(
       implicit ct: Context
   ): Option[SourcePosition] =
-    val name = df.name.toString()
+    val name = df.name.toString().stripSuffix("$")
     val endMarkerLine =
       sourceText.slice(df.span.start, df.span.end).split('\n').last
     val index = endMarkerLine.length() - name.length()
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala
index 3226018f88d4..50806322b09e 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala
@@ -534,3 +534,14 @@ class PcRenameSuite extends BasePcRenameSuite:
         |""".stripMargin,
      wrap = false
    )
+
+  @Test def `local-object-with-end-rename` =
+   check(
+     """|def bar =
+        |  object <<fo@@o>>:
+        |    def aaa = ???
+        |  end <<foo>>
+        |  1
+        |""".stripMargin,
+     wrap = false
+   )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
index fd90a8dfaca0..9f8d82020806 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
@@ -258,7 +258,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite:
           |  } = new:
           |    def <<scalameta>>/*method,definition*/ = "4.0"
           |  <<V>>/*variable,readonly*/.<<scalameta>>/*method*/
-          |end StructuralTypes
+          |end <<StructuralTypes>>/*class,definition*/
           |""".stripMargin
     )
 
@@ -431,4 +431,13 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite:
         |  <<usage>>/*method*/[<<Option>>/*class,abstract*/[<<Int>>/*class,abstract*/]](<<_>>/*parameter,readonly*/.<<typeArg>>/*method*/[<<Some>>/*class*/[<<Int>>/*class,abstract*/]].<<value>>/*variable,readonly*/.<<inferredTypeArg>>/*method*/[<<String>>/*type*/]("str"))
         |}
         |""".stripMargin
-    )
\ No newline at end of file
+    )
+
+  @Test def `local-object-with-end-i7246` =
+   check(
+      """|def <<bar>>/*method,definition*/ =
+         |  object <<foo>>/*class*/:
+         |    def <<aaa>>/*method,definition*/ = <<???>>/*method*/
+         |  end <<foo>>/*class,definition*/
+         |""".stripMargin
+   )

From e6a57d06353bb923a8cd0fae17b9c240150c4e22 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Wed, 19 Mar 2025 15:54:35 +0000
Subject: [PATCH 214/505] chore: remove old drone configuration (dead-code)

[Cherry-picked 0f51329b944d9fd6558d9021b3215ac09f16c550]
---
 .../dotty/communitybuild/CommunityBuildRunner.scala   |  3 +--
 compiler/test/dotty/Properties.scala                  |  1 -
 .../test/dotty/tools/vulpix/VulpixUnitTests.scala     |  2 +-
 project/Build.scala                                   | 11 ++---------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala
index b3065fefe87f..6aaaedb8a3dd 100644
--- a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala
+++ b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala
@@ -13,8 +13,7 @@ object CommunityBuildRunner:
    *  is necessary since we run tests each time on a fresh
    *  Docker container. We run the update on Docker container
    *  creation time to create the cache of the dependencies
-   *  and avoid network overhead. See https://github.com/lampepfl/dotty-drone
-   *  for more infrastructural details.
+   *  and avoid network overhead.
    */
   extension (self: CommunityProject) 
     def run()(using suite: CommunityBuildRunner): Unit =
diff --git a/compiler/test/dotty/Properties.scala b/compiler/test/dotty/Properties.scala
index cc47303d5468..4830f1d7b24c 100644
--- a/compiler/test/dotty/Properties.scala
+++ b/compiler/test/dotty/Properties.scala
@@ -19,7 +19,6 @@ object Properties {
 
   /** Are we running on the CI? */
   val isRunByCI: Boolean = sys.env.isDefinedAt("DOTTY_CI_RUN")
-  || sys.env.isDefinedAt("DRONE")  // TODO remove this when we drop Drone
 
   val testCache: Path =
     sys.env.get("DOTTY_TEST_CACHE").map(Paths.get(_)).getOrElse {
diff --git a/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala b/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
index baf61c845d96..ab8a611caa33 100644
--- a/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
+++ b/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
@@ -105,7 +105,7 @@ object VulpixUnitTests extends ParallelTesting {
   def maxDuration = 3.seconds
   def numberOfSlaves = 5
   def safeMode = sys.env.get("SAFEMODE").isDefined
-  def isInteractive = !sys.env.contains("DRONE")
+  def isInteractive = !sys.env.contains("DOTTY_CI_RUN")
   def testFilter = Nil
   def updateCheckFiles: Boolean = false
   def failedTests = None
diff --git a/project/Build.scala b/project/Build.scala
index a63df060a841..0e463c817bf9 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -292,15 +292,8 @@ object Build {
     PgpKeys.pgpPassphrase := sys.env.get("PGP_PW").map(_.toCharArray()),
     PgpKeys.useGpgPinentry := true,
 
-    javaOptions ++= {
-      val ciOptions = // propagate if this is a CI build
-        sys.props.get("dotty.drone.mem") match {
-          case Some(prop) => List("-Xmx" + prop)
-          case _ => List()
-        }
-      // Do not cut off the bottom of large stack traces (default is 1024)
-      "-XX:MaxJavaStackTraceDepth=1000000" :: agentOptions ::: ciOptions
-    },
+    // Do not cut off the bottom of large stack traces (default is 1024)
+    javaOptions ++= "-XX:MaxJavaStackTraceDepth=1000000" :: agentOptions,
 
     excludeLintKeys ++= Set(
       // We set these settings in `commonSettings`, if a project

From 70a62a3ef08da672f5314dc2a207850d512be016 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 14 Mar 2025 12:29:28 -0700
Subject: [PATCH 215/505] Retire untried tests

[Cherry-picked 2aa6fc6f951cc1407acca2d72930cbc68ad7ef46]
---
 tests/untried/neg/warn-unused-imports.check  |  33 -----
 tests/untried/neg/warn-unused-imports.flags  |   1 -
 tests/untried/neg/warn-unused-imports.scala  | 125 ------------------
 tests/untried/neg/warn-unused-privates.check |  66 ----------
 tests/untried/neg/warn-unused-privates.flags |   1 -
 tests/warn/i15503a.scala                     | 132 +++++++++++++++++++
 6 files changed, 132 insertions(+), 226 deletions(-)
 delete mode 100644 tests/untried/neg/warn-unused-imports.check
 delete mode 100644 tests/untried/neg/warn-unused-imports.flags
 delete mode 100644 tests/untried/neg/warn-unused-imports.scala
 delete mode 100644 tests/untried/neg/warn-unused-privates.check
 delete mode 100644 tests/untried/neg/warn-unused-privates.flags

diff --git a/tests/untried/neg/warn-unused-imports.check b/tests/untried/neg/warn-unused-imports.check
deleted file mode 100644
index 36c6dd03c38d..000000000000
--- a/tests/untried/neg/warn-unused-imports.check
+++ /dev/null
@@ -1,33 +0,0 @@
-warn-unused-imports.scala:57: warning: Unused import
-    import p1.A // warn
-              ^
-warn-unused-imports.scala:62: warning: Unused import
-    import p1.{ A, B } // warn on A
-                ^
-warn-unused-imports.scala:67: warning: Unused import
-    import p1.{ A, B } // warn on both
-                ^
-warn-unused-imports.scala:67: warning: Unused import
-    import p1.{ A, B } // warn on both
-                   ^
-warn-unused-imports.scala:73: warning: Unused import
-    import c._  // warn
-             ^
-warn-unused-imports.scala:78: warning: Unused import
-    import p1._ // warn
-              ^
-warn-unused-imports.scala:85: warning: Unused import
-    import c._  // warn
-             ^
-warn-unused-imports.scala:91: warning: Unused import
-    import p1.c._  // warn
-                ^
-warn-unused-imports.scala:98: warning: Unused import
-    import p1._   // warn
-              ^
-warn-unused-imports.scala:118: warning: Unused import
-    import p1.A   // warn
-              ^
-error: No warnings can be incurred under -Xfatal-warnings.
-10 warnings found
-one error found
diff --git a/tests/untried/neg/warn-unused-imports.flags b/tests/untried/neg/warn-unused-imports.flags
deleted file mode 100644
index 24db705df164..000000000000
--- a/tests/untried/neg/warn-unused-imports.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xfatal-warnings -Ywarn-unused-import
diff --git a/tests/untried/neg/warn-unused-imports.scala b/tests/untried/neg/warn-unused-imports.scala
deleted file mode 100644
index 4b1c1183dcba..000000000000
--- a/tests/untried/neg/warn-unused-imports.scala
+++ /dev/null
@@ -1,125 +0,0 @@
-class Bippo {
-  def length: Int = 123
-  class Tree
-}
-
-package object p1 {
-  class A
-  implicit class B(val s: String) { def bippy = s }
-  val c: Bippo = new Bippo
-  type D = String
-}
-package object p2 {
-  class A
-  implicit class B(val s: String) { def bippy = s }
-  val c: Bippo = new Bippo
-  type D = Int
-}
-
-trait NoWarn {
-  {
-    import p1._ // no warn
-    println("abc".bippy)
-  }
-
-  {
-    import p1._ // no warn
-    println(new A)
-  }
-
-  {
-    import p1.B // no warn
-    println("abc".bippy)
-  }
-
-  {
-    import p1._ // no warn
-    import c._  // no warn
-    println(length)
-  }
-
-  {
-    import p1._ // no warn
-    import c._  // no warn
-    val x: Tree = null
-    println(x)
-  }
-
-  {
-    import p1.D // no warn
-    val x: D = null
-    println(x)
-  }
-}
-
-trait Warn {
-  {
-    import p1.A // warn
-    println(123)
-  }
-
-  {
-    import p1.{ A, B } // warn on A
-    println("abc".bippy)
-  }
-
-  {
-    import p1.{ A, B } // warn on both
-    println(123)
-  }
-
-  {
-    import p1._ // no warn (technically this could warn, but not worth the effort to unroll unusedness transitively)
-    import c._  // warn
-    println(123)
-  }
-
-  {
-    import p1._ // warn
-    println(123)
-  }
-
-  {
-    class Tree
-    import p1._ // no warn
-    import c._  // warn
-    val x: Tree = null
-    println(x)
-  }
-
-  {
-    import p1.c._  // warn
-    println(123)
-  }
-}
-
-trait Nested {
-  {
-    import p1._   // warn
-    trait Warn {  // warn about unused local trait for good measure
-      import p2.*
-      println(new A)
-      println("abc".bippy)
-    }
-    println("")
-  }
-
-  {
-    import p1._   // no warn
-    trait NoWarn {
-      import p2.B  // no warn
-      println("abc".bippy)
-      println(new A)
-    }
-    println(new NoWarn { })
-  }
-
-  {
-    import p1.A   // warn
-    trait Warn {
-      import p2.A
-      println(new A)
-    }
-    println(new Warn { })
-  }
-}
diff --git a/tests/untried/neg/warn-unused-privates.check b/tests/untried/neg/warn-unused-privates.check
deleted file mode 100644
index d012869c934a..000000000000
--- a/tests/untried/neg/warn-unused-privates.check
+++ /dev/null
@@ -1,66 +0,0 @@
-warn-unused-privates.scala:2: warning: private constructor in class Bippy is never used
-  private def this(c: Int) = this(c, c)           // warn
-              ^
-warn-unused-privates.scala:4: warning: private method in class Bippy is never used
-  private def boop(x: Int)            = x+a+b     // warn
-              ^
-warn-unused-privates.scala:6: warning: private val in class Bippy is never used
-  final private val MILLIS2: Int      = 1000      // warn
-                    ^
-warn-unused-privates.scala:13: warning: private val in object Bippy is never used
-  private val HEY_INSTANCE: Int = 1000    // warn
-              ^
-warn-unused-privates.scala:35: warning: private val in class Boppy is never used
-  private val hummer = "def" // warn
-              ^
-warn-unused-privates.scala:42: warning: private var in trait Accessors is never used
-  private var v1: Int = 0 // warn
-              ^
-warn-unused-privates.scala:42: warning: private setter in trait Accessors is never used
-  private var v1: Int = 0 // warn
-              ^
-warn-unused-privates.scala:43: warning: private setter in trait Accessors is never used
-  private var v2: Int = 0 // warn, never set
-              ^
-warn-unused-privates.scala:44: warning: private var in trait Accessors is never used
-  private var v3: Int = 0 // warn, never got
-              ^
-warn-unused-privates.scala:56: warning: private default argument in trait DefaultArgs is never used
-  private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3
-                             ^
-warn-unused-privates.scala:56: warning: private default argument in trait DefaultArgs is never used
-  private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3
-                                           ^
-warn-unused-privates.scala:67: warning: local var in method f0 is never used
-    var x = 1 // warn
-        ^
-warn-unused-privates.scala:74: warning: local val in method f1 is never used
-    val b = new Outer // warn
-        ^
-warn-unused-privates.scala:84: warning: private object in object Types is never used
-  private object Dongo { def f = this } // warn
-                 ^
-warn-unused-privates.scala:94: warning: local object in method l1 is never used
-    object HiObject { def f = this } // warn
-           ^
-warn-unused-privates.scala:78: warning: local var x in method f2 is never set - it could be a val
-    var x = 100 // warn about it being a var
-        ^
-warn-unused-privates.scala:85: warning: private class Bar1 in object Types is never used
-  private class Bar1 // warn
-                ^
-warn-unused-privates.scala:87: warning: private type Alias1 in object Types is never used
-  private type Alias1 = String // warn
-               ^
-warn-unused-privates.scala:95: warning: local class Hi is never used
-    class Hi { // warn
-          ^
-warn-unused-privates.scala:99: warning: local class DingDongDoobie is never used
-    class DingDongDoobie // warn
-          ^
-warn-unused-privates.scala:102: warning: local type OtherThing is never used
-    type OtherThing = String // warn
-         ^
-error: No warnings can be incurred under -Xfatal-warnings.
-21 warnings found
-one error found
diff --git a/tests/untried/neg/warn-unused-privates.flags b/tests/untried/neg/warn-unused-privates.flags
deleted file mode 100644
index 25474aefb362..000000000000
--- a/tests/untried/neg/warn-unused-privates.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ywarn-unused -Xfatal-warnings
diff --git a/tests/warn/i15503a.scala b/tests/warn/i15503a.scala
index 3707b18d316e..884261e140a7 100644
--- a/tests/warn/i15503a.scala
+++ b/tests/warn/i15503a.scala
@@ -328,3 +328,135 @@ package i22692:
 
   type b = AbstractButton
   type t = swingEvent.AncestorListener
+
+package ancient:
+  package p {
+    class Bippo {
+      def length: Int = 123
+      class Tree
+    }
+  }
+
+  package object p1 {
+    import p._
+    class A
+    implicit class B(val s: String) { def bippy = s }
+    val c: Bippo = new Bippo
+    type D = String
+  }
+  package object p2 {
+    import p._
+    class A
+    implicit class B(val s: String) { def bippy = s }
+    val c: Bippo = new Bippo
+    type D = Int
+  }
+
+  trait NoWarn {
+    {
+      import p1._ // no warn
+      println("abc".bippy)
+    }
+
+    {
+      import p1._ // no warn
+      println(new A)
+    }
+
+    {
+      import p1.B // no warn
+      println("abc".bippy)
+    }
+
+    {
+      import p1._ // no warn
+      import c._  // no warn
+      println(length)
+    }
+
+    {
+      import p1._ // no warn
+      import c._  // no warn
+      val x: Tree = null
+      println(x)
+    }
+
+    {
+      import p1.D // no warn
+      val x: D = null
+      println(x)
+    }
+  }
+
+  trait Warn {
+    {
+      import p1.A // warn
+      println(123)
+    }
+
+    {
+      import p1.{ A, B } // warn on A
+      println("abc".bippy)
+    }
+
+    {
+      import p1.{ A, B } //warn // warn on both
+      println(123)
+    }
+
+    {
+      import p1._ // no warn (technically this could warn, but not worth the effort to unroll unusedness transitively)
+      import c._  // warn
+      println(123)
+    }
+
+    {
+      import p1._ // warn
+      println(123)
+    }
+
+    {
+      class Tree
+      import p1._ // no warn
+      import c._  // warn
+      val x: Tree = null
+      println(x)
+    }
+
+    {
+      import p1.c._  // warn
+      println(123)
+    }
+  }
+
+  trait Nested {
+    {
+      import p1._   // warn
+      trait Warn {
+        import p2.*
+        println(new A)
+        println("abc".bippy)
+      }
+      println("")
+    }
+
+    {
+      import p1._   // no warn
+      trait NoWarn {
+        import p2.B  // no warn
+        println("abc".bippy)
+        println(new A)
+      }
+      println(new NoWarn { })
+    }
+
+    {
+      import p1.A   // warn
+      trait Warn {
+        import p2.A
+        println(new A)
+      }
+      println(new Warn { })
+    }
+  }
+end ancient

From a44ebae53098f3da5cbb487ec201834e03f0d915 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sat, 15 Mar 2025 13:25:19 -0700
Subject: [PATCH 216/505] Move untried tests to tried and true

---
 tests/neg/type-params.check                   | 103 ++++++++++++++++++
 tests/neg/type-params.scala                   |  45 ++++++++
 tests/untried/neg/class-of-double-targs.check |   4 -
 tests/untried/neg/class-of-double-targs.scala |   3 -
 tests/untried/neg/t0842.check                 |   4 -
 tests/untried/neg/t0842.scala                 |   1 -
 tests/untried/neg/t1701.check                 |   4 -
 tests/untried/neg/t1701.scala                 |   1 -
 tests/untried/neg/t278.check                  |  11 --
 tests/untried/neg/t278.scala                  |   6 -
 tests/untried/neg/t2918.check                 |  10 --
 tests/untried/neg/t2918.scala                 |   3 -
 tests/untried/neg/t5093.check                 |  10 --
 tests/untried/neg/t5093.scala                 |   3 -
 .../neg/t8219-any-any-ref-equals.check        |  10 --
 .../neg/t8219-any-any-ref-equals.scala        |   8 --
 tests/untried/neg/wellkinded_app.check        |   4 -
 tests/untried/neg/wellkinded_app.scala        |   4 -
 tests/untried/neg/wellkinded_app2.check       |   4 -
 tests/untried/neg/wellkinded_app2.scala       |   4 -
 tests/untried/neg/wellkinded_bounds.check     |   4 -
 tests/untried/neg/wellkinded_bounds.scala     |   3 -
 tests/untried/neg/wellkinded_wrongarity.check |   4 -
 tests/untried/neg/wellkinded_wrongarity.scala |   5 -
 .../untried/neg/wellkinded_wrongarity2.check  |  13 ---
 .../untried/neg/wellkinded_wrongarity2.scala  |  12 --
 26 files changed, 148 insertions(+), 135 deletions(-)
 create mode 100644 tests/neg/type-params.check
 create mode 100644 tests/neg/type-params.scala
 delete mode 100644 tests/untried/neg/class-of-double-targs.check
 delete mode 100644 tests/untried/neg/class-of-double-targs.scala
 delete mode 100644 tests/untried/neg/t0842.check
 delete mode 100644 tests/untried/neg/t0842.scala
 delete mode 100644 tests/untried/neg/t1701.check
 delete mode 100644 tests/untried/neg/t1701.scala
 delete mode 100644 tests/untried/neg/t278.check
 delete mode 100644 tests/untried/neg/t278.scala
 delete mode 100644 tests/untried/neg/t2918.check
 delete mode 100644 tests/untried/neg/t2918.scala
 delete mode 100644 tests/untried/neg/t5093.check
 delete mode 100644 tests/untried/neg/t5093.scala
 delete mode 100644 tests/untried/neg/t8219-any-any-ref-equals.check
 delete mode 100644 tests/untried/neg/t8219-any-any-ref-equals.scala
 delete mode 100644 tests/untried/neg/wellkinded_app.check
 delete mode 100644 tests/untried/neg/wellkinded_app.scala
 delete mode 100644 tests/untried/neg/wellkinded_app2.check
 delete mode 100644 tests/untried/neg/wellkinded_app2.scala
 delete mode 100644 tests/untried/neg/wellkinded_bounds.check
 delete mode 100644 tests/untried/neg/wellkinded_bounds.scala
 delete mode 100644 tests/untried/neg/wellkinded_wrongarity.check
 delete mode 100644 tests/untried/neg/wellkinded_wrongarity.scala
 delete mode 100644 tests/untried/neg/wellkinded_wrongarity2.check
 delete mode 100644 tests/untried/neg/wellkinded_wrongarity2.scala

diff --git a/tests/neg/type-params.check b/tests/neg/type-params.check
new file mode 100644
index 000000000000..e1eefb4c6fe9
--- /dev/null
+++ b/tests/neg/type-params.check
@@ -0,0 +1,103 @@
+-- [E053] Type Error: tests/neg/type-params.scala:14:13 ----------------------------------------------------------------
+14 |    type t = x[x] // error
+   |             ^^^^
+   |             x does not take type parameters
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E053] Type Error: tests/neg/type-params.scala:16:13 ----------------------------------------------------------------
+16 |    val foo: s[Int] // error
+   |             ^^^^^^
+   |             s does not take type parameters
+   |
+   | longer explanation available when compiling with `-explain`
+-- Error: tests/neg/type-params.scala:21:26 ----------------------------------------------------------------------------
+21 |  object mp extends Monad[Tuple2] // error
+   |                          ^^^^^^
+   |                          Type argument [T1, T2] =>> (T1, T2) does not have the same kind as its bound [x]
+-- Error: tests/neg/type-params.scala:24:26 ----------------------------------------------------------------------------
+24 |  trait ms1 extends Monad[String]        // error
+   |                          ^^^^^^
+   |                          Type argument String does not have the same kind as its bound [x]
+-- Error: tests/neg/type-params.scala:25:29 ----------------------------------------------------------------------------
+25 |  trait ms2[t] extends Monad[t]          // error
+   |                             ^
+   |                             Type argument t does not have the same kind as its bound [x]
+-- Error: tests/neg/type-params.scala:26:35 ----------------------------------------------------------------------------
+26 |  trait ms3[m[_], t] extends Monad[m[t]] // error -- added to check regression on bug
+   |                                   ^^^^
+   |                                   Type argument m[t] does not have the same kind as its bound [x]
+-- Error: tests/neg/type-params.scala:31:31 ----------------------------------------------------------------------------
+31 |  trait Bar2[m[_]] extends Foo[m] // error check that m is properly recognized as kind *->*, while * is expected
+   |                               ^
+   |                               Type argument m does not have the same kind as its bound 
+-- [E053] Type Error: tests/neg/type-params.scala:37:20 ----------------------------------------------------------------
+37 |class t1701 extends java.lang.Cloneable[String, Option, Int] // error
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                    Cloneable does not take type parameters
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E053] Type Error: tests/neg/type-params.scala:39:24 ----------------------------------------------------------------
+39 |trait t0842[T] { def m: this.type[T] = this } // error
+   |                        ^^^^^^^^^^^^
+   |                        (t0842.this : t0842[T]) does not take type parameters
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E134] Type Error: tests/neg/type-params.scala:45:10 ----------------------------------------------------------------
+45 |  println(a[A]) // error
+   |          ^
+   |          None of the overloaded alternatives of method apply in trait Function1 with types
+   |           (v1: t278.this.A): Unit
+   |           (): Unit
+   |          match type arguments [t278.this.A] and expected type Any
+-- [E120] Naming Error: tests/neg/type-params.scala:44:6 ---------------------------------------------------------------
+44 |  def a = (p: A) => () // error
+   |      ^
+   |      Double definition:
+   |      def a: () => Unit in trait t278 at line 43 and
+   |      def a: t278.this.A => Unit in trait t278 at line 44
+   |      have the same type after erasure.
+   |
+   |      Consider adding a @targetName annotation to one of the conflicting definitions
+   |      for disambiguation.
+-- Error: tests/neg/type-params.scala:4:7 ------------------------------------------------------------------------------
+4 |  "".==[Int] // error
+  |  ^^^^^^^^^^
+  |  method == in class Any does not take type parameters
+-- Error: tests/neg/type-params.scala:5:17 -----------------------------------------------------------------------------
+5 |  ("": AnyRef).==[Int] // error
+  |  ^^^^^^^^^^^^^^^^^^^^
+  |  method == in class Any does not take type parameters
+-- Error: tests/neg/type-params.scala:6:17 -----------------------------------------------------------------------------
+6 |  ("": Object).==[Int] // error
+  |  ^^^^^^^^^^^^^^^^^^^^
+  |  method == in class Any does not take type parameters
+-- Error: tests/neg/type-params.scala:9:14 -----------------------------------------------------------------------------
+9 |  classOf[Int][Int] // error
+  |  ^^^^^^^^^^^^^^^^^
+  |  illegal repeated type application
+  |  You might have meant something like:
+  |  classOf[Int, Int]
+-- [E140] Cyclic Error: tests/neg/type-params.scala:34:11 --------------------------------------------------------------
+34 |  def g[X, A[X] <: A[X]](x: A[X]) = x // error // error
+   |           ^
+   |           illegal cyclic type reference: upper bound ... of type A refers back to the type itself
+   |
+   |            Run with -explain-cyclic for more details.
+-- [E053] Type Error: tests/neg/type-params.scala:34:28 ----------------------------------------------------------------
+34 |  def g[X, A[X] <: A[X]](x: A[X]) = x // error // error
+   |                            ^^^^
+   |                            A does not take type parameters
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E140] Cyclic Error: tests/neg/type-params.scala:35:8 ---------------------------------------------------------------
+35 |  def f[C[X] <: C[X]](l: C[_]) = l.x // error // error
+   |        ^
+   |        illegal cyclic type reference: upper bound ... of type C refers back to the type itself
+   |
+   |         Run with -explain-cyclic for more details.
+-- [E053] Type Error: tests/neg/type-params.scala:35:25 ----------------------------------------------------------------
+35 |  def f[C[X] <: C[X]](l: C[_]) = l.x // error // error
+   |                         ^^^^
+   |                         C does not take type parameters
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/type-params.scala b/tests/neg/type-params.scala
new file mode 100644
index 000000000000..2803141f3b85
--- /dev/null
+++ b/tests/neg/type-params.scala
@@ -0,0 +1,45 @@
+
+def `t8219 Any == is not overloaded in error message`: Unit =
+  // Scala 2 once defined AnyRef == and Any == as overloaded. Spec defines only Any ==.
+  "".==[Int] // error
+  ("": AnyRef).==[Int] // error
+  ("": Object).==[Int] // error
+
+def `extra type arg to class literal` =
+  classOf[Int][Int] // error
+
+class `various ancient kindedness`:
+
+  class WellKinded[x]:
+    type t = x[x] // error
+  trait WellKindedBounded[s <: Throwable]:
+    val foo: s[Int] // error
+  class WellKindedWrongSyntax[s <: List] // must be s[x] <: List[x] ?
+
+  class Monad[m[x]]
+
+  object mp extends Monad[Tuple2] // error
+
+  // expecting types of kind *->*
+  trait ms1 extends Monad[String]        // error
+  trait ms2[t] extends Monad[t]          // error
+  trait ms3[m[_], t] extends Monad[m[t]] // error -- added to check regression on bug
+
+  // expecting types of kind *
+  trait Foo[x]
+  trait Bar1[m[_]] extends Foo[m[Int]] // check that m[Int] is properly recognized as kind-*
+  trait Bar2[m[_]] extends Foo[m] // error check that m is properly recognized as kind *->*, while * is expected
+
+def `t2918 t5093 detect cyclic error` =
+  def g[X, A[X] <: A[X]](x: A[X]) = x // error // error
+  def f[C[X] <: C[X]](l: C[_]) = l.x // error // error
+
+class t1701 extends java.lang.Cloneable[String, Option, Int] // error
+
+trait t0842[T] { def m: this.type[T] = this } // error
+
+trait t278:
+  class A
+  def a = () => ()
+  def a = (p: A) => () // error
+  println(a[A]) // error
diff --git a/tests/untried/neg/class-of-double-targs.check b/tests/untried/neg/class-of-double-targs.check
deleted file mode 100644
index f7e2094f9778..000000000000
--- a/tests/untried/neg/class-of-double-targs.check
+++ /dev/null
@@ -1,4 +0,0 @@
-class-of-double-targs.scala:2: error: expression of type Class[Int](classOf[scala.Int]) does not take type parameters.
-  classOf[Int][Int]
-              ^
-one error found
diff --git a/tests/untried/neg/class-of-double-targs.scala b/tests/untried/neg/class-of-double-targs.scala
deleted file mode 100644
index 26a2fa838136..000000000000
--- a/tests/untried/neg/class-of-double-targs.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object Test {
-  classOf[Int][Int]
-}
diff --git a/tests/untried/neg/t0842.check b/tests/untried/neg/t0842.check
deleted file mode 100644
index 3351aa1174ce..000000000000
--- a/tests/untried/neg/t0842.check
+++ /dev/null
@@ -1,4 +0,0 @@
-t0842.scala:1: error: A.this.type does not take type parameters
-trait A[T] { def m: this.type[T] = this }
-                        ^
-one error found
diff --git a/tests/untried/neg/t0842.scala b/tests/untried/neg/t0842.scala
deleted file mode 100644
index f32c2ba26d71..000000000000
--- a/tests/untried/neg/t0842.scala
+++ /dev/null
@@ -1 +0,0 @@
-trait A[T] { def m: this.type[T] = this }
diff --git a/tests/untried/neg/t1701.check b/tests/untried/neg/t1701.check
deleted file mode 100644
index d603e62e5a6a..000000000000
--- a/tests/untried/neg/t1701.check
+++ /dev/null
@@ -1,4 +0,0 @@
-t1701.scala:1: error: Cloneable does not take type parameters
-class A extends java.lang.Cloneable[String, Option, Int]
-                          ^
-one error found
diff --git a/tests/untried/neg/t1701.scala b/tests/untried/neg/t1701.scala
deleted file mode 100644
index 7cd6ff9953be..000000000000
--- a/tests/untried/neg/t1701.scala
+++ /dev/null
@@ -1 +0,0 @@
-class A extends java.lang.Cloneable[String, Option, Int]
diff --git a/tests/untried/neg/t278.check b/tests/untried/neg/t278.check
deleted file mode 100644
index 405f7d225c17..000000000000
--- a/tests/untried/neg/t278.check
+++ /dev/null
@@ -1,11 +0,0 @@
-t278.scala:5: error: overloaded method value a with alternatives:
-  => C.this.A => Unit <and>
-  => () => Unit
- does not take type parameters
-  println(a[A])
-          ^
-t278.scala:4: error: method a is defined twice
-  conflicting symbols both originated in file 't278.scala'
-  def a = (p:A) => ()
-      ^
-two errors found
diff --git a/tests/untried/neg/t278.scala b/tests/untried/neg/t278.scala
deleted file mode 100644
index 39a711bb0985..000000000000
--- a/tests/untried/neg/t278.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-class C {
-  class A
-  def a = () => ()
-  def a = (p:A) => ()
-  println(a[A])
-}
diff --git a/tests/untried/neg/t2918.check b/tests/untried/neg/t2918.check
deleted file mode 100644
index aae3045e8af7..000000000000
--- a/tests/untried/neg/t2918.check
+++ /dev/null
@@ -1,10 +0,0 @@
-t2918.scala:2: error: illegal cyclic reference involving type A
-  def g[X, A[X] <: A[X]](x: A[X]) = x
-                                    ^
-t2918.scala:2: error: cyclic aliasing or subtyping involving type A
-  def g[X, A[X] <: A[X]](x: A[X]) = x
-           ^
-t2918.scala:2: error: A does not take type parameters
-  def g[X, A[X] <: A[X]](x: A[X]) = x
-                            ^
-three errors found
diff --git a/tests/untried/neg/t2918.scala b/tests/untried/neg/t2918.scala
deleted file mode 100644
index ff2be39ae0c4..000000000000
--- a/tests/untried/neg/t2918.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object Test {
-  def g[X, A[X] <: A[X]](x: A[X]) = x
-}
diff --git a/tests/untried/neg/t5093.check b/tests/untried/neg/t5093.check
deleted file mode 100644
index daba46001153..000000000000
--- a/tests/untried/neg/t5093.check
+++ /dev/null
@@ -1,10 +0,0 @@
-t5093.scala:2: error: illegal cyclic reference involving type C
-  def f[C[X] <: C[X]](l: C[_]) = l.x
-                                 ^
-t5093.scala:2: error: cyclic aliasing or subtyping involving type C
-  def f[C[X] <: C[X]](l: C[_]) = l.x
-        ^
-t5093.scala:2: error: C does not take type parameters
-  def f[C[X] <: C[X]](l: C[_]) = l.x
-                         ^
-three errors found
diff --git a/tests/untried/neg/t5093.scala b/tests/untried/neg/t5093.scala
deleted file mode 100644
index 9cde364dee4c..000000000000
--- a/tests/untried/neg/t5093.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class T {
-  def f[C[X] <: C[X]](l: C[_]) = l.x
-}
diff --git a/tests/untried/neg/t8219-any-any-ref-equals.check b/tests/untried/neg/t8219-any-any-ref-equals.check
deleted file mode 100644
index 95d2536fba06..000000000000
--- a/tests/untried/neg/t8219-any-any-ref-equals.check
+++ /dev/null
@@ -1,10 +0,0 @@
-t8219-any-any-ref-equals.scala:5: error: method ==: (x$1: Any)Boolean does not take type parameters.
-  "".==[Int]
-       ^
-t8219-any-any-ref-equals.scala:6: error: method ==: (x$1: Any)Boolean does not take type parameters.
-  ("": AnyRef).==[Int]
-                 ^
-t8219-any-any-ref-equals.scala:7: error: method ==: (x$1: Any)Boolean does not take type parameters.
-  ("": Object).==[Int]
-                 ^
-three errors found
diff --git a/tests/untried/neg/t8219-any-any-ref-equals.scala b/tests/untried/neg/t8219-any-any-ref-equals.scala
deleted file mode 100644
index f1b81fa734c1..000000000000
--- a/tests/untried/neg/t8219-any-any-ref-equals.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object Test {
-  // The error message tells us that AnyRef#== and Any#== are overloaded.
-  // A real class couldn't define such an overload, why do we allow AnyRef
-  // to do so?
-  "".==[Int]
-  ("": AnyRef).==[Int]
-  ("": Object).==[Int]
-}
diff --git a/tests/untried/neg/wellkinded_app.check b/tests/untried/neg/wellkinded_app.check
deleted file mode 100644
index d57a0e4b5648..000000000000
--- a/tests/untried/neg/wellkinded_app.check
+++ /dev/null
@@ -1,4 +0,0 @@
-wellkinded_app.scala:3: error: x does not take type parameters
-  type t = x[x]
-           ^
-one error found
diff --git a/tests/untried/neg/wellkinded_app.scala b/tests/untried/neg/wellkinded_app.scala
deleted file mode 100644
index 7fa3f95a9848..000000000000
--- a/tests/untried/neg/wellkinded_app.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-// test well-kindedness checks
-class WellKinded[x] {
-  type t = x[x]
-}
diff --git a/tests/untried/neg/wellkinded_app2.check b/tests/untried/neg/wellkinded_app2.check
deleted file mode 100644
index 20a177ea590e..000000000000
--- a/tests/untried/neg/wellkinded_app2.check
+++ /dev/null
@@ -1,4 +0,0 @@
-wellkinded_app2.scala:3: error: s does not take type parameters
-      val foo: s[Int]
-               ^
-one error found
diff --git a/tests/untried/neg/wellkinded_app2.scala b/tests/untried/neg/wellkinded_app2.scala
deleted file mode 100644
index 7bb4c87f6b17..000000000000
--- a/tests/untried/neg/wellkinded_app2.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-// test well-kindedness checks
-class WellKinded[s <: Throwable] {
-      val foo: s[Int]
-}
diff --git a/tests/untried/neg/wellkinded_bounds.check b/tests/untried/neg/wellkinded_bounds.check
deleted file mode 100644
index 806eb09a76d7..000000000000
--- a/tests/untried/neg/wellkinded_bounds.check
+++ /dev/null
@@ -1,4 +0,0 @@
-wellkinded_bounds.scala:2: error: type List takes type parameters
-class WellKindedWrongSyntax[s <: List] { // must be s[x] <: List[x]
-                                 ^
-one error found
diff --git a/tests/untried/neg/wellkinded_bounds.scala b/tests/untried/neg/wellkinded_bounds.scala
deleted file mode 100644
index cfa5e74c115f..000000000000
--- a/tests/untried/neg/wellkinded_bounds.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-// test well-kindedness checks -- syntax error
-class WellKindedWrongSyntax[s <: List] { // must be s[x] <: List[x]
-}
diff --git a/tests/untried/neg/wellkinded_wrongarity.check b/tests/untried/neg/wellkinded_wrongarity.check
deleted file mode 100644
index b9f033b4536b..000000000000
--- a/tests/untried/neg/wellkinded_wrongarity.check
+++ /dev/null
@@ -1,4 +0,0 @@
-wellkinded_wrongarity.scala:5: error: Tuple2 takes two type parameters, expected: one
-object mp extends Monad[Tuple2]
-                        ^
-one error found
diff --git a/tests/untried/neg/wellkinded_wrongarity.scala b/tests/untried/neg/wellkinded_wrongarity.scala
deleted file mode 100644
index 39c7601d53a3..000000000000
--- a/tests/untried/neg/wellkinded_wrongarity.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-// test well-kindedness checks -- arity error
-
-class Monad[m[x]]
-
-object mp extends Monad[Tuple2]
diff --git a/tests/untried/neg/wellkinded_wrongarity2.check b/tests/untried/neg/wellkinded_wrongarity2.check
deleted file mode 100644
index 922f73381e29..000000000000
--- a/tests/untried/neg/wellkinded_wrongarity2.check
+++ /dev/null
@@ -1,13 +0,0 @@
-wellkinded_wrongarity2.scala:5: error: String takes no type parameters, expected: one
-trait ms1 extends Monad[String]        // wrong
-                        ^
-wellkinded_wrongarity2.scala:6: error: t takes no type parameters, expected: one
-trait ms2[t] extends Monad[t]          // wrong
-                           ^
-wellkinded_wrongarity2.scala:7: error: m[t] takes no type parameters, expected: one
-trait ms3[m[_], t] extends Monad[m[t]] // wrong -- added to check regression on bug
-                                 ^
-wellkinded_wrongarity2.scala:12: error: type m takes type parameters
-trait Bar2[m[_]] extends Foo[m] // check that m is properly recognized as kind *->*, while * is expected
-                             ^
-four errors found
diff --git a/tests/untried/neg/wellkinded_wrongarity2.scala b/tests/untried/neg/wellkinded_wrongarity2.scala
deleted file mode 100644
index aac617bd8770..000000000000
--- a/tests/untried/neg/wellkinded_wrongarity2.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-// test well-kindedness checks
-
-// expecting types of kind *->*
-class Monad[m[x]]
-trait ms1 extends Monad[String]        // wrong
-trait ms2[t] extends Monad[t]          // wrong
-trait ms3[m[_], t] extends Monad[m[t]] // wrong -- added to check regression on bug
-
-// expecting types of kind *
-trait Foo[x]
-trait Bar1[m[_]] extends Foo[m[Int]] // check that m[Int] is properly recognized as kind-*
-trait Bar2[m[_]] extends Foo[m] // check that m is properly recognized as kind *->*, while * is expected

From 97176d3aa555754cf5c805d175a5ecc7c6eefd33 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 12:53:22 +0200
Subject: [PATCH 217/505] Move untried tests to tried and true

[Cherry-picked a8a971101ce035209ddfe191e43709faf717cfa7][modified]

From e3543a846cc2a31b397b147e50adeff44a5664ab Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sat, 15 Mar 2025 11:05:45 -0700
Subject: [PATCH 218/505] Revert unconditional lint of Inlined

[Cherry-picked 0b3e859b4058e2b05d333377bb0fe2aa3a7a28cf]
---
 compiler/src/dotty/tools/dotc/transform/CheckUnused.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 4d071618ac71..acaf615d4c43 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -145,9 +145,10 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     refInfos.inlined.push(tree.call.srcPos)
     ctx
   override def transformInlined(tree: Inlined)(using Context): tree.type =
-    transformAllDeep(tree.expansion) // traverse expansion with nonempty inlined stack to avoid registering defs
+    //transformAllDeep(tree.expansion) // traverse expansion with nonempty inlined stack to avoid registering defs
     val _ = refInfos.inlined.pop()
-    transformAllDeep(tree.call)
+    if !tree.call.isEmpty && phaseMode.eq(PhaseMode.Aggregate) then
+      transformAllDeep(tree.call)
     tree
 
   override def prepareForBind(tree: Bind)(using Context): Context =

From def6fb62e6ed0efca7c5ebfd104e7e6330399e80 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Fri, 28 Mar 2025 08:49:02 +0100
Subject: [PATCH 219/505] bugfix: Fix issues with annotations not detected
 (#22878)

[Cherry-picked d519790da2041ffab419749c0c49588bbb71db26]
---
 .../src/main/dotty/tools/pc/PcCollector.scala  |  6 +++---
 .../pc/tests/tokens/SemanticTokensSuite.scala  | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
index f3fd7c8738d5..d145272ba01d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
@@ -160,7 +160,7 @@ trait PcCollector[T]:
           def collectEndMarker =
             EndMarker.getPosition(df, pos, sourceText).map:
               collect(EndMarker(df.symbol), _)
-          val annots = collectTrees(df.mods.annotations)
+          val annots = collectTrees(df.symbol.annotations.map(_.tree))
           val traverser =
             new PcCollector.DeepFolderWithParent[Set[T]](
               collectNamesWithParent
@@ -215,8 +215,8 @@ trait PcCollector[T]:
          * @<<JsonNotification>>("")
          * def params() = ???
          */
-        case mdf: MemberDef if mdf.mods.annotations.nonEmpty =>
-          val trees = collectTrees(mdf.mods.annotations)
+        case mdf: MemberDef if mdf.symbol.annotations.nonEmpty =>
+          val trees = collectTrees(mdf.symbol.annotations.map(_.tree))
           val traverser =
             new PcCollector.DeepFolderWithParent[Set[T]](
               collectNamesWithParent
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
index 9f8d82020806..aebdf7f6c04e 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
@@ -36,6 +36,24 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite:
           |""".stripMargin
     )
 
+  @Test def `metals-6823` =
+      check(
+        s"""|package <<example>>/*namespace*/
+            |
+            | @<<main>>/*class*/ def <<main1>>/*method,definition*/(): <<Unit>>/*class,abstract*/ =
+            |     val <<array>>/*variable,definition,readonly*/ = <<Array>>/*class*/(1, 2, 3)
+            |     <<println>>/*method*/(<<array>>/*variable,readonly*/)
+            |
+            |@<<main>>/*class*/ def <<main2>>/*method,definition*/(): <<Unit>>/*class,abstract*/ =
+            |   val <<list>>/*variable,definition,readonly*/ = <<List>>/*class*/(1, 2, 3)
+            |   <<println>>/*method*/(<<list>>/*variable,readonly*/)
+            |
+            |@<<main>>/*class*/ def <<main3>>/*method,definition*/(): <<Unit>>/*class,abstract*/ =
+            |   val <<list>>/*variable,definition,readonly*/ = <<List>>/*class*/(1, 2, 3)
+            |   <<println>>/*method*/(<<list>>/*variable,readonly*/)
+            |""".stripMargin
+      )
+
   @Test def `Comment(Single-Line, Multi-Line)` =
     check(
       s"""|package <<example>>/*namespace*/

From b1fb18be68222e97a1045898d506467da684f278 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 13 Mar 2025 09:26:10 -0700
Subject: [PATCH 220/505] Dealias when looking into imports

[Cherry-picked 77194018cc419c660babd0d8733aa5de3e42c331]
---
 .../tools/dotc/transform/CheckUnused.scala    |  4 +++-
 tests/warn/i22787.scala                       | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/warn/i22787.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index acaf615d4c43..0e4c1cda5b42 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -283,7 +283,9 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
 
     def matchingSelector(info: ImportInfo): ImportSelector | Null =
       val qtpe = info.site
-      def hasAltMember(nm: Name) = qtpe.member(nm).hasAltWith(_.symbol == sym)
+      def hasAltMember(nm: Name) = qtpe.member(nm).hasAltWith: alt =>
+           alt.symbol == sym
+        || nm.isTypeName && alt.symbol.isAliasType && alt.info.dealias.typeSymbol == sym
       def loop(sels: List[ImportSelector]): ImportSelector | Null = sels match
         case sel :: sels =>
           val matches =
diff --git a/tests/warn/i22787.scala b/tests/warn/i22787.scala
new file mode 100644
index 000000000000..2d01f12c5f12
--- /dev/null
+++ b/tests/warn/i22787.scala
@@ -0,0 +1,19 @@
+//> using options -Wunused:imports -Werror
+
+object tpd:
+  type Block = Trees.Block
+
+object Trees:
+  abstract case class Block(x: Int)
+  private object Block
+  val block = new Block(42) {}
+
+def f(x: Any) =
+  import tpd.Block
+  //import Trees.Block
+  x match
+  case Block(_) => "yes"
+  case _ => "no"
+
+@main def test = println:
+  f(Trees.block)

From 7c90bb25fea12f6869eb7f2b3bae75c10fd0ac5e Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Mon, 31 Mar 2025 19:50:37 +0000
Subject: [PATCH 221/505] Approximate annotated types in `wildApprox`

[Cherry-picked 4cdeb81184d74a9b3c2d6d728c054e87b842898c]
---
 compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala | 9 +++++++++
 tests/pos/annot-default-arg-22874.scala              | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/pos/annot-default-arg-22874.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
index 89a2cbbfbc21..db2faa2b28fd 100644
--- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -950,6 +950,15 @@ object ProtoTypes {
         paramInfos = tl.paramInfos.mapConserve(wildApprox(_, theMap, seen, internal1).bounds),
         resType = wildApprox(tl.resType, theMap, seen, internal1)
       )
+    case tp @ AnnotatedType(parent, _) =>
+      // This case avoids approximating types in the annotation tree, which can
+      // cause the type assigner to fail.
+      // See #22893 and tests/pos/annot-default-arg-22874.scala.
+      val parentApprox = wildApprox(parent, theMap, seen, internal)
+      if tp.isRefining then
+        WildcardType(TypeBounds.upper(parentApprox))
+      else
+        parentApprox
     case _ =>
       (if (theMap != null && seen.eq(theMap.seen)) theMap else new WildApproxMap(seen, internal))
         .mapOver(tp)
diff --git a/tests/pos/annot-default-arg-22874.scala b/tests/pos/annot-default-arg-22874.scala
new file mode 100644
index 000000000000..7a983f4d3351
--- /dev/null
+++ b/tests/pos/annot-default-arg-22874.scala
@@ -0,0 +1,7 @@
+package defaultArgBug
+
+class staticAnnot(arg: Int) extends scala.annotation.StaticAnnotation
+class refiningAnnot(arg: Int) extends scala.annotation.RefiningAnnotation
+
+def f1(a: Int, b: Int @staticAnnot(a + a) = 42): Int = b
+def f2(a: Int, b: Int @refiningAnnot(a + a) = 42): Int = b

From 1f9f1a041723cccba9568fe683a0a3a4a823908a Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 17 Mar 2025 13:43:12 -0700
Subject: [PATCH 222/505] Extension check checks for no parens not empty parens

[Cherry-picked d0e90629571a856789f4a210fd96c9d82c5adb98]
---
 .../dotty/tools/dotc/typer/RefChecks.scala    | 40 ++++----
 tests/warn/i16743.check                       | 91 -------------------
 tests/warn/i16743.scala                       |  2 +
 3 files changed, 25 insertions(+), 108 deletions(-)
 delete mode 100644 tests/warn/i16743.check

diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
index 3393378617d6..bcf92eb2721f 100644
--- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
@@ -1043,8 +1043,8 @@ object RefChecks {
    *  This check is suppressed if the method is an override. (Because the type of the receiver
    *  may be narrower in the override.)
    *
-   *  If the extension method is nullary, it is always hidden by a member of the same name.
-   *  (Either the member is nullary, or the reference is taken as the eta-expansion of the member.)
+   *  If the extension method is nilary, it is always hidden by a member of the same name.
+   *  (Either the member is nilary, or the reference is taken as the eta-expansion of the member.)
    *
    *  This check is in lieu of a more expensive use-site check that an application failed to use an extension.
    *  That check would account for accessibility and opacity. As a limitation, this check considers
@@ -1068,25 +1068,29 @@ object RefChecks {
       extension (tp: Type)
         def explicit = Applications.stripImplicit(tp.stripPoly, wildcardOnly = true)
         def hasImplicitParams = tp.stripPoly match { case mt: MethodType => mt.isImplicitMethod case _ => false }
+        def isNilary = tp.stripPoly match { case mt: MethodType => false case _ => true }
       val explicitInfo = sym.info.explicit // consider explicit value params
-      val target0 = explicitInfo.firstParamTypes.head // required for extension method, the putative receiver
-      val target = target0.dealiasKeepOpaques.typeSymbol.info
-      val methTp = explicitInfo.resultType // skip leading implicits and the "receiver" parameter
-      def memberMatchesMethod(member: Denotation) =
+      def memberHidesMethod(member: Denotation): Boolean =
+        val methTp = explicitInfo.resultType // skip leading implicits and the "receiver" parameter
+        if methTp.isNilary then
+          return true // extension without parens is always hidden by a member of same name
         val memberIsImplicit = member.info.hasImplicitParams
-        val paramTps =
-          if memberIsImplicit then methTp.stripPoly.firstParamTypes
-          else methTp.explicit.firstParamTypes
         inline def paramsCorrespond =
+          val paramTps =
+            if memberIsImplicit then methTp.stripPoly.firstParamTypes
+            else methTp.explicit.firstParamTypes
           val memberParamTps = member.info.stripPoly.firstParamTypes
           memberParamTps.corresponds(paramTps): (m, x) =>
             m.typeSymbol.denot.isOpaqueAlias == x.typeSymbol.denot.isOpaqueAlias && (x frozen_<:< m)
-        paramTps.isEmpty || memberIsImplicit && !methTp.hasImplicitParams || paramsCorrespond
-      def hidden =
-        target.nonPrivateMember(sym.name)
-        .filterWithPredicate: member =>
-          member.symbol.isPublic && memberMatchesMethod(member)
-        .exists
+        memberIsImplicit && !methTp.hasImplicitParams || paramsCorrespond
+      def targetOfHiddenExtension: Symbol =
+        val target =
+          val target0 = explicitInfo.firstParamTypes.head // required for extension method, the putative receiver
+          target0.dealiasKeepOpaques.typeSymbol.info
+        val member = target.nonPrivateMember(sym.name)
+          .filterWithPredicate: member =>
+            member.symbol.isPublic && memberHidesMethod(member)
+        if member.exists then target.typeSymbol else NoSymbol
       if sym.is(HasDefaultParams) then
         val getterDenot =
           val receiverName = explicitInfo.firstParamNames.head
@@ -1095,8 +1099,10 @@ object RefChecks {
           sym.owner.info.member(getterName)
         if getterDenot.exists
         then report.warning(ExtensionHasDefault(sym), getterDenot.symbol.srcPos)
-      if !sym.nextOverriddenSymbol.exists && hidden
-      then report.warning(ExtensionNullifiedByMember(sym, target.typeSymbol), sym.srcPos)
+      if !sym.nextOverriddenSymbol.exists then
+        val target = targetOfHiddenExtension
+        if target.exists then
+          report.warning(ExtensionNullifiedByMember(sym, target), sym.srcPos)
   end checkExtensionMethods
 
   /** Verify that references in the user-defined `@implicitNotFound` message are valid.
diff --git a/tests/warn/i16743.check b/tests/warn/i16743.check
deleted file mode 100644
index 9fdf80e71f2b..000000000000
--- a/tests/warn/i16743.check
+++ /dev/null
@@ -1,91 +0,0 @@
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:90:8 --------------------------------------------------------
-90 |    def length() = 42 // warn This extension method will be shadowed by .length() on String.
-   |        ^
-   |        Extension method length will never be selected from type String
-   |        because String already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:30:6 --------------------------------------------------------
-30 |  def t = 27 // warn
-   |      ^
-   |      Extension method t will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:32:6 --------------------------------------------------------
-32 |  def g(x: String)(i: Int): String = x*i // warn
-   |      ^
-   |      Extension method g will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:33:6 --------------------------------------------------------
-33 |  def h(x: String): String = x // warn
-   |      ^
-   |      Extension method h will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:35:6 --------------------------------------------------------
-35 |  def j(x: Any, y: Int): String = (x.toString)*y // warn
-   |      ^
-   |      Extension method j will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:36:6 --------------------------------------------------------
-36 |  def k(x: String): String = x // warn
-   |      ^
-   |      Extension method k will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:38:6 --------------------------------------------------------
-38 |  def m(using String): String = "m" + summon[String] // warn
-   |      ^
-   |      Extension method m will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:39:6 --------------------------------------------------------
-39 |  def n(using String): String = "n" + summon[String] // warn
-   |      ^
-   |      Extension method n will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:40:6 --------------------------------------------------------
-40 |  def o: String = "42" // warn
-   |      ^
-   |      Extension method o will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:41:6 --------------------------------------------------------
-41 |  def u: Int = 27 // warn
-   |      ^
-   |      Extension method u will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:44:6 --------------------------------------------------------
-44 |  def at: Int = 42 // warn
-   |      ^
-   |      Extension method at will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:46:6 --------------------------------------------------------
-46 |  def x(using String)(n: Int): Int = summon[String].toInt + n // warn
-   |      ^
-   |      Extension method x will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E194] Potential Issue Warning: tests/warn/i16743.scala:47:6 --------------------------------------------------------
-47 |  def y(using String)(s: String): String = s + summon[String] // warn
-   |      ^
-   |      Extension method y will never be selected from type T
-   |      because T already has a member with the same name and compatible parameter types.
-   |
-   | longer explanation available when compiling with `-explain`
diff --git a/tests/warn/i16743.scala b/tests/warn/i16743.scala
index 213e22ff4cb4..cca0ecbce90e 100644
--- a/tests/warn/i16743.scala
+++ b/tests/warn/i16743.scala
@@ -25,6 +25,7 @@ trait T:
   def x(n: Int): Int = 42 + n
   def y(n: Int): Int = u + n
   def y(s: String): String = s + u
+  def z(s: String): String = s + m
 
 extension (_t: T)
   def t = 27 // warn
@@ -45,6 +46,7 @@ extension (_t: T)
   def w(using String)(n: String): Int = (summon[String] + n).toInt
   def x(using String)(n: Int): Int = summon[String].toInt + n // warn
   def y(using String)(s: String): String = s + summon[String] // warn
+  def z(): String = "extension"
 
 // deferred extension is defined in subclass
 trait Foo:

From 5f2ce763ec9377015c85e4df788b8710c7a720aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Rochala?=
 <48657087+rochala@users.noreply.github.com>
Date: Wed, 2 Apr 2025 12:10:28 +0200
Subject: [PATCH 223/505] Update getting started docs. (#22905)

Getting started now includes correct commands used to setup working on
bootstrapped projects
[Cherry-picked 4a0803070ef9e6a20e66d06743bb93154173d2f2]
---
 docs/_docs/contributing/setting-up-your-ide.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/contributing/setting-up-your-ide.md b/docs/_docs/contributing/setting-up-your-ide.md
index 3779ce1c3403..690b42a37a51 100644
--- a/docs/_docs/contributing/setting-up-your-ide.md
+++ b/docs/_docs/contributing/setting-up-your-ide.md
@@ -42,7 +42,15 @@ want to make sure you do two things:
 +    val enableBspAllProjects = true,
 ```
 
-2. Run `sbt publishLocal` to get the needed presentation compiler jars.
+2. Run in sbt shell `sbt> scala3-bootstrapped/compile` and then `sbt> scala3-bootstrapped/publishLocalBin`
+   to get the required presentation compiler jars.
+
+   If any step fails due to random errors, try removing `./out/` directory and running `sbt> clean`
+
+   This step has to be repeated every time compiler version has been bumped.
+
+
+
 
 By default Metals uses Bloop build server, however you can also use sbt
 directly. You can achieve this with the `Metals: Switch Build Server` command

From 3873ab0b5d048663124facdb5cd40c122c5c8000 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 12:57:12 +0200
Subject: [PATCH 224/505] bugfix: Add error showing up in LTS

---
 tests/neg/type-params.check | 4 ++++
 tests/neg/type-params.scala | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/neg/type-params.check b/tests/neg/type-params.check
index e1eefb4c6fe9..3b052f3556e0 100644
--- a/tests/neg/type-params.check
+++ b/tests/neg/type-params.check
@@ -10,6 +10,10 @@
    |             s does not take type parameters
    |
    | longer explanation available when compiling with `-explain`
+-- Error: tests/neg/type-params.scala:17:35 ----------------------------------------------------------------------------
+17 |  class WellKindedWrongSyntax[s <: List] // error
+   |                                   ^^^^
+   |                                   type List takes type parameters
 -- Error: tests/neg/type-params.scala:21:26 ----------------------------------------------------------------------------
 21 |  object mp extends Monad[Tuple2] // error
    |                          ^^^^^^
diff --git a/tests/neg/type-params.scala b/tests/neg/type-params.scala
index 2803141f3b85..3a5279868405 100644
--- a/tests/neg/type-params.scala
+++ b/tests/neg/type-params.scala
@@ -14,7 +14,7 @@ class `various ancient kindedness`:
     type t = x[x] // error
   trait WellKindedBounded[s <: Throwable]:
     val foo: s[Int] // error
-  class WellKindedWrongSyntax[s <: List] // must be s[x] <: List[x] ?
+  class WellKindedWrongSyntax[s <: List] // error
 
   class Monad[m[x]]
 

From 0b6f9d24c50eee5036114d924fcf86eb31da075f Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Mon, 24 Mar 2025 11:15:00 +0100
Subject: [PATCH 225/505] Mix in the `productPrefix` hash statically in case
 class `hashCode`

Since 2.13, case class `hashCode` mixes in the hash code of the
`productPrefix` string. This is inconsistent with the `equals` method,
subclasses of case classes that override `productPrefix` compare
equal but have a different `hashCode`.

This commit changes `hashCode` to mix in the `productPrefix.hashCode`
statically instead of invoking `productPrefix` at runtime.

For case classes without primitive fields, the synthetic `hashCode`
invokes `ScalaRunTime._hashCode`, which mixes in the result of
`productPrefix`. To fix that, the synthetic hashCode is changed
to invoke `MurmurHash3.productHash` directly and mix in the name
to the seed statically.
---
 .../dotty/tools/dotc/core/Definitions.scala   |  3 +
 .../dotc/transform/SyntheticMembers.scala     | 60 ++++++++--------
 tests/run-macros/tasty-extractors-2.check     |  2 +-
 tests/run/t13033.scala                        | 69 +++++++++++++++++++
 4 files changed, 102 insertions(+), 32 deletions(-)
 create mode 100644 tests/run/t13033.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
index da57315e15ff..623d9e8c77ca 100644
--- a/compiler/src/dotty/tools/dotc/core/Definitions.scala
+++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -496,6 +496,9 @@ class Definitions {
     @tu lazy val ScalaRuntime_toArray: Symbol = ScalaRuntimeModule.requiredMethod(nme.toArray)
     @tu lazy val ScalaRuntime_toObjectArray: Symbol = ScalaRuntimeModule.requiredMethod(nme.toObjectArray)
 
+  @tu lazy val MurmurHash3Module: Symbol = requiredModule("scala.util.hashing.MurmurHash3")
+    @tu lazy val MurmurHash3_productHash = MurmurHash3Module.info.member(termName("productHash")).suchThat(_.info.firstParamTypes.size == 3).symbol
+
   @tu lazy val BoxesRunTimeModule: Symbol = requiredModule("scala.runtime.BoxesRunTime")
     @tu lazy val BoxesRunTimeModule_externalEquals: Symbol = BoxesRunTimeModule.info.decl(nme.equals_).suchThat(toDenot(_).info.firstParamTypes.size == 2).symbol
   @tu lazy val ScalaStaticsModule: Symbol = requiredModule("scala.runtime.Statics")
diff --git a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
index 70f82434a5a6..28399ceb727c 100644
--- a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
@@ -15,6 +15,7 @@ import util.Property
 import util.Spans.Span
 import config.Printers.derive
 import NullOpsDecorator.*
+import scala.runtime.Statics
 
 object SyntheticMembers {
 
@@ -95,6 +96,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
     val isSimpleEnumValue = isEnumValue && !clazz.owner.isAllOf(EnumCase)
     val isJavaEnumValue = isEnumValue && clazz.derivesFrom(defn.JavaEnumClass)
     val isNonJavaEnumValue = isEnumValue && !isJavaEnumValue
+    val ownName = clazz.name.stripModuleClassSuffix.toString
 
     val symbolsToSynthesize: List[Symbol] =
       if clazz.is(Case) then
@@ -118,8 +120,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
       def forwardToRuntime(vrefs: List[Tree]): Tree =
         ref(defn.runtimeMethodRef("_" + sym.name.toString)).appliedToTermArgs(This(clazz) :: vrefs)
 
-      def ownName: Tree =
-        Literal(Constant(clazz.name.stripModuleClassSuffix.toString))
+      def ownNameLit: Tree = Literal(Constant(ownName))
 
       def nameRef: Tree =
         if isJavaEnumValue then
@@ -146,7 +147,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
           Literal(Constant(candidate.get))
 
       def toStringBody(vrefss: List[List[Tree]]): Tree =
-        if (clazz.is(ModuleClass)) ownName
+        if (clazz.is(ModuleClass)) ownNameLit
         else if (isNonJavaEnumValue) identifierRef
         else forwardToRuntime(vrefss.head)
 
@@ -159,7 +160,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
         case nme.ordinal => ordinalRef
         case nme.productArity => Literal(Constant(accessors.length))
         case nme.productPrefix if isEnumValue => nameRef
-        case nme.productPrefix => ownName
+        case nme.productPrefix => ownNameLit
         case nme.productElement => productElementBody(accessors.length, vrefss.head.head)
         case nme.productElementName => productElementNameBody(accessors.length, vrefss.head.head)
       }
@@ -300,39 +301,36 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
       ref(accessors.head).select(nme.hashCode_).ensureApplied
     }
 
-    /** The class
-     *
-     *  ```
-     *  case object C
-     *  ```
-     *
-     *  gets the `hashCode` method:
-     *
-     *  ```
-     *  def hashCode: Int = "C".hashCode // constant folded
-     *  ```
-     *
-     *  The class
-     *
-     *  ```
-     *  case class C(x: T, y: U)
-     *  ```
+    /**
+     * A `case object C` or a `case class C()` without parameters gets the `hashCode` method
+     * ```
+     *    def hashCode: Int = "C".hashCode // constant folded
+     * ```
      *
-     *  if none of `T` or `U` are primitive types, gets the `hashCode` method:
+     * Otherwise, if none of the parameters are primitive types:
+     * ```
+     *   def hashCode: Int = MurmurHash3.productHash(
+     *      this,
+     *      Statics.mix(0xcafebabe, "C".hashCode), // constant folded
+     *      ignorePrefix = true)
+     * ```
      *
-     *  ```
-     *  def hashCode: Int = ScalaRunTime._hashCode(this)
-     *  ```
+     * The implementation used to invoke `ScalaRunTime._hashCode`, but that implementation mixes in the result
+     * of `productPrefix`, which causes scala/bug#13033. By setting `ignorePrefix = true` and mixing in the case
+     * name into the seed, the bug can be fixed and the generated code works with the unchanged Scala library.
      *
-     *  else if either `T` or `U` are primitive, gets the `hashCode` method implemented by [[caseHashCodeBody]]
+     * For case classes with primitive paramters, see [[caseHashCodeBody]].
      */
     def chooseHashcode(using Context) =
-      if (clazz.is(ModuleClass))
-        Literal(Constant(clazz.name.stripModuleClassSuffix.toString.hashCode))
+      if (accessors.isEmpty) Literal(Constant(ownName.hashCode))
       else if (accessors.exists(_.info.finalResultType.classSymbol.isPrimitiveValueClass))
         caseHashCodeBody
       else
-        ref(defn.ScalaRuntime__hashCode).appliedTo(This(clazz))
+        ref(defn.MurmurHash3Module).select(defn.MurmurHash3_productHash).appliedTo(
+          This(clazz),
+          Literal(Constant(Statics.mix(0xcafebabe, ownName.hashCode))),
+          Literal(Constant(true))
+        )
 
     /** The class
      *
@@ -345,7 +343,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
      *  ```
      *  def hashCode: Int = {
      *    <synthetic> var acc: Int = 0xcafebabe
-     *    acc = Statics.mix(acc, this.productPrefix.hashCode());
+     *    acc = Statics.mix(acc, "C".hashCode);
      *    acc = Statics.mix(acc, x);
      *    acc = Statics.mix(acc, Statics.this.anyHash(y));
      *    Statics.finalizeHash(acc, 2)
@@ -356,7 +354,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
       val acc = newSymbol(ctx.owner, nme.acc, Mutable | Synthetic, defn.IntType, coord = ctx.owner.span)
       val accDef = ValDef(acc, Literal(Constant(0xcafebabe)))
       val mixPrefix = Assign(ref(acc),
-        ref(defn.staticsMethod("mix")).appliedTo(ref(acc), This(clazz).select(defn.Product_productPrefix).select(defn.Any_hashCode).appliedToNone))
+        ref(defn.staticsMethod("mix")).appliedTo(ref(acc), Literal(Constant(ownName.hashCode))))
       val mixes = for (accessor <- accessors) yield
         Assign(ref(acc), ref(defn.staticsMethod("mix")).appliedTo(ref(acc), hashImpl(accessor)))
       val finish = ref(defn.staticsMethod("finalizeHash")).appliedTo(ref(acc), Literal(Constant(accessors.size)))
diff --git a/tests/run-macros/tasty-extractors-2.check b/tests/run-macros/tasty-extractors-2.check
index 5dd6af8d8b04..c9c3aec869d4 100644
--- a/tests/run-macros/tasty-extractors-2.check
+++ b/tests/run-macros/tasty-extractors-2.check
@@ -49,7 +49,7 @@ TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 Inlined(None, Nil, Block(List(ClassDef("Foo", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil)), None, List(DefDef("a", Nil, Inferred(), Some(Literal(IntConstant(0))))))), Literal(UnitConstant())))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Block(List(ClassDef("Foo", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), TypeSelect(Select(Ident("_root_"), "scala"), "Product"), TypeSelect(Select(Ident("_root_"), "scala"), "Serializable")), None, List(DefDef("hashCode", List(TermParamClause(Nil)), Inferred(), Some(Apply(Ident("_hashCode"), List(This(Some("Foo")))))), DefDef("equals", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(Apply(Select(This(Some("Foo")), "eq"), List(TypeApply(Select(Ident("x$0"), "$asInstanceOf$"), List(Inferred())))), "||"), List(Match(Ident("x$0"), List(CaseDef(Bind("x$0", Typed(Wildcard(), Inferred())), None, Apply(Select(Literal(BooleanConstant(true)), "&&"), List(Apply(Select(Ident("x$0"), "canEqual"), List(This(Some("Foo"))))))), CaseDef(Wildcard(), None, Literal(BooleanConstant(false))))))))), DefDef("toString", List(TermParamClause(Nil)), Inferred(), Some(Apply(Ident("_toString"), List(This(Some("Foo")))))), DefDef("canEqual", List(TermParamClause(List(ValDef("that", Inferred(), None)))), Inferred(), Some(TypeApply(Select(Ident("that"), "isInstanceOf"), List(Inferred())))), DefDef("productArity", Nil, Inferred(), Some(Literal(IntConstant(0)))), DefDef("productPrefix", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), DefDef("productElement", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Wildcard(), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("productElementName", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Wildcard(), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("copy", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))))), ValDef("Foo", TypeIdent("Foo$"), Some(Apply(Select(New(TypeIdent("Foo$")), "<init>"), Nil))), ClassDef("Foo$", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), Inferred()), Some(ValDef("_", Singleton(Ident("Foo")), None)), List(DefDef("apply", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))), DefDef("unapply", List(TermParamClause(List(ValDef("x$1", Inferred(), None)))), Singleton(Literal(BooleanConstant(true))), Some(Literal(BooleanConstant(true)))), DefDef("toString", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), TypeDef("MirroredMonoType", TypeBoundsTree(Inferred(), Inferred())), DefDef("fromProduct", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil)))))), Literal(UnitConstant())))
+Inlined(None, Nil, Block(List(ClassDef("Foo", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), TypeSelect(Select(Ident("_root_"), "scala"), "Product"), TypeSelect(Select(Ident("_root_"), "scala"), "Serializable")), None, List(DefDef("hashCode", List(TermParamClause(Nil)), Inferred(), Some(Literal(IntConstant(70822)))), DefDef("equals", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(Apply(Select(This(Some("Foo")), "eq"), List(TypeApply(Select(Ident("x$0"), "$asInstanceOf$"), List(Inferred())))), "||"), List(Match(Ident("x$0"), List(CaseDef(Bind("x$0", Typed(Wildcard(), Inferred())), None, Apply(Select(Literal(BooleanConstant(true)), "&&"), List(Apply(Select(Ident("x$0"), "canEqual"), List(This(Some("Foo"))))))), CaseDef(Wildcard(), None, Literal(BooleanConstant(false))))))))), DefDef("toString", List(TermParamClause(Nil)), Inferred(), Some(Apply(Ident("_toString"), List(This(Some("Foo")))))), DefDef("canEqual", List(TermParamClause(List(ValDef("that", Inferred(), None)))), Inferred(), Some(TypeApply(Select(Ident("that"), "isInstanceOf"), List(Inferred())))), DefDef("productArity", Nil, Inferred(), Some(Literal(IntConstant(0)))), DefDef("productPrefix", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), DefDef("productElement", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Wildcard(), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("productElementName", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Wildcard(), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("copy", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))))), ValDef("Foo", TypeIdent("Foo$"), Some(Apply(Select(New(TypeIdent("Foo$")), "<init>"), Nil))), ClassDef("Foo$", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), Inferred()), Some(ValDef("_", Singleton(Ident("Foo")), None)), List(DefDef("apply", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))), DefDef("unapply", List(TermParamClause(List(ValDef("x$1", Inferred(), None)))), Singleton(Literal(BooleanConstant(true))), Some(Literal(BooleanConstant(true)))), DefDef("toString", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), TypeDef("MirroredMonoType", TypeBoundsTree(Inferred(), Inferred())), DefDef("fromProduct", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil)))))), Literal(UnitConstant())))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
 Inlined(None, Nil, Block(List(ClassDef("Foo1", DefDef("<init>", List(TermParamClause(List(ValDef("a", TypeIdent("Int"), None)))), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil)), None, List(ValDef("a", Inferred(), None)))), Literal(UnitConstant())))
diff --git a/tests/run/t13033.scala b/tests/run/t13033.scala
new file mode 100644
index 000000000000..43f227990011
--- /dev/null
+++ b/tests/run/t13033.scala
@@ -0,0 +1,69 @@
+// This method will be in the 2.13.17 standard library. Until this test declares a copy of it.
+// import scala.util.hashing.MurmurHash3.caseClassHash
+def caseClassHash(x: Product, caseClassName: String = null): Int =
+  import scala.runtime.Statics._
+  val arr = x.productArity
+  val aye = (if (caseClassName != null) caseClassName else x.productPrefix).hashCode
+  if (arr == 0) aye
+  else {
+    var h = 0xcafebabe
+    h = mix(h, aye)
+    var i = 0
+    while (i < arr) {
+      h = mix(h, x.productElement(i).##)
+      i += 1
+    }
+    finalizeHash(h, arr)
+  }
+
+
+case class C1(a: Int)
+class C2(a: Int) extends C1(a) { override def productPrefix = "C2" }
+class C3(a: Int) extends C1(a) { override def productPrefix = "C3" }
+case class C4(a: Int) { override def productPrefix = "Sea4" }
+case class C5()
+case object C6
+case object C6b { override def productPrefix = "Sea6b" }
+case class C7(s: String) // hashCode forwards to ScalaRunTime._hashCode if there are no primitives
+class C8(s: String) extends C7(s) { override def productPrefix = "C8" }
+
+case class VCC(x: Int) extends AnyVal
+
+object Test extends App {
+  val c1 = C1(1)
+  val c2 = new C2(1)
+  val c3 = new C3(1)
+  assert(c1 == c2)
+  assert(c2 == c1)
+  assert(c2 == c3)
+  assert(c1.hashCode == c2.hashCode)
+  assert(c2.hashCode == c3.hashCode)
+
+  assert(c1.hashCode == caseClassHash(c1))
+  // `caseClassHash` mixes in the `productPrefix.hashCode`, while `hashCode` mixes in the case class name statically
+  assert(c2.hashCode != caseClassHash(c2))
+  assert(c2.hashCode == caseClassHash(c2, c1.productPrefix))
+
+  val c4 = C4(1)
+  assert(c4.hashCode != caseClassHash(c4))
+  assert(c4.hashCode == caseClassHash(c4, "C4"))
+
+  assert((1, 2).hashCode == caseClassHash(1 -> 2))
+  assert(("", "").hashCode == caseClassHash("" -> ""))
+
+  assert(C5().hashCode == caseClassHash(C5()))
+  assert(C6.hashCode == caseClassHash(C6))
+  assert(C6b.hashCode == caseClassHash(C6b, "C6b"))
+
+  val c7 = C7("hi")
+  val c8 = new C8("hi")
+  assert(c7.hashCode == caseClassHash(c7))
+  assert(c7 == c8)
+  assert(c7.hashCode == c8.hashCode)
+  assert(c8.hashCode != caseClassHash(c8))
+  assert(c8.hashCode == caseClassHash(c8, "C7"))
+
+
+  assert(VCC(1).canEqual(VCC(1)))
+  assert(!VCC(1).canEqual(1))
+}

From 639b51ac1294ec189cdc27885dcf283a8e744938 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 22:59:15 +0200
Subject: [PATCH 226/505] Mix in the `productPrefix` hash statically in case
 class `hashCode`

Since 2.13, case class `hashCode` mixes in the hash code of the
`productPrefix` string. This is inconsistent with the `equals` method,
subclasses of case classes that override `productPrefix` compare
equal but have a different `hashCode`.

This commit changes `hashCode` to mix in the `productPrefix.hashCode`
statically instead of invoking `productPrefix` at runtime.

For case classes without primitive fields, the synthetic `hashCode`
invokes `ScalaRunTime._hashCode`, which mixes in the result of
`productPrefix`. To fix that, the synthetic hashCode is changed
to invoke `MurmurHash3.productHash` directly and mix in the name
to the seed statically.

[Cherry-picked d2fc35861f0d6bac8d83a47ec3f141c28410c5d3][modified]

From 4447d41e0ce26b06119dd8ac5e9912900dd7375a Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 1 Apr 2025 08:32:55 -0700
Subject: [PATCH 227/505] No warn implicit param of overriding method

---
 tests/warn/i15503f.scala | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/warn/i15503f.scala b/tests/warn/i15503f.scala
index 76badc659fb9..1b145a20280a 100644
--- a/tests/warn/i15503f.scala
+++ b/tests/warn/i15503f.scala
@@ -75,3 +75,18 @@ package givens:
   given namely (using x: X): Y with // warn protected param to given class
     def doY = "8"
 end givens
+
+object i22895:
+  trait Test[F[_], Ev] {
+    def apply[A, B](fa: F[A])(f: A => B)(using ev: Ev): F[B]
+  }
+  given testId: Test[[a] =>> a, Unit] =
+    new Test[[a] =>> a, Unit] {
+      def apply[A, B](fa: A)(f: A => B)(using ev: Unit): B = f(fa) // nowarn override
+    }
+  class C:
+    def f(using s: String) = s.toInt
+  class D(i: Int) extends C:
+    override def f(using String) = compute(i) // nowarn override
+    def g(using sss: String) = compute(i) // warn
+    def compute(i: Int) = i * 42 // returning a class param is deemed trivial, make it non-trivial

From 61e34b625e0093f27253454aa2731f5821867053 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 23:01:13 +0200
Subject: [PATCH 228/505] No warn implicit param of overriding method

[Cherry-picked 0ebb4db4d769688cb70b7f6b5c4166fceca93190][modified]

From c637007bffdd474566fda15b0b6a16e87d92606d Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 1 Apr 2025 10:48:29 -0700
Subject: [PATCH 229/505] Check Override before looking for overridden

[Cherry-picked 8253ee23f00e81d53794a3633251637a47161d12]
---
 .../dotty/tools/dotc/transform/CheckUnused.scala    |  2 +-
 tests/warn/i22896/J.java                            |  6 ++++++
 tests/warn/i22896/s.scala                           | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/warn/i22896/J.java
 create mode 100644 tests/warn/i22896/s.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 0e4c1cda5b42..45e1b9c989b3 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -923,7 +923,7 @@ object CheckUnused:
       }
     def isEffectivelyPrivate: Boolean =
       sym.is(Private, butNot = ParamAccessor)
-      || sym.owner.isAnonymousClass && !sym.nextOverriddenSymbol.exists
+      || sym.owner.isAnonymousClass && !sym.is(Override) && !sym.nextOverriddenSymbol.exists
     // pick the symbol the user wrote for purposes of tracking
     inline def userSymbol: Symbol=
       if sym.denot.is(ModuleClass) then sym.denot.companionModule else sym
diff --git a/tests/warn/i22896/J.java b/tests/warn/i22896/J.java
new file mode 100644
index 000000000000..d110dd16c8fd
--- /dev/null
+++ b/tests/warn/i22896/J.java
@@ -0,0 +1,6 @@
+
+public class J {
+    private int i = 42;
+    public int i() { return 27; }
+    public String i(int j) { return "hello, world"; }
+}
diff --git a/tests/warn/i22896/s.scala b/tests/warn/i22896/s.scala
new file mode 100644
index 000000000000..678c77a9bb3e
--- /dev/null
+++ b/tests/warn/i22896/s.scala
@@ -0,0 +1,13 @@
+//> using options -Werror -Wunused:privates
+
+def f =
+  new J:
+    override val i = -1 // nowarn, trust override
+
+def g =
+  new J:
+    override def i = -1 // nowarn, trust override
+
+def h =
+  new J:
+    override def i() = -1 // nowarn correctly matches signature

From 8736ff8e6ea320644157bf2a9434e210bb1d1daa Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 2 Apr 2025 08:45:22 -0700
Subject: [PATCH 230/505] Always trust override modifier

[Cherry-picked 1da65992f886c358f26e53d7b1e91bdc1b175fd0]
---
 compiler/src/dotty/tools/dotc/transform/CheckUnused.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 45e1b9c989b3..ace6bb2db9e7 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -581,7 +581,7 @@ object CheckUnused:
       end checkExplicit
       // begin
       if !infos.skip(m)
-        && !m.nextOverriddenSymbol.exists
+        && !m.isEffectivelyOverride
         && !allowed
       then
         checkExplicit()
@@ -923,7 +923,9 @@ object CheckUnused:
       }
     def isEffectivelyPrivate: Boolean =
       sym.is(Private, butNot = ParamAccessor)
-      || sym.owner.isAnonymousClass && !sym.is(Override) && !sym.nextOverriddenSymbol.exists
+      || sym.owner.isAnonymousClass && !sym.isEffectivelyOverride
+    def isEffectivelyOverride(using Context): Boolean =
+      sym.is(Override) || sym.nextOverriddenSymbol.exists
     // pick the symbol the user wrote for purposes of tracking
     inline def userSymbol: Symbol=
       if sym.denot.is(ModuleClass) then sym.denot.companionModule else sym

From 1b48670eac90254afa60f70c75f162d9b6014efa Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 2 Apr 2025 08:53:24 -0700
Subject: [PATCH 231/505] Collectivize contextual param in extensions

---
 .../tools/dotc/transform/CheckUnused.scala    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index ace6bb2db9e7..82eaa7dee176 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -883,20 +883,20 @@ object CheckUnused:
     inline def exists(p: Name => Boolean): Boolean = nm.ne(nme.NO_NAME) && p(nm)
     inline def isWildcard: Boolean = nm == nme.WILDCARD || nm.is(WildcardParamName)
 
-  extension (tp: Type)
-    def importPrefix(using Context): Type = tp match
+  extension (tp: Type)(using Context)
+    def importPrefix: Type = tp match
       case tp: NamedType => tp.prefix
       case tp: ClassInfo => tp.prefix
       case tp: TypeProxy => tp.superType.normalizedPrefix
       case _ => NoType
-    def underlyingPrefix(using Context): Type = tp match
+    def underlyingPrefix: Type = tp match
       case tp: NamedType => tp.prefix
       case tp: ClassInfo => tp.prefix
       case tp: TypeProxy => tp.underlying.underlyingPrefix
       case _ => NoType
-    def skipPackageObject(using Context): Type =
+    def skipPackageObject: Type =
       if tp.typeSymbol.isPackageObject then tp.underlyingPrefix else tp
-    def underlying(using Context): Type = tp match
+    def underlying: Type = tp match
       case tp: TypeProxy => tp.underlying
       case _ => tp
 
@@ -913,6 +913,9 @@ object CheckUnused:
       sym.isClass && sym.info.allMembers.forall: d =>
         val m = d.symbol
         !m.isTerm || m.isSelfSym || m.is(Method) && (m.owner == defn.AnyClass || m.owner == defn.ObjectClass)
+    def isEffectivelyPrivate: Boolean =
+      sym.is(Private, butNot = ParamAccessor)
+      || sym.owner.isAnonymousClass && !sym.isEffectivelyOverride
     def isEffectivelyOverride: Boolean =
       sym.is(Override)
       ||
@@ -921,11 +924,6 @@ object CheckUnused:
         val base = if owner.classInfo.selfInfo != NoType then owner.thisType else owner.info
         base.baseClasses.drop(1).iterator.exists(sym.overriddenSymbol(_).exists)
       }
-    def isEffectivelyPrivate: Boolean =
-      sym.is(Private, butNot = ParamAccessor)
-      || sym.owner.isAnonymousClass && !sym.isEffectivelyOverride
-    def isEffectivelyOverride(using Context): Boolean =
-      sym.is(Override) || sym.nextOverriddenSymbol.exists
     // pick the symbol the user wrote for purposes of tracking
     inline def userSymbol: Symbol=
       if sym.denot.is(ModuleClass) then sym.denot.companionModule else sym
@@ -941,13 +939,13 @@ object CheckUnused:
       case untpd.Ident(nme.WILDCARD) => true
       case _ => false
 
-  extension (imp: Import)
+  extension (imp: Import)(using Context)
     /** Is it the first import clause in a statement? `a.x` in `import a.x, b.{y, z}` */
-    def isPrimaryClause(using Context): Boolean =
+    def isPrimaryClause: Boolean =
       imp.srcPos.span.pointDelta > 0 // primary clause starts at `import` keyword with point at clause proper
 
     /** Generated import of cases from enum companion. */
-    def isGeneratedByEnum(using Context): Boolean =
+    def isGeneratedByEnum: Boolean =
       imp.symbol.exists && imp.symbol.owner.is(Enum, butNot = Case)
 
     /** Under -Wunused:strict-no-implicit-warn, avoid false positives
@@ -955,7 +953,7 @@ object CheckUnused:
      *  specifically does import an implicit.
      *  Similarly, import of CanEqual must not warn, as it is always witness.
      */
-    def isLoose(sel: ImportSelector)(using Context): Boolean =
+    def isLoose(sel: ImportSelector): Boolean =
       if ctx.settings.WunusedHas.strictNoImplicitWarn then
         if sel.isWildcard
           || imp.expr.tpe.member(sel.name.toTermName).hasAltWith(_.symbol.isOneOf(GivenOrImplicit))

From acb2bdce7dbf66c375b06c46324ca5d21422159c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 23:03:15 +0200
Subject: [PATCH 232/505] Collectivize contextual param in extensions

[Cherry-picked 819586f10409b6f5357d2f15ac014e1f09259e69][modified]

From 78e45124870bcab5a3ef7cb20f61b18eed0b2a34 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 23:04:33 +0200
Subject: [PATCH 233/505] Prefer allOverriddenSymbols.hasNext

[Cherry-picked 94defc2bb253663c839ef574af895a2647f5e796][modified]

From 87fbea5563bc967861361893977c7d0887db3783 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 2 Apr 2025 12:06:58 -0700
Subject: [PATCH 234/505] Consult self type for overrides

[Cherry-picked f8d681fb9cc8be0210662566d16c6d299bce7b0e]
---
 .../src/dotty/tools/dotc/core/SymDenotations.scala     |  2 +-
 tests/warn/unused-params.scala                         | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
index 340197ffc4a0..00530c3a6936 100644
--- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -1932,7 +1932,7 @@ object SymDenotations {
       case _ => NoSymbol
 
     /** The explicitly given self type (self types of modules are assumed to be
-     *  explcitly given here).
+     *  explicitly given here).
      */
     def givenSelfType(using Context): Type = classInfo.selfInfo match {
       case tp: Type => tp
diff --git a/tests/warn/unused-params.scala b/tests/warn/unused-params.scala
index 3266f3957247..9136da6425a5 100644
--- a/tests/warn/unused-params.scala
+++ b/tests/warn/unused-params.scala
@@ -122,7 +122,7 @@ trait BadMix { self: InterFace =>
     a
   }
   override def call(a: Int,
-                    XXXX: String,               // warn no longer excused because required by superclass
+                    XXXX: String, // no warn still excused because override (required by self type)
                     c: Double): Int = {
     println(c)
     a
@@ -135,6 +135,14 @@ trait BadMix { self: InterFace =>
   def i(implicit s: String) = answer           // warn
 }
 
+trait ImplFace:
+  self: InterFace =>
+  def call(a: Int,
+           b: String, // no warn required by self type
+           c: Double): Int =
+    println(c)
+    a
+
 class Unequal {
   override def equals(other: Any) = toString.nonEmpty   // no warn (override)
 }

From 67e00eae6a35fa6269502ff48416bf2c15afecb8 Mon Sep 17 00:00:00 2001
From: Nikita Glushchenko <npcrus@gmail.com>
Date: Thu, 3 Apr 2025 19:29:16 +0200
Subject: [PATCH 235/505] Completions for requests just before string (#22894)

fixes #22514
[Cherry-picked 823782c796e73c322212f7c4d94d6049434407aa]
---
 .../tools/dotc/interactive/Completion.scala   | 15 +++-
 .../CompletionStringContextSuite.scala        | 79 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionStringContextSuite.scala

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index ba37a48287ff..b1c0119fb2df 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -95,6 +95,8 @@ object Completion:
       else if sel.isGiven && sel.bound.span.contains(pos.span) then Mode.ImportOrExport
       else Mode.None // import scala.{util => u@@}
     case GenericImportOrExport(_) => Mode.ImportOrExport | Mode.Scope // import TrieMa@@
+    case untpd.InterpolatedString(_, untpd.Literal(Constants.Constant(_: String)) :: _) :: _ =>
+      Mode.Term | Mode.Scope
     case untpd.Literal(Constants.Constant(_: String)) :: _ => Mode.Term | Mode.Scope // literal completions
     case (ref: untpd.RefTree) :: _ =>
       val maybeSelectMembers = if ref.isInstanceOf[untpd.Select] then Mode.Member else Mode.Scope
@@ -169,6 +171,14 @@ object Completion:
         case (importOrExport: untpd.ImportOrExport) :: _ => Some(importOrExport)
         case _ => None
 
+  private object StringContextApplication:
+    def unapply(path: List[tpd.Tree]): Option[tpd.Apply] = 
+      path match
+        case tpd.Select(qual @ tpd.Apply(tpd.Select(tpd.Select(_, StdNames.nme.StringContext), _), _), _) :: _ =>
+          Some(qual)
+        case _ => None
+      
+
   /** Inspect `path` to determine the offset where the completion result should be inserted. */
   def completionOffset(untpdPath: List[untpd.Tree]): Int =
     untpdPath match
@@ -218,7 +228,10 @@ object Completion:
       // Ignore synthetic select from `This` because in code it was `Ident`
       // See example in dotty.tools.languageserver.CompletionTest.syntheticThis
       case tpd.Select(qual @ tpd.This(_), _) :: _ if qual.span.isSynthetic      => completer.scopeCompletions
-      case tpd.Select(qual, _) :: _               if qual.typeOpt.hasSimpleKind => completer.selectionCompletions(qual)
+      case StringContextApplication(qual) =>
+        completer.scopeCompletions ++ completer.selectionCompletions(qual) 
+      case tpd.Select(qual, _) :: _               if qual.typeOpt.hasSimpleKind => 
+        completer.selectionCompletions(qual)
       case tpd.Select(qual, _) :: _                                             => Map.empty
       case (tree: tpd.ImportOrExport) :: _                                      => completer.directMemberCompletions(tree.expr)
       case _                                                                    => completer.scopeCompletions
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionStringContextSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionStringContextSuite.scala
new file mode 100644
index 000000000000..689be1862bcc
--- /dev/null
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionStringContextSuite.scala
@@ -0,0 +1,79 @@
+package dotty.tools.pc.tests.completion
+
+import dotty.tools.pc.base.BaseCompletionSuite
+import org.junit.Test
+import dotty.tools.dotc.core.Types.ThisType.raw
+
+class CompletionStringContextSuite extends BaseCompletionSuite:
+  @Test
+  def inScopeSymbol = check(
+    """
+    |object M:
+    | val VersionRegex = "".r
+    | VersionRe@@"1234"
+    """.stripMargin,
+    "|VersionRegex: Regex".stripMargin 
+  )
+
+  @Test
+  def workspaceSymbol = check(
+    """
+    |object M:
+    | ListBuf@@"1234" 
+    """.stripMargin,
+    """
+    |ListBuffer[A](elems: A*): ListBuffer[A] - scala.collection.mutable
+    |new ListBuffer[A]: ListBuffer[A] - scala.collection.mutable
+    |ListBuffer - scala.collection.mutable
+    |""".stripMargin 
+  )
+
+  @Test
+  def providedSymbol = check(
+    """
+    |object M:
+    | ra@@"1234"
+    """.stripMargin,
+    "|raw(args: Any*): String".stripMargin 
+  )
+
+  // bellow are tests of edits
+  @Test
+  def editTest1 = checkEdit(
+    """
+    |object M:
+    | ra@@"1234"
+    """.stripMargin,
+    """
+    |object M:
+    | raw"1234"
+    |""".stripMargin 
+  )
+
+  @Test
+  def editTest2 = checkEdit(
+    """
+    |object M:
+    | printl@@"1234"
+    """.stripMargin,
+    """
+    |object M:
+    | println"1234"
+    |""".stripMargin,
+    assertSingleItem = false 
+  )
+
+  @Test
+  def editTest3 = checkEdit(
+    """
+    |object M:
+    | def select(s: String): String = s
+    | selec@@"1234"
+    """.stripMargin,
+    """
+    |object M:
+    | def select(s: String): String = s
+    | select"1234"
+    |""".stripMargin,
+    assertSingleItem = false 
+  )
\ No newline at end of file

From 0ac0542b1880a3a7b9325e5f76ad5b240289a561 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Tue, 8 Apr 2025 13:51:59 +0200
Subject: [PATCH 236/505] Fix isGenericArrayElement for higher-kinded types

A higher-kinded type `type A[T]` has to be treated just like an abstract type
`type A`.

Fixes #22888

[Cherry-picked b90a185fb2de8930c848e38f737b26432c46bc65]
---
 .../dotty/tools/dotc/core/TypeErasure.scala   |  6 ++-
 tests/run/i22888.scala                        | 37 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 tests/run/i22888.scala

diff --git a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
index 87672e18744b..747f79228e36 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
@@ -365,6 +365,8 @@ object TypeErasure {
       case tp: MatchType =>
         val alts = tp.alternatives
         alts.nonEmpty && !fitsInJVMArray(alts.reduce(OrType(_, _, soft = true)))
+      case tp @ AppliedType(tycon, _) if tycon.isLambdaSub =>
+        !fitsInJVMArray(tp.translucentSuperType)
       case tp: TypeProxy =>
         isGenericArrayElement(tp.translucentSuperType, isScala2)
       case tp: AndType =>
@@ -779,11 +781,11 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
 
   private def eraseArray(tp: Type)(using Context) = {
     val defn.ArrayOf(elemtp) = tp: @unchecked
-    if isGenericArrayElement(elemtp, isScala2 = sourceLanguage.isScala2) then 
+    if isGenericArrayElement(elemtp, isScala2 = sourceLanguage.isScala2) then
       defn.ObjectType
     else if sourceLanguage.isScala2 && (elemtp.hiBound.isNullType || elemtp.hiBound.isNothingType) then
       JavaArrayType(defn.ObjectType)
-    else 
+    else
       try erasureFn(sourceLanguage, semiEraseVCs = false, isConstructor, isSymbol, inSigName)(elemtp) match
         case _: WildcardType => WildcardType
         case elem => JavaArrayType(elem)
diff --git a/tests/run/i22888.scala b/tests/run/i22888.scala
new file mode 100644
index 000000000000..abc71376cc4d
--- /dev/null
+++ b/tests/run/i22888.scala
@@ -0,0 +1,37 @@
+trait Foo:
+  type A[T]
+  var arr: Array[A[Int]] = null
+
+class Bar() extends Foo:
+  type A[T] = Int
+
+trait Foo2:
+  type Dummy
+  type A[T] <: Dummy
+  var arr: Array[A[Int]] = null
+
+class Bar2() extends Foo2:
+  type Dummy = Any
+  type A[T] = Int
+
+trait Foo3:
+  type A[T] <: Object
+  var arr: Array[A[String]] = null
+
+class Bar3() extends Foo3:
+  type A[T] = String
+
+object Test:
+  def main(args: Array[String]) =
+    val bar = new Bar()
+    bar.arr = Array.ofDim[Int](1)
+    bar.arr(0) = 123
+
+    val bar2 = new Bar2()
+    bar2.arr = Array.ofDim[Int](1)
+    bar2.arr(0) = 123
+
+    val bar3 = new Bar3()
+    bar3.arr = Array.ofDim[String](1)
+    bar3.arr(0) = "123"
+

From d0c01ca5f73951ce6d6e6979daf9df257de2292f Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 8 Apr 2025 08:47:27 -0700
Subject: [PATCH 237/505] Improve dentation at EOF

Check trailing blank line at EOF for OUTDENT

If EOF is preceded by only spaces on the last line, do not outdent
because it will complain about alignment during an edit.

Preserve EOF token when probing arrow EOL

For REPL, `: x =>` at EOF sees an EOF in order to detect lambda eol.
---
 .../src/dotty/tools/dotc/parsing/Scanners.scala | 17 +++++++++++++++--
 compiler/src/dotty/tools/dotc/util/Chars.scala  |  2 +-
 .../dotty/tools/repl/ReplCompilerTests.scala    | 10 ++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
index 96e9cd600363..1992ab32c9c6 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -601,6 +601,20 @@ object Scanners {
           lastWidth = r.knownWidth
           newlineIsSeparating = r.isInstanceOf[InBraces]
 
+      // can emit OUTDENT if line is not non-empty blank line at EOF
+      inline def isTrailingBlankLine: Boolean =
+        token == EOF && {
+          val end = buf.length - 1 // take terminal NL as empty last line
+          val prev = buf.lastIndexWhere(!isWhitespace(_), end = end)
+          prev < 0 || end - prev > 0 && isLineBreakChar(buf(prev))
+        }
+
+      inline def canDedent: Boolean =
+           lastToken != INDENT
+        && !isLeadingInfixOperator(nextWidth)
+        && !statCtdTokens.contains(lastToken)
+        && !isTrailingBlankLine
+
       if newlineIsSeparating
          && canEndStatTokens.contains(lastToken)
          && canStartStatTokens.contains(token)
@@ -613,9 +627,8 @@ object Scanners {
            || nextWidth == lastWidth && (indentPrefix == MATCH || indentPrefix == CATCH) && token != CASE then
           if currentRegion.isOutermost then
             if nextWidth < lastWidth then currentRegion = topLevelRegion(nextWidth)
-          else if !isLeadingInfixOperator(nextWidth) && !statCtdTokens.contains(lastToken) && lastToken != INDENT then
+          else if canDedent then
             currentRegion match
-              case _ if token == EOF => // no OUTDENT at EOF
               case r: Indented =>
                 insert(OUTDENT, offset)
                 handleNewIndentWidth(r.enclosing, ir =>
diff --git a/compiler/src/dotty/tools/dotc/util/Chars.scala b/compiler/src/dotty/tools/dotc/util/Chars.scala
index cde1a63f5293..4bdf6e464cd1 100644
--- a/compiler/src/dotty/tools/dotc/util/Chars.scala
+++ b/compiler/src/dotty/tools/dotc/util/Chars.scala
@@ -50,7 +50,7 @@ object Chars:
   }
 
   /** Is character a whitespace character (but not a new line)? */
-  def isWhitespace(c: Char): Boolean =
+  inline def isWhitespace(c: Char): Boolean =
     c == ' ' || c == '\t' || c == CR
 
   /** Can character form part of a doc comment variable $xxx? */
diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
index 9fe5ffcf072e..3d228e3721a2 100644
--- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
+++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
@@ -400,6 +400,16 @@ class ReplCompilerTests extends ReplTest:
     assertTrue(all.head.startsWith("-- [E103] Syntax Error"))
     assertTrue(all.exists(_.trim().startsWith("|  Illegal start of statement: this modifier is not allowed here")))
 
+  @Test def `i22844 regression colon eol`: Unit = initially:
+    run:
+      """|println:
+         |  "hello, world"
+         |""".stripMargin // outdent, but this test does not exercise the bug
+    assertEquals(List("hello, world"), lines())
+
+  @Test def `i22844b regression colon arrow eol`: Unit = contextually:
+    assertTrue(ParseResult.isIncomplete("List(42).map: x =>"))
+
 object ReplCompilerTests:
 
   private val pattern = Pattern.compile("\\r[\\n]?|\\n");

From f143d1daacd14aad76dab9400062a0652edd356a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 23:06:26 +0200
Subject: [PATCH 238/505] Improve dentation at EOF

Check trailing blank line at EOF for OUTDENT

If EOF is preceded by only spaces on the last line, do not outdent
because it will complain about alignment during an edit.

Preserve EOF token when probing arrow EOL

For REPL, `: x =>` at EOF sees an EOF in order to detect lambda eol.

[Cherry-picked bc6cf47575469621bbee4e11dfd7d66544e6cfe8][modified]

From e290481098050a6e35bc3cf0924d98109afcb97c Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 7 Apr 2025 10:45:12 -0700
Subject: [PATCH 239/505] Format interpolator messages get an ID

---
 .../tools/dotc/interactive/Completion.scala   | 10 +-
 .../tools/dotc/reporting/ErrorMessageID.scala |  1 +
 .../tools/dotc/reporting/MessageKind.scala    |  1 +
 .../dotty/tools/dotc/reporting/messages.scala |  5 +
 .../transform/localopt/FormatChecker.scala    | 15 ++-
 tests/neg/f-interpolator-neg.check            | 92 +++++++++----------
 tests/neg/f-interpolator-tests.check          |  4 +-
 tests/neg/fEscapes.check                      |  2 +-
 8 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index b1c0119fb2df..a37e972ef715 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -172,12 +172,12 @@ object Completion:
         case _ => None
 
   private object StringContextApplication:
-    def unapply(path: List[tpd.Tree]): Option[tpd.Apply] = 
+    def unapply(path: List[tpd.Tree]): Option[tpd.Apply] =
       path match
-        case tpd.Select(qual @ tpd.Apply(tpd.Select(tpd.Select(_, StdNames.nme.StringContext), _), _), _) :: _ =>
+        case tpd.Select(qual @ tpd.Apply(tpd.Select(tpd.Select(_, nme.StringContext), _), _), _) :: _ =>
           Some(qual)
         case _ => None
-      
+
 
   /** Inspect `path` to determine the offset where the completion result should be inserted. */
   def completionOffset(untpdPath: List[untpd.Tree]): Int =
@@ -229,8 +229,8 @@ object Completion:
       // See example in dotty.tools.languageserver.CompletionTest.syntheticThis
       case tpd.Select(qual @ tpd.This(_), _) :: _ if qual.span.isSynthetic      => completer.scopeCompletions
       case StringContextApplication(qual) =>
-        completer.scopeCompletions ++ completer.selectionCompletions(qual) 
-      case tpd.Select(qual, _) :: _               if qual.typeOpt.hasSimpleKind => 
+        completer.scopeCompletions ++ completer.selectionCompletions(qual)
+      case tpd.Select(qual, _) :: _               if qual.typeOpt.hasSimpleKind =>
         completer.selectionCompletions(qual)
       case tpd.Select(qual, _) :: _                                             => Map.empty
       case (tree: tpd.ImportOrExport) :: _                                      => completer.directMemberCompletions(tree.expr)
diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index 93744197cadd..600370509c6f 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -222,6 +222,7 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case EnumMayNotBeValueClassesID // errorNumber: 206
   case IllegalUnrollPlacementID // errorNumber: 207  - unused in LTS
   case ExtensionHasDefaultID // errorNumber: 208
+  case FormatInterpolationErrorID // errorNumber: 209
 
   def errorNumber = ordinal - 1
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageKind.scala b/compiler/src/dotty/tools/dotc/reporting/MessageKind.scala
index bb02a08d2e46..e09dd1d6e69e 100644
--- a/compiler/src/dotty/tools/dotc/reporting/MessageKind.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/MessageKind.scala
@@ -23,6 +23,7 @@ enum MessageKind:
   case PotentialIssue
   case UnusedSymbol
   case Staging
+  case Interpolation
 
   /** Human readable message that will end up being shown to the user.
    *  NOTE: This is only used in the situation where you have multiple words
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 7cafa04f8792..6c1f8ed939d6 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3208,3 +3208,8 @@ final class EnumMayNotBeValueClasses(sym: Symbol)(using Context) extends SyntaxM
 
     def explain(using Context) = ""
 end EnumMayNotBeValueClasses
+
+class BadFormatInterpolation(errorText: String)(using Context) extends Message(FormatInterpolationErrorID):
+  def kind = MessageKind.Interpolation
+  def msg(using Context) = errorText
+  def explain(using Context) = ""
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
index 4922024b6c35..31b72e5055ba 100644
--- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
@@ -12,6 +12,7 @@ import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.core.Phases.typerPhase
+import dotty.tools.dotc.reporting.BadFormatInterpolation
 import dotty.tools.dotc.util.Spans.Span
 import dotty.tools.dotc.util.chaining.*
 
@@ -276,10 +277,16 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
     val pos = partsElems(index).sourcePos
     val bgn = pos.span.start + offset
     val fin = if end < 0 then pos.span.end else pos.span.start + end
-    pos.withSpan(Span(bgn, fin, bgn))
+    pos.withSpan(Span(start = bgn, end = fin, point = bgn))
 
   extension (r: report.type)
-    def argError(message: String, index: Int): Unit = r.error(message, args(index).srcPos).tap(_ => reported = true)
-    def partError(message: String, index: Int, offset: Int, end: Int = -1): Unit = r.error(message, partPosAt(index, offset, end)).tap(_ => reported = true)
-    def partWarning(message: String, index: Int, offset: Int, end: Int = -1): Unit = r.warning(message, partPosAt(index, offset, end)).tap(_ => reported = true)
+    def argError(message: String, index: Int): Unit =
+      r.error(BadFormatInterpolation(message), args(index).srcPos)
+        .tap(_ => reported = true)
+    def partError(message: String, index: Int, offset: Int, end: Int = -1): Unit =
+      r.error(BadFormatInterpolation(message), partPosAt(index, offset, end))
+        .tap(_ => reported = true)
+    def partWarning(message: String, index: Int, offset: Int, end: Int): Unit =
+      r.warning(BadFormatInterpolation(message), partPosAt(index, offset, end))
+        .tap(_ => reported = true)
 end TypedFormatChecker
diff --git a/tests/neg/f-interpolator-neg.check b/tests/neg/f-interpolator-neg.check
index ea8df052589e..2d19649e142e 100644
--- a/tests/neg/f-interpolator-neg.check
+++ b/tests/neg/f-interpolator-neg.check
@@ -14,187 +14,187 @@
 7 |    new StringContext("", "").f() // error
   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |    too few arguments for interpolated string
--- Error: tests/neg/f-interpolator-neg.scala:11:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:11:7 -------------------------------------------------
 11 |    f"$s%b" // error
    |       ^
    |       Found: (s : String), Required: Boolean, Null
--- Error: tests/neg/f-interpolator-neg.scala:12:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:12:7 -------------------------------------------------
 12 |    f"$s%c" // error
    |       ^
    |       Found: (s : String), Required: Char, Byte, Short, Int
--- Error: tests/neg/f-interpolator-neg.scala:13:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:13:7 -------------------------------------------------
 13 |    f"$f%c" // error
    |       ^
    |       Found: (f : Double), Required: Char, Byte, Short, Int
--- Error: tests/neg/f-interpolator-neg.scala:14:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:14:7 -------------------------------------------------
 14 |    f"$s%x" // error
    |       ^
    |       Found: (s : String), Required: Int, Long, Byte, Short, BigInt
--- Error: tests/neg/f-interpolator-neg.scala:15:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:15:7 -------------------------------------------------
 15 |    f"$b%d" // error
    |       ^
    |       Found: (b : Boolean), Required: Int, Long, Byte, Short, BigInt
--- Error: tests/neg/f-interpolator-neg.scala:16:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:16:7 -------------------------------------------------
 16 |    f"$s%d" // error
    |       ^
    |       Found: (s : String), Required: Int, Long, Byte, Short, BigInt
--- Error: tests/neg/f-interpolator-neg.scala:17:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:17:7 -------------------------------------------------
 17 |    f"$f%o" // error
    |       ^
    |       Found: (f : Double), Required: Int, Long, Byte, Short, BigInt
--- Error: tests/neg/f-interpolator-neg.scala:18:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:18:7 -------------------------------------------------
 18 |    f"$s%e" // error
    |       ^
    |       Found: (s : String), Required: Double, Float, BigDecimal
--- Error: tests/neg/f-interpolator-neg.scala:19:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:19:7 -------------------------------------------------
 19 |    f"$b%f" // error
    |       ^
    |       Found: (b : Boolean), Required: Double, Float, BigDecimal
--- Error: tests/neg/f-interpolator-neg.scala:20:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:20:9 -------------------------------------------------
 20 |    f"$s%i" // error
    |         ^
    |         illegal conversion character 'i'
--- Error: tests/neg/f-interpolator-neg.scala:24:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:24:9 -------------------------------------------------
 24 |    f"$s%+ 0,(s" // error
    |         ^^^^^
    |         Illegal flag '+'
--- Error: tests/neg/f-interpolator-neg.scala:25:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:25:9 -------------------------------------------------
 25 |    f"$c%#+ 0,(c" // error
    |         ^^^^^^
    |         Only '-' allowed for c conversion
--- Error: tests/neg/f-interpolator-neg.scala:26:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:26:9 -------------------------------------------------
 26 |    f"$d%#d" // error
    |         ^
    |         # not allowed for d conversion
--- Error: tests/neg/f-interpolator-neg.scala:27:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:27:9 -------------------------------------------------
 27 |    f"$d%,x" // error
    |         ^
    |         ',' only allowed for d conversion of integral types
--- Error: tests/neg/f-interpolator-neg.scala:28:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:28:9 -------------------------------------------------
 28 |    f"$d%+ (x" // error
    |         ^^^
    |         only use '+' for BigInt conversions to o, x, X
--- Error: tests/neg/f-interpolator-neg.scala:29:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:29:9 -------------------------------------------------
 29 |    f"$f%,(a" // error
    |         ^^
    |         ',' not allowed for a, A
--- Error: tests/neg/f-interpolator-neg.scala:30:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:30:9 -------------------------------------------------
 30 |    f"$t%#+ 0,(tT" // error
    |         ^^^^^^
    |         Only '-' allowed for date/time conversions
--- Error: tests/neg/f-interpolator-neg.scala:31:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:31:7 -------------------------------------------------
 31 |    f"%-#+ 0,(n" // error
    |       ^^^^^^^
    |       flags not allowed
--- Error: tests/neg/f-interpolator-neg.scala:32:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:32:7 -------------------------------------------------
 32 |    f"%#+ 0,(%" // error
    |       ^^^^^^
    |       Illegal flag '#'
--- Error: tests/neg/f-interpolator-neg.scala:36:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:36:9 -------------------------------------------------
 36 |    f"$c%.2c" // error
    |         ^^
    |         precision not allowed
--- Error: tests/neg/f-interpolator-neg.scala:37:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:37:9 -------------------------------------------------
 37 |    f"$d%.2d" // error
    |         ^^
    |         precision not allowed
--- Error: tests/neg/f-interpolator-neg.scala:38:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:38:7 -------------------------------------------------
 38 |    f"%.2%" // error
    |       ^^
    |       precision not allowed
--- Error: tests/neg/f-interpolator-neg.scala:39:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:39:7 -------------------------------------------------
 39 |    f"%.2n" // error
    |       ^^
    |       precision not allowed
--- Error: tests/neg/f-interpolator-neg.scala:40:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:40:9 -------------------------------------------------
 40 |    f"$f%.2a" // error
    |         ^^
    |         precision not allowed
--- Error: tests/neg/f-interpolator-neg.scala:41:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:41:9 -------------------------------------------------
 41 |    f"$t%.2tT" // error
    |         ^^
    |         precision not allowed
--- Error: tests/neg/f-interpolator-neg.scala:45:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:45:7 -------------------------------------------------
 45 |    f"%<s" // error
    |       ^
    |       No last arg
--- Error: tests/neg/f-interpolator-neg.scala:46:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:46:7 -------------------------------------------------
 46 |    f"%<c" // error
    |       ^
    |       No last arg
--- Error: tests/neg/f-interpolator-neg.scala:47:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:47:7 -------------------------------------------------
 47 |    f"%<tT" // error
    |       ^
    |       No last arg
--- Error: tests/neg/f-interpolator-neg.scala:48:21 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:48:21 ------------------------------------------------
 48 |    f"${8}%d ${9}%d %3$$d" // error
    |                     ^
    |                     Argument index out of range
--- Error: tests/neg/f-interpolator-neg.scala:49:20 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:49:20 ------------------------------------------------
 49 |    f"${8}%d ${9}%d%0$$d" // error
    |                    ^
    |                    Argument index out of range
--- Warning: tests/neg/f-interpolator-neg.scala:54:17 -------------------------------------------------------------------
+-- [E209] Interpolation Warning: tests/neg/f-interpolator-neg.scala:54:17 ----------------------------------------------
 54 |    f"$s%s $s%s %1$$<s"
    |                 ^
    |                 Argument index ignored if '<' flag is present
--- Error: tests/neg/f-interpolator-neg.scala:59:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:59:7 -------------------------------------------------
 59 |    f"$s%#s" // error
    |       ^
    |       Found: (s : String), Required: java.util.Formattable
--- Error: tests/neg/f-interpolator-neg.scala:63:10 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:63:10 ------------------------------------------------
 63 |    f"$t%tG" // error
    |          ^
    |          'G' doesn't seem to be a date or time conversion
--- Error: tests/neg/f-interpolator-neg.scala:64:9 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:64:9 -------------------------------------------------
 64 |    f"$t%t" // error
    |         ^
    |         Date/time conversion must have two characters
--- Error: tests/neg/f-interpolator-neg.scala:65:8 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:65:8 -------------------------------------------------
 65 |    f"$s%10.5" // error
    |        ^^^^^
    |        Missing conversion operator in '%10.5'; use %% for literal %, %n for newline
--- Error: tests/neg/f-interpolator-neg.scala:69:29 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:69:29 ------------------------------------------------
 69 |    f"${d}random-leading-junk%d" // error
    |                             ^^
    |                             conversions must follow a splice; use %% for literal %, %n for newline
--- Error: tests/neg/f-interpolator-neg.scala:71:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:71:7 -------------------------------------------------
 71 |    f"%1$$d" // error
    |       ^
    |       Argument index out of range
--- Error: tests/neg/f-interpolator-neg.scala:72:23 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:72:23 ------------------------------------------------
 72 |    f"blablablabla %% %.2d" // error
    |                       ^^
    |                       precision not allowed
--- Error: tests/neg/f-interpolator-neg.scala:73:19 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:73:19 ------------------------------------------------
 73 |    f"blablablabla %.2b %%" // error
    |                   ^^^^
    |                   conversions must follow a splice; use %% for literal %, %n for newline
--- Error: tests/neg/f-interpolator-neg.scala:75:17 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:75:17 ------------------------------------------------
 75 |    f"ana${3}%.2f%2${true}%bb" // error
    |                 ^^
    |                 Missing conversion operator in '%2'; use %% for literal %, %n for newline
--- Error: tests/neg/f-interpolator-neg.scala:78:7 ----------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:78:7 -------------------------------------------------
 78 |    f"b%c.%2ii%iin" // error // error // error
    |       ^^
    |       conversions must follow a splice; use %% for literal %, %n for newline
--- Error: tests/neg/f-interpolator-neg.scala:78:12 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:78:12 ------------------------------------------------
 78 |    f"b%c.%2ii%iin" // error // error // error
    |            ^
    |            illegal conversion character 'i'
--- Error: tests/neg/f-interpolator-neg.scala:78:15 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:78:15 ------------------------------------------------
 78 |    f"b%c.%2ii%iin" // error // error // error
    |               ^
    |               illegal conversion character 'i'
--- Error: tests/neg/f-interpolator-neg.scala:79:10 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:79:10 ------------------------------------------------
 79 |    f"b}22%2.c<{%{"  // error // error
    |          ^^
    |          Missing conversion operator in '%2'; use %% for literal %, %n for newline
--- Error: tests/neg/f-interpolator-neg.scala:79:16 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:79:16 ------------------------------------------------
 79 |    f"b}22%2.c<{%{"  // error // error
    |                ^
    |                Missing conversion operator in '%'; use %% for literal %, %n for newline
--- Error: tests/neg/f-interpolator-neg.scala:80:19 ---------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:80:19 ------------------------------------------------
 80 |    f"%%bci.2${'i'}%..2c2" // error
    |                   ^
    |                   Missing conversion operator in '%'; use %% for literal %, %n for newline
diff --git a/tests/neg/f-interpolator-tests.check b/tests/neg/f-interpolator-tests.check
index 72b63369ce24..db8d7ae3f880 100644
--- a/tests/neg/f-interpolator-tests.check
+++ b/tests/neg/f-interpolator-tests.check
@@ -1,8 +1,8 @@
--- Error: tests/neg/f-interpolator-tests.scala:4:19 --------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-tests.scala:4:19 -----------------------------------------------
 4 |  def `um uh` = f"$s%d"  // error
   |                   ^
   |                   Found: (T.this.s : String), Required: Int, Long, Byte, Short, BigInt
--- Error: tests/neg/f-interpolator-tests.scala:10:10 -------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/f-interpolator-tests.scala:10:10 ----------------------------------------------
 10 |    f"x % y = ${x % y}%d" // error: illegal conversion character 'y'
    |          ^
    |          illegal conversion character 'y'
diff --git a/tests/neg/fEscapes.check b/tests/neg/fEscapes.check
index 29fe1412e075..8e6bfc05e04f 100644
--- a/tests/neg/fEscapes.check
+++ b/tests/neg/fEscapes.check
@@ -1,4 +1,4 @@
--- Error: tests/neg/fEscapes.scala:5:18 --------------------------------------------------------------------------------
+-- [E209] Interpolation Error: tests/neg/fEscapes.scala:5:18 -----------------------------------------------------------
 5 |  val fEscape = f"\u$octal%04x" // error
   |                  ^^
   |                  invalid unicode escape at index 1 of \u

From 538799d7bed53089cb5babd7a539b33e0313656f Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 23:13:37 +0200
Subject: [PATCH 240/505] Format interpolator messages get an ID

[Cherry-picked 797659803738410634a695db4c9ee8a369efaa95][modified]

From 1d5c8d14b3b463f01f9ec59aacedda646430880e Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 7 Apr 2025 22:09:30 +0100
Subject: [PATCH 241/505] Fix existing GADT constraints with introduced
 pattern-bound symbols

[Cherry-picked 9173814a948156a708ed6107175ab1149e5329d0]
---
 .../dotty/tools/dotc/core/GadtConstraint.scala    | 15 +++++++++++++++
 .../src/dotty/tools/dotc/typer/Inferencing.scala  |  7 ++++++-
 tests/pos/i22879.scala                            |  9 +++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22879.scala

diff --git a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala
index 44ce31b27a73..d685b3253f59 100644
--- a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala
+++ b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala
@@ -33,6 +33,18 @@ class GadtConstraint private (
     reverseMapping = reverseMapping.updated(tv.origin, sym),
   )
 
+  def replace(param: TypeParamRef, tp: Type)(using Context) =
+    var constr = constraint
+    for
+      poly <- constraint.domainLambdas
+      paramRef <- poly.paramRefs
+    do
+      val entry0 = constr.entry(paramRef)
+      val entry1 = entry0.substParam(param, tp)
+      if entry1 ne entry0 then
+        constr = constr.updateEntry(paramRef, entry1)
+    withConstraint(constr)
+
   /** Is `sym1` ordered to be less than `sym2`? */
   def isLess(sym1: Symbol, sym2: Symbol)(using Context): Boolean =
     constraint.isLess(tvarOrError(sym1).origin, tvarOrError(sym2).origin)
@@ -241,6 +253,9 @@ sealed trait GadtState {
     result
   }
 
+  def replace(param: TypeParamRef, tp: Type)(using Context) =
+    gadt = gadt.replace(param, tp)
+
   /** See [[ConstraintHandling.approximation]] */
   def approximation(sym: Symbol, fromBelow: Boolean, maxLevel: Int = Int.MaxValue)(using Context): Type = {
     approximation(gadt.tvarOrError(sym).origin, fromBelow, maxLevel).match
diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
index 877c6d36d3e9..ffef8e0638cd 100644
--- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
@@ -442,10 +442,15 @@ object Inferencing {
           }
         }
     }
-    val res = patternBindings.toList.map { (boundSym, _) =>
+    val res = patternBindings.toList.map { (boundSym, origin) =>
       // substitute bounds of pattern bound variables to deal with possible F-bounds
       for (wildCard, param) <- patternBindings do
         boundSym.info = boundSym.info.substParam(param, wildCard.typeRef)
+
+      // also substitute in any GADT bounds
+      // e.g. in i22879, replace the `T` in `X <: Iterable[T]` with the pattern bound `T$1`
+      ctx.gadtState.replace(origin, boundSym.typeRef)
+
       boundSym
     }
 
diff --git a/tests/pos/i22879.scala b/tests/pos/i22879.scala
new file mode 100644
index 000000000000..121ff603c398
--- /dev/null
+++ b/tests/pos/i22879.scala
@@ -0,0 +1,9 @@
+sealed trait E[S]
+final case class I[T, U <: Iterable[T]]() extends E[U]
+class Test {
+  def test[X](a: E[X]): Unit = {
+    a match {
+      case I() => ???
+    }
+  }
+}

From 44dfad53f70498becdf578f7589065f62b40a5b6 Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Thu, 10 Apr 2025 18:25:41 +0200
Subject: [PATCH 242/505] pc: Properly adjust indentation when inlining blocks
 (#22915)

closes scalameta/metals#7137

---------

Co-authored-by: Katarzyna Marek <26606662+kasiaMarek@users.noreply.github.com>
Co-authored-by: Robert Marek <64277069+susuro@users.noreply.github.com>
[Cherry-picked 44a61ea0f74e137f5134478fbf0bf4dfa5537535]
---
 ...Impl.scala => PcInlineValueProvider.scala} | 131 ++++++++++++++++--
 .../tools/pc/ScalaPresentationCompiler.scala  |   2 +-
 .../pc/tests/edit/InlineValueSuite.scala      |  49 ++++++-
 3 files changed, 167 insertions(+), 15 deletions(-)
 rename presentation-compiler/src/main/dotty/tools/pc/{PcInlineValueProviderImpl.scala => PcInlineValueProvider.scala} (63%)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
similarity index 63%
rename from presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala
rename to presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
index fc4b53e60bbd..eafac513c7e1 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
@@ -16,17 +16,76 @@ import dotty.tools.dotc.core.StdNames
 import dotty.tools.dotc.core.Symbols.Symbol
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
+import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 import dotty.tools.pc.IndexedContext.Result
 
 import org.eclipse.lsp4j as l
 
-final class PcInlineValueProviderImpl(
+final class PcInlineValueProvider(
     driver: InteractiveDriver,
     val params: OffsetParams
-) extends WithSymbolSearchCollector[Option[Occurence]](driver, params)
-    with InlineValueProvider:
+) extends WithSymbolSearchCollector[Option[Occurence]](driver, params):
+
+  // We return a result or an error
+  def getInlineTextEdits(): Either[String, List[l.TextEdit]] =
+    defAndRefs() match {
+      case Right((defn, refs)) =>
+        val edits =
+          if (defn.shouldBeRemoved) {
+            val defEdit = definitionTextEdit(defn)
+            val refsEdits = refs.map(referenceTextEdit(defn))
+            defEdit :: refsEdits
+          } else refs.map(referenceTextEdit(defn))
+        Right(edits)
+      case Left(error) => Left(error)
+    }
+
+  private def referenceTextEdit(
+      definition: Definition
+  )(ref: Reference): l.TextEdit =
+    if (definition.requiresBrackets && ref.requiresBrackets)
+      new l.TextEdit(
+        ref.range,
+        s"""(${ref.rhs})"""
+      )
+    else new l.TextEdit(ref.range, ref.rhs)
+
+  private def definitionTextEdit(definition: Definition): l.TextEdit =
+    new l.TextEdit(
+      extend(
+        definition.rangeOffsets.start,
+        definition.rangeOffsets.end,
+        definition.range
+      ),
+      ""
+    )
+
+  private def extend(
+      startOffset: Int,
+      endOffset: Int,
+      range: l.Range
+  ): l.Range = {
+    val (startWithSpace, endWithSpace): (Int, Int) =
+      extendRangeToIncludeWhiteCharsAndTheFollowingNewLine(
+        text
+      )(startOffset, endOffset)
+    val startPos = new l.Position(
+      range.getStart.getLine,
+      range.getStart.getCharacter - (startOffset - startWithSpace)
+    )
+    val endPos =
+      if (endWithSpace - 1 >= 0 && text(endWithSpace - 1) == '\n')
+        new l.Position(range.getEnd.getLine + 1, 0)
+      else
+        new l.Position(
+          range.getEnd.getLine,
+          range.getEnd.getCharacter + endWithSpace - endOffset
+        )
+
+    new l.Range(startPos, endPos)
+  }
 
   val position: l.Position = pos.toLsp.getStart().nn
 
@@ -41,7 +100,7 @@ final class PcInlineValueProviderImpl(
         Some(Occurence(tree, parent, adjustedPos))
       case _ => None
 
-  override def defAndRefs(): Either[String, (Definition, List[Reference])] =
+  def defAndRefs(): Either[String, (Definition, List[Reference])] =
     val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)
     val allOccurences = result().flatten
     for
@@ -60,7 +119,6 @@ final class PcInlineValueProviderImpl(
       val defPos = definition.tree.sourcePos
       val defEdit = Definition(
         defPos.toLsp,
-        adjustRhs(definition.tree.rhs.sourcePos),
         RangeOffset(defPos.start, defPos.end),
         definitionRequiresBrackets(definition.tree.rhs)(using newctx),
         deleteDefinition
@@ -70,6 +128,18 @@ final class PcInlineValueProviderImpl(
     end for
   end defAndRefs
 
+  private def stripIndentPrefix(rhs: String, refIndent: String, defIndent: String): String =
+    val rhsLines = rhs.split("\n").toList
+    rhsLines match
+      case h :: Nil => rhs
+      case h :: t =>
+        val noPrefixH = h.stripPrefix(refIndent)
+        if noPrefixH.startsWith("{") then
+          noPrefixH ++ t.map(refIndent ++ _.stripPrefix(defIndent)).mkString("\n","\n", "")
+        else
+          (("  " ++ h) :: t).map(refIndent ++ _.stripPrefix(defIndent)).mkString("\n", "\n", "")
+      case Nil => rhs
+
   private def definitionRequiresBrackets(tree: Tree)(using Context): Boolean =
     NavigateAST
       .untypedPath(tree.span)
@@ -102,12 +172,12 @@ final class PcInlineValueProviderImpl(
 
   end referenceRequiresBrackets
 
-  private def adjustRhs(pos: SourcePosition) =
+  private def extendWithSurroundingParens(pos: SourcePosition) =
+    /** Move `point` by `step` as long as the character at `point` is `acceptedChar` */
     def extend(point: Int, acceptedChar: Char, step: Int): Int =
       val newPoint = point + step
-      if newPoint > 0 && newPoint < text.length && text(
-          newPoint
-        ) == acceptedChar
+      if newPoint > 0 && newPoint < text.length &&
+        text(newPoint) == acceptedChar
       then extend(newPoint, acceptedChar, step)
       else point
     val adjustedStart = extend(pos.start, '(', -1)
@@ -139,7 +209,7 @@ final class PcInlineValueProviderImpl(
       .exists(e => e.isTerm)
     def allreferences = allOccurences.filterNot(_.isDefn)
     def inlineAll() =
-      makeRefsEdits(allreferences, symbols).map((true, _))
+      makeRefsEdits(allreferences, symbols, definition).map((true, _))
     if definition.tree.sourcePos.toLsp.encloses(position)
     then if defIsLocal then inlineAll() else Left(Errors.notLocal)
     else
@@ -150,14 +220,28 @@ final class PcInlineValueProviderImpl(
             ref <- list
               .find(_.pos.toLsp.encloses(position))
               .toRight(Errors.didNotFindReference)
-            refEdits <- makeRefsEdits(List(ref), symbols)
+            refEdits <- makeRefsEdits(List(ref), symbols, definition)
           yield (false, refEdits)
     end if
   end getReferencesToInline
 
+  extension (pos: SourcePosition)
+    def startColumnIndentPadding: String = {
+      val source = pos.source
+      val offset = pos.start
+      var idx = source.startOfLine(offset)
+      val pad = new StringBuilder
+      while (idx != offset && idx < source.content().length && source.content()(idx).isWhitespace) {
+        pad.append(if (idx < source.content().length && source.content()(idx) == '\t') '\t' else ' ')
+        idx += 1
+      }
+      pad.result()
+    }
+
   private def makeRefsEdits(
       refs: List[Occurence],
-      symbols: Set[Symbol]
+      symbols: Set[Symbol],
+      definition: DefinitionTree
   ): Either[String, List[Reference]] =
     val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)
     def buildRef(occurrence: Occurence): Either[String, Reference] =
@@ -178,6 +262,11 @@ final class PcInlineValueProviderImpl(
         Right(
           Reference(
             occurrence.pos.toLsp,
+            stripIndentPrefix(
+              extendWithSurroundingParens(definition.tree.rhs.sourcePos),
+              occurrence.tree.startPos.startColumnIndentPadding,
+              definition.tree.startPos.startColumnIndentPadding
+            ),
             occurrence.parent.map(p =>
               RangeOffset(p.sourcePos.start, p.sourcePos.end)
             ),
@@ -196,7 +285,7 @@ final class PcInlineValueProviderImpl(
     )
   end makeRefsEdits
 
-end PcInlineValueProviderImpl
+end PcInlineValueProvider
 
 case class Occurence(tree: Tree, parent: Option[Tree], pos: SourcePosition):
   def isDefn =
@@ -205,3 +294,19 @@ case class Occurence(tree: Tree, parent: Option[Tree], pos: SourcePosition):
       case _ => false
 
 case class DefinitionTree(tree: ValDef, pos: SourcePosition)
+
+case class RangeOffset(start: Int, end: Int)
+
+case class Definition(
+    range: l.Range,
+    rangeOffsets: RangeOffset,
+    requiresBrackets: Boolean,
+    shouldBeRemoved: Boolean
+)
+
+case class Reference(
+    range: l.Range,
+    rhs: String,
+    parentOffsets: Option[RangeOffset],
+    requiresBrackets: Boolean
+)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index dc53525480c3..0359e21dae89 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -355,7 +355,7 @@ case class ScalaPresentationCompiler(
     val empty: Either[String, List[l.TextEdit]] = Right(List())
     (compilerAccess
       .withInterruptableCompiler(empty, params.token()) { pc =>
-        new PcInlineValueProviderImpl(pc.compiler(), params)
+        new PcInlineValueProvider(pc.compiler(), params)
           .getInlineTextEdits()
       }(params.toQueryContext))
       .thenApply {
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
index cee0aada9f86..541340bd3f38 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
@@ -228,7 +228,8 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments:
          |  for {
          |    i <- List(1,2,3)
          |  } yield i + 1
-         |val b = (for {
+         |val b = (
+         |  for {
          |    i <- List(1,2,3)
          |  } yield i + 1).map(_ + 1)
          |}""".stripMargin
@@ -407,6 +408,52 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments:
       InlineErrors.variablesAreShadowed("T.a")
     )
 
+  @Test def `i7137` =
+    checkEdit(
+      """|object O {
+         |  def foo = {
+         |    val newValue =
+         |      val x = true
+         |      x
+         |    val xx =new<<V>>alue
+         |  }
+         |}
+         |""".stripMargin,
+      """|object O {
+         |  def foo = {
+         |    val xx =
+         |      val x = true
+         |      x
+         |  }
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `i7137a` =
+      checkEdit(
+        """|object O {
+            |  def foo = {
+            |    val newValue = {
+            |      val x = true
+            |      x
+            |    }
+            |    def bar =
+            |      val xx = new<<V>>alue
+            |  }
+            |}
+            |""".stripMargin,
+        """|object O {
+            |  def foo = {
+            |    def bar =
+            |      val xx = {
+            |        val x = true
+            |        x
+            |      }
+            |  }
+            |}
+            |""".stripMargin
+      )
+
   def checkEdit(
       original: String,
       expected: String,

From 361004f3d4bd920a779d674552dd4dfa8597d32c Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Mon, 17 Mar 2025 14:40:35 +0100
Subject: [PATCH 243/505] Revert the PolyType case in #21744

[Cherry-picked 00e92b1488ef069cd48f2c4f54d79ae17e06d581]
---
 .../dotty/tools/dotc/typer/Applications.scala   |  2 +-
 tests/pos/i22724.scala                          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22724.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 8947a2941cc0..87e9a39c7c57 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -1960,7 +1960,7 @@ trait Applications extends Compatibility {
       resultType.revealIgnored match {
         case resultType: ValueType =>
           altType.widen match {
-            case tp: PolyType => resultConforms(altSym, tp.resultType, resultType)
+            case tp: PolyType => resultConforms(altSym, instantiateWithTypeVars(tp), resultType)
             case tp: MethodType =>
               val wildRes = wildApprox(tp.resultType)
 
diff --git a/tests/pos/i22724.scala b/tests/pos/i22724.scala
new file mode 100644
index 000000000000..6146e91b88ca
--- /dev/null
+++ b/tests/pos/i22724.scala
@@ -0,0 +1,17 @@
+import java.util.concurrent.atomic.AtomicReference
+
+object UnboundedHub:
+  final class Node[A](var value: A, val pointer: AtomicReference[Pointer[A]])
+  final case class Pointer[A](node: Node[A], subscribers: Int)
+
+private final class UnboundedHub[A]:
+  import UnboundedHub.*
+
+  val publisherHead: AtomicReference[Node[A]] = new AtomicReference(
+    new Node[A](
+      null.asInstanceOf[A],
+      new AtomicReference(
+        Pointer(null, 0) // error: too many arguments for constructor AtomicReference
+      )
+    )
+  )
\ No newline at end of file

From 93b148905602e75158a946f3cca905e1bc0138bf Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 9 Apr 2025 20:21:41 +0200
Subject: [PATCH 244/505] improvement: Support using directives in worksheets

[Cherry-picked e5ea2a2af88667efd99a64ec4188f4e6d1077113]
---
 .../tools/pc/completions/ScalaCliCompletions.scala   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/ScalaCliCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/ScalaCliCompletions.scala
index e2a0a033ee6b..8df727b14155 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/ScalaCliCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/ScalaCliCompletions.scala
@@ -13,14 +13,20 @@ class ScalaCliCompletions(
 ):
   def unapply(path: List[Tree]) =
     def scalaCliDep = CoursierComplete.isScalaCliDep(
-      pos.lineContent.take(pos.column).stripPrefix("/*<script>*/")
+      pos.lineContent.take(pos.column).stripPrefix("/*<script>*/").dropWhile(c => c == ' ' || c == '\t')
     )
+
+    lazy val supportsUsing =
+      val filename = pos.source.file.path
+      filename.endsWith(".sc.scala") ||
+      filename.endsWith(".worksheet.sc")
+
     path match
       case Nil | (_: PackageDef) :: _ => scalaCliDep
       // generated script file will end with .sc.scala
-      case (_: TypeDef) :: (_: PackageDef) :: Nil if pos.source.file.path.endsWith(".sc.scala") =>
+      case (_: TypeDef) :: (_: PackageDef) :: Nil if supportsUsing =>
         scalaCliDep
-      case (_: Template) :: (_: TypeDef) :: Nil if pos.source.file.path.endsWith(".sc.scala") =>
+      case (_: Template) :: (_: TypeDef) :: Nil if supportsUsing =>
         scalaCliDep
       case head :: next => None
 

From bf7bd04d4ecf2a55387ab99605b224b93da48a4c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 23:23:53 +0200
Subject: [PATCH 245/505] Fix compilation in presentation compiler module

---
 .../dotty/tools/pc/PcInlineValueProvider.scala | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
index eafac513c7e1..7d04ea8771a4 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
@@ -72,16 +72,16 @@ final class PcInlineValueProvider(
         text
       )(startOffset, endOffset)
     val startPos = new l.Position(
-      range.getStart.getLine,
-      range.getStart.getCharacter - (startOffset - startWithSpace)
+      range.getStart.nn.getLine,
+      range.getStart.nn.getCharacter - (startOffset - startWithSpace)
     )
     val endPos =
       if (endWithSpace - 1 >= 0 && text(endWithSpace - 1) == '\n')
-        new l.Position(range.getEnd.getLine + 1, 0)
+        new l.Position(range.getEnd.nn.getLine + 1, 0)
       else
         new l.Position(
-          range.getEnd.getLine,
-          range.getEnd.getCharacter + endWithSpace - endOffset
+          range.getEnd.nn.getLine,
+          range.getEnd.nn.getCharacter + endWithSpace - endOffset
         )
 
     new l.Range(startPos, endPos)
@@ -129,15 +129,15 @@ final class PcInlineValueProvider(
   end defAndRefs
 
   private def stripIndentPrefix(rhs: String, refIndent: String, defIndent: String): String =
-    val rhsLines = rhs.split("\n").toList
+    val rhsLines = rhs.split("\n").nn.toList
     rhsLines match
       case h :: Nil => rhs
       case h :: t =>
-        val noPrefixH = h.stripPrefix(refIndent)
+        val noPrefixH = h.nn.stripPrefix(refIndent)
         if noPrefixH.startsWith("{") then
-          noPrefixH ++ t.map(refIndent ++ _.stripPrefix(defIndent)).mkString("\n","\n", "")
+          noPrefixH ++ t.map(refIndent ++ _.nn.stripPrefix(defIndent)).mkString("\n","\n", "")
         else
-          (("  " ++ h) :: t).map(refIndent ++ _.stripPrefix(defIndent)).mkString("\n", "\n", "")
+          (("  " ++ h.nn) :: t).map(refIndent ++ _.nn.stripPrefix(defIndent)).mkString("\n", "\n", "")
       case Nil => rhs
 
   private def definitionRequiresBrackets(tree: Tree)(using Context): Boolean =

From 5ca62f826505728987ce64f01f6ccf6a56c32d7c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Sun, 27 Apr 2025 23:33:11 +0200
Subject: [PATCH 246/505] backport Introduce all changes from
 https://github.com/scala/scala3/pull/20578/commits

---
 .../tools/dotc/config/ScalaSettings.scala     |   2 +
 .../transform/localopt/FormatChecker.scala    | 164 ++++++++++--------
 .../localopt/StringInterpolatorOpt.scala      |  12 +-
 tests/neg/f-interpolator-neg.check            |   8 +-
 tests/neg/f-interpolator-neg.scala            |   2 +-
 tests/warn/tostring-interpolated.scala        |  36 ++++
 6 files changed, 144 insertions(+), 80 deletions(-)
 create mode 100644 tests/warn/tostring-interpolated.scala

diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index cfd20c95a76b..4ae5df316839 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -173,6 +173,7 @@ private sealed trait WarningSettings:
   private val WvalueDiscard: Setting[Boolean] = BooleanSetting("-Wvalue-discard", "Warn when non-Unit expression results are unused.")
   private val WNonUnitStatement = BooleanSetting("-Wnonunit-statement", "Warn when block statements are non-Unit expressions.")
   private val WenumCommentDiscard = BooleanSetting("-Wenum-comment-discard", "Warn when a comment ambiguously assigned to multiple enum cases is discarded.")
+  private val WtoStringInterpolated = BooleanSetting("-Wtostring-interpolated", "Warn a standard interpolator used toString on a reference type.")
   private val Wunused: Setting[List[ChoiceWithHelp[String]]] = MultiChoiceHelpSetting(
     name = "-Wunused",
     helpArg = "warning",
@@ -288,6 +289,7 @@ private sealed trait WarningSettings:
     def valueDiscard(using Context): Boolean = allOr(WvalueDiscard)
     def nonUnitStatement(using Context): Boolean = allOr(WNonUnitStatement)
     def enumCommentDiscard(using Context): Boolean = allOr(WenumCommentDiscard)
+    def toStringInterpolated(using Context): Boolean = allOr(WtoStringInterpolated)
     def checkInit(using Context): Boolean = allOr(YcheckInit)
 
 /** -X "Extended" or "Advanced" settings */
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
index 31b72e5055ba..b0ce1d6614fd 100644
--- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
@@ -5,8 +5,6 @@ import scala.annotation.tailrec
 import scala.collection.mutable.ListBuffer
 import scala.util.matching.Regex.Match
 
-import PartialFunction.cond
-
 import dotty.tools.dotc.ast.tpd.{Match => _, *}
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Symbols.*
@@ -30,8 +28,9 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
   def argType(argi: Int, types: Type*): Type =
     require(argi < argc, s"$argi out of range picking from $types")
     val tpe = argTypes(argi)
-    types.find(t => argConformsTo(argi, tpe, t))
-      .orElse(types.find(t => argConvertsTo(argi, tpe, t)))
+    types.find(t => t != defn.AnyType && argConformsTo(argi, tpe, t))
+      .orElse(types.find(t => t != defn.AnyType && argConvertsTo(argi, tpe, t)))
+      .orElse(types.find(t => t == defn.AnyType && argConformsTo(argi, tpe, t)))
       .getOrElse {
         report.argError(s"Found: ${tpe.show}, Required: ${types.map(_.show).mkString(", ")}", argi)
         actuals += args(argi)
@@ -64,50 +63,57 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
 
   /** For N part strings and N-1 args to interpolate, normalize parts and check arg types.
    *
-   *  Returns normalized part strings and args, where args correcpond to conversions in tail of parts.
+   *  Returns normalized part strings and args, where args correspond to conversions in tail of parts.
    */
   def checked: (List[String], List[Tree]) =
     val amended = ListBuffer.empty[String]
     val convert = ListBuffer.empty[Conversion]
 
+    def checkPart(part: String, n: Int): Unit =
+      val matches = formatPattern.findAllMatchIn(part)
+
+      def insertStringConversion(): Unit =
+        amended += "%s" + part
+        val cv = Conversion.stringXn(n)
+        cv.accepts(argType(n-1, defn.AnyType))
+        convert += cv
+        cv.lintToString(argTypes(n-1))
+
+      def errorLeading(op: Conversion) = op.errorAt(Spec):
+        s"conversions must follow a splice; ${Conversion.literalHelp}"
+
+      def accept(op: Conversion): Unit =
+        if !op.isLeading then errorLeading(op)
+        op.accepts(argType(n-1, op.acceptableVariants*))
+        amended += part
+        convert += op
+        op.lintToString(argTypes(n-1))
+
+      // after the first part, a leading specifier is required for the interpolated arg; %s is supplied if needed
+      if n == 0 then amended += part
+      else if !matches.hasNext then insertStringConversion()
+      else
+        val cv = Conversion(matches.next(), n)
+        if cv.isLiteral then insertStringConversion()
+        else if cv.isIndexed then
+          if cv.index.getOrElse(-1) == n then accept(cv) else insertStringConversion()
+        else if !cv.isError then accept(cv)
+
+      // any remaining conversions in this part must be either literals or indexed
+      while matches.hasNext do
+        val cv = Conversion(matches.next(), n)
+        if n == 0 && cv.hasFlag('<') then cv.badFlag('<', "No last arg")
+        else if !cv.isLiteral && !cv.isIndexed then errorLeading(cv)
+    end checkPart
+
     @tailrec
-    def loop(remaining: List[String], n: Int): Unit =
-      remaining match
-        case part0 :: more =>
-          def badPart(t: Throwable): String = "".tap(_ => report.partError(t.getMessage.nn, index = n, offset = 0))
-          val part = try StringContext.processEscapes(part0) catch badPart
-          val matches = formatPattern.findAllMatchIn(part)
-
-          def insertStringConversion(): Unit =
-            amended += "%s" + part
-            convert += Conversion(formatPattern.findAllMatchIn("%s").next(), n)  // improve
-            argType(n-1, defn.AnyType)
-          def errorLeading(op: Conversion) = op.errorAt(Spec)(s"conversions must follow a splice; ${Conversion.literalHelp}")
-          def accept(op: Conversion): Unit =
-            if !op.isLeading then errorLeading(op)
-            op.accepts(argType(n-1, op.acceptableVariants*))
-            amended += part
-            convert += op
-
-          // after the first part, a leading specifier is required for the interpolated arg; %s is supplied if needed
-          if n == 0 then amended += part
-          else if !matches.hasNext then insertStringConversion()
-          else
-            val cv = Conversion(matches.next(), n)
-            if cv.isLiteral then insertStringConversion()
-            else if cv.isIndexed then
-              if cv.index.getOrElse(-1) == n then accept(cv) else insertStringConversion()
-            else if !cv.isError then accept(cv)
-
-          // any remaining conversions in this part must be either literals or indexed
-          while matches.hasNext do
-            val cv = Conversion(matches.next(), n)
-            if n == 0 && cv.hasFlag('<') then cv.badFlag('<', "No last arg")
-            else if !cv.isLiteral && !cv.isIndexed then errorLeading(cv)
-
-          loop(more, n + 1)
-        case Nil => ()
-    end loop
+    def loop(remaining: List[String], n: Int): Unit = remaining match
+      case part0 :: remaining =>
+        def badPart(t: Throwable): String = "".tap(_ => report.partError(t.getMessage.nn, index = n, offset = 0))
+        val part = try StringContext.processEscapes(part0) catch badPart
+        checkPart(part, n)
+        loop(remaining, n + 1)
+      case Nil =>
 
     loop(parts, n = 0)
     if reported then (Nil, Nil)
@@ -125,10 +131,8 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
     def intOf(g: SpecGroup): Option[Int] = group(g).map(_.toInt)
 
   extension (inline value: Boolean)
-    inline def or(inline body: => Unit): Boolean     = value || { body ; false }
-    inline def orElse(inline body: => Unit): Boolean = value || { body ; true }
-    inline def and(inline body: => Unit): Boolean    = value && { body ; true }
-    inline def but(inline body: => Unit): Boolean    = value && { body ; false }
+    inline infix def or(inline body: => Unit): Boolean  = value || { body; false }
+    inline infix def and(inline body: => Unit): Boolean = value && { body; true }
 
   enum Kind:
     case StringXn, HashXn, BooleanXn, CharacterXn, IntegralXn, FloatingPointXn, DateTimeXn, LiteralXn, ErrorXn
@@ -147,9 +151,10 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
     // the conversion char is the head of the op string (but see DateTimeXn)
     val cc: Char =
       kind match
-        case ErrorXn => if op.isEmpty then '?' else op(0)
-        case DateTimeXn => if op.length > 1 then op(1) else '?'
-        case _ => op(0)
+        case ErrorXn    => if op.isEmpty then '?' else op(0)
+        case DateTimeXn => if op.length <= 1 then '?' else op(1)
+        case StringXn   => if op.isEmpty then 's' else op(0) // accommodate the default %s
+        case _          => op(0)
 
     def isIndexed: Boolean = index.nonEmpty || hasFlag('<')
     def isError: Boolean   = kind == ErrorXn
@@ -209,18 +214,28 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
     // is the specifier OK with the given arg
     def accepts(arg: Type): Boolean =
       kind match
-        case BooleanXn  => arg == defn.BooleanType orElse warningAt(CC)("Boolean format is null test for non-Boolean")
-        case IntegralXn =>
-          arg == BigIntType || !cond(cc) {
-            case 'o' | 'x' | 'X' if hasAnyFlag("+ (") => "+ (".filter(hasFlag).foreach(bad => badFlag(bad, s"only use '$bad' for BigInt conversions to o, x, X")) ; true
-          }
+      case BooleanXn if arg != defn.BooleanType =>
+        warningAt(CC):
+          """non-Boolean value formats as "true" for non-null references and boxed primitives, otherwise "false""""
+        true
+      case IntegralXn if arg != BigIntType =>
+        cc match
+        case 'o' | 'x' | 'X' if hasAnyFlag("+ (") =>
+          "+ (".filter(hasFlag).foreach: bad =>
+            badFlag(bad, s"only use '$bad' for BigInt conversions to o, x, X")
+          false
         case _ => true
+      case _ => true
+
+    def lintToString(arg: Type): Unit =
+      if ctx.settings.Whas.toStringInterpolated && kind == StringXn && !(arg.widen =:= defn.StringType) && !arg.isPrimitiveValueType
+      then warningAt(CC)("interpolation uses toString")
 
     // what arg type if any does the conversion accept
     def acceptableVariants: List[Type] =
       kind match
         case StringXn        => if hasFlag('#') then FormattableType :: Nil else defn.AnyType :: Nil
-        case BooleanXn       => defn.BooleanType :: defn.NullType :: Nil
+        case BooleanXn       => defn.BooleanType :: defn.NullType :: defn.AnyType :: Nil // warn if not boolean
         case HashXn          => defn.AnyType :: Nil
         case CharacterXn     => defn.CharType :: defn.ByteType :: defn.ShortType :: defn.IntType :: Nil
         case IntegralXn      => defn.IntType :: defn.LongType :: defn.ByteType :: defn.ShortType :: BigIntType :: Nil
@@ -249,25 +264,30 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
 
   object Conversion:
     def apply(m: Match, i: Int): Conversion =
-      def kindOf(cc: Char) = cc match
-        case 's' | 'S' => StringXn
-        case 'h' | 'H' => HashXn
-        case 'b' | 'B' => BooleanXn
-        case 'c' | 'C' => CharacterXn
-        case 'd' | 'o' |
-             'x' | 'X' => IntegralXn
-        case 'e' | 'E' |
-             'f' |
-             'g' | 'G' |
-             'a' | 'A' => FloatingPointXn
-        case 't' | 'T' => DateTimeXn
-        case '%' | 'n' => LiteralXn
-        case _         => ErrorXn
-      end kindOf
       m.group(CC) match
-        case Some(cc) => new Conversion(m, i, kindOf(cc(0))).tap(_.verify)
-        case None     => new Conversion(m, i, ErrorXn).tap(_.errorAt(Spec)(s"Missing conversion operator in '${m.matched}'; $literalHelp"))
+      case Some(cc) =>
+        val xn = cc(0) match
+          case 's' | 'S' => StringXn
+          case 'h' | 'H' => HashXn
+          case 'b' | 'B' => BooleanXn
+          case 'c' | 'C' => CharacterXn
+          case 'd' | 'o' |
+               'x' | 'X' => IntegralXn
+          case 'e' | 'E' |
+               'f' |
+               'g' | 'G' |
+               'a' | 'A' => FloatingPointXn
+          case 't' | 'T' => DateTimeXn
+          case '%' | 'n' => LiteralXn
+          case _         => ErrorXn
+        new Conversion(m, i, xn)
+          .tap(_.verify)
+      case None =>
+        new Conversion(m, i, ErrorXn)
+          .tap(_.errorAt(Spec)(s"Missing conversion operator in '${m.matched}'; $literalHelp"))
     end apply
+    // construct a default %s conversion
+    def stringXn(i: Int): Conversion = new Conversion(formatPattern.findAllMatchIn("%").next(), i, StringXn)
     val literalHelp = "use %% for literal %, %n for newline"
   end Conversion
 
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
index 7743054f5487..1afcfbac6206 100644
--- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
@@ -96,16 +96,22 @@ class StringInterpolatorOpt extends MiniPhase:
     def mkConcat(strs: List[Literal], elems: List[Tree]): Tree =
       val stri = strs.iterator
       val elemi = elems.iterator
-      var result: Tree = stri.next
+      var result: Tree = stri.next()
       def concat(tree: Tree): Unit =
         result = result.select(defn.String_+).appliedTo(tree).withSpan(tree.span)
       while elemi.hasNext
       do
-        concat(elemi.next)
-        val str = stri.next
+        val elem = elemi.next()
+        lintToString(elem)
+        concat(elem)
+        val str = stri.next()
         if !str.const.stringValue.isEmpty then concat(str)
       result
     end mkConcat
+    def lintToString(t: Tree): Unit =
+      val arg: Type = t.tpe
+      if ctx.settings.Whas.toStringInterpolated && !(arg.widen =:= defn.StringType) && !arg.isPrimitiveValueType
+      then report.warning("interpolation uses toString", t.srcPos)
     val sym = tree.symbol
     // Test names first to avoid loading scala.StringContext if not used, and common names first
     val isInterpolatedMethod =
diff --git a/tests/neg/f-interpolator-neg.check b/tests/neg/f-interpolator-neg.check
index 2d19649e142e..fe1f41ab3871 100644
--- a/tests/neg/f-interpolator-neg.check
+++ b/tests/neg/f-interpolator-neg.check
@@ -14,10 +14,10 @@
 7 |    new StringContext("", "").f() // error
   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |    too few arguments for interpolated string
--- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:11:7 -------------------------------------------------
-11 |    f"$s%b" // error
-   |       ^
-   |       Found: (s : String), Required: Boolean, Null
+-- [E209] Interpolation Warning: tests/neg/f-interpolator-neg.scala:11:9 -----------------------------------------------
+11 |    f"$s%b" // warn only
+   |         ^
+   |         non-Boolean value formats as "true" for non-null references and boxed primitives, otherwise "false"
 -- [E209] Interpolation Error: tests/neg/f-interpolator-neg.scala:12:7 -------------------------------------------------
 12 |    f"$s%c" // error
    |       ^
diff --git a/tests/neg/f-interpolator-neg.scala b/tests/neg/f-interpolator-neg.scala
index d5c49d5a8111..a4cfe887bb95 100644
--- a/tests/neg/f-interpolator-neg.scala
+++ b/tests/neg/f-interpolator-neg.scala
@@ -8,7 +8,7 @@ object Test {
   }
 
   def interpolationMismatches(s : String, f : Double, b : Boolean) = {
-    f"$s%b" // error
+    f"$s%b" // warn only
     f"$s%c" // error
     f"$f%c" // error
     f"$s%x" // error
diff --git a/tests/warn/tostring-interpolated.scala b/tests/warn/tostring-interpolated.scala
new file mode 100644
index 000000000000..165bc374b5ef
--- /dev/null
+++ b/tests/warn/tostring-interpolated.scala
@@ -0,0 +1,36 @@
+//> using options -Wtostring-interpolated
+//> abusing options -Wconf:cat=w-flag-tostring-interpolated:e -Wtostring-interpolated
+
+case class C(x: Int)
+
+trait T {
+  def c = C(42)
+  def f = f"$c" // warn
+  def s = s"$c" // warn
+  def r = raw"$c" // warn
+
+  def format = f"${c.x}%d in $c or $c%s" // warn using c.toString // warn
+
+  def bool = f"$c%b" // warn just a null check
+
+  def oops = s"${null} slipped thru my fingers" // warn
+
+  def ok = s"${c.toString}"
+
+  def sb = new StringBuilder().append("hello")
+  def greeting = s"$sb, world" // warn
+}
+
+class Mitigations {
+
+  val s = "hello, world"
+  val i = 42
+  def shown = println("shown")
+
+  def ok = s"$s is ok"
+  def jersey = s"number $i"
+  def unitized = s"unfortunately $shown" // maybe tell them about unintended ()?
+
+  def nopct = f"$s is ok"
+  def nofmt = f"number $i"
+}

From da2db945d76edbbf44e3f627dee8b54e61c94538 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Fri, 11 Apr 2025 15:10:15 +0200
Subject: [PATCH 247/505] chore: remove all the warnings in the compiler
 codebase

[Cherry-picked 46a26945a172429740ebdd1fc83517130670080b]
---
 .../src/dotty/tools/dotc/core/Types.scala     | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 6c871f829941..6c3c8ef9fe85 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -392,10 +392,9 @@ object Types extends TypeUtils {
       case _ => false
 
     /** Does the type carry an annotation that is an instance of `cls`? */
-    @tailrec final def hasAnnotation(cls: ClassSymbol)(using Context): Boolean = stripTypeVar match {
-      case AnnotatedType(tp, annot) => (annot matches cls) || (tp hasAnnotation cls)
+    @tailrec final def hasAnnotation(cls: ClassSymbol)(using Context): Boolean = stripTypeVar match
+      case AnnotatedType(tp, annot) => annot.matches(cls) || tp.hasAnnotation(cls)
       case _ => false
-    }
 
     /** Does this type have a supertype with an annotation satisfying given predicate `p`? */
     def derivesAnnotWith(p: Annotation => Boolean)(using Context): Boolean = this match {
@@ -556,8 +555,8 @@ object Types extends TypeUtils {
       case AndType(l, r) =>
         val lsym = l.classSymbol
         val rsym = r.classSymbol
-        if (lsym isSubClass rsym) lsym
-        else if (rsym isSubClass lsym) rsym
+        if lsym.isSubClass(rsym) then lsym
+        else if rsym.isSubClass(lsym) then rsym
         else NoSymbol
       case tp: OrType =>
         if tp.tp1.hasClassSymbol(defn.NothingClass) then
@@ -696,7 +695,7 @@ object Types extends TypeUtils {
       case tp: TypeProxy =>
         tp.superType.findDecl(name, excluded)
       case err: ErrorType =>
-        newErrorSymbol(classSymbol orElse defn.RootClass, name, err.msg)
+        newErrorSymbol(classSymbol.orElse(defn.RootClass), name, err.msg)
       case _ =>
         NoDenotation
     }
@@ -777,7 +776,7 @@ object Types extends TypeUtils {
         case tp: JavaArrayType =>
           defn.ObjectType.findMember(name, pre, required, excluded)
         case err: ErrorType =>
-          newErrorSymbol(pre.classSymbol orElse defn.RootClass, name, err.msg)
+          newErrorSymbol(pre.classSymbol.orElse(defn.RootClass), name, err.msg)
         case _ =>
           NoDenotation
       }
@@ -872,7 +871,7 @@ object Types extends TypeUtils {
           // member in Super instead of Sub.
           // As an example of this in the wild, see
           // loadClassWithPrivateInnerAndSubSelf in ShowClassTests
-          go(tp.cls.typeRef) orElse d
+          go(tp.cls.typeRef).orElse(d)
 
       def goParam(tp: TypeParamRef) = {
         val next = tp.underlying
@@ -1110,7 +1109,7 @@ object Types extends TypeUtils {
         false
 
     def relaxed_<:<(that: Type)(using Context): Boolean =
-      (this <:< that) || (this isValueSubType that)
+      (this <:< that) || this.isValueSubType(that)
 
     /** Is this type a legal type for member `sym1` that overrides another
      *  member `sym2` of type `that`? This is the same as `<:<`, except that
@@ -1164,10 +1163,10 @@ object Types extends TypeUtils {
      *  vice versa.
      */
     def matchesLoosely(that: Type)(using Context): Boolean =
-      (this matches that) || {
+      this.matches(that) || {
         val thisResult = this.widenExpr
         val thatResult = that.widenExpr
-        (this eq thisResult) != (that eq thatResult) && (thisResult matchesLoosely thatResult)
+        (this eq thisResult) != (that eq thatResult) && thisResult.matchesLoosely(thatResult)
       }
 
     /** The basetype of this type with given class symbol, NoType if `base` is not a class. */
@@ -1798,7 +1797,7 @@ object Types extends TypeUtils {
      *  no symbol it tries `member` as an alternative.
      */
     def typeParamNamed(name: TypeName)(using Context): Symbol =
-      classSymbol.unforcedDecls.lookup(name) orElse member(name).symbol
+      classSymbol.unforcedDecls.lookup(name).orElse(member(name).symbol)
 
     /** If this is a prototype with some ignored component, reveal one more
      *  layer of it. Otherwise the type itself.
@@ -1931,9 +1930,9 @@ object Types extends TypeUtils {
     def annotatedToRepeated(using Context): Type = this match {
       case tp @ ExprType(tp1) =>
         tp.derivedExprType(tp1.annotatedToRepeated)
-      case self @ AnnotatedType(tp, annot) if annot matches defn.RetainsByNameAnnot =>
+      case self @ AnnotatedType(tp, annot) if annot.matches(defn.RetainsByNameAnnot) =>
         self.derivedAnnotatedType(tp.annotatedToRepeated, annot)
-      case AnnotatedType(tp, annot) if annot matches defn.RepeatedAnnot =>
+      case AnnotatedType(tp, annot) if annot.matches(defn.RepeatedAnnot) =>
         val typeSym = tp.typeSymbol.asClass
         assert(typeSym == defn.SeqClass || typeSym == defn.ArrayClass)
         tp.translateParameterized(typeSym, defn.RepeatedParamClass)
@@ -2633,9 +2632,9 @@ object Types extends TypeUtils {
      */
     final def controlled[T](op: => T)(using Context): T = try {
       ctx.base.underlyingRecursions += 1
-      if (ctx.base.underlyingRecursions < Config.LogPendingUnderlyingThreshold)
+      if ctx.base.underlyingRecursions < Config.LogPendingUnderlyingThreshold then
         op
-      else if (ctx.pendingUnderlying contains this)
+      else if ctx.pendingUnderlying.contains(this) then
         throw CyclicReference(symbol)
       else
         try {
@@ -3375,8 +3374,8 @@ object Types extends TypeUtils {
         val bcs1set = BaseClassSet(bcs1)
         def recur(bcs2: List[ClassSymbol]): List[ClassSymbol] = bcs2 match {
           case bc2 :: bcs2rest =>
-            if (bcs1set contains bc2)
-              if (bc2.is(Trait)) recur(bcs2rest)
+            if bcs1set.contains(bc2) then
+              if bc2.is(Trait) then recur(bcs2rest)
               else bcs1 // common class, therefore rest is the same in both sequences
             else bc2 :: recur(bcs2rest)
           case nil => bcs1
@@ -3472,9 +3471,8 @@ object Types extends TypeUtils {
         val bcs1set = BaseClassSet(bcs1)
         def recur(bcs2: List[ClassSymbol]): List[ClassSymbol] = bcs2 match {
           case bc2 :: bcs2rest =>
-            if (bcs1set contains bc2)
-              if (bc2.is(Trait)) bc2 :: recur(bcs2rest)
-              else bcs2
+            if bcs1set.contains(bc2) then
+              if bc2.is(Trait) then bc2 :: recur(bcs2rest) else bcs2
             else recur(bcs2rest)
           case nil =>
             bcs2
@@ -5415,11 +5413,11 @@ object Types extends TypeUtils {
       parent.hashIsStable
 
     override def eql(that: Type): Boolean = that match
-      case that: AnnotatedType => (parent eq that.parent) && (annot eql that.annot)
+      case that: AnnotatedType => (parent eq that.parent) && annot.eql(that.annot)
       case _ => false
 
     override def iso(that: Any, bs: BinderPairs): Boolean = that match
-      case that: AnnotatedType => parent.equals(that.parent, bs) && (annot eql that.annot)
+      case that: AnnotatedType => parent.equals(that.parent, bs) && annot.eql(that.annot)
       case _ => false
   }
 
@@ -5986,7 +5984,7 @@ object Types extends TypeUtils {
     }
   }
 
-  @sharable object IdentityTypeMap extends TypeMap()(NoContext) {
+  @sharable object IdentityTypeMap extends TypeMap()(using NoContext) {
     def apply(tp: Type): Type = tp
   }
 
@@ -6457,7 +6455,7 @@ object Types extends TypeUtils {
     def maybeAdd(xs: List[NamedType], tp: NamedType): List[NamedType] = if p(tp) then tp :: xs else xs
     val seen = util.HashSet[Type]()
     def apply(xs: List[NamedType], tp: Type): List[NamedType] =
-      if seen contains tp then xs
+      if seen.contains(tp) then xs
       else
         seen += tp
         tp match
@@ -6636,7 +6634,7 @@ object Types extends TypeUtils {
 
   object fieldFilter extends NameFilter {
     def apply(pre: Type, name: Name)(using Context): Boolean =
-      name.isTermName && (pre member name).hasAltWith(!_.symbol.is(Method))
+      name.isTermName && pre.member(name).hasAltWith(!_.symbol.is(Method))
     def isStable = true
   }
 

From 326326fb4e704bee9ea2ea51f0dc255f870614c0 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Fri, 11 Apr 2025 15:34:54 +0200
Subject: [PATCH 248/505] chore: add .git-blame-ignore-revs

[Cherry-picked 5569c74f6eedbff89181452ba3c13a6d7e6d164c]
---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000000..118a334b383a
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+46a26945a172429740ebdd1fc83517130670080b

From c38970b9816d797c41afe83862642673839c4d52 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Fri, 11 Apr 2025 13:19:20 +0200
Subject: [PATCH 249/505] fix: show hover for synthetics if explicitly used

---
 .../main/dotty/tools/pc/MetalsInteractive.scala    | 14 +++++++-------
 .../tools/pc/tests/hover/HoverTermSuite.scala      | 13 +++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
index f5de56711118..8c3e52080c93 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
@@ -216,13 +216,6 @@ object MetalsInteractive:
         if head.symbol.is(Exported) then
           val sym = head.symbol.sourceSymbol
           List((sym, sym.info, None))
-        else if head.symbol.is(Synthetic) then
-          enclosingSymbolsWithExpressionType(
-            tail,
-            pos,
-            indexed,
-            skipCheckOnName
-          )
         else if head.symbol != NoSymbol then
           if skipCheckOnName ||
             MetalsInteractive.isOnName(
@@ -231,6 +224,13 @@ object MetalsInteractive:
               indexed.ctx.source
             )
           then List((head.symbol, head.typeOpt, None))
+          else if head.symbol.is(Synthetic) then
+            enclosingSymbolsWithExpressionType(
+              tail,
+              pos,
+              indexed,
+              skipCheckOnName
+            )
           /* Type tree for List(1) has an Int type variable, which has span
            * but doesn't exist in code.
            * https://github.com/lampepfl/dotty/issues/15937
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
index 6f682139506e..b2170d0e32b5 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -718,3 +718,16 @@ class HoverTermSuite extends BaseHoverSuite:
       """def ???: Nothing""".stripMargin.hover
   )
 
+  @Test def `value-of`: Unit =
+    check(
+      """|enum Foo(val key: String) {
+         |  case Bar extends Foo("b")
+         |  case Baz extends Foo("z")
+         |}
+         |
+         |object Foo {
+         |  def parse(key: String) = Foo.va@@lueOf("b")
+         |
+         |""".stripMargin,
+         "def valueOf($name: String): Foo".hover
+    )

From 85710688ee84533d372878b10c63da000d780428 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Apr 2025 10:58:19 +0200
Subject: [PATCH 250/505] fix: show hover for synthetics if explicitly used

[Cherry-picked 2078b746b23675393fb5ba3789adfe9ed0e162ff][modified]

From 164720f287dc569c3e6604fbc8cf51bcc565561a Mon Sep 17 00:00:00 2001
From: Jan-Pieter van den Heuvel <jan-pieter@piozum.com>
Date: Sun, 13 Apr 2025 18:11:39 +0200
Subject: [PATCH 251/505] Disallow context bounds in type lambdas (#22659)

Fixes #22552

---------

Co-authored-by: Natsu Kagami <nki@nkagami.me>
---
 compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 13 +++++++++++--
 tests/neg/i22552.check                              |  8 ++++++++
 tests/neg/i22552.scala                              |  5 +++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/neg/i22552.check
 create mode 100644 tests/neg/i22552.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 47389fbce054..e92ef2f7ce69 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -1677,8 +1677,9 @@ object Parsers {
         val start = in.offset
         val tparams = typeParamClause(ParamOwner.TypeParam)
         if in.token == TLARROW then
+          // Filter illegal context bounds and report syntax error
           atSpan(start, in.skipToken()):
-            LambdaTypeTree(tparams, toplevelTyp())
+            LambdaTypeTree(tparams.mapConserve(stripContextBounds("type lambdas")), toplevelTyp())
         else if in.token == ARROW || isPureArrow(nme.PUREARROW) then
           val arrowOffset = in.skipToken()
           val body = toplevelTyp()
@@ -1699,6 +1700,13 @@ object Parsers {
         typeRest(infixType())
     end typ
 
+    /** Removes context bounds from TypeDefs and returns a syntax error. */
+    private def stripContextBounds(in: String)(tparam: TypeDef) = tparam match
+      case TypeDef(name, rhs: ContextBounds) =>
+        syntaxError(em"context bounds are not allowed in $in", rhs.span)
+        TypeDef(name, rhs.bounds)
+      case other => other
+
     private def makeKindProjectorTypeDef(name: TypeName): TypeDef = {
       val isVarianceAnnotated = name.startsWith("+") || name.startsWith("-")
       // We remove the variance marker from the name without passing along the specified variance at all
@@ -3267,7 +3275,8 @@ object Parsers {
      *  TypTypeParam      ::=  {Annotation} id [HkTypePamClause] TypeBounds
      *
      *  HkTypeParamClause ::=  ‘[’ HkTypeParam {‘,’ HkTypeParam} ‘]’
-     *  HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’] (id [HkTypePamClause] | ‘_’) TypeBounds
+     *  HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’]
+     *                         (id | ‘_’) [HkTypeParamClause] TypeBounds
      */
     def typeParamClause(paramOwner: ParamOwner): List[TypeDef] = inBracketsWithCommas {
 
diff --git a/tests/neg/i22552.check b/tests/neg/i22552.check
new file mode 100644
index 000000000000..7a9b6c9800c7
--- /dev/null
+++ b/tests/neg/i22552.check
@@ -0,0 +1,8 @@
+-- [E040] Syntax Error: tests/neg/i22552.scala:3:10 --------------------------------------------------------------------
+3 |  type A[X: TC]                     // error
+  |          ^
+  |          ']' expected, but ':' found
+-- Error: tests/neg/i22552.scala:4:15 ----------------------------------------------------------------------------------
+4 |  type C = [X: TC] =>> List[X]      // error
+  |               ^^
+  |               context bounds are not allowed in type lambdas
diff --git a/tests/neg/i22552.scala b/tests/neg/i22552.scala
new file mode 100644
index 000000000000..5ac7840a3a96
--- /dev/null
+++ b/tests/neg/i22552.scala
@@ -0,0 +1,5 @@
+trait Foo:
+  type TC[T]
+  type A[X: TC]                     // error
+  type C = [X: TC] =>> List[X]      // error
+  type D = [X: TC] => () => List[X] // allowed context bound

From 3c8c16b7c17bda26de3b61a5c52d8cd65632b3da Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Apr 2025 10:59:18 +0200
Subject: [PATCH 252/505] Disallow context bounds in type lambdas (#22659)

Fixes #22552

---------

Co-authored-by: Natsu Kagami <nki@nkagami.me>
[Cherry-picked 5b4b5c21b791d592f4bd2218485a11c50a48e538][modified]

From 6fd24716ac9f8c19b2faa649c7ba32e96d529485 Mon Sep 17 00:00:00 2001
From: Daisy Li <li.daisy2003@gmail.com>
Date: Mon, 24 Mar 2025 22:28:18 -0400
Subject: [PATCH 253/505] Report warning for argument parameter number
 mismatch.

---
 .../tools/dotc/transform/init/Semantic.scala  | 23 ++++++++++-
 .../tools/dotc/transform/init/Util.scala      |  5 +++
 .../dotty/tools/dotc/CompilationTests.scala   | 41 +++++++++++++++----
 tests/init/tasty-error/typedef/C.scala        |  1 +
 tests/init/tasty-error/typedef/Main.scala     |  2 +
 tests/init/tasty-error/typedef/v0/A.scala     |  3 ++
 tests/init/tasty-error/typedef/v1/A.scala     |  3 ++
 tests/init/tasty-error/typedef/v1/B.scala     |  4 ++
 .../{ => val-or-defdef}/Main.scala            |  0
 .../{ => val-or-defdef}/v0/A.scala            |  0
 .../{ => val-or-defdef}/v1/A.scala            |  0
 .../{ => val-or-defdef}/v1/B.scala            |  0
 12 files changed, 73 insertions(+), 9 deletions(-)
 create mode 100644 tests/init/tasty-error/typedef/C.scala
 create mode 100644 tests/init/tasty-error/typedef/Main.scala
 create mode 100644 tests/init/tasty-error/typedef/v0/A.scala
 create mode 100644 tests/init/tasty-error/typedef/v1/A.scala
 create mode 100644 tests/init/tasty-error/typedef/v1/B.scala
 rename tests/init/tasty-error/{ => val-or-defdef}/Main.scala (100%)
 rename tests/init/tasty-error/{ => val-or-defdef}/v0/A.scala (100%)
 rename tests/init/tasty-error/{ => val-or-defdef}/v1/A.scala (100%)
 rename tests/init/tasty-error/{ => val-or-defdef}/v1/B.scala (100%)

diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
index 5d9b4f0e5ce0..a9115251e14f 100644
--- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
+++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
@@ -448,6 +448,18 @@ object Semantic:
   object TreeCache:
     class CacheData:
       private val emptyTrees = mutable.Set[ValOrDefDef]()
+      private val templatesToSkip = mutable.Set[Template]()
+
+      def checkTemplateBodyValidity(tpl: Template, className: String)(using Context): Unit =
+        if (templatesToSkip.contains(tpl))
+          throw new TastyTreeException(className)
+
+        val errorCount = ctx.reporter.errorCount
+        tpl.forceFields()
+
+        if (ctx.reporter.errorCount > errorCount)
+          templatesToSkip.add(tpl)
+          throw new TastyTreeException(className)
 
       extension (tree: ValOrDefDef)
         def getRhs(using Context): Tree =
@@ -466,6 +478,8 @@ object Semantic:
           else getTree
   end TreeCache
 
+  inline def treeCache(using t: TreeCache.CacheData): TreeCache.CacheData = t
+
 // ----- Operations on domains -----------------------------
   extension (a: Value)
     def join(b: Value): Value =
@@ -645,6 +659,8 @@ object Semantic:
         val methodType = atPhaseBeforeTransforms { meth.info.stripPoly }
         var allArgsHot = true
         val allParamTypes = methodType.paramInfoss.flatten.map(_.repeatedToSingle)
+        if(allParamTypes.size != args.size)
+          report.warning("[Internal error] Number of parameters do not match number of arguments in " + meth.name)
         val errors = allParamTypes.zip(args).flatMap { (info, arg) =>
           val tryReporter = Reporter.errorsIn { arg.promote }
           allArgsHot = allArgsHot && tryReporter.errors.isEmpty
@@ -1164,7 +1180,10 @@ object Semantic:
     given Cache.Data()
     given TreeCache.CacheData()
     for classSym <- classes if isConcreteClass(classSym) do
-      checkClass(classSym)
+      try
+        checkClass(classSym)
+      catch
+        case TastyTreeException(className) => report.warning("Skipping the analysis of " + classSym.show + " due to an error reading the body of " + className + "'s TASTy.")
 
 // ----- Semantic definition --------------------------------
   type ArgInfo = TraceValue[Value]
@@ -1498,6 +1517,8 @@ object Semantic:
    * @param klass     The class to which the template belongs.
    */
   def init(tpl: Template, thisV: Ref, klass: ClassSymbol): Contextual[Value] = log("init " + klass.show, printer, (_: Value).show) {
+    treeCache.checkTemplateBodyValidity(tpl, klass.show)
+
     val paramsMap = tpl.constr.termParamss.flatten.map { vdef =>
       vdef.name -> thisV.objekt.field(vdef.symbol)
     }.toMap
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Util.scala b/compiler/src/dotty/tools/dotc/transform/init/Util.scala
index ba2216504aef..a4741e276188 100644
--- a/compiler/src/dotty/tools/dotc/transform/init/Util.scala
+++ b/compiler/src/dotty/tools/dotc/transform/init/Util.scala
@@ -15,6 +15,9 @@ import config.Printers.init as printer
 import Trace.*
 
 object Util:
+  /** Exception used for errors encountered when reading TASTy. */
+  case class TastyTreeException(msg: String) extends RuntimeException(msg)
+  
   /** Utility definition used for better error-reporting of argument errors */
   case class TraceValue[T](value: T, trace: Trace)
 
@@ -39,6 +42,8 @@ object Util:
       case Apply(fn, args) =>
         val argTps = fn.tpe.widen match
           case mt: MethodType => mt.paramInfos
+        if (args.size != argTps.size)
+          report.warning("[Internal error] Number of arguments do not match number of argument types in " + tree.symbol.name)
         val normArgs: List[Arg] = args.zip(argTps).map {
           case (arg, _: ExprType) => ByNameArg(arg)
           case (arg, _)           => arg
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index e9562b016a74..9571e80d5ccd 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -241,20 +241,45 @@ class CompilationTests {
      * compatible, but (b) and (c) are not. If (b) and (c) are compiled together, there should be
      * an error when reading the files' TASTy trees. */
     locally {
-      val tastyErrorGroup = TestGroup("checkInit/tasty-error")
+      val tastyErrorGroup = TestGroup("checkInit/tasty-error/val-or-defdef")
       val tastyErrorOptions = options.without("-Xfatal-warnings")
 
-      val a0Dir = defaultOutputDir + tastyErrorGroup + "/A/v0/A"
-      val a1Dir = defaultOutputDir + tastyErrorGroup + "/A/v1/A"
-      val b1Dir = defaultOutputDir + tastyErrorGroup + "/B/v1/B"
+      val classA0 = defaultOutputDir + tastyErrorGroup + "/A/v0/A"
+      val classA1 = defaultOutputDir + tastyErrorGroup + "/A/v1/A"
+      val classB1 = defaultOutputDir + tastyErrorGroup + "/B/v1/B"
 
       val tests = List(
-        compileFile("tests/init/tasty-error/v1/A.scala", tastyErrorOptions)(tastyErrorGroup),
-        compileFile("tests/init/tasty-error/v1/B.scala", tastyErrorOptions.withClasspath(a1Dir))(tastyErrorGroup),
-        compileFile("tests/init/tasty-error/v0/A.scala", tastyErrorOptions)(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/val-or-defdef/v1/A.scala", tastyErrorOptions)(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/val-or-defdef/v1/B.scala", tastyErrorOptions.withClasspath(classA1))(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/val-or-defdef/v0/A.scala", tastyErrorOptions)(tastyErrorGroup),
       ).map(_.keepOutput.checkCompile())
 
-      compileFile("tests/init/tasty-error/Main.scala", tastyErrorOptions.withClasspath(a0Dir).withClasspath(b1Dir))(tastyErrorGroup).checkExpectedErrors()
+      compileFile("tests/init/tasty-error/val-or-defdef/Main.scala", tastyErrorOptions.withClasspath(classA0).withClasspath(classB1))(tastyErrorGroup).checkExpectedErrors()
+
+      tests.foreach(_.delete())
+    }
+
+    /* This tests for errors in the program's TASTy trees.
+     * The test consists of five files: Main, C, v1/A, v1/B, and v0/A. The files v1/A, v1/B, and v0/A all depend on C. v1/A and v1/B are
+     * compatible, but v1/B and v0/A are not. If v1/B and v0/A are compiled together, there should be
+     * an error when reading the files' TASTy trees. This fact is demonstrated by the compilation of Main. */
+    locally {
+      val tastyErrorGroup = TestGroup("checkInit/tasty-error/typedef")
+      val tastyErrorOptions = options.without("-Xfatal-warnings").without("-Ycheck:all")
+
+      val classC = defaultOutputDir + tastyErrorGroup + "/C/typedef/C"
+      val classA0 = defaultOutputDir + tastyErrorGroup + "/A/v0/A"
+      val classA1 = defaultOutputDir + tastyErrorGroup + "/A/v1/A"
+      val classB1 = defaultOutputDir + tastyErrorGroup + "/B/v1/B"
+
+      val tests = List(
+        compileFile("tests/init/tasty-error/typedef/C.scala", tastyErrorOptions)(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/typedef/v1/A.scala", tastyErrorOptions.withClasspath(classC))(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/typedef/v1/B.scala", tastyErrorOptions.withClasspath(classC).withClasspath(classA1))(tastyErrorGroup),
+        compileFile("tests/init/tasty-error/typedef/v0/A.scala", tastyErrorOptions.withClasspath(classC))(tastyErrorGroup),
+      ).map(_.keepOutput.checkCompile())
+
+      compileFile("tests/init/tasty-error/typedef/Main.scala", tastyErrorOptions.withClasspath(classC).withClasspath(classA0).withClasspath(classB1))(tastyErrorGroup).checkExpectedErrors()
 
       tests.foreach(_.delete())
     }
diff --git a/tests/init/tasty-error/typedef/C.scala b/tests/init/tasty-error/typedef/C.scala
new file mode 100644
index 000000000000..9dccdd5e5954
--- /dev/null
+++ b/tests/init/tasty-error/typedef/C.scala
@@ -0,0 +1 @@
+class C
\ No newline at end of file
diff --git a/tests/init/tasty-error/typedef/Main.scala b/tests/init/tasty-error/typedef/Main.scala
new file mode 100644
index 000000000000..232a7c34c4e1
--- /dev/null
+++ b/tests/init/tasty-error/typedef/Main.scala
@@ -0,0 +1,2 @@
+class Main extends B{} // anypos-error
+class ExtendsB extends B{}
\ No newline at end of file
diff --git a/tests/init/tasty-error/typedef/v0/A.scala b/tests/init/tasty-error/typedef/v0/A.scala
new file mode 100644
index 000000000000..9c86f47e2c77
--- /dev/null
+++ b/tests/init/tasty-error/typedef/v0/A.scala
@@ -0,0 +1,3 @@
+class A(c1: C) {
+  def fail(a: Int, b: Int): Int = a
+}
diff --git a/tests/init/tasty-error/typedef/v1/A.scala b/tests/init/tasty-error/typedef/v1/A.scala
new file mode 100644
index 000000000000..a79930e5dd30
--- /dev/null
+++ b/tests/init/tasty-error/typedef/v1/A.scala
@@ -0,0 +1,3 @@
+class A(c1: C, c2: C) {
+  def fail(a: Int, b: Int): Int = a
+}
diff --git a/tests/init/tasty-error/typedef/v1/B.scala b/tests/init/tasty-error/typedef/v1/B.scala
new file mode 100644
index 000000000000..801efcb5fdf0
--- /dev/null
+++ b/tests/init/tasty-error/typedef/v1/B.scala
@@ -0,0 +1,4 @@
+class B extends C{
+  new A(this, this).fail(0,0)
+  val x = 5
+}
\ No newline at end of file
diff --git a/tests/init/tasty-error/Main.scala b/tests/init/tasty-error/val-or-defdef/Main.scala
similarity index 100%
rename from tests/init/tasty-error/Main.scala
rename to tests/init/tasty-error/val-or-defdef/Main.scala
diff --git a/tests/init/tasty-error/v0/A.scala b/tests/init/tasty-error/val-or-defdef/v0/A.scala
similarity index 100%
rename from tests/init/tasty-error/v0/A.scala
rename to tests/init/tasty-error/val-or-defdef/v0/A.scala
diff --git a/tests/init/tasty-error/v1/A.scala b/tests/init/tasty-error/val-or-defdef/v1/A.scala
similarity index 100%
rename from tests/init/tasty-error/v1/A.scala
rename to tests/init/tasty-error/val-or-defdef/v1/A.scala
diff --git a/tests/init/tasty-error/v1/B.scala b/tests/init/tasty-error/val-or-defdef/v1/B.scala
similarity index 100%
rename from tests/init/tasty-error/v1/B.scala
rename to tests/init/tasty-error/val-or-defdef/v1/B.scala

From eeaa5607719b97dec14bd2c62e052cff22e7476b Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Apr 2025 11:00:27 +0200
Subject: [PATCH 254/505] Report warning for argument parameter number
 mismatch.

[Cherry-picked 884436fd2c641cd32c5d68b06dc5c13fb1dcc1d3][modified]

From bb90d08a368b653b6ded228c57fd21aa5cbf032a Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 16 Apr 2025 14:33:42 +0000
Subject: [PATCH 255/505] Disable Cats flaky tests

[Cherry-picked c41054820ffdea2c6b824287df1ad0ec2ace8ed2]
---
 community-build/community-projects/cats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats
index 771c6c802f59..683f28dd0da4 160000
--- a/community-build/community-projects/cats
+++ b/community-build/community-projects/cats
@@ -1 +1 @@
-Subproject commit 771c6c802f59c72dbc1be1898081c9c882ddfeb0
+Subproject commit 683f28dd0da42e20c4bbf1515c7a7839c3d3c7a9

From da59705c8e28714adecb865df805baa3efccab88 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Wed, 16 Apr 2025 11:12:36 +0200
Subject: [PATCH 256/505] Call dealias after stripping type variables for
 tupleElementTypesUpTo

[Cherry-picked f8b12dd4b73ae832278e21d4da0cd6a9fb6b6846]
---
 .../src/dotty/tools/dotc/core/TypeUtils.scala |  3 +-
 tests/pos/i22643.scala                        | 48 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22643.scala

diff --git a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
index 73acc24c38c2..d2f2e61f2e39 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
@@ -71,7 +71,8 @@ class TypeUtils:
           case _ =>
             if defn.isTupleClass(tp.typeSymbol) && !normalize then Some(tp.dealias.argInfos)
             else None
-      recur(self.stripTypeVar, bound)
+      val stripped = if normalize then self.stripTypeVar.dealias else self.stripTypeVar // keep error reporting aliased
+      recur(stripped, bound)
 
     /** Is this a generic tuple but not already an instance of one of Tuple1..22? */
     def isGenericTuple(using Context): Boolean =
diff --git a/tests/pos/i22643.scala b/tests/pos/i22643.scala
new file mode 100644
index 000000000000..5b203c678740
--- /dev/null
+++ b/tests/pos/i22643.scala
@@ -0,0 +1,48 @@
+import language.experimental.namedTuples
+
+
+
+object ExhibitB:
+
+  trait JoinB[A <: Tuple, B <: Tuple]:
+    type NTB = NamedTuple.NamedTuple[Tuple.Concat[A, B], (String, Int)]
+    val ntB: NTB = ???
+
+  val joinB: JoinB[Tuple1["nameB"], Tuple1["ageB"]] = ???
+
+  joinB.ntB.nameB    // works
+
+
+object ExhibitC:
+
+  type A = Tuple1["nameC"]
+  type B = Tuple1["ageC"]
+
+  type NamesC = Tuple.Concat[A, B]
+  type NTC = NamedTuple.NamedTuple[NamesC, (String, Int)]
+  val ntC: NTC = ???
+
+  ntC.nameC   // works
+
+
+object ExhibitD:
+
+  trait JoinD[A, B]:
+    type NamesD = (A, B)
+    type NTD = NamedTuple.NamedTuple[NamesD, (String, Int)]
+    val ntD: NTD = ???
+
+  val joinD: JoinD["nameD", "ageD"] = ???
+
+  joinD.ntD.nameD    // works
+
+object ExhibitA:
+
+  trait JoinA[A <: Tuple, B <: Tuple]:
+    type NamesA = Tuple.Concat[A, B]
+    type NTA = NamedTuple.NamedTuple[NamesA, (String, Int)]
+    val ntA: NTA = ???
+
+  val joinA: JoinA[Tuple1["nameA"], Tuple1["ageA"]] = ???
+
+  joinA.ntA.nameA    // fixed

From f674f80e1d194679c89cb91fb11e8f0a73364321 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Wed, 16 Apr 2025 11:57:04 +0200
Subject: [PATCH 257/505] Add tests from #22645

[Cherry-picked 5b869a43016a8642bd19078c57a18006e11157e7]
---
 tests/pos/i22645a.scala | 44 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 tests/pos/i22645a.scala

diff --git a/tests/pos/i22645a.scala b/tests/pos/i22645a.scala
new file mode 100644
index 000000000000..3015d7dd161c
--- /dev/null
+++ b/tests/pos/i22645a.scala
@@ -0,0 +1,44 @@
+import language.experimental.namedTuples
+object ExhibitA:  //  fails
+
+  class SelectableNT[N <: Tuple] extends Selectable:
+    def selectDynamic(name: String) = ???
+    type Names = Tuple.Map[N, [X] =>> X]
+    type Fields = NamedTuple.NamedTuple[Names, (String, Int)]
+
+  val x = new SelectableNT[("name", "age")]
+  x.name  // fails
+
+
+object ExhibitB:  //  works
+
+  class SelectableNT[N <: Tuple] extends Selectable:
+    def selectDynamic(name: String) = ???
+    type Fields = NamedTuple.NamedTuple[N, (String, Int)]
+
+  val x = new SelectableNT[("name", "age")]
+  x.name
+
+
+object ExhibitC:  // works
+
+  class SelectableNT[N <: Tuple] extends Selectable:
+    def selectDynamic(name: String) = ???
+    type Fields = NamedTuple.NamedTuple[N, (String, Int)]
+
+  type N = ("name", "age")
+  val x = new SelectableNT[N]
+  x.name
+
+
+object ExhibitD:  // works
+
+  class SelectableNT[N <: Tuple] extends Selectable:
+    def selectDynamic(name: String) = ???
+    type Fields = NamedTuple.NamedTuple[N, (String, Int)]
+
+  type N = ("name", "age")
+  type Names = Tuple.Map[N, [X] =>> X]
+  val x = new SelectableNT[Names]
+  x.name
+

From 594b07cebed293a8d45200d5338b1f4480713965 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 17 Apr 2025 10:46:40 +0200
Subject: [PATCH 258/505] Move delias into recur for tupleElementTypesUpTo

[Cherry-picked 0cded6554dfcb19a87997f8745b18457eca353d2]
---
 compiler/src/dotty/tools/dotc/core/TypeUtils.scala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
index d2f2e61f2e39..e31cd19b1135 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
@@ -60,7 +60,7 @@ class TypeUtils:
     def tupleElementTypesUpTo(bound: Int, normalize: Boolean = true)(using Context): Option[List[Type]] =
       def recur(tp: Type, bound: Int): Option[List[Type]] =
         if bound < 0 then Some(Nil)
-        else (if normalize then tp.normalized else tp).dealias match
+        else (if normalize then tp.dealias.normalized else tp).dealias match
           case AppliedType(tycon, hd :: tl :: Nil) if tycon.isRef(defn.PairClass) =>
             recur(tl, bound - 1).map(hd :: _)
           case tp: AppliedType if defn.isTupleNType(tp) && normalize =>
@@ -71,8 +71,7 @@ class TypeUtils:
           case _ =>
             if defn.isTupleClass(tp.typeSymbol) && !normalize then Some(tp.dealias.argInfos)
             else None
-      val stripped = if normalize then self.stripTypeVar.dealias else self.stripTypeVar // keep error reporting aliased
-      recur(stripped, bound)
+      recur(self.stripTypeVar, bound)
 
     /** Is this a generic tuple but not already an instance of one of Tuple1..22? */
     def isGenericTuple(using Context): Boolean =

From 96797468590505bdcfb32dcb26b6fe76c7fc070f Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 17 Apr 2025 11:11:52 +0200
Subject: [PATCH 259/505] Readd ExhibitB test with pickling exclusion

[Cherry-picked fbaca4c3cab6505b4f93990b91b576a23780609b]
---
 compiler/test/dotc/pos-test-pickling.excludelist |  1 +
 tests/pos/i22645b.scala                          | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 tests/pos/i22645b.scala

diff --git a/compiler/test/dotc/pos-test-pickling.excludelist b/compiler/test/dotc/pos-test-pickling.excludelist
index 8f09dc61609b..1aae6f88e55a 100644
--- a/compiler/test/dotc/pos-test-pickling.excludelist
+++ b/compiler/test/dotc/pos-test-pickling.excludelist
@@ -71,6 +71,7 @@ i18211.scala
 named-tuples1.scala
 i20897.scala
 i20512.scala
+i22645b.scala
 
 # Opaque type
 i5720.scala
diff --git a/tests/pos/i22645b.scala b/tests/pos/i22645b.scala
new file mode 100644
index 000000000000..acce89f25ee9
--- /dev/null
+++ b/tests/pos/i22645b.scala
@@ -0,0 +1,12 @@
+import language.experimental.namedTuples
+object ExhibitE:  // works
+
+  type N = ("name", "age")
+  type Names = Tuple.Map[N, [X] =>> X]
+
+  class SelectableNT extends Selectable:
+    def selectDynamic(name: String) = ???
+    type Fields = NamedTuple.NamedTuple[Names, (String, Int)]
+
+  val x = new SelectableNT
+  x.name
\ No newline at end of file

From 9ebb8c4062148dec314f55c86c9d139741da5eb6 Mon Sep 17 00:00:00 2001
From: philippus <philippus@gmail.com>
Date: Wed, 16 Apr 2025 06:56:33 +0200
Subject: [PATCH 260/505] Update asm to 9.8.0

[Cherry-picked f87077d3c1eb6a16f7aab81b5213a89a74351d9e]
---
 compiler/src/dotty/tools/backend/jvm/BackendUtils.scala | 3 ++-
 project/Build.scala                                     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala b/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala
index 973e9cddcadd..1b16b2bc9800 100644
--- a/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala
@@ -186,6 +186,7 @@ object BackendUtils {
     21 -> asm.Opcodes.V21,
     22 -> asm.Opcodes.V22,
     23 -> asm.Opcodes.V23,
-    24 -> asm.Opcodes.V24
+    24 -> asm.Opcodes.V24,
+    25 -> asm.Opcodes.V25
   )
 }
diff --git a/project/Build.scala b/project/Build.scala
index 0e463c817bf9..69eda7596559 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -657,7 +657,7 @@ object Build {
 
       // get libraries onboard
       libraryDependencies ++= Seq(
-        "org.scala-lang.modules" % "scala-asm" % "9.7.1-scala-1", // used by the backend
+        "org.scala-lang.modules" % "scala-asm" % "9.8.0-scala-1", // used by the backend
         Dependencies.compilerInterface,
         "org.jline" % "jline-reader" % "3.29.0",   // used by the REPL
         "org.jline" % "jline-terminal" % "3.29.0",

From 5c1e5f691a5c43b13950e799bf1ea6496b71cbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Bra=C4=8Devac?= <bracevac@users.noreply.github.com>
Date: Thu, 17 Apr 2025 16:23:44 +0200
Subject: [PATCH 261/505] Disallow context function types as value-class
 parameters

[Cherry-picked 3ee5b29d010af0f15769dc19892c0b72de805490]
---
 compiler/src/dotty/tools/dotc/typer/Checking.scala | 2 ++
 tests/neg/i22752.scala                             | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 tests/neg/i22752.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
index 2757304f32e8..dda32fd380a7 100644
--- a/compiler/src/dotty/tools/dotc/typer/Checking.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -755,6 +755,8 @@ object Checking {
         }
         clParamAccessors match {
           case param :: params =>
+            if (defn.isContextFunctionType(param.info))
+              report.error("value classes are not allowed for context function types", param.srcPos)
             if (param.is(Mutable))
               report.error(ValueClassParameterMayNotBeAVar(clazz, param), param.srcPos)
             if (param.info.isInstanceOf[ExprType])
diff --git a/tests/neg/i22752.scala b/tests/neg/i22752.scala
new file mode 100644
index 000000000000..5c93b3ccbd68
--- /dev/null
+++ b/tests/neg/i22752.scala
@@ -0,0 +1,4 @@
+class Inner(body: Int ?=> Int) extends AnyVal: // error
+  def rescue: Int ?=> Int = ???
+
+class Inner2(body: Int => Int) extends AnyVal // ok

From 2395411b74fb13f4d8e00e056b831e683165aa0f Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Apr 2025 12:12:45 +0200
Subject: [PATCH 262/505] bugfix: Drop changes unrelated to LTS

---
 .../dotty/tools/dotc/parsing/Parsers.scala    | 13 +----
 tests/neg/i22552.check                        | 10 ++--
 tests/neg/i22552.scala                        |  2 +-
 tests/pos/i22643.scala                        | 48 -------------------
 tests/pos/i22645a.scala                       | 44 -----------------
 tests/pos/i22645b.scala                       | 12 -----
 6 files changed, 10 insertions(+), 119 deletions(-)
 delete mode 100644 tests/pos/i22643.scala
 delete mode 100644 tests/pos/i22645a.scala
 delete mode 100644 tests/pos/i22645b.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index e92ef2f7ce69..47389fbce054 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -1677,9 +1677,8 @@ object Parsers {
         val start = in.offset
         val tparams = typeParamClause(ParamOwner.TypeParam)
         if in.token == TLARROW then
-          // Filter illegal context bounds and report syntax error
           atSpan(start, in.skipToken()):
-            LambdaTypeTree(tparams.mapConserve(stripContextBounds("type lambdas")), toplevelTyp())
+            LambdaTypeTree(tparams, toplevelTyp())
         else if in.token == ARROW || isPureArrow(nme.PUREARROW) then
           val arrowOffset = in.skipToken()
           val body = toplevelTyp()
@@ -1700,13 +1699,6 @@ object Parsers {
         typeRest(infixType())
     end typ
 
-    /** Removes context bounds from TypeDefs and returns a syntax error. */
-    private def stripContextBounds(in: String)(tparam: TypeDef) = tparam match
-      case TypeDef(name, rhs: ContextBounds) =>
-        syntaxError(em"context bounds are not allowed in $in", rhs.span)
-        TypeDef(name, rhs.bounds)
-      case other => other
-
     private def makeKindProjectorTypeDef(name: TypeName): TypeDef = {
       val isVarianceAnnotated = name.startsWith("+") || name.startsWith("-")
       // We remove the variance marker from the name without passing along the specified variance at all
@@ -3275,8 +3267,7 @@ object Parsers {
      *  TypTypeParam      ::=  {Annotation} id [HkTypePamClause] TypeBounds
      *
      *  HkTypeParamClause ::=  ‘[’ HkTypeParam {‘,’ HkTypeParam} ‘]’
-     *  HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’]
-     *                         (id | ‘_’) [HkTypeParamClause] TypeBounds
+     *  HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’] (id [HkTypePamClause] | ‘_’) TypeBounds
      */
     def typeParamClause(paramOwner: ParamOwner): List[TypeDef] = inBracketsWithCommas {
 
diff --git a/tests/neg/i22552.check b/tests/neg/i22552.check
index 7a9b6c9800c7..910c8ad44c11 100644
--- a/tests/neg/i22552.check
+++ b/tests/neg/i22552.check
@@ -2,7 +2,11 @@
 3 |  type A[X: TC]                     // error
   |          ^
   |          ']' expected, but ':' found
--- Error: tests/neg/i22552.scala:4:15 ----------------------------------------------------------------------------------
+-- [E040] Syntax Error: tests/neg/i22552.scala:4:13 --------------------------------------------------------------------
 4 |  type C = [X: TC] =>> List[X]      // error
-  |               ^^
-  |               context bounds are not allowed in type lambdas
+  |             ^
+  |             ']' expected, but ':' found
+-- [E040] Syntax Error: tests/neg/i22552.scala:5:13 --------------------------------------------------------------------
+5 |  type D = [X: TC] => () => List[X] // error
+  |             ^
+  |             ']' expected, but ':' found
diff --git a/tests/neg/i22552.scala b/tests/neg/i22552.scala
index 5ac7840a3a96..d76c6ec2af8d 100644
--- a/tests/neg/i22552.scala
+++ b/tests/neg/i22552.scala
@@ -2,4 +2,4 @@ trait Foo:
   type TC[T]
   type A[X: TC]                     // error
   type C = [X: TC] =>> List[X]      // error
-  type D = [X: TC] => () => List[X] // allowed context bound
+  type D = [X: TC] => () => List[X] // error
diff --git a/tests/pos/i22643.scala b/tests/pos/i22643.scala
deleted file mode 100644
index 5b203c678740..000000000000
--- a/tests/pos/i22643.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-import language.experimental.namedTuples
-
-
-
-object ExhibitB:
-
-  trait JoinB[A <: Tuple, B <: Tuple]:
-    type NTB = NamedTuple.NamedTuple[Tuple.Concat[A, B], (String, Int)]
-    val ntB: NTB = ???
-
-  val joinB: JoinB[Tuple1["nameB"], Tuple1["ageB"]] = ???
-
-  joinB.ntB.nameB    // works
-
-
-object ExhibitC:
-
-  type A = Tuple1["nameC"]
-  type B = Tuple1["ageC"]
-
-  type NamesC = Tuple.Concat[A, B]
-  type NTC = NamedTuple.NamedTuple[NamesC, (String, Int)]
-  val ntC: NTC = ???
-
-  ntC.nameC   // works
-
-
-object ExhibitD:
-
-  trait JoinD[A, B]:
-    type NamesD = (A, B)
-    type NTD = NamedTuple.NamedTuple[NamesD, (String, Int)]
-    val ntD: NTD = ???
-
-  val joinD: JoinD["nameD", "ageD"] = ???
-
-  joinD.ntD.nameD    // works
-
-object ExhibitA:
-
-  trait JoinA[A <: Tuple, B <: Tuple]:
-    type NamesA = Tuple.Concat[A, B]
-    type NTA = NamedTuple.NamedTuple[NamesA, (String, Int)]
-    val ntA: NTA = ???
-
-  val joinA: JoinA[Tuple1["nameA"], Tuple1["ageA"]] = ???
-
-  joinA.ntA.nameA    // fixed
diff --git a/tests/pos/i22645a.scala b/tests/pos/i22645a.scala
deleted file mode 100644
index 3015d7dd161c..000000000000
--- a/tests/pos/i22645a.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-import language.experimental.namedTuples
-object ExhibitA:  //  fails
-
-  class SelectableNT[N <: Tuple] extends Selectable:
-    def selectDynamic(name: String) = ???
-    type Names = Tuple.Map[N, [X] =>> X]
-    type Fields = NamedTuple.NamedTuple[Names, (String, Int)]
-
-  val x = new SelectableNT[("name", "age")]
-  x.name  // fails
-
-
-object ExhibitB:  //  works
-
-  class SelectableNT[N <: Tuple] extends Selectable:
-    def selectDynamic(name: String) = ???
-    type Fields = NamedTuple.NamedTuple[N, (String, Int)]
-
-  val x = new SelectableNT[("name", "age")]
-  x.name
-
-
-object ExhibitC:  // works
-
-  class SelectableNT[N <: Tuple] extends Selectable:
-    def selectDynamic(name: String) = ???
-    type Fields = NamedTuple.NamedTuple[N, (String, Int)]
-
-  type N = ("name", "age")
-  val x = new SelectableNT[N]
-  x.name
-
-
-object ExhibitD:  // works
-
-  class SelectableNT[N <: Tuple] extends Selectable:
-    def selectDynamic(name: String) = ???
-    type Fields = NamedTuple.NamedTuple[N, (String, Int)]
-
-  type N = ("name", "age")
-  type Names = Tuple.Map[N, [X] =>> X]
-  val x = new SelectableNT[Names]
-  x.name
-
diff --git a/tests/pos/i22645b.scala b/tests/pos/i22645b.scala
deleted file mode 100644
index acce89f25ee9..000000000000
--- a/tests/pos/i22645b.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import language.experimental.namedTuples
-object ExhibitE:  // works
-
-  type N = ("name", "age")
-  type Names = Tuple.Map[N, [X] =>> X]
-
-  class SelectableNT extends Selectable:
-    def selectDynamic(name: String) = ???
-    type Fields = NamedTuple.NamedTuple[Names, (String, Int)]
-
-  val x = new SelectableNT
-  x.name
\ No newline at end of file

From af060828fca53332efcb3b18c048d9c488b176d1 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Apr 2025 12:19:34 +0200
Subject: [PATCH 263/505] bugfix: CheckUnused checks span.exists before testing
 its parts

---
 compiler/src/dotty/tools/dotc/config/ScalaSettings.scala | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index 4ae5df316839..075ea2423f86 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -192,9 +192,10 @@ private sealed trait WarningSettings:
       ChoiceWithHelp("linted", "Enable -Wunused:imports,privates,locals,implicits"),
       ChoiceWithHelp(
         name = "strict-no-implicit-warn",
-        description = "Same as -Wunused:import, only for imports of explicit named members.\n" +
-        "NOTE : This overrides -Wunused:imports and NOT set by -Wunused:all"
+        description = """Same as -Wunused:imports, only for imports of explicit named members.
+                        |NOTE : This overrides -Wunused:imports and NOT set by -Wunused:all""".stripMargin
       ),
+      ChoiceWithHelp("unsafe-warn-patvars", "Deprecated alias for `patvars`"),
     ),
     default = Nil
   )
@@ -219,7 +220,7 @@ private sealed trait WarningSettings:
     def params(using Context) = allOr("params")
     def privates(using Context) =
       allOr("privates") || allOr("linted")
-    def patvars(using Context) = allOr("patvars")
+    def patvars(using Context) = allOr("patvars") || isChoiceSet("unsafe-warn-patvars")
     def inlined(using Context) = isChoiceSet("inlined")
     def linted(using Context) =
       allOr("linted")

From 5df2a921ff91d3f55cf6444d8b0e8e3bfc8158c3 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 29 Apr 2025 18:07:30 +0200
Subject: [PATCH 264/505] chore: Switch reference version to 3.3.6-RC2

---
 project/Build.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index 69eda7596559..bec970038ae0 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -88,7 +88,7 @@ object Build {
    *
    *  Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
    */
-  val referenceVersion = "3.3.6-RC1"
+  val referenceVersion = "3.3.6-RC2"
 
   /** Version of the Scala compiler targeted in the current release cycle
    *  Contains a version without RC/SNAPSHOT/NIGHTLY specific suffixes

From 11f0366e8f58a8aa575edb54ee07bbcce34a5ecf Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 29 Apr 2025 19:43:48 +0200
Subject: [PATCH 265/505] Revert "Do not lift annotation arguments"

This reverts commit a08bf03eefca7fee7ef15a59e6139dce84b04d92.
---
 .../src/dotty/tools/dotc/ast/TreeInfo.scala   |  4 +--
 .../tools/dotc/printing/RefinedPrinter.scala  |  2 +-
 .../dotty/tools/dotc/typer/Applications.scala |  9 +------
 .../dependent-annot-default-args.check        | 25 -------------------
 .../dependent-annot-default-args.scala        |  6 -----
 5 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 tests/printing/dependent-annot-default-args.check
 delete mode 100644 tests/printing/dependent-annot-default-args.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
index 8c682971adcb..9efad31e9796 100644
--- a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
+++ b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
@@ -142,7 +142,7 @@ trait TreeInfo[T <: Untyped] { self: Trees.Instance[T] =>
   def allTermArguments(tree: Tree): List[Tree] = unsplice(tree) match {
     case Apply(fn, args) => allTermArguments(fn) ::: args
     case TypeApply(fn, args) => allTermArguments(fn)
-    case Block(Nil, expr) => allTermArguments(expr)
+    case Block(_, expr) => allTermArguments(expr)
     case _ => Nil
   }
 
@@ -150,7 +150,7 @@ trait TreeInfo[T <: Untyped] { self: Trees.Instance[T] =>
   def allArguments(tree: Tree): List[Tree] = unsplice(tree) match {
     case Apply(fn, args) => allArguments(fn) ::: args
     case TypeApply(fn, args) => allArguments(fn) ::: args
-    case Block(Nil, expr) => allArguments(expr)
+    case Block(_, expr) => allArguments(expr)
     case _ => Nil
   }
 
diff --git a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
index 286d68319c4e..26936361cb2f 100644
--- a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
+++ b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
@@ -1040,7 +1040,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     def recur(t: untpd.Tree): Text = t match
       case Apply(fn, Nil) => recur(fn)
       case Apply(fn, args) =>
-        val explicitArgs = args.filterNot(untpd.stripNamedArg(_).symbol.name.is(DefaultGetterName))
+        val explicitArgs = args.filterNot(_.symbol.name.is(DefaultGetterName))
         recur(fn) ~ "(" ~ toTextGlobal(explicitArgs, ", ") ~ ")"
       case TypeApply(fn, args) => recur(fn) ~ "[" ~ toTextGlobal(args, ", ") ~ "]"
       case Select(qual, nme.CONSTRUCTOR) => recur(qual)
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 87e9a39c7c57..0d1b5595334e 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -479,7 +479,7 @@ trait Applications extends Compatibility {
         case tp => args.size
       }
 
-      !isAnnotConstr(methRef.symbol) &&
+      !isJavaAnnotConstr(methRef.symbol) &&
       args.size < requiredArgNum(funType)
     }
 
@@ -611,11 +611,6 @@ trait Applications extends Compatibility {
     def isJavaAnnotConstr(sym: Symbol): Boolean =
       sym.is(JavaDefined) && sym.isConstructor && sym.owner.is(JavaAnnotation)
 
-
-    /** Is `sym` a constructor of an annotation? */
-    def isAnnotConstr(sym: Symbol): Boolean =
-      sym.isConstructor && sym.owner.isAnnotation
-
     /** Match re-ordered arguments against formal parameters
      *  @param n   The position of the first parameter in formals in `methType`.
      */
@@ -905,8 +900,6 @@ trait Applications extends Compatibility {
       val app1 =
         if !success then app0.withType(UnspecifiedErrorType)
         else {
-          if isAnnotConstr(methRef.symbol) && !isJavaAnnotConstr(methRef.symbol) then
-            typedArgs
           if !sameSeq(args, orderedArgs)
              && !isJavaAnnotConstr(methRef.symbol)
              && !typedArgs.forall(isSafeArg)
diff --git a/tests/printing/dependent-annot-default-args.check b/tests/printing/dependent-annot-default-args.check
deleted file mode 100644
index 44c1fe31e2d1..000000000000
--- a/tests/printing/dependent-annot-default-args.check
+++ /dev/null
@@ -1,25 +0,0 @@
-[[syntax trees at end of                     typer]] // tests/printing/dependent-annot-default-args.scala
-package <empty> {
-  class annot(x: Any, y: Any) extends annotation.Annotation() {
-    private[this] val x: Any
-    private[this] val y: Any
-  }
-  final lazy module val annot: annot = new annot()
-  final module class annot() extends AnyRef() { this: annot.type =>
-    def $lessinit$greater$default$2: Any @uncheckedVariance = 42
-  }
-  final lazy module val dependent-annot-default-args$package:
-    dependent-annot-default-args$package =
-    new dependent-annot-default-args$package()
-  final module class dependent-annot-default-args$package() extends Object() {
-    this: dependent-annot-default-args$package.type =>
-    def f(x: Int): Int @annot(x) = x
-    def test: Unit =
-      {
-        val y: Int = ???
-        val z: Int @annot(y) = f(y)
-        ()
-      }
-  }
-}
-
diff --git a/tests/printing/dependent-annot-default-args.scala b/tests/printing/dependent-annot-default-args.scala
deleted file mode 100644
index 075913a63689..000000000000
--- a/tests/printing/dependent-annot-default-args.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-class annot(x: Any, y: Any = 42) extends annotation.Annotation
-def f(x: Int): Int @annot(x) = x
-
-def test =
-  val y: Int = ???
-  val z = f(y)

From b48d36fe6ac14bf26fbbe9487fed9d84f61219fd Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 11 Apr 2025 15:40:11 -0700
Subject: [PATCH 266/505] Process Export for unused check

[Cherry-picked 7e863578642ce0f1ba6f7248a037616c846934cf]
---
 .../src/dotty/tools/dotc/transform/CheckUnused.scala   |  2 ++
 tests/warn/i22983.scala                                | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 tests/warn/i22983.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 82eaa7dee176..7be84e6e3df1 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -218,6 +218,8 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
           selector.bound match
           case untpd.TypedSplice(bound) => transformAllDeep(bound)
           case _ =>
+    case exp: Export =>
+      transformAllDeep(exp.expr)
     case AppliedTypeTree(tpt, args) =>
       transformAllDeep(tpt)
       args.foreach(transformAllDeep)
diff --git a/tests/warn/i22983.scala b/tests/warn/i22983.scala
new file mode 100644
index 000000000000..673ed4b45f67
--- /dev/null
+++ b/tests/warn/i22983.scala
@@ -0,0 +1,10 @@
+//> using options -Werror -Wunused:imports
+
+object test1:
+  object foo:
+    type X = Int
+
+object test2:
+  import test1.foo
+
+  export foo.X

From 275b52ea3f8e078b0ba8cf76f7e8676eca96d55b Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 11 Apr 2025 05:11:04 -0700
Subject: [PATCH 267/505] No warn for evidence params of marker traits such as
 NotGiven

---
 .../src/dotty/tools/dotc/transform/CheckUnused.scala  | 11 ++++++-----
 tests/warn/i15503f.scala                              |  5 +++--
 tests/warn/i22969.scala                               | 10 ++++++++++
 tests/warn/scala2-t11681.scala                        |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 tests/warn/i22969.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 7be84e6e3df1..2940abaeac79 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -595,15 +595,16 @@ object CheckUnused:
         val dd = defn
            m.isDeprecated
         || m.is(Synthetic)
-        || sym.owner.name.isContextFunction    // a ubiquitous parameter
-        || sym.name.is(ContextBoundParamName) && sym.info.typeSymbol.isMarkerTrait // a ubiquitous parameter
         || m.hasAnnotation(dd.UnusedAnnot)          // param of unused method
+        || sym.owner.name.isContextFunction         // a ubiquitous parameter
+        || sym.isCanEqual
         || sym.info.typeSymbol.match                // more ubiquity
            case dd.DummyImplicitClass | dd.SubTypeClass | dd.SameTypeClass => true
-           case _ => false
+           case tps =>
+             tps.isMarkerTrait // no members to use; was only if sym.name.is(ContextBoundParamName)
+             ||                // but consider NotGiven
+             tps.hasAnnotation(dd.LanguageFeatureMetaAnnot)
         || sym.info.isSingleton // DSL friendly
-        || sym.isCanEqual
-        || sym.info.typeSymbol.hasAnnotation(dd.LanguageFeatureMetaAnnot)
         || sym.info.isInstanceOf[RefinedType] // can't be expressed as a context bound
       if ctx.settings.WunusedHas.implicits
         && !infos.skip(m)
diff --git a/tests/warn/i15503f.scala b/tests/warn/i15503f.scala
index 1b145a20280a..7c3483411f86 100644
--- a/tests/warn/i15503f.scala
+++ b/tests/warn/i15503f.scala
@@ -19,7 +19,7 @@ trait T
 object T:
   def hole(using T) = ()
 
-class C(using T) // warn
+class C(using T) // no warn marker trait is evidence only
 
 class D(using T):
   def t = T.hole // nowarn
@@ -44,7 +44,8 @@ object Unmatched:
       case _ =>
     e
 
-trait Ctx
+trait Ctx:
+  val state: Int
 case class K(i: Int)(using val ctx: Ctx) // nowarn
 class L(val i: Int)(using val ctx: Ctx) // nowarn
 class M(val i: Int)(using ctx: Ctx) // warn
diff --git a/tests/warn/i22969.scala b/tests/warn/i22969.scala
new file mode 100644
index 000000000000..ed0f38f1aba1
--- /dev/null
+++ b/tests/warn/i22969.scala
@@ -0,0 +1,10 @@
+//> using options -Werror -Wunused:all
+import scala.util.NotGiven
+
+object Test {
+  def f[T](a: Int)(using NotGiven[T <:< Int]) = a + 2
+}
+
+trait Furthermore:
+  type Intish[A] = A <:< Int
+  def f[A: Intish] = ()
diff --git a/tests/warn/scala2-t11681.scala b/tests/warn/scala2-t11681.scala
index 507b58bf2277..adbf5ea41299 100644
--- a/tests/warn/scala2-t11681.scala
+++ b/tests/warn/scala2-t11681.scala
@@ -98,7 +98,7 @@ trait Anonymous {
 }
 trait Context[A]
 trait Implicits {
-  def f[A](implicit ctx: Context[A]) = answer // warn implicit param even though only marker
+  def f[A](implicit ctx: Context[A]) = answer // no warn after all; previously, warn implicit param even though marker
   def g[A: Context] = answer // no warn bound that is marker only
 }
 class Bound[A: Context] // no warn bound that is marker only

From c942d25395eb4e71ca9423fcb75bb3a62f497d80 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 30 Apr 2025 14:34:12 +0200
Subject: [PATCH 268/505] No warn for evidence params of marker traits such as
 NotGiven

[Cherry-picked 32defdf95710f358ef6041cb62401844f777cb05][modified]

From e8588512ecbdced0d1bb5532dc85f32a2efb0697 Mon Sep 17 00:00:00 2001
From: Yoonjae Jeon <yoonjae.jeon@devsisters.com>
Date: Wed, 23 Apr 2025 21:22:25 +0900
Subject: [PATCH 269/505] Disallow value classes extending type aliases of
 AnyVal

---
 .../tools/dotc/reporting/ErrorMessageID.scala |  1 +
 .../dotty/tools/dotc/reporting/messages.scala |  6 ++++++
 .../tools/dotc/transform/TreeChecker.scala    |  2 +-
 .../src/dotty/tools/dotc/typer/Checking.scala | 19 +++++++++++++++----
 .../src/dotty/tools/dotc/typer/Typer.scala    |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index 600370509c6f..b077989f4f9a 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -223,6 +223,7 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case IllegalUnrollPlacementID // errorNumber: 207  - unused in LTS
   case ExtensionHasDefaultID // errorNumber: 208
   case FormatInterpolationErrorID // errorNumber: 209
+  case ValueClassCannotExtendAliasOfAnyValID // errorNumber: 210
 
   def errorNumber = ordinal - 1
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 6c1f8ed939d6..896dcb497e00 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -1793,6 +1793,12 @@ class ValueClassParameterMayNotBeCallByName(valueClass: Symbol, param: Symbol)(u
   def explain(using Context) = ""
 }
 
+class ValueClassCannotExtendAliasOfAnyVal(valueClass: Symbol, alias: Symbol)(using Context)
+  extends SyntaxMsg(ValueClassCannotExtendAliasOfAnyValID) {
+  def msg(using Context) = i"""A value class cannot extend a type alias ($alias) of ${hl("AnyVal")}"""
+  def explain(using Context) = ""
+}
+
 class SuperCallsNotAllowedInlineable(symbol: Symbol)(using Context)
   extends SyntaxMsg(SuperCallsNotAllowedInlineableID) {
   def msg(using Context) = i"Super call not allowed in inlineable $symbol"
diff --git a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
index 33d1ea20df14..9d29344789c3 100644
--- a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
@@ -214,7 +214,7 @@ object TreeChecker {
     private val everDefinedSyms = MutableSymbolMap[untpd.Tree]()
 
     // don't check value classes after typer, as the constraint about constructors doesn't hold after transform
-    override def checkDerivedValueClass(clazz: Symbol, stats: List[Tree])(using Context): Unit = ()
+    override def checkDerivedValueClass(cdef: untpd.TypeDef, clazz: Symbol, stats: List[Tree])(using Context): Unit = ()
 
     def withDefinedSyms[T](trees: List[untpd.Tree])(op: => T)(using Context): T = {
       var locally = List.empty[Symbol]
diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
index dda32fd380a7..8b6e875ab6ff 100644
--- a/compiler/src/dotty/tools/dotc/typer/Checking.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -720,7 +720,7 @@ object Checking {
   }
 
   /** Verify classes extending AnyVal meet the requirements */
-  def checkDerivedValueClass(clazz: Symbol, stats: List[Tree])(using Context): Unit = {
+  def checkDerivedValueClass(cdef: untpd.TypeDef, clazz: Symbol, stats: List[Tree])(using Context): Unit = {
     def checkValueClassMember(stat: Tree) = stat match {
       case _: TypeDef if stat.symbol.isClass =>
         report.error(ValueClassesMayNotDefineInner(clazz, stat.symbol), stat.srcPos)
@@ -733,6 +733,14 @@ object Checking {
       case _ =>
         report.error(ValueClassesMayNotContainInitalization(clazz), stat.srcPos)
     }
+    inline def checkParentIsNotAnyValAlias(): Unit =
+      cdef.rhs match {
+        case impl: Template =>
+          val parent = impl.parents.head
+          if parent.symbol.isAliasType && parent.typeOpt.dealias =:= defn.AnyValType then
+            report.error(ValueClassCannotExtendAliasOfAnyVal(clazz, parent.symbol), cdef.srcPos)
+        case _ => ()
+      }
     // We don't check synthesised enum anonymous classes that are generated from
     // enum extending a value class type (AnyVal or an alias of it)
     // The error message 'EnumMayNotBeValueClassesID' will take care of generating the error message (See #22236)
@@ -747,6 +755,9 @@ object Checking {
         report.error(ValueClassesMayNotBeAbstract(clazz), clazz.srcPos)
       if (!clazz.isStatic)
         report.error(ValueClassesMayNotBeContainted(clazz), clazz.srcPos)
+
+      checkParentIsNotAnyValAlias()
+
       if (isDerivedValueClass(underlyingOfValueClass(clazz.asClass).classSymbol))
         report.error(ValueClassesMayNotWrapAnotherValueClass(clazz), clazz.srcPos)
       else {
@@ -1228,8 +1239,8 @@ trait Checking {
     else tpt
 
   /** Verify classes extending AnyVal meet the requirements */
-  def checkDerivedValueClass(clazz: Symbol, stats: List[Tree])(using Context): Unit =
-    Checking.checkDerivedValueClass(clazz, stats)
+  def checkDerivedValueClass(cdef: untpd.TypeDef, clazz: Symbol, stats: List[Tree])(using Context): Unit =
+    Checking.checkDerivedValueClass(cdef, clazz, stats)
 
   /** Check that case classes are not inherited by case classes.
    */
@@ -1600,7 +1611,7 @@ trait NoChecking extends ReChecking {
   override def checkNoTargetNameConflict(stats: List[Tree])(using Context): Unit = ()
   override def checkParentCall(call: Tree, caller: ClassSymbol)(using Context): Unit = ()
   override def checkSimpleKinded(tpt: Tree)(using Context): Tree = tpt
-  override def checkDerivedValueClass(clazz: Symbol, stats: List[Tree])(using Context): Unit = ()
+  override def checkDerivedValueClass(cdef: untpd.TypeDef, clazz: Symbol, stats: List[Tree])(using Context): Unit = ()
   override def checkCaseInheritance(parentSym: Symbol, caseCls: ClassSymbol, pos: SrcPos)(using Context): Unit = ()
   override def checkNoForwardDependencies(vparams: List[ValDef])(using Context): Unit = ()
   override def checkMembersOK(tp: Type, pos: SrcPos)(using Context): Type = tp
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index bdf1151e9b35..035d57cfc230 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2779,7 +2779,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
       checkNonCyclicInherited(cls.thisType, cls.info.parents, cls.info.decls, cdef.srcPos)
 
       // check value class constraints
-      checkDerivedValueClass(cls, body1)
+      checkDerivedValueClass(cdef, cls, body1)
 
       // check PolyFunction constraints (no erased functions!)
       if parents1.exists(_.tpe.classSymbol eq defn.PolyFunctionClass) then

From 7cb911c4c6f80b31f71a81995b456625c1ef8586 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 30 Apr 2025 14:42:13 +0200
Subject: [PATCH 270/505] less allocation

[Cherry-picked 9315bbbbb8958c376dbfab250073559a39337769][modified]

From a34b2134913463d496ba1e1b567b9c86db38fdd3 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sun, 7 Jul 2024 09:07:29 -0700
Subject: [PATCH 271/505] Respect export alias for default arg forwarder

[Cherry-picked 4db7df7c240087aad013434668f63637a2be643c]
---
 .../src/dotty/tools/dotc/typer/Namer.scala    | 24 ++++++-------
 tests/run/i19587.scala                        | 34 +++++++++++++++++++
 2 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 tests/run/i19587.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index 542ea04442ff..4f779e4a9c71 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1176,20 +1176,21 @@ class Namer { typer: Typer =>
           Yes
       }
 
-      def foreachDefaultGetterOf(sym: TermSymbol, op: TermSymbol => Unit): Unit =
+      def foreachDefaultGetterOf(sym: TermSymbol, alias: TermName)(op: (TermSymbol, TermName) => Unit): Unit =
         var n = 0
-        val methodName =
-          if sym.name == nme.apply && sym.is(Synthetic) && sym.owner.companionClass.is(Case) then
-            // The synthesized `apply` methods of case classes use the constructor's default getters
-            nme.CONSTRUCTOR
-          else sym.name
+        // The synthesized `apply` methods of case classes use the constructor's default getters
+        val useConstructor = sym.name == nme.apply && sym.is(Synthetic) && sym.owner.companionClass.is(Case)
+        val methodName     = if useConstructor then nme.CONSTRUCTOR else sym.name
+        val aliasedName    = if useConstructor then nme.CONSTRUCTOR else alias
+        val useAliased     = !useConstructor && methodName != aliasedName
         for params <- sym.paramSymss; param <- params do
           if param.isTerm then
             if param.is(HasDefault) then
               val getterName = DefaultGetterName(methodName, n)
               val getter = pathType.member(getterName).symbol
               assert(getter.exists, i"$path does not have a default getter named $getterName")
-              op(getter.asTerm)
+              val targetName = if useAliased then DefaultGetterName(aliasedName, n) else getterName
+              op(getter.asTerm, targetName)
             n += 1
 
       /** Add a forwarder with name `alias` or its type name equivalent to `mbr`,
@@ -1310,9 +1311,8 @@ class Namer { typer: Typer =>
             })
             buf += ddef.withSpan(span)
             if hasDefaults then
-              foreachDefaultGetterOf(sym.asTerm,
-                getter => addForwarder(
-                  getter.name.asTermName, getter.asSeenFrom(path.tpe), span))
+              foreachDefaultGetterOf(sym.asTerm, alias): (getter, getterName) =>
+                addForwarder(getterName, getter.asSeenFrom(path.tpe), span)
 
             // adding annotations and flags at the parameter level
             // TODO: This probably needs to be filtered to avoid adding some annotation
@@ -1367,13 +1367,13 @@ class Namer { typer: Typer =>
               addWildcardForwardersNamed(alias, span)
 
       def addForwarders(sels: List[untpd.ImportSelector], seen: List[TermName]): Unit = sels match
-        case sel :: sels1 =>
+        case sel :: sels =>
           if sel.isWildcard then
             addWildcardForwarders(seen, sel.span)
           else
             if sel.rename != nme.WILDCARD then
               addForwardersNamed(sel.name, sel.rename, sel.span)
-            addForwarders(sels1, sel.name :: seen)
+            addForwarders(sels, sel.name :: seen)
         case _ =>
 
       /** Avoid a clash of export forwarder `forwarder` with other forwarders in `forwarders`.
diff --git a/tests/run/i19587.scala b/tests/run/i19587.scala
new file mode 100644
index 000000000000..25d7220fd99b
--- /dev/null
+++ b/tests/run/i19587.scala
@@ -0,0 +1,34 @@
+case class Foo(bar: String, baz: Int)
+object Foo:
+  def withDefaults(bar: String = "", baz: Int = 42) = Foo(bar, baz)
+
+object Test1:
+  export Foo.withDefaults
+
+object Test2:
+  export Foo.withDefaults as fooWithDefaults
+
+class Bar:
+  infix def bar(other: Bar) = 42
+
+object Baz:
+  val b = Bar()
+  export b.bar
+  export b.bar as baz
+
+@main def Test =
+  // this works
+  assert:
+    Test1.withDefaults("test1") == Foo("test1", 42)
+
+  // this doesn't work
+  assert:
+    Test2.fooWithDefaults("test2") == Foo("test2", 42)
+
+  val b = Bar()
+  println:
+    b bar Bar()
+  println:
+    Baz bar Bar()
+  println:
+    Baz baz Bar()

From e983911d9ea13b099d8e8aec7041a9e4a0fbcbea Mon Sep 17 00:00:00 2001
From: Aleksey Troitskiy <road21@users.noreply.github.com>
Date: Fri, 25 Apr 2025 10:11:51 +0300
Subject: [PATCH 272/505] doc: make TypeTest example compiling (#23009)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Current example is not compiling:

```scala
import scala.reflect.{ClassTag, TypeTest}

val tt: TypeTest[Any, String] =
  new TypeTest[Any, String]:
    def unapply(s: Any): Option[s.type & String] = s match
      case s: String => Some(s) // compiler error Found: (s : String) Required: (s² : Any) & String
      case _ => None
```

https://scastie.scala-lang.org/road21/jq3j9XsUTdeshqbHxDXv3w
[Cherry-picked 6c021c67a0e3fcc3b14e6c931686ff390b8b45c2]
---
 docs/_docs/reference/other-new-features/type-test.md     | 2 +-
 docs/_spec/TODOreference/other-new-features/type-test.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/reference/other-new-features/type-test.md b/docs/_docs/reference/other-new-features/type-test.md
index ec7a87230753..fb2a2e584711 100644
--- a/docs/_docs/reference/other-new-features/type-test.md
+++ b/docs/_docs/reference/other-new-features/type-test.md
@@ -63,7 +63,7 @@ We could create a type test at call site where the type test can be performed wi
 val tt: TypeTest[Any, String] =
   new TypeTest[Any, String]:
     def unapply(s: Any): Option[s.type & String] = s match
-      case s: String => Some(s)
+      case q: (s.type & String) => Some(q)
       case _ => None
 
 f[AnyRef, String]("acb")(using tt)
diff --git a/docs/_spec/TODOreference/other-new-features/type-test.md b/docs/_spec/TODOreference/other-new-features/type-test.md
index ec7a87230753..fb2a2e584711 100644
--- a/docs/_spec/TODOreference/other-new-features/type-test.md
+++ b/docs/_spec/TODOreference/other-new-features/type-test.md
@@ -63,7 +63,7 @@ We could create a type test at call site where the type test can be performed wi
 val tt: TypeTest[Any, String] =
   new TypeTest[Any, String]:
     def unapply(s: Any): Option[s.type & String] = s match
-      case s: String => Some(s)
+      case q: (s.type & String) => Some(q)
       case _ => None
 
 f[AnyRef, String]("acb")(using tt)

From f5207d32f5490dfa6ab979a2c8677ee756b2d286 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Fri, 11 Apr 2025 16:34:40 +0200
Subject: [PATCH 273/505] Fix issue with certain synthetics missing in
 compiletime.typechecks

Previously, instead of using the PostTyper phase directly, a typed tree
Transformer was used. However, it did not transform the ClassInfo
values using PostTyper.transformInfo, which lead to RefChecks not
finding certain synthesized methods, throwing an incorrect error about
a missing implementation. This is fixed by running the full suite of
PostTyper transforms. A minor refactor is included, to limit
the repeated CompilationUnit construction and error checking.

[Cherry-picked 8f48a3befb3b23ec6cb9fbfca1bc3e148c0d893b]
---
 .../dotty/tools/dotc/CompilationUnit.scala    |  2 +-
 .../dotty/tools/dotc/inlines/Inlines.scala    | 38 ++++++++++---------
 .../test/dotc/run-test-pickling.excludelist   |  2 +-
 tests/run/i22968.check                        |  1 +
 tests/run/i22968.scala                        |  7 ++++
 5 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 tests/run/i22968.check
 create mode 100644 tests/run/i22968.scala

diff --git a/compiler/src/dotty/tools/dotc/CompilationUnit.scala b/compiler/src/dotty/tools/dotc/CompilationUnit.scala
index b796b6c3cb5b..e0c7e63be261 100644
--- a/compiler/src/dotty/tools/dotc/CompilationUnit.scala
+++ b/compiler/src/dotty/tools/dotc/CompilationUnit.scala
@@ -134,7 +134,7 @@ object CompilationUnit {
   /** Create a compilation unit corresponding to an in-memory String.
    *  Used for `compiletime.testing.typeChecks`.
    */
-  def apply(name: String, source: String)(using Context): CompilationUnit = {
+  def apply(name: String, source: String): CompilationUnit = {
     val src = SourceFile.virtual(name = name, content = source, maybeIncomplete = false)
     new CompilationUnit(src)
   }
diff --git a/compiler/src/dotty/tools/dotc/inlines/Inlines.scala b/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
index 598c3c91ea2f..e84fe174a6d0 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
@@ -393,6 +393,11 @@ object Inlines:
         case ConstantType(Constant(code: String)) =>
           val unitName = "tasty-reflect"
           val source2 = SourceFile.virtual(unitName, code)
+          def compilationUnits(untpdTree: untpd.Tree, tpdTree: Tree): List[CompilationUnit] =
+            val compilationUnit = CompilationUnit(unitName, code)
+            compilationUnit.tpdTree = tpdTree
+            compilationUnit.untpdTree = untpdTree
+            List(compilationUnit)
           // We need a dummy owner, as the actual one does not have a computed denotation yet,
           // but might be inspected in a transform phase, leading to cyclic errors
           val dummyOwner = newSymbol(ctx.owner, "$dummySymbol$".toTermName, Private, defn.AnyType, NoSymbol)
@@ -400,31 +405,30 @@ object Inlines:
             ctx.fresh.setNewTyperState().setTyper(new Typer(ctx.nestingLevel + 1)).setSource(source2)
 
           inContext(newContext) {
-            val tree2 = new Parser(source2).block()
-            if ctx.reporter.allErrors.nonEmpty then
+            def noErrors = ctx.reporter.allErrors.isEmpty
+            val untpdTree = new Parser(source2).block()
+            if !noErrors then
               ctx.reporter.allErrors.map((ErrorKind.Parser, _))
             else
-              val tree3 = ctx.typer.typed(tree2)
+              val tpdTree1 = ctx.typer.typed(untpdTree)
               ctx.base.postTyperPhase match
-                case postTyper: PostTyper if ctx.reporter.allErrors.isEmpty =>
-                  val tree4 = atPhase(postTyper) { postTyper.newTransformer.transform(tree3) }
+                case postTyper: PostTyper if noErrors =>
+                  val tpdTree2 =
+                    atPhase(postTyper) { postTyper.runOn(compilationUnits(untpdTree, tpdTree1)).head.tpdTree }
                   ctx.base.setRootTreePhase match
-                    case setRootTree =>
-                      val tree5 =
-                        val compilationUnit = CompilationUnit(unitName, code)
-                        compilationUnit.tpdTree = tree4
-                        compilationUnit.untpdTree = tree2
-                        var units = List(compilationUnit)
-                        atPhase(setRootTree)(setRootTree.runOn(units).head.tpdTree)
+                    case setRootTree if noErrors => // might be noPhase, if -Yretain-trees is not used
+                      val tpdTree3 =
+                        atPhase(setRootTree)(setRootTree.runOn(compilationUnits(untpdTree, tpdTree2)).head.tpdTree)
                       ctx.base.inliningPhase match
-                        case inlining: Inlining if ctx.reporter.allErrors.isEmpty =>
-                          val tree6 = atPhase(inlining) { inlining.newTransformer.transform(tree5) }
-                          if ctx.reporter.allErrors.isEmpty && reconstructedTransformPhases.nonEmpty then
-                            var transformTree = tree6
+                        case inlining: Inlining if noErrors =>
+                          val tpdTree4 = atPhase(inlining) { inlining.newTransformer.transform(tpdTree3) }
+                          if noErrors && reconstructedTransformPhases.nonEmpty then
+                            var transformTree = tpdTree4
                             for phase <- reconstructedTransformPhases do
-                              if ctx.reporter.allErrors.isEmpty then
+                              if noErrors then
                                 transformTree = atPhase(phase.end + 1)(phase.transformUnit(transformTree))
                         case _ =>
+                    case _ =>
                 case _ =>
               ctx.reporter.allErrors.map((ErrorKind.Typer, _))
           }
diff --git a/compiler/test/dotc/run-test-pickling.excludelist b/compiler/test/dotc/run-test-pickling.excludelist
index c880a4b78f23..1597487da668 100644
--- a/compiler/test/dotc/run-test-pickling.excludelist
+++ b/compiler/test/dotc/run-test-pickling.excludelist
@@ -49,4 +49,4 @@ named-tuples-strawman-2.scala
 # typecheckErrors method unpickling
 typeCheckErrors.scala
 i18150.scala
-
+i22968.scala
diff --git a/tests/run/i22968.check b/tests/run/i22968.check
new file mode 100644
index 000000000000..375518e921cd
--- /dev/null
+++ b/tests/run/i22968.check
@@ -0,0 +1 @@
+List()
diff --git a/tests/run/i22968.scala b/tests/run/i22968.scala
new file mode 100644
index 000000000000..28ed954d1d86
--- /dev/null
+++ b/tests/run/i22968.scala
@@ -0,0 +1,7 @@
+import scala.compiletime.testing.typeCheckErrors
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    println(typeCheckErrors("enum Foo { case A }"))
+  }
+}

From b057c813710a3e311ae1b518104d6471ab839eeb Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Fri, 25 Apr 2025 17:18:52 +0200
Subject: [PATCH 274/505] improvement: Rework IndexedContext to reuse the
 previously calculated scopes (#22898)

It turns out the work being done in IndexedContext was already done in
Completions, but better, since it doesn't try to read files as the
separate logic does.

There is still some improvement to be done to not calculate it twice,
but in order to keep this PR as simple as possible I will skip that for
now.
---
 .../tools/dotc/interactive/Completion.scala   |  56 ++--
 .../src/main/dotty/tools/pc/AutoImports.scala |  31 ++-
 .../dotty/tools/pc/AutoImportsProvider.scala  |   6 +-
 .../tools/pc/ExtractMethodProvider.scala      |   2 +-
 .../main/dotty/tools/pc/HoverProvider.scala   |  11 +-
 .../main/dotty/tools/pc/IndexedContext.scala  | 240 +++++-------------
 .../dotty/tools/pc/InferExpectedType.scala    |   2 +-
 .../dotty/tools/pc/InferredTypeProvider.scala |   2 +-
 .../dotty/tools/pc/PcDefinitionProvider.scala |   2 +-
 .../dotty/tools/pc/PcInlayHintsProvider.scala |   4 +-
 .../tools/pc/PcInlineValueProvider.scala      |  16 +-
 .../tools/pc/SignatureHelpProvider.scala      |   2 +-
 .../pc/completions/CompletionProvider.scala   |   3 +-
 .../tools/pc/completions/Completions.scala    |   1 +
 .../pc/completions/MatchCaseCompletions.scala |   9 +-
 .../pc/completions/NamedArgCompletions.scala  |  47 ++--
 .../pc/completions/OverrideCompletions.scala  |   2 +-
 .../pc/printer/ShortenedTypePrinter.scala     |  45 ++--
 .../pc/utils/InteractiveEnrichments.scala     |   5 +-
 .../tests/completion/CompletionArgSuite.scala |   2 +-
 .../completion/CompletionCaseSuite.scala      |   6 +-
 .../completion/CompletionContextSuite.scala   |  38 +++
 .../pc/tests/inlayHints/InlayHintsSuite.scala |   2 +-
 23 files changed, 252 insertions(+), 282 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index a37e972ef715..81afc68e2342 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -46,6 +46,16 @@ case class Completion(label: String, description: String, symbols: List[Symbol])
 
 object Completion:
 
+  def scopeContext(pos: SourcePosition)(using Context): CompletionResult =
+    val tpdPath = Interactive.pathTo(ctx.compilationUnit.tpdTree, pos.span)
+    val completionContext = Interactive.contextOfPath(tpdPath).withPhase(Phases.typerPhase)
+    inContext(completionContext):
+      val untpdPath = Interactive.resolveTypedOrUntypedPath(tpdPath, pos)
+      val mode = completionMode(untpdPath, pos, forSymbolSearch = true)
+      val rawPrefix = completionPrefix(untpdPath, pos)
+      val completer = new Completer(mode, pos, untpdPath, _ => true)
+      completer.scopeCompletions
+
   /** Get possible completions from tree at `pos`
    *
    *  @return offset and list of symbols for possible completions
@@ -58,7 +68,6 @@ object Completion:
       val mode = completionMode(untpdPath, pos)
       val rawPrefix = completionPrefix(untpdPath, pos)
       val completions = rawCompletions(pos, mode, rawPrefix, tpdPath, untpdPath)
-
       postProcessCompletions(untpdPath, completions, rawPrefix)
 
   /** Get possible completions from tree at `pos`
@@ -87,7 +96,7 @@ object Completion:
    *
    * Otherwise, provide no completion suggestion.
    */
-  def completionMode(path: List[untpd.Tree], pos: SourcePosition): Mode = path match
+  def completionMode(path: List[untpd.Tree], pos: SourcePosition, forSymbolSearch: Boolean = false): Mode = path match
     // Ignore `package foo@@` and `package foo.bar@@`
     case ((_: tpd.Select) | (_: tpd.Ident)):: (_ : tpd.PackageDef) :: _  => Mode.None
     case GenericImportSelector(sel) =>
@@ -100,11 +109,14 @@ object Completion:
     case untpd.Literal(Constants.Constant(_: String)) :: _ => Mode.Term | Mode.Scope // literal completions
     case (ref: untpd.RefTree) :: _ =>
       val maybeSelectMembers = if ref.isInstanceOf[untpd.Select] then Mode.Member else Mode.Scope
-
-      if (ref.name.isTermName) Mode.Term | maybeSelectMembers
+      if (forSymbolSearch) then Mode.Term | Mode.Type | maybeSelectMembers
+      else if (ref.name.isTermName) Mode.Term | maybeSelectMembers
       else if (ref.name.isTypeName) Mode.Type | maybeSelectMembers
       else Mode.None
 
+    case (_: tpd.TypeTree | _: tpd.MemberDef) :: _ if forSymbolSearch => Mode.Type | Mode.Term
+    case (_: tpd.CaseDef) :: _ if forSymbolSearch => Mode.Type | Mode.Term
+    case Nil if forSymbolSearch =>  Mode.Type | Mode.Term
     case _ => Mode.None
 
   /** When dealing with <errors> in varios palces we check to see if they are
@@ -227,14 +239,14 @@ object Completion:
     val result = adjustedPath match
       // Ignore synthetic select from `This` because in code it was `Ident`
       // See example in dotty.tools.languageserver.CompletionTest.syntheticThis
-      case tpd.Select(qual @ tpd.This(_), _) :: _ if qual.span.isSynthetic      => completer.scopeCompletions
+      case tpd.Select(qual @ tpd.This(_), _) :: _ if qual.span.isSynthetic      => completer.scopeCompletions.names
       case StringContextApplication(qual) =>
-        completer.scopeCompletions ++ completer.selectionCompletions(qual)
+        completer.scopeCompletions.names ++ completer.selectionCompletions(qual)
       case tpd.Select(qual, _) :: _               if qual.typeOpt.hasSimpleKind =>
         completer.selectionCompletions(qual)
       case tpd.Select(qual, _) :: _                                             => Map.empty
       case (tree: tpd.ImportOrExport) :: _                                      => completer.directMemberCompletions(tree.expr)
-      case _                                                                    => completer.scopeCompletions
+      case _                                                                    => completer.scopeCompletions.names
 
     interactiv.println(i"""completion info with pos    = $pos,
                           |                     term   = ${completer.mode.is(Mode.Term)},
@@ -335,6 +347,7 @@ object Completion:
          (completionMode.is(Mode.Term) && (sym.isTerm || sym.is(ModuleClass))
       || (completionMode.is(Mode.Type) && (sym.isType || sym.isStableMember)))
     )
+  end isValidCompletionSymbol
 
   given ScopeOrdering(using Context): Ordering[Seq[SingleDenotation]] with
     val order =
@@ -368,7 +381,7 @@ object Completion:
      *    (even if the import follows it syntactically)
      *  - a more deeply nested import shadowing a member or a local definition causes an ambiguity
      */
-    def scopeCompletions(using context: Context): CompletionMap =
+    def scopeCompletions(using context: Context): CompletionResult =
 
       /** Temporary data structure representing denotations with the same name introduced in a given scope
        *  as a member of a type, by a local definition or by an import clause
@@ -379,14 +392,19 @@ object Completion:
           ScopedDenotations(denots.filter(includeFn), ctx)
 
       val mappings = collection.mutable.Map.empty[Name, List[ScopedDenotations]].withDefaultValue(List.empty)
+      val renames = collection.mutable.Map.empty[Symbol, Name]
       def addMapping(name: Name, denots: ScopedDenotations) =
         mappings(name) = mappings(name) :+ denots
 
       ctx.outersIterator.foreach { case ctx @ given Context =>
         if ctx.isImportContext then
-          importedCompletions.foreach { (name, denots) =>
+          val imported = importedCompletions
+          imported.names.foreach { (name, denots) =>
             addMapping(name, ScopedDenotations(denots, ctx, include(_, name)))
           }
+          imported.renames.foreach { (name, newName) =>
+            renames(name) = newName
+          }
         else if ctx.owner.isClass then
           accessibleMembers(ctx.owner.thisType)
             .groupByName.foreach { (name, denots) =>
@@ -430,7 +448,6 @@ object Completion:
           // most deeply nested member or local definition if not shadowed by an import
           case Some(local) if local.ctx.scope == first.ctx.scope =>
             resultMappings += name -> local.denots
-
           case None if isSingleImport || isImportedInDifferentScope || isSameSymbolImportedDouble =>
             resultMappings += name -> first.denots
           case None if notConflictingWithDefaults =>
@@ -440,7 +457,7 @@ object Completion:
         }
       }
 
-      resultMappings
+      CompletionResult(resultMappings, renames.toMap)
     end scopeCompletions
 
     /** Widen only those types which are applied or are exactly nothing
@@ -474,15 +491,20 @@ object Completion:
     /** Completions introduced by imports directly in this context.
      *  Completions from outer contexts are not included.
      */
-    private def importedCompletions(using Context): CompletionMap =
+    private def importedCompletions(using Context): CompletionResult =
       val imp = ctx.importInfo
+      val renames = collection.mutable.Map.empty[Symbol, Name]
 
       if imp == null then
-        Map.empty
+        CompletionResult(Map.empty, Map.empty)
       else
         def fromImport(name: Name, nameInScope: Name): Seq[(Name, SingleDenotation)] =
           imp.site.member(name).alternatives
-            .collect { case denot if include(denot, nameInScope) => nameInScope -> denot }
+            .collect { case denot if include(denot, nameInScope) =>
+               if name != nameInScope then
+                 renames(denot.symbol) = nameInScope
+               nameInScope -> denot
+            }
 
         val givenImports = imp.importedImplicits
           .map { ref => (ref.implicitName: Name, ref.underlyingRef.denot.asSingleDenotation) }
@@ -508,7 +530,8 @@ object Completion:
               fromImport(original.toTypeName, nameInScope.toTypeName)
             }.toSeq.groupByName
 
-        givenImports ++ wildcardMembers ++ explicitMembers
+        val results = givenImports ++ wildcardMembers ++ explicitMembers
+        CompletionResult(results, renames.toMap)
     end importedCompletions
 
     /** Completions from implicit conversions including old style extensions using implicit classes */
@@ -562,7 +585,7 @@ object Completion:
 
       // 1. The extension method is visible under a simple name, by being defined or inherited or imported in a scope enclosing the reference.
       val termCompleter = new Completer(Mode.Term, pos, untpdPath, matches)
-      val extMethodsInScope = termCompleter.scopeCompletions.toList.flatMap:
+      val extMethodsInScope = termCompleter.scopeCompletions.names.toList.flatMap:
         case (name, denots) => denots.collect:
           case d: SymDenotation if d.isTerm && d.termRef.symbol.is(Extension) => (d.termRef, name.asTermName)
 
@@ -664,6 +687,7 @@ object Completion:
 
   private type CompletionMap = Map[Name, Seq[SingleDenotation]]
 
+  case class CompletionResult(names: Map[Name, Seq[SingleDenotation]], renames: Map[Symbol, Name])
   /**
    * The completion mode: defines what kinds of symbols should be included in the completion
    * results.
diff --git a/presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala b/presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala
index 1b44dce8c642..7b30c745e3ed 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala
@@ -40,7 +40,7 @@ object AutoImports:
     case class Select(qual: SymbolIdent, name: String) extends SymbolIdent:
       def value: String = s"${qual.value}.$name"
 
-    def direct(name: String): SymbolIdent = Direct(name)
+    def direct(name: String)(using Context): SymbolIdent = Direct(name)
 
     def fullIdent(symbol: Symbol)(using Context): SymbolIdent =
       val symbols = symbol.ownersIterator.toList
@@ -70,7 +70,7 @@ object AutoImports:
       importSel: Option[ImportSel]
   ):
 
-    def name: String = ident.value
+    def name(using Context): String = ident.value
 
   object SymbolImport:
 
@@ -189,10 +189,13 @@ object AutoImports:
                 ownerImport.importSel,
               )
             else
-              (
-                SymbolIdent.direct(symbol.nameBackticked),
-                Some(ImportSel.Direct(symbol)),
-              )
+              renames(symbol) match
+                case Some(rename) => (SymbolIdent.direct(rename), None)
+                case None =>
+                  (
+                    SymbolIdent.direct(symbol.nameBackticked),
+                    Some(ImportSel.Direct(symbol)),
+                  )
           end val
 
           SymbolImport(
@@ -223,9 +226,13 @@ object AutoImports:
                 importSel
               )
             case None =>
+              val reverse = symbol.ownersIterator.toList.reverse
+              val fullName = reverse.drop(1).foldLeft(SymbolIdent.direct(reverse.head.nameBackticked)){
+                case (acc, sym) => SymbolIdent.Select(acc, sym.nameBackticked(false))
+              }
               SymbolImport(
                 symbol,
-                SymbolIdent.direct(symbol.fullNameBackticked),
+                SymbolIdent.Direct(symbol.fullNameBackticked),
                 None
               )
           end match
@@ -252,7 +259,6 @@ object AutoImports:
         val topPadding =
           if importPosition.padTop then "\n"
           else ""
-
         val formatted = imports
           .map {
             case ImportSel.Direct(sym) => importName(sym)
@@ -267,15 +273,16 @@ object AutoImports:
     end renderImports
 
     private def importName(sym: Symbol): String =
-      if indexedContext.importContext.toplevelClashes(sym) then
+      if indexedContext.toplevelClashes(sym, inImportScope = true) then
         s"_root_.${sym.fullNameBackticked(false)}"
       else
         sym.ownersIterator.zipWithIndex.foldLeft((List.empty[String], false)) { case ((acc, isDone), (sym, idx)) =>
           if(isDone || sym.isEmptyPackage || sym.isRoot) (acc, true)
           else indexedContext.rename(sym) match
-            case Some(renamed) => (renamed :: acc, true)
-            case None if !sym.isPackageObject => (sym.nameBackticked(false) :: acc, false)
-            case None => (acc, false)
+            // we can't import first part
+            case Some(renamed) if idx != 0 => (renamed :: acc, true)
+            case _ if !sym.isPackageObject => (sym.nameBackticked(false) :: acc, false)
+            case _ => (acc, false)
         }._1.mkString(".")
   end AutoImportsGenerator
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
index d30ab813f9f2..0a6178eae106 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
@@ -44,8 +44,8 @@ final class AutoImportsProvider(
     val path =
       Interactive.pathTo(newctx.compilationUnit.tpdTree, pos.span)(using newctx)
 
-    val indexedContext = IndexedContext(
-      Interactive.contextOfPath(path)(using newctx)
+    val indexedContext = IndexedContext(pos)(
+      using Interactive.contextOfPath(path)(using newctx)
     )
     import indexedContext.ctx
 
@@ -96,7 +96,7 @@ final class AutoImportsProvider(
                 text,
                 tree,
                 unit.comments,
-                indexedContext.importContext,
+                indexedContext,
                 config
               )
             (sym: Symbol) => generator.forSymbol(sym)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala
index c72a0602f1ce..00cde67873d5 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala
@@ -51,7 +51,7 @@ final class ExtractMethodProvider(
     given locatedCtx: Context =
       val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)
       Interactive.contextOfPath(path)(using newctx)
-    val indexedCtx = IndexedContext(locatedCtx)
+    val indexedCtx = IndexedContext(pos)(using locatedCtx)
     val printer =
       ShortenedTypePrinter(search, IncludeDefaultParam.Never)(using indexedCtx)
     def prettyPrint(tpe: Type) =
diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
index f8249aebf68c..6c1ffa7d7fac 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -47,7 +47,7 @@ object HoverProvider:
     val path = unit
       .map(unit => Interactive.pathTo(unit.tpdTree, pos.span))
       .getOrElse(Interactive.pathTo(driver.openedTrees(uri), pos))
-    val indexedContext = IndexedContext(ctx)
+    val indexedContext = IndexedContext(pos)(using ctx)
 
     def typeFromPath(path: List[Tree]) =
       if path.isEmpty then NoType else path.head.typeOpt
@@ -94,7 +94,7 @@ object HoverProvider:
 
       val printerCtx = Interactive.contextOfPath(path)
       val printer = ShortenedTypePrinter(search, IncludeDefaultParam.Include)(
-        using IndexedContext(printerCtx)
+        using IndexedContext(pos)(using printerCtx)
       )
       MetalsInteractive.enclosingSymbolsWithExpressionType(
         enclosing,
@@ -131,7 +131,12 @@ object HoverProvider:
             .flatMap(symTpe => search.symbolDocumentation(symTpe._1, contentType))
             .map(_.docstring())
             .mkString("\n")
-          printer.expressionType(exprTpw) match
+
+          val expresionTypeOpt =
+            if symbol.name == nme.??? then
+              InferExpectedType(search, driver, params).infer()
+            else printer.expressionType(exprTpw)
+          expresionTypeOpt match
             case Some(expressionType) =>
               val forceExpressionType =
                 !pos.span.isZeroExtent || (
diff --git a/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala b/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
index 7c2c34cf5ebb..aa4bc30d577b 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
@@ -4,64 +4,45 @@ import scala.annotation.tailrec
 import scala.util.control.NonFatal
 
 import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Denotations.PreDenotation
+import dotty.tools.dotc.core.Denotations.SingleDenotation
 import dotty.tools.dotc.core.Flags.*
-import dotty.tools.dotc.core.NameOps.moduleClassName
+import dotty.tools.dotc.core.NameOps.*
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.Scopes.EmptyScope
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
+import dotty.tools.dotc.interactive.Completion
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.typer.ImportInfo
+import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.IndexedContext.Result
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 sealed trait IndexedContext:
   given ctx: Context
   def scopeSymbols: List[Symbol]
-  def names: IndexedContext.Names
   def rename(sym: Symbol): Option[String]
-  def outer: IndexedContext
-
-  def findSymbol(name: String): Option[List[Symbol]]
-
-  final def findSymbol(name: Name): Option[List[Symbol]] =
-    findSymbol(name.decoded)
+  def findSymbol(name: Name): Option[List[Symbol]]
+  def findSymbolInLocalScope(name: String): Option[List[Symbol]]
 
   final def lookupSym(sym: Symbol): Result =
-    findSymbol(sym.decodedName) match
-      case Some(symbols) if symbols.exists(_ == sym) =>
-        Result.InScope
-      case Some(symbols)
-          if symbols.exists(s => isNotConflictingWithDefault(s, sym) || isTypeAliasOf(s, sym) || isTermAliasOf(s, sym)) =>
-            Result.InScope
-      // when all the conflicting symbols came from an old version of the file
+    def all(symbol: Symbol): Set[Symbol] = Set(symbol, symbol.companionModule, symbol.companionClass, symbol.companion).filter(_ != NoSymbol)
+    val isRelated = all(sym) ++ all(sym.dealiasType)
+    findSymbol(sym.name) match
+      case Some(symbols) if symbols.exists(isRelated) => Result.InScope
+      case Some(symbols) if symbols.exists(isTermAliasOf(_, sym)) => Result.InScope
+      case Some(symbols) if symbols.map(_.dealiasType).exists(isRelated) => Result.InScope
       case Some(symbols) if symbols.nonEmpty && symbols.forall(_.isStale) => Result.Missing
       case Some(symbols) if symbols.exists(rename(_).isEmpty) => Result.Conflict
+      case Some(symbols) => Result.InScope
       case _ => Result.Missing
   end lookupSym
 
-  /**
-   * Scala by default imports following packages:
-   * https://scala-lang.org/files/archive/spec/3.4/02-identifiers-names-and-scopes.html
-   * import java.lang.*
-   * {
-   *   import scala.*
-   *   {
-   *     import Predef.*
-   *     { /* source */ }
-   *   }
-   * }
-   *
-   * This check is necessary for proper scope resolution, because when we compare symbols from
-   * index including the underlying type like scala.collection.immutable.List it actually
-   * is in current scope in form of type forwarder imported from Predef.
-   */
-  private def isNotConflictingWithDefault(sym: Symbol, queriedSym: Symbol): Boolean =
-    sym.info.widenDealias =:= queriedSym.info.widenDealias && (Interactive.isImportedByDefault(sym))
-
   final def hasRename(sym: Symbol, as: String): Boolean =
     rename(sym) match
-      case Some(v) => v == as
+      case Some(v) =>
+        v == as
       case None => false
 
   // detects import scope aliases like
@@ -74,73 +55,74 @@ sealed trait IndexedContext:
         case _ => false
     )
 
-  private def isTypeAliasOf(alias: Symbol, queriedSym: Symbol): Boolean =
-    alias.isAliasType && alias.info.deepDealias.typeSymbol  == queriedSym
-
-  final def isEmpty: Boolean = this match
-    case IndexedContext.Empty => true
-    case _ => false
-
-  final def importContext: IndexedContext =
-    this match
-      case IndexedContext.Empty => this
-      case _ if ctx.owner.is(Package) => this
-      case _ => outer.importContext
-
   @tailrec
-  final def toplevelClashes(sym: Symbol): Boolean =
+  final def toplevelClashes(sym: Symbol, inImportScope: Boolean): Boolean =
     if sym == NoSymbol || sym.owner == NoSymbol || sym.owner.isRoot then
-      lookupSym(sym) match
-        case IndexedContext.Result.Conflict => true
+      val possibleConflictingSymbols = findSymbolInLocalScope(sym.name.show)
+      // if it's import scope we only care about toplevel conflicts, not any clashes inside objects etc.
+      val symbolClashes = if inImportScope then
+        // It's toplevel if it's parent is a package
+        possibleConflictingSymbols.filter(_.exists(_.owner.is(Package)))
+      else
+        possibleConflictingSymbols
+      symbolClashes match
+        case Some(symbols) if !symbols.contains(sym) => true
         case _ => false
-    else toplevelClashes(sym.owner)
+    else toplevelClashes(sym.owner, inImportScope)
 
 end IndexedContext
 
 object IndexedContext:
 
-  def apply(ctx: Context): IndexedContext =
+  def apply(pos: SourcePosition)(using Context): IndexedContext =
     ctx match
       case NoContext => Empty
-      case _ => LazyWrapper(using ctx)
+      case _ => LazyWrapper(pos)(using ctx)
 
   case object Empty extends IndexedContext:
     given ctx: Context = NoContext
-    def findSymbol(name: String): Option[List[Symbol]] = None
+    def findSymbol(name: Name): Option[List[Symbol]] = None
+    def findSymbolInLocalScope(name: String): Option[List[Symbol]] = None
     def scopeSymbols: List[Symbol] = List.empty
-    val names: Names = Names(Map.empty, Map.empty)
     def rename(sym: Symbol): Option[String] = None
-    def outer: IndexedContext = this
-
-  class LazyWrapper(using val ctx: Context) extends IndexedContext:
-    val outer: IndexedContext = IndexedContext(ctx.outer)
-    val names: Names = extractNames(ctx)
 
-    def findSymbol(name: String): Option[List[Symbol]] =
-      names.symbols
-        .get(name)
-        .map(_.toList)
-        .orElse(outer.findSymbol(name))
+  class LazyWrapper(pos: SourcePosition)(using val ctx: Context) extends IndexedContext:
+
+    val completionContext = Completion.scopeContext(pos)
+    val names: Map[String, Seq[SingleDenotation]] = completionContext.names.toList.groupBy(_._1.show).map{
+      case (name, denotations) =>
+        val denots = denotations.flatMap(_._2)
+        val nonRoot = denots.filter(!_.symbol.owner.isRoot)
+        val (importedByDefault, conflictingValue) = denots.partition(denot => Interactive.isImportedByDefault(denot.symbol))
+        if importedByDefault.nonEmpty && conflictingValue.nonEmpty then
+          name.trim.nn -> conflictingValue
+        else
+          name.trim.nn -> nonRoot
+    }
+    val renames = completionContext.renames
+
+    def defaultScopes(name: Name): Option[List[Symbol]] =
+      List(defn.ScalaPredefModuleClass, defn.ScalaPackageClass, defn.JavaLangPackageClass)
+        .map(_.membersNamed(name))
+        .collect { case denot if denot.exists => denot.first.symbol }
+        .toList match
+        case Nil => None
+        case list => Some(list)
+
+    override def findSymbolInLocalScope(name: String): Option[List[Symbol]] =
+      names.get(name).map(_.map(_.symbol).toList).filter(_.nonEmpty)
+    def findSymbol(name: Name): Option[List[Symbol]] =
+      names
+        .get(name.show)
+        .map(_.map(_.symbol).toList)
+        .orElse(defaultScopes(name))
 
     def scopeSymbols: List[Symbol] =
-      val acc = Set.newBuilder[Symbol]
-      (this :: outers).foreach { ref =>
-        acc ++= ref.names.symbols.values.flatten
-      }
-      acc.result.toList
+      names.values.flatten.map(_.symbol).toList
 
     def rename(sym: Symbol): Option[String] =
-      names.renames
-        .get(sym)
-        .orElse(outer.rename(sym))
-
-    private def outers: List[IndexedContext] =
-      val builder = List.newBuilder[IndexedContext]
-      var curr = outer
-      while !curr.isEmpty do
-        builder += curr
-        curr = curr.outer
-      builder.result
+      renames.get(sym).orElse(renames.get(sym.companion)).map(_.decoded)
+
   end LazyWrapper
 
   enum Result:
@@ -149,97 +131,5 @@ object IndexedContext:
       case InScope | Conflict => true
       case Missing => false
 
-  case class Names(
-      symbols: Map[String, List[Symbol]],
-      renames: Map[Symbol, String]
-  )
-
-  private def extractNames(ctx: Context): Names =
-    def isAccessibleFromSafe(sym: Symbol, site: Type): Boolean =
-      try sym.isAccessibleFrom(site, superAccess = false)
-      catch
-        case NonFatal(e) =>
-          false
-
-    def accessibleSymbols(site: Type, tpe: Type)(using
-        Context
-    ): List[Symbol] =
-      tpe.decls.toList.filter(sym => isAccessibleFromSafe(sym, site))
-
-    def accesibleMembers(site: Type)(using Context): List[Symbol] =
-      site.allMembers
-        .filter(denot =>
-          try isAccessibleFromSafe(denot.symbol, site)
-          catch
-            case NonFatal(e) =>
-              false
-        )
-        .map(_.symbol)
-        .toList
-
-    def allAccessibleSymbols(
-        tpe: Type,
-        filter: Symbol => Boolean = _ => true
-    )(using Context): List[Symbol] =
-      val initial = accessibleSymbols(tpe, tpe).filter(filter)
-      val fromPackageObjects =
-        initial
-          .filter(_.isPackageObject)
-          .flatMap(sym => accessibleSymbols(tpe, sym.thisType))
-      initial ++ fromPackageObjects
-
-    def fromImport(site: Type, name: Name)(using Context): List[Symbol] =
-      List(
-        site.member(name.toTypeName),
-        site.member(name.toTermName),
-        site.member(name.moduleClassName),
-      )
-        .flatMap(_.alternatives)
-        .map(_.symbol)
-
-    def fromImportInfo(
-        imp: ImportInfo
-    )(using Context): List[(Symbol, Option[TermName])] =
-      val excludedNames = imp.excluded.map(_.decoded)
-
-      if imp.isWildcardImport then
-        allAccessibleSymbols(
-          imp.site,
-          sym => !excludedNames.contains(sym.name.decoded)
-        ).map((_, None))
-      else
-        imp.forwardMapping.toList.flatMap { (name, rename) =>
-          val isRename = name != rename
-          if !isRename && !excludedNames.contains(name.decoded) then
-            fromImport(imp.site, name).map((_, None))
-          else if isRename then
-            fromImport(imp.site, name).map((_, Some(rename)))
-          else Nil
-        }
-      end if
-    end fromImportInfo
-
-    given Context = ctx
-    val (symbols, renames) =
-      if ctx.isImportContext then
-        val (syms, renames) =
-          fromImportInfo(ctx.importInfo.nn)
-            .map((sym, rename) => (sym, rename.map(r => sym -> r.decoded)))
-            .unzip
-        (syms, renames.flatten.toMap)
-      else if ctx.owner.isClass then
-        val site = ctx.owner.thisType
-        (accesibleMembers(site), Map.empty)
-      else if ctx.scope != EmptyScope then (ctx.scope.toList, Map.empty)
-      else (List.empty, Map.empty)
-
-    val initial = Map.empty[String, List[Symbol]]
-    val values =
-      symbols.foldLeft(initial) { (acc, sym) =>
-        val name = sym.decodedName
-        val syms = acc.getOrElse(name, List.empty)
-        acc.updated(name, sym :: syms)
-      }
-    Names(values, renames)
-  end extractNames
+
 end IndexedContext
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
index d121c8059286..67f7f43aa030 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
@@ -51,7 +51,7 @@ class InferExpectedType(
           )
         val locatedCtx =
           Interactive.contextOfPath(tpdPath)(using newctx)
-        val indexedCtx = IndexedContext(locatedCtx)
+        val indexedCtx = IndexedContext(pos)(using locatedCtx)
         val printer =
           ShortenedTypePrinter(search, IncludeDefaultParam.ResolveLater)(using indexedCtx)
         InterCompletionType.inferType(path)(using newctx).map{
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
index a0d726d5f382..2006774ae19b 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
@@ -75,7 +75,7 @@ final class InferredTypeProvider(
       Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)
 
     given locatedCtx: Context = driver.localContext(params)
-    val indexedCtx = IndexedContext(locatedCtx)
+    val indexedCtx = IndexedContext(pos)(using locatedCtx)
     val autoImportsGen = AutoImports.generator(
       pos,
       sourceText,
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
index a2e9b05e0610..69ec509043f8 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
@@ -51,7 +51,7 @@ class PcDefinitionProvider(
       Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)
 
     given ctx: Context = driver.localContext(params)
-    val indexedContext = IndexedContext(ctx)
+    val indexedContext = IndexedContext(pos)(using ctx)
     val result =
       if findTypeDef then findTypeDefinitions(path, pos, indexedContext, uri)
       else findDefinitions(path, pos, indexedContext, uri)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 5d8739fb3343..0f69e16831a0 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -125,7 +125,7 @@ class PcInlayHintsProvider(
     val tpdPath =
       Interactive.pathTo(unit.tpdTree, pos.span)
 
-    val indexedCtx = IndexedContext(Interactive.contextOfPath(tpdPath))
+    val indexedCtx = IndexedContext(pos)(using Interactive.contextOfPath(tpdPath))
     val printer = ShortenedTypePrinter(
       symbolSearch
     )(using indexedCtx)
@@ -149,7 +149,7 @@ class PcInlayHintsProvider(
     InlayHints.makeLabelParts(parts, tpeStr)
   end toLabelParts
 
-  private val definitions = IndexedContext(ctx).ctx.definitions
+  private val definitions = IndexedContext(pos)(using ctx).ctx.definitions
   private def syntheticTupleApply(tree: Tree): Boolean =
     tree match
       case sel: Select =>
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
index 7d04ea8771a4..8d0b1b569f5a 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
@@ -110,8 +110,8 @@ final class PcInlineValueProvider(
         }
         .toRight(Errors.didNotFindDefinition)
       path = Interactive.pathTo(unit.tpdTree, definition.tree.rhs.span)(using newctx)
-      indexedContext = IndexedContext(Interactive.contextOfPath(path)(using newctx))
-      symbols = symbolsUsedInDefn(definition.tree.rhs).filter(indexedContext.lookupSym(_) == Result.InScope)
+      indexedContext = IndexedContext(definition.tree.namePos)(using Interactive.contextOfPath(path)(using newctx))
+      symbols = symbolsUsedInDefn(definition.tree.rhs, indexedContext)
       references <- getReferencesToInline(definition, allOccurences, symbols)
     yield
       val (deleteDefinition, refsEdits) = references
@@ -184,15 +184,19 @@ final class PcInlineValueProvider(
     val adjustedEnd = extend(pos.end - 1, ')', 1) + 1
     text.slice(adjustedStart, adjustedEnd).mkString
 
-  private def symbolsUsedInDefn(rhs: Tree): Set[Symbol] =
+  private def symbolsUsedInDefn(rhs: Tree, indexedContext: IndexedContext): Set[Symbol] =
     def collectNames(
         symbols: Set[Symbol],
         tree: Tree
     ): Set[Symbol] =
       tree match
-        case id: (Ident | Select)
+        case id: Ident
             if !id.symbol.is(Synthetic) && !id.symbol.is(Implicit) =>
           symbols + tree.symbol
+        case sel: Select =>
+          indexedContext.lookupSym(sel.symbol) match
+            case IndexedContext.Result.InScope => symbols + sel.symbol
+            case _ => symbols
         case _ => symbols
 
     val traverser = new DeepFolder[Set[Symbol]](collectNames)
@@ -247,8 +251,8 @@ final class PcInlineValueProvider(
     def buildRef(occurrence: Occurence): Either[String, Reference] =
       val path =
         Interactive.pathTo(unit.tpdTree, occurrence.pos.span)(using newctx)
-      val indexedContext = IndexedContext(
-        Interactive.contextOfPath(path)(using newctx)
+      val indexedContext = IndexedContext(pos)(
+        using Interactive.contextOfPath(path)(using newctx)
       )
       import indexedContext.ctx
       val conflictingSymbols = symbols
diff --git a/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala
index bd16d2ce2aa9..5f925ea80ee7 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala
@@ -37,7 +37,7 @@ object SignatureHelpProvider:
         val path = Interactive.pathTo(unit.tpdTree, pos.span)(using driver.currentCtx)
 
         val localizedContext = Interactive.contextOfPath(path)(using driver.currentCtx)
-        val indexedContext = IndexedContext(driver.currentCtx)
+        val indexedContext = IndexedContext(pos)(using driver.currentCtx)
 
         given Context = localizedContext.fresh
           .setCompilationUnit(unit)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
index 2a63d6a92a81..ef9f77eb58fc 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -107,7 +107,7 @@ class CompletionProvider(
 
 
         val locatedCtx = Interactive.contextOfPath(tpdPath)(using newctx)
-        val indexedCtx = IndexedContext(locatedCtx)
+        val indexedCtx = IndexedContext(pos)(using locatedCtx)
 
         val completionPos = CompletionPos.infer(pos, params, adjustedPath, wasCursorApplied)(using locatedCtx)
 
@@ -222,7 +222,6 @@ class CompletionProvider(
       if config.isDetailIncludedInLabel then completion.labelWithDescription(printer)
       else completion.label
     val ident = underlyingCompletion.insertText.getOrElse(underlyingCompletion.label)
-
     lazy val isInStringInterpolation =
       path match
         // s"My name is $name"
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
index 1114a07f91b5..050ab50dae49 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
@@ -571,6 +571,7 @@ class Completions(
         then
           indexedContext.lookupSym(sym) match
             case IndexedContext.Result.InScope => false
+            case IndexedContext.Result.Missing if indexedContext.rename(sym).isDefined => false
             case _ if completionMode.is(Mode.ImportOrExport) =>
               visit(
                 CompletionValue.Workspace(
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
index 5e809f5b0110..536163d6dacb 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
@@ -147,7 +147,7 @@ object CaseKeywordCompletion:
             definitions.NullClass,
             definitions.NothingClass,
           )
-          val tpes = Set(selectorSym, selectorSym.companion)
+          val tpes = Set(selectorSym, selectorSym.companion).filter(_ != NoSymbol)
           def isSubclass(sym: Symbol) = tpes.exists(par => sym.isSubClass(par))
 
           def visit(symImport: SymbolImport): Unit =
@@ -174,8 +174,9 @@ object CaseKeywordCompletion:
 
           indexedContext.scopeSymbols
             .foreach(s =>
-              val ts = s.info.deepDealias.typeSymbol
-              if isValid(ts) then visit(autoImportsGen.inferSymbolImport(ts))
+              val ts = if s.is(Flags.Module) then s.info.typeSymbol else s.dealiasType
+              if isValid(ts) then
+                visit(autoImportsGen.inferSymbolImport(ts))
             )
           // Step 2: walk through known subclasses of sealed types.
           val sealedDescs = subclassesForType(
@@ -185,6 +186,7 @@ object CaseKeywordCompletion:
             val symbolImport = autoImportsGen.inferSymbolImport(sym)
             visit(symbolImport)
           }
+
           val res = result.result().flatMap {
             case si @ SymbolImport(sym, name, importSel) =>
               completionGenerator.labelForCaseMember(sym, name.value).map {
@@ -293,7 +295,6 @@ object CaseKeywordCompletion:
 
     val (labels, imports) =
       sortedSubclasses.map((si, label) => (label, si.importSel)).unzip
-
     val (obracket, cbracket) = if noIndent then (" {", "}") else ("", "")
     val basicMatch = CompletionValue.MatchCompletion(
       "match",
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
index a21706b9e36e..7b88d8edfbc8 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
@@ -30,6 +30,9 @@ import dotty.tools.dotc.core.Types.WildcardType
 import dotty.tools.pc.IndexedContext
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 import scala.annotation.tailrec
+import dotty.tools.dotc.core.Denotations.Denotation
+import dotty.tools.dotc.core.Denotations.MultiDenotation
+import dotty.tools.dotc.core.Denotations.SingleDenotation
 
 object NamedArgCompletions:
 
@@ -136,46 +139,42 @@ object NamedArgCompletions:
 
     // fallback for when multiple overloaded methods match the supplied args
     def fallbackFindMatchingMethods() =
-      def maybeNameAndIndexedContext(
+      def matchingMethodsSymbols(
           method: Tree
-      ): Option[(Name, IndexedContext)] =
+      ): List[Symbol] =
         method match
-          case Ident(name) => Some((name, indexedContext))
-          case Select(This(_), name) => Some((name, indexedContext))
-          case Select(from, name) =>
+          case Ident(name) => indexedContext.findSymbol(name).getOrElse(Nil)
+          case Select(This(_), name) => indexedContext.findSymbol(name).getOrElse(Nil)
+          case sel @ Select(from, name) =>
             val symbol = from.symbol
             val ownerSymbol =
               if symbol.is(Method) && symbol.owner.isClass then
                 Some(symbol.owner)
               else Try(symbol.info.classSymbol).toOption
-            ownerSymbol.map(sym =>
-              (name, IndexedContext(context.localContext(from, sym)))
-            )
-          case Apply(fun, _) => maybeNameAndIndexedContext(fun)
-          case _ => None
+            ownerSymbol.map(sym =>  sym.info.member(name)).collect{
+              case single: SingleDenotation => List(single.symbol)
+              case multi: MultiDenotation => multi.allSymbols
+            }.getOrElse(Nil)
+          case Apply(fun, _) => matchingMethodsSymbols(fun)
+          case _ => Nil
       val matchingMethods =
         for
-          (name, indexedContext) <- maybeNameAndIndexedContext(method)
-          potentialMatches <- indexedContext.findSymbol(name)
-        yield
-          potentialMatches.collect {
-            case m
-              if m.is(Flags.Method) &&
-                m.vparamss.length >= argss.length &&
-                Try(m.isAccessibleFrom(apply.symbol.info)).toOption
+          potentialMatch <- matchingMethodsSymbols(method)
+          if potentialMatch.is(Flags.Method) &&
+                potentialMatch.vparamss.length >= argss.length &&
+                Try(potentialMatch.isAccessibleFrom(apply.symbol.info)).toOption
                   .getOrElse(false) &&
-                m.vparamss
+                potentialMatch.vparamss
                   .zip(argss)
                   .reverse
                   .zipWithIndex
                   .forall { case (pair, index) =>
-                    FuzzyArgMatcher(m.tparams)
+                    FuzzyArgMatcher(potentialMatch.tparams)
                       .doMatch(allArgsProvided = index != 0, ident)
                       .tupled(pair)
-                  } =>
-            m
-        }
-      matchingMethods.getOrElse(Nil)
+                    }
+        yield potentialMatch
+      matchingMethods
     end fallbackFindMatchingMethods
 
     val matchingMethods: List[Symbols.Symbol] =
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
index f5c15ca6df0e..8123bc8fa216 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
@@ -191,7 +191,7 @@ object OverrideCompletions:
               template :: path
             case path => path
 
-        val indexedContext = IndexedContext(
+        val indexedContext = IndexedContext(pos)(using
           Interactive.contextOfPath(path)(using newctx)
         )
         import indexedContext.ctx
diff --git a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
index 4fb84b87695c..7ae332a7c21c 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
@@ -133,11 +133,16 @@ class ShortenedTypePrinter(
     prefixIterator.flatMap { owner =>
       val prefixAfterRename = ownersAfterRename(owner)
       val ownerRename = indexedCtx.rename(owner)
-        ownerRename.foreach(rename => foundRenames += owner -> rename)
+      ownerRename.foreach(rename => foundRenames += owner -> rename)
       val currentRenamesSearchResult =
-        ownerRename.map(Found(owner, _, prefixAfterRename))
+      ownerRename.map(rename => Found(owner, rename, prefixAfterRename))
       lazy val configRenamesSearchResult =
-        renameConfigMap.get(owner).map(Missing(owner, _, prefixAfterRename))
+        renameConfigMap.get(owner).flatMap{rename =>
+          // if the rename is taken, we don't want to use it
+          indexedCtx.findSymbolInLocalScope(rename) match
+            case Some(symbols) => None
+            case None => Some(Missing(owner, rename, prefixAfterRename))
+        }
       currentRenamesSearchResult orElse configRenamesSearchResult
     }.nextOption
 
@@ -150,40 +155,36 @@ class ShortenedTypePrinter(
   private def optionalRootPrefix(sym: Symbol): Text =
     // If the symbol has toplevel clash we need to prepend `_root_.` to the symbol to disambiguate
     // it from the local symbol. It is only required when we are computing text for text edit.
-    if isTextEdit && indexedCtx.toplevelClashes(sym) then
+    if isTextEdit && indexedCtx.toplevelClashes(sym, inImportScope = false) then
       Str("_root_.")
     else
       Text()
 
   private def findRename(tp: NamedType): Option[Text] =
     val maybePrefixRename = findPrefixRename(tp.symbol.maybeOwner)
+    maybePrefixRename.map {
+      case res: Found => res.toPrefixText
+      case res: Missing =>
+        val importSel =
+          if res.owner.name.decoded == res.rename then
+            ImportSel.Direct(res.owner)
+          else ImportSel.Rename(res.owner, res.rename)
 
-    if maybePrefixRename.exists(importRename => indexedCtx.findSymbol(importRename.rename).isDefined) then
-      Some(super.toTextPrefixOf(tp))
-    else
-      maybePrefixRename.map {
-        case res: Found => res.toPrefixText
-        case res: Missing =>
-          val importSel =
-            if res.owner.name.toString == res.rename then
-              ImportSel.Direct(res.owner)
-            else ImportSel.Rename(res.owner, res.rename)
-
-          missingImports += importSel
-          res.toPrefixText
-      }
+        missingImports += importSel
+        res.toPrefixText
+    }
 
 
   override def toTextPrefixOf(tp: NamedType): Text = controlled {
     val maybeRenamedPrefix: Option[Text] = findRename(tp)
-    val trimmedPrefix: Text =
+    def trimmedPrefix: Text =
       if !tp.designator.isInstanceOf[Symbol] && tp.typeSymbol == NoSymbol then
-        maybeRenamedPrefix.getOrElse(super.toTextPrefixOf(tp))
+        super.toTextPrefixOf(tp)
       else
         indexedCtx.lookupSym(tp.symbol) match
+          case _ if indexedCtx.rename(tp.symbol).isDefined => Text()
           // symbol is missing and is accessible statically, we can import it and add proper prefix
           case Result.Missing if isAccessibleStatically(tp.symbol) =>
-            maybeRenamedPrefix.getOrElse:
               missingImports += ImportSel.Direct(tp.symbol)
               Text()
           // the symbol is in scope, we can omit the prefix
@@ -193,7 +194,7 @@ class ShortenedTypePrinter(
             maybeRenamedPrefix.getOrElse(super.toTextPrefixOf(tp))
           case _ => super.toTextPrefixOf(tp)
 
-    optionalRootPrefix(tp.symbol) ~ trimmedPrefix
+    optionalRootPrefix(tp.symbol) ~ maybeRenamedPrefix.getOrElse(trimmedPrefix)
   }
 
   override protected def selectionString(tp: NamedType): String =
diff --git a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
index d909b6ee7e04..fb5e56085e15 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
@@ -166,7 +166,7 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
       @tailrec
       def loop(acc: List[String], sym: Symbol): List[String] =
         if sym == NoSymbol || sym.isRoot || sym.isEmptyPackage then acc
-        else if sym.isPackageObject then loop(acc, sym.owner)
+        else if sym.isPackageObject || sym.isConstructor then loop(acc, sym.owner)
         else
           val v = this.nameBackticked(sym)(exclusions)
           loop(v :: acc, sym.owner)
@@ -177,6 +177,9 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
     def companion: Symbol =
       if sym.is(Module) then sym.companionClass else sym.companionModule
 
+    def dealiasType: Symbol =
+      if sym.isType then sym.info.deepDealias.typeSymbol else sym
+
     def nameBackticked: String = nameBackticked(Set.empty[String])
 
     def nameBackticked(backtickSoftKeyword: Boolean = true): String =
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
index e5f2d31ad808..044b5456d31d 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
@@ -826,8 +826,8 @@ class CompletionArgSuite extends BaseCompletionSuite:
          |""".stripMargin,
       """|aaa = : Int
          |aaa = g : Int
-         |abb = : Option[Int]
          |abb = : Int
+         |abb = : Option[Int]
          |abb = g : Int
          |""".stripMargin,
       topLines = Some(5),
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionCaseSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionCaseSuite.scala
index e72ee5221d91..edc6cb2b4fb2 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionCaseSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionCaseSuite.scala
@@ -37,7 +37,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
         |class Cat extends Animal
         |class Dog extends Animal
         |object Elephant extends Animal
-        |class HasFeet[A, B](e: T, f: B) extends Animal
+        |class HasFeet[A, B](e: A, f: B) extends Animal
         |class HasMouth[T](e: T) extends Animal
         |case class HasWings[T](e: T) extends Animal
         |case object Seal extends Animal
@@ -146,14 +146,12 @@ class CompletionCaseSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
-  // TODO: `Left` has conflicting name in Scope, we should fix it so the result is the same as for scala 2
-  // Issue: https://github.com/scalameta/metals/issues/4368
   @Test def `sealed-conflict` =
     check(
       """
         |object A {
         |  val e: Either[Int, String] = ???
-        |  type Left = String
+        |  val Left = 123
         |  e match {
         |    case@@
         |  }
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionContextSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionContextSuite.scala
index 5314a61ab599..961022375f86 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionContextSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionContextSuite.scala
@@ -25,3 +25,41 @@ class CompletionContextSuite extends BaseCompletionSuite:
         |""".stripMargin,
       filter = futureCompletionResult.contains
     )
+
+  @Test def multipleFoos =
+    checkEdit(
+      """|
+         |package a{
+         |  class Foo
+         |}
+         |package b{
+         |  class Foo
+         |}
+         |package c{
+         |  class Foo
+         |}
+         |package d{
+         |  import a.{Foo => Bar}
+         |  import b.Foo
+         |
+         |  val x = new Foo@@ // I want to import c.Foo
+         |}""".stripMargin,
+      """|
+         |package a{
+         |  class Foo
+         |}
+         |package b{
+         |  class Foo
+         |}
+         |package c{
+         |  class Foo
+         |}
+         |package d{
+         |  import a.{Foo => Bar}
+         |  import b.Foo
+         |
+         |  val x = new c.Foo // I want to import c.Foo
+         |}""".stripMargin,
+      assertSingleItem = false,
+      filter = (label: String) => label.contains("Foo - c")
+    )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
index 8aa885149852..1fb9cb51ae80 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
@@ -655,7 +655,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |    val y/*: S<<scala/collection/Set#>>[Char<<scala/Char#>>]*/ = f
         |    ???
         |  }
-        |  val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<scala/Predef.String#>>]*/ = test(Set/*[Int<<scala/Int#>>]*/(1), Set/*[Char<<scala/Char#>>]*/('a'))
+        |  val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = test(Set/*[Int<<scala/Int#>>]*/(1), Set/*[Char<<scala/Char#>>]*/('a'))
         |}
         |""".stripMargin,
     )

From 79e4a424c4d85e6189165843a5fad1e048d6930e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 30 Apr 2025 14:51:40 +0200
Subject: [PATCH 275/505] improvement: Rework IndexedContext to reuse the
 previously calculated scopes (#22898)

It turns out the work being done in IndexedContext was already done in
Completions, but better, since it doesn't try to read files as the
separate logic does.

There is still some improvement to be done to not calculate it twice,
but in order to keep this PR as simple as possible I will skip that for
now.
[Cherry-picked 9d90ff5f5f7525785799c6a5844a25930ab4cb92][modified]

From 129205ff1bcb8e5d527aeedee4cf12d1f5b9ac5a Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 3 Apr 2025 03:19:33 -0700
Subject: [PATCH 276/505] Test chars safely when highlighting

The arrow test at lastOffset - 3 is out-of-range when highlighting,
which parses a snippet of source.

Always check lower bound in testChar.

Don't check as initial condition in testChars because it recurses.
---
 compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 7 ++++---
 compiler/test/dotty/tools/utils.scala               | 6 ++++++
 tests/neg/i19320.scala                              | 8 ++++----
 tests/neg/i22906.check                              | 6 ++++++
 tests/neg/i22906.scala                              | 6 ++++++
 5 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 tests/neg/i22906.check
 create mode 100644 tests/neg/i22906.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 47389fbce054..701e37ffa462 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -692,16 +692,17 @@ object Parsers {
 
     def testChar(idx: Int, p: Char => Boolean): Boolean = {
       val txt = source.content
-      idx < txt.length && p(txt(idx))
+      idx >= 0 && idx < txt.length && p(txt(idx))
     }
 
     def testChar(idx: Int, c: Char): Boolean = {
       val txt = source.content
-      idx < txt.length && txt(idx) == c
+      idx >= 0 && idx < txt.length && txt(idx) == c
     }
 
     def testChars(from: Int, str: String): Boolean =
-      str.isEmpty ||
+      str.isEmpty
+      ||
       testChar(from, str.head) && testChars(from + 1, str.tail)
 
     def skipBlanks(idx: Int, step: Int = 1): Int =
diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala
index 49ea2d4d3873..e3ee944decf1 100644
--- a/compiler/test/dotty/tools/utils.scala
+++ b/compiler/test/dotty/tools/utils.scala
@@ -89,6 +89,9 @@ private val toolArg = raw"(?://|/\*| \*) ?(?i:(${ToolName.values.mkString("|")})
 /** Directive to specify to vulpix the options to pass to Dotty */
 private val directiveOptionsArg = raw"//> using options (.*)".r.unanchored
 private val directiveJavacOptions = raw"//> using javacOpt (.*)".r.unanchored
+private val directiveTargetOptions = raw"//> using target.platform (jvm|scala-js)".r.unanchored
+private val directiveUnsupported = raw"//> using (scala) (.*)".r.unanchored
+private val directiveUnknown = raw"//> using (.*)".r.unanchored
 
 // Inspect the lines for compiler options of the form
 // `//> using options args`, `// scalajs: args`, `/* scalajs: args`, ` * scalajs: args` etc.
@@ -104,6 +107,9 @@ def toolArgsParse(lines: List[String], filename: Option[String]): List[(String,S
   lines.flatMap {
     case directiveOptionsArg(args) => List(("scalac", args))
     case directiveJavacOptions(args) => List(("javac", args))
+    case directiveTargetOptions(platform) => List(("target", platform))
+    case directiveUnsupported(name, args) => Nil
+    case directiveUnknown(rest) => sys.error(s"Unknown directive: `//> using ${CommandLineParser.tokenize(rest).headOption.getOrElse("''")}`${filename.fold("")(f => s" in file $f")}")
     case _ => Nil
   }
 
diff --git a/tests/neg/i19320.scala b/tests/neg/i19320.scala
index e802215a1f10..3597f02cf431 100644
--- a/tests/neg/i19320.scala
+++ b/tests/neg/i19320.scala
@@ -1,7 +1,7 @@
-//> using scala "3.3.1"
-//> using dep org.http4s::http4s-ember-client:1.0.0-M40
-//> using dep org.http4s::http4s-ember-server:1.0.0-M40
-//> using dep org.http4s::http4s-dsl:1.0.0-M40
+//!> using scala "3.3.1"
+//!> using dep org.http4s::http4s-ember-client:1.0.0-M40
+//!> using dep org.http4s::http4s-ember-server:1.0.0-M40
+//!> using dep org.http4s::http4s-dsl:1.0.0-M40
 
 //import cats.effect.*
 //import cats.implicits.*
diff --git a/tests/neg/i22906.check b/tests/neg/i22906.check
new file mode 100644
index 000000000000..118f9f4fa069
--- /dev/null
+++ b/tests/neg/i22906.check
@@ -0,0 +1,6 @@
+Flag -indent set repeatedly
+-- Error: tests/neg/i22906.scala:6:15 ----------------------------------------------------------------------------------
+6 |    {`1`: Int  =>  5} // error
+  |               ^
+  |               parentheses are required around the parameter of a lambda
+  |               This construct can be rewritten automatically under -rewrite -source 3.0-migration.
diff --git a/tests/neg/i22906.scala b/tests/neg/i22906.scala
new file mode 100644
index 000000000000..ca464e99bd48
--- /dev/null
+++ b/tests/neg/i22906.scala
@@ -0,0 +1,6 @@
+//> using options -rewrite -indent
+//> nominally using scala 3.7.0-RC1
+// does not reproduce under "vulpix" test rig, which enforces certain flag sets?
+
+def program: Int => Int =
+    {`1`: Int  =>  5} // error

From 7e8464a1af3cbce02b4db7665fdcf119965aa952 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 30 Apr 2025 14:52:54 +0200
Subject: [PATCH 277/505] Test chars safely when highlighting

The arrow test at lastOffset - 3 is out-of-range when highlighting,
which parses a snippet of source.

Always check lower bound in testChar.

Don't check as initial condition in testChars because it recurses.

[Cherry-picked fb6cc9b8066adc28437adf80a29ea410be71b9e6][modified]

From 4bfcef1019706ac6992021baf9ec1d60392a12dc Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 2 May 2025 12:22:35 +0200
Subject: [PATCH 278/505] chore: Bump reference version to RC3

---
 project/Build.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index bec970038ae0..b11589490264 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -88,7 +88,7 @@ object Build {
    *
    *  Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
    */
-  val referenceVersion = "3.3.6-RC2"
+  val referenceVersion = "3.3.6-RC3"
 
   /** Version of the Scala compiler targeted in the current release cycle
    *  Contains a version without RC/SNAPSHOT/NIGHTLY specific suffixes

From 06dd49e5cf01ed2de3267860901fc461f2156fc1 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Fri, 26 Jan 2024 10:20:04 -0500
Subject: [PATCH 279/505] forward-port ClassfileParserTest from Scala 2

Co-authored-by: Lukas Rytz <lukas.rytz@gmail.com>

[Cherry-picked 0c3933f4449bce336ae8ce4eb849f7b0d1d048bd]
---
 .../backend/jvm/ClassfileParserTest.scala     | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala

diff --git a/compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala b/compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala
new file mode 100644
index 000000000000..8103812a3865
--- /dev/null
+++ b/compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala
@@ -0,0 +1,54 @@
+package dotty.tools.backend.jvm
+
+// painful to do Java reflection stuff without this
+import scala.language.unsafeNulls
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+import java.lang.reflect.Member
+
+class ClassfileParserTest {
+  @Test
+  def noConstantPoolLag(): Unit = {
+    def constNames(ms: List[Member]) = ms.collect {
+      case f if f.getName.startsWith("CONSTANT_") => f.getName
+    }.sorted
+
+    val toDotc = Map(
+      "CONSTANT_INTERFACE_METHODREF" -> "CONSTANT_INTFMETHODREF",
+      "CONSTANT_INVOKE_DYNAMIC" -> "CONSTANT_INVOKEDYNAMIC",
+      "CONSTANT_METHOD_HANDLE" -> "CONSTANT_METHODHANDLE",
+      "CONSTANT_METHOD_TYPE" -> "CONSTANT_METHODTYPE",
+      "CONSTANT_NAME_AND_TYPE" -> "CONSTANT_NAMEANDTYPE",
+    ).withDefault(x => x)
+
+    val asmConsts = constNames(Class.forName("scala.tools.asm.Symbol").getDeclaredFields.toList)
+      .map(_.stripSuffix("_TAG"))
+      .map(toDotc)
+      .::("CONSTANT_UNICODE")
+      .sorted
+    // in the Scala 2 version of this test, we also use Java reflection to get the constant
+    // names out of ClassfileConstants. in Dotty, the constants are `inline val`s, invisible
+    // to Java reflection, so we hardcode them here
+    assertEquals(asmConsts, List(
+      // do not add to this list without also making the corresponding change
+      // in ClassfileConstants! that would defeat the purpose of the test
+      "CONSTANT_CLASS",
+      "CONSTANT_DOUBLE",
+      "CONSTANT_FIELDREF",
+      "CONSTANT_FLOAT",
+      "CONSTANT_INTEGER",
+      "CONSTANT_INTFMETHODREF",
+      "CONSTANT_INVOKEDYNAMIC",
+      "CONSTANT_LONG",
+      "CONSTANT_METHODHANDLE",
+      "CONSTANT_METHODREF",
+      "CONSTANT_METHODTYPE",
+      "CONSTANT_NAMEANDTYPE",
+      "CONSTANT_STRING",
+      "CONSTANT_UNICODE",
+      "CONSTANT_UTF8",
+    ))
+  }
+}

From bdf57ac33f323b981486c9252e0c7dced3777682 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 25 Jan 2024 19:14:17 -0500
Subject: [PATCH 280/505] classfile reader: allow JDK 9+ constant types in
 constant pool

forward-port of scala/scala#10675 and scala/scala#8595
references scala/bug#12396 and scala/bug#11635
fixes lampepfl/dotty#19527 ("bad constant pool tag 17")
also fixes unreported potential "bad constant pool tag 19" and
"bad constant pool tag 20" errors
---
 .../core/classfile/ClassfileConstants.scala     |  3 +++
 .../dotc/core/classfile/ClassfileParser.scala   |  5 +++--
 .../tools/backend/jvm/ClassfileParserTest.scala |  3 +++
 tests/pos/t12396/A_1.java                       | 17 +++++++++++++++++
 tests/pos/t12396/B_2.scala                      |  5 +++++
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/t12396/A_1.java
 create mode 100644 tests/pos/t12396/B_2.scala

diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala
index 6ad71c5fd1ce..7a2232891a83 100644
--- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala
+++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala
@@ -73,7 +73,10 @@ object ClassfileConstants {
 
   inline val CONSTANT_METHODHANDLE  = 15
   inline val CONSTANT_METHODTYPE    = 16
+  inline val CONSTANT_DYNAMIC       = 17
   inline val CONSTANT_INVOKEDYNAMIC = 18
+  inline val CONSTANT_MODULE        = 19
+  inline val CONSTANT_PACKAGE       = 20
 
   // tags describing the type of a literal in attribute values
   inline val BYTE_TAG   = 'B'
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
index 37367ca56488..cd4cf3c0dd3a 100644
--- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
+++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
@@ -1224,13 +1224,14 @@ class ClassfileParser(
         (in.nextByte.toInt: @switch) match {
           case CONSTANT_UTF8 | CONSTANT_UNICODE =>
             in.skip(in.nextChar)
-          case CONSTANT_CLASS | CONSTANT_STRING | CONSTANT_METHODTYPE =>
+          case CONSTANT_CLASS | CONSTANT_STRING | CONSTANT_METHODTYPE
+             | CONSTANT_MODULE | CONSTANT_PACKAGE =>
             in.skip(2)
           case CONSTANT_METHODHANDLE =>
             in.skip(3)
           case CONSTANT_FIELDREF | CONSTANT_METHODREF | CONSTANT_INTFMETHODREF
              | CONSTANT_NAMEANDTYPE | CONSTANT_INTEGER | CONSTANT_FLOAT
-             | CONSTANT_INVOKEDYNAMIC =>
+             | CONSTANT_INVOKEDYNAMIC | CONSTANT_DYNAMIC =>
             in.skip(4)
           case CONSTANT_LONG | CONSTANT_DOUBLE =>
             in.skip(8)
diff --git a/compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala b/compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala
index 8103812a3865..9263103f1712 100644
--- a/compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala
+++ b/compiler/test/dotty/tools/backend/jvm/ClassfileParserTest.scala
@@ -36,6 +36,7 @@ class ClassfileParserTest {
       // in ClassfileConstants! that would defeat the purpose of the test
       "CONSTANT_CLASS",
       "CONSTANT_DOUBLE",
+      "CONSTANT_DYNAMIC",
       "CONSTANT_FIELDREF",
       "CONSTANT_FLOAT",
       "CONSTANT_INTEGER",
@@ -45,7 +46,9 @@ class ClassfileParserTest {
       "CONSTANT_METHODHANDLE",
       "CONSTANT_METHODREF",
       "CONSTANT_METHODTYPE",
+      "CONSTANT_MODULE",
       "CONSTANT_NAMEANDTYPE",
+      "CONSTANT_PACKAGE",
       "CONSTANT_STRING",
       "CONSTANT_UNICODE",
       "CONSTANT_UTF8",
diff --git a/tests/pos/t12396/A_1.java b/tests/pos/t12396/A_1.java
new file mode 100644
index 000000000000..a394d3a0a59d
--- /dev/null
+++ b/tests/pos/t12396/A_1.java
@@ -0,0 +1,17 @@
+// test: -jvm 21+
+
+public class A_1 {
+  public int f(Object s) {
+    switch(s) {
+      case Res.R -> {
+        return 1;
+      }
+      default -> {
+        return 3;
+      }
+    }
+  }
+  static enum Res {
+    R
+  }
+}
diff --git a/tests/pos/t12396/B_2.scala b/tests/pos/t12396/B_2.scala
new file mode 100644
index 000000000000..662da7b3a575
--- /dev/null
+++ b/tests/pos/t12396/B_2.scala
@@ -0,0 +1,5 @@
+// test: -jvm 21+
+
+class B {
+  def bar = (new A_1).f(null)
+}

From abb6d41d25490eed93735672cd06135d171f7810 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 5 May 2025 11:25:04 +0200
Subject: [PATCH 281/505] classfile reader: allow JDK 9+ constant types in
 constant pool

forward-port of scala/scala#10675 and scala/scala#8595
references scala/bug#12396 and scala/bug#11635
fixes lampepfl/dotty#19527 ("bad constant pool tag 17")
also fixes unreported potential "bad constant pool tag 19" and
"bad constant pool tag 20" errors

[Cherry-picked 26852deba278185eb62bc305c5e863ad93f52dbc][modified]

From f6ab96da333fee5403ed4f1d0512acf933c4e247 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Tue, 18 Mar 2025 16:01:13 +0000
Subject: [PATCH 282/505] Revert "Rename `InlineCopier` to
 `ConservativeTreeCopier`, use it in `TypeMap`s"

This reverts commit bb63e31a8384e6e3127ee679ea0033e8437ef9ce.

[Cherry-picked e01af070bd507ae2b82be9ffe46261a59a075c4c]
---
 compiler/src/dotty/tools/dotc/ast/tpd.scala     |  8 --------
 compiler/src/dotty/tools/dotc/core/Types.scala  |  9 +--------
 .../src/dotty/tools/dotc/inlines/Inliner.scala  | 17 ++++++++++-------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
index 6ce8d93af76a..df220271ba4c 100644
--- a/compiler/src/dotty/tools/dotc/ast/tpd.scala
+++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -832,14 +832,6 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
       Closure(tree: Tree)(env, meth, tpt)
   }
 
-  // This is a more fault-tolerant copier that does not cause errors when
-  // function types in applications are undefined.
-  // This was called `Inliner.InlineCopier` before 3.6.3.
-  class ConservativeTreeCopier() extends TypedTreeCopier:
-    override def Apply(tree: Tree)(fun: Tree, args: List[Tree])(using Context): Apply =
-      if fun.tpe.widen.exists then super.Apply(tree)(fun, args)
-      else untpd.cpy.Apply(tree)(fun, args).withTypeUnchecked(tree.tpe)
-
   override def skipTransform(tree: Tree)(using Context): Boolean = tree.tpe.isError
 
   implicit class TreeOps[ThisTree <: tpd.Tree](private val tree: ThisTree) extends AnyVal {
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 6c3c8ef9fe85..994179649704 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -5939,14 +5939,7 @@ object Types extends TypeUtils {
       }
     }
 
-    private def treeTypeMap = new TreeTypeMap(
-      typeMap = this,
-      // Using `ConservativeTreeCopier` is needed when copying dependent annoted
-      // types, where we can refer to a previous parameter represented as
-      // `TermParamRef` that has no underlying type yet.
-      // See tests/pos/annot-17242.scala.
-      cpy = ConservativeTreeCopier()
-    )
+    private def treeTypeMap = new TreeTypeMap(typeMap = this)
 
     def mapOver(syms: List[Symbol]): List[Symbol] = mapSymbols(syms, treeTypeMap)
 
diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 50eaa0f57e38..63a99104685f 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -96,6 +96,15 @@ object Inliner:
     }
   end isElideableExpr
 
+  // InlineCopier is a more fault-tolerant copier that does not cause errors when
+  // function types in applications are undefined. This is necessary since we copy at
+  // the same time as establishing the proper context in which the copied tree should
+  // be evaluated. This matters for opaque types, see neg/i14653.scala.
+  private class InlineCopier() extends TypedTreeCopier:
+    override def Apply(tree: Tree)(fun: Tree, args: List[Tree])(using Context): Apply =
+      if fun.tpe.widen.exists then super.Apply(tree)(fun, args)
+      else untpd.cpy.Apply(tree)(fun, args).withTypeUnchecked(tree.tpe)
+
   // InlinerMap is a TreeTypeMap with special treatment for inlined arguments:
   // They are generally left alone (not mapped further, and if they wrap a type
   // the type Inlined wrapper gets dropped.
@@ -108,13 +117,7 @@ object Inliner:
       substFrom: List[Symbol],
       substTo: List[Symbol])(using Context)
     extends TreeTypeMap(
-      typeMap, treeMap, oldOwners, newOwners, substFrom, substTo,
-      // It is necessary to use the `ConservativeTreeCopier` since we copy at
-      // the same time as establishing the proper context in which the copied
-      // tree should be evaluated. This matters for opaque types, see
-      // neg/i14653.scala.
-      ConservativeTreeCopier()
-    ):
+      typeMap, treeMap, oldOwners, newOwners, substFrom, substTo, InlineCopier()):
 
     override def transform(tree: Tree)(using Context): Tree =
       tree match

From 88ef51c697a6c2fd67830d719787ad038f1df72b Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 19 Mar 2025 15:35:57 +0000
Subject: [PATCH 283/505] Avoid loosing denotations of named types during
 `integrate`

---
 .../src/dotty/tools/dotc/core/Types.scala     | 28 ++++++++++++++++++-
 tests/pos/annot-17242.scala                   |  2 --
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 994179649704..59049712e52c 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -3730,9 +3730,35 @@ object Types extends TypeUtils {
     def integrate(tparams: List[ParamInfo], tp: Type)(using Context): Type =
       (tparams: @unchecked) match {
         case LambdaParam(lam, _) :: _ => tp.subst(lam, this) // This is where the precondition is necessary.
-        case params: List[Symbol @unchecked] => tp.subst(params, paramRefs)
+        case params: List[Symbol @unchecked] => IntegrateMap(params, paramRefs)(tp)
       }
 
+    /** A map that replaces references to symbols in `params` by the types in
+     *  `paramRefs`.
+     *
+     *  It is similar to [[Substituters#subst]] but avoids reloading denotations
+     *  of named types by overriding `derivedSelect`.
+     *
+     *  This is needed because during integration, [[TermParamRef]]s refer to a
+     *  [[LambdaType]] that is not yet fully constructed, in particular for wich
+     *  `paramInfos` is `null`. In that case all [[TermParamRef]]s have
+     *  [[NoType]] as underlying type. Reloading denotions of selections
+     *  involving such [[TermParamRef]]s in [[NamedType#withPrefix]] could then
+     *  result in a [[NoDenotation]], which would make later disambiguation of
+     *  overloads impossible. See `tests/pos/annot-17242.scala` for example.
+     */
+    private class IntegrateMap(params: List[Symbol], paramRefs: List[Type])(using Context) extends TypeMap:
+      override def apply(tp: Type) =
+        tp match
+          case tp: NamedType if params.contains(tp.symbol) => paramRefs(params.indexOf(tp.symbol))
+          case _: BoundType | _: ThisType => tp
+          case _ => mapOver(tp)
+
+      override def derivedSelect(tp: NamedType, pre: Type): Type =
+        if tp.prefix eq pre then tp
+        else if tp.symbol.exists then NamedType(pre, tp.name, tp.denot.asSeenFrom(pre))
+        else NamedType(pre, tp.name)
+
     final def derivedLambdaType(paramNames: List[ThisName] = this.paramNames,
                           paramInfos: List[PInfo] = this.paramInfos,
                           resType: Type = this.resType)(using Context): This =
diff --git a/tests/pos/annot-17242.scala b/tests/pos/annot-17242.scala
index a8fcc9dbe15f..a1a62638ced3 100644
--- a/tests/pos/annot-17242.scala
+++ b/tests/pos/annot-17242.scala
@@ -1,5 +1,3 @@
-// See also tests/pos/annot-21595.scala
-
 class local(predicate: Int) extends annotation.StaticAnnotation
 
 def failing1(x: Int, z: Int @local(x + x)) = ()

From 98c9ff67e36266dcbfde23b6b54c8b6af81f163b Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 5 May 2025 11:28:42 +0200
Subject: [PATCH 284/505] Avoid loosing denotations of named types during
 `integrate`

[Cherry-picked 2f285a20140b3e63a36affbe272a7cb0a8c844a6][modified]

From 7587326508cb0623d364d47f6fad3dbba5d46f46 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 9 Apr 2025 12:13:53 +0000
Subject: [PATCH 285/505] Copy implementation of SubstMap to IntegrateMap

---
 compiler/src/dotty/tools/dotc/core/Types.scala | 18 +++++++++++++++---
 tests/neg/i12448.scala                         |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 59049712e52c..b98670e48c33 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -3747,14 +3747,26 @@ object Types extends TypeUtils {
      *  result in a [[NoDenotation]], which would make later disambiguation of
      *  overloads impossible. See `tests/pos/annot-17242.scala` for example.
      */
-    private class IntegrateMap(params: List[Symbol], paramRefs: List[Type])(using Context) extends TypeMap:
+    private class IntegrateMap(from: List[Symbol], to: List[Type])(using Context) extends TypeMap:
       override def apply(tp: Type) =
+        // Same implementation as in `SubstMap`, except the `derivedSelect` in
+        // the `NamedType` case, and the default case that just calls `mapOver`.
         tp match
-          case tp: NamedType if params.contains(tp.symbol) => paramRefs(params.indexOf(tp.symbol))
+          case tp: NamedType =>
+            val sym = tp.symbol
+            var fs = from
+            var ts = to
+            while (fs.nonEmpty && ts.nonEmpty) {
+              if (fs.head eq sym) return ts.head
+              fs = fs.tail
+              ts = ts.tail
+            }
+            if (tp.prefix `eq` NoPrefix) tp
+            else derivedSelect(tp, apply(tp.prefix))
           case _: BoundType | _: ThisType => tp
           case _ => mapOver(tp)
 
-      override def derivedSelect(tp: NamedType, pre: Type): Type =
+      override final def derivedSelect(tp: NamedType, pre: Type): Type =
         if tp.prefix eq pre then tp
         else if tp.symbol.exists then NamedType(pre, tp.name, tp.denot.asSeenFrom(pre))
         else NamedType(pre, tp.name)
diff --git a/tests/neg/i12448.scala b/tests/neg/i12448.scala
index e495cfd19f1d..df9ee94ecbfe 100644
--- a/tests/neg/i12448.scala
+++ b/tests/neg/i12448.scala
@@ -1,5 +1,5 @@
 object Main {
   def mkArray[T <: A]: T#AType // error // error
-  mkArray[Array] // was: "assertion failed: invalid prefix HKTypeLambda..."
+  mkArray[Array]
   val x = mkArray[Array]
 }

From 5133a0285f700805de3e4085be08a1f93bc4bbd8 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 5 May 2025 11:30:50 +0200
Subject: [PATCH 286/505] Copy implementation of SubstMap to IntegrateMap

[Cherry-picked 9bef68c5ddf0f30b83d2daadbe8e735ce19f787f][modified]

From 0fe834032e71850dfe19c6d0eba90eee81621ae6 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Mon, 28 Apr 2025 11:05:32 +0000
Subject: [PATCH 287/505] Tighten condition to preserve denotation in
 IntegrateMap

[Cherry-picked c3564dfac837b1a070ff260ac7cc7708d9f86b85]
---
 compiler/src/dotty/tools/dotc/core/Types.scala |  8 ++++++--
 tests/pos/23056.scala                          | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/23056.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index b98670e48c33..d6521270ea3d 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -3768,8 +3768,12 @@ object Types extends TypeUtils {
 
       override final def derivedSelect(tp: NamedType, pre: Type): Type =
         if tp.prefix eq pre then tp
-        else if tp.symbol.exists then NamedType(pre, tp.name, tp.denot.asSeenFrom(pre))
-        else NamedType(pre, tp.name)
+        else
+          pre match
+            case ref: ParamRef if (ref.binder eq self) && tp.symbol.exists =>
+              NamedType(pre, tp.name, tp.denot.asSeenFrom(pre))
+            case _ =>
+              tp.derivedSelect(pre)
 
     final def derivedLambdaType(paramNames: List[ThisName] = this.paramNames,
                           paramInfos: List[PInfo] = this.paramInfos,
diff --git a/tests/pos/23056.scala b/tests/pos/23056.scala
new file mode 100644
index 000000000000..e38909e16c61
--- /dev/null
+++ b/tests/pos/23056.scala
@@ -0,0 +1,18 @@
+def Test = {
+  val ops: CompileOps[Option, Option, Any]  = ???
+  ops.to(List).map(_.reverse) // error
+}
+
+trait CompileOps[F[_], G[_], O]:
+  def to(collector: Collector[O]): G[collector.Out]
+trait Collector[-A] {
+  type Out
+}
+
+object Collector:
+  type Aux[A, X] = Collector[A] { type Out = X }
+
+  given [A, C[_]]: Conversion[
+    scala.collection.IterableFactory[C],
+    Collector.Aux[A, C[A]]
+  ] = ???

From ae17e7e9cce1d7f5de146e1fe1e7ea6e52748176 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 23 Apr 2025 07:49:28 -0700
Subject: [PATCH 288/505] Keep unused annot on params

[Cherry-picked 1c886c6dc26f63f0c8257e8b7112523c4069945c]
---
 .../src/dotty/tools/dotc/transform/PostTyper.scala  |  6 ++++--
 tests/warn/i23033.scala                             | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 tests/warn/i23033.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
index 9134e9736079..6d5175bf17a0 100644
--- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
@@ -194,8 +194,10 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
           else
             if sym.is(Param) then
               // @unused is getter/setter but we want it on ordinary method params
-              if !sym.owner.is(Method) || sym.owner.isConstructor then
-                sym.keepAnnotationsCarrying(thisPhase, Set(defn.ParamMetaAnnot), orNoneOf = defn.NonBeanMetaAnnots)
+              // @param should be consulted only for fields
+              val unusing = sym.getAnnotation(defn.UnusedAnnot)
+              sym.keepAnnotationsCarrying(thisPhase, Set(defn.ParamMetaAnnot), orNoneOf = defn.NonBeanMetaAnnots)
+              unusing.foreach(sym.addAnnotation)
             else if sym.is(ParamAccessor) then
               sym.keepAnnotationsCarrying(thisPhase, Set(defn.GetterMetaAnnot, defn.FieldMetaAnnot))
             else
diff --git a/tests/warn/i23033.scala b/tests/warn/i23033.scala
new file mode 100644
index 000000000000..6170664e05e2
--- /dev/null
+++ b/tests/warn/i23033.scala
@@ -0,0 +1,13 @@
+//> using options -Werror -Wunused:all
+
+import scala.annotation.unused
+import scala.concurrent.ExecutionContext
+import scala.util.NotGiven
+
+object Test {
+  given [T](using @unused ev: NotGiven[T <:< Int]): AnyRef with {}
+}
+object Useful:
+  given [T](using @unused ec: ExecutionContext): AnyRef with {}
+object Syntax:
+  given [T] => (@unused ec: ExecutionContext) => AnyRef

From 40de9416aee54776d94b66acc973f2debd1d8472 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 15 Apr 2025 11:04:14 -0700
Subject: [PATCH 289/505] Warn if match in block is not used for PF

[Cherry-picked 08f2e4a1f3adb6b1a15d2857d28d5c9aa46656fd]
---
 .../tools/dotc/reporting/ErrorMessageID.scala |  1 +
 .../dotty/tools/dotc/reporting/messages.scala | 34 +++++++++++++++++--
 .../tools/dotc/transform/ExpandSAMs.scala     |  8 ++++-
 tests/warn/i21649.scala                       | 16 +++++++++
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 tests/warn/i21649.scala

diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index b077989f4f9a..d3ac238fbc5c 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -224,6 +224,7 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case ExtensionHasDefaultID // errorNumber: 208
   case FormatInterpolationErrorID // errorNumber: 209
   case ValueClassCannotExtendAliasOfAnyValID // errorNumber: 210
+  case MatchIsNotPartialFunctionID // errorNumber: 211
 
   def errorNumber = ordinal - 1
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 896dcb497e00..ecd11289c959 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3217,5 +3217,35 @@ end EnumMayNotBeValueClasses
 
 class BadFormatInterpolation(errorText: String)(using Context) extends Message(FormatInterpolationErrorID):
   def kind = MessageKind.Interpolation
-  def msg(using Context) = errorText
-  def explain(using Context) = ""
+  protected def msg(using Context) = errorText
+  protected def explain(using Context) = ""
+
+class MatchIsNotPartialFunction(using Context) extends SyntaxMsg(MatchIsNotPartialFunctionID):
+  protected def msg(using Context) =
+    "match expression in result of block will not be used to synthesize partial function"
+  protected def explain(using Context) =
+    i"""A `PartialFunction` can be synthesized from a function literal if its body is just a pattern match.
+       |
+       |For example, `collect` takes a `PartialFunction`.
+       |  (1 to 10).collect(i => i match { case n if n % 2 == 0 => n })
+       |is equivalent to using a "pattern-matching anonymous function" directly:
+       |  (1 to 10).collect { case n if n % 2 == 0 => n }
+       |Compare an operation that requires a `Function1` instead:
+       |  (1 to 10).map { case n if n % 2 == 0 => n case n => n + 1 }
+       |
+       |As a convenience, the "selector expression" of the match can be an arbitrary expression:
+       |  List("1", "two", "3").collect(x => Try(x.toInt) match { case Success(i) => i })
+       |In this example, `isDefinedAt` evaluates the selector expression and any guard expressions
+       |in the pattern match in order to report whether an input is in the domain of the function.
+       |
+       |However, blocks of statements are not supported by this idiom:
+       |  List("1", "two", "3").collect: x =>
+       |    val maybe = Try(x.toInt) // statements preceding the match
+       |    maybe match
+       |    case Success(i) if i % 2 == 0 => i // throws MatchError on cases not covered
+       |
+       |This restriction is enforced to simplify the evaluation semantics of the partial function.
+       |Otherwise, it might not be clear what is computed by `isDefinedAt`.
+       |
+       |Efficient operations will use `applyOrElse` to avoid computing the match twice,
+       |but the `apply` body would be executed "per element" in the example."""
diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala
index f62044eae7d2..01875818ec74 100644
--- a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala
@@ -126,10 +126,16 @@ class ExpandSAMs extends MiniPhase:
     // The right hand side from which to construct the partial function. This is always a Match.
     // If the original rhs is already a Match (possibly in braces), return that.
     // Otherwise construct a match `x match case _ => rhs` where `x` is the parameter of the closure.
-    def partialFunRHS(tree: Tree): Match = tree match
+    def partialFunRHS(tree: Tree): Match =
+      inline def checkMatch(): Unit =
+        tree match
+        case Block(_, m: Match) => report.warning(reporting.MatchIsNotPartialFunction(), m.srcPos)
+        case _ =>
+      tree match
       case m: Match => m
       case Block(Nil, expr) => partialFunRHS(expr)
       case _ =>
+        checkMatch()
         Match(ref(param.symbol),
           CaseDef(untpd.Ident(nme.WILDCARD).withType(param.symbol.info), EmptyTree, tree) :: Nil)
 
diff --git a/tests/warn/i21649.scala b/tests/warn/i21649.scala
new file mode 100644
index 000000000000..d63a7f3a7ecb
--- /dev/null
+++ b/tests/warn/i21649.scala
@@ -0,0 +1,16 @@
+//> using options -explain
+// do warn if function literal adaptation has match in non-empty block
+
+import scala.util.*
+import PartialFunction.condOpt
+
+val f: PartialFunction[String, Boolean] = _.toUpperCase match { case "TRUE" => true }
+
+val g: PartialFunction[String, Boolean] = x =>
+  val uc = x.toUpperCase
+  uc match // warn
+  case "TRUE" => true
+
+def kollekt = List("1", "two", "3").collect(x => Try(x.toInt) match { case Success(i) => i })
+
+def lesen = List("1", "two", "3").flatMap(x => condOpt(Try(x.toInt)) { case Success(i) => i })

From 91441e486609108a94024d5ae78615ecb22d3b38 Mon Sep 17 00:00:00 2001
From: Katarzyna Marek <kasia@marek.net>
Date: Tue, 29 Apr 2025 11:50:45 +0200
Subject: [PATCH 290/505] pc: fix: inline value when def indentation equals 2
 (#22990)

Co-authored-by: Robert Marek <64277069+susuro@users.noreply.github.com>
---
 .../tools/pc/PcInlineValueProvider.scala      | 16 +++----
 .../pc/tests/edit/InlineValueSuite.scala      | 44 +++++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
index 8d0b1b569f5a..5679568d620b 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProvider.scala
@@ -128,16 +128,13 @@ final class PcInlineValueProvider(
     end for
   end defAndRefs
 
-  private def stripIndentPrefix(rhs: String, refIndent: String, defIndent: String): String =
+  private def stripIndentPrefix(rhs: String, refIndent: String, defIndent: String, hasNextLineAfterEqualsSign: Boolean): String =
     val rhsLines = rhs.split("\n").nn.toList
     rhsLines match
       case h :: Nil => rhs
       case h :: t =>
-        val noPrefixH = h.nn.stripPrefix(refIndent)
-        if noPrefixH.startsWith("{") then
-          noPrefixH ++ t.map(refIndent ++ _.nn.stripPrefix(defIndent)).mkString("\n","\n", "")
-        else
-          (("  " ++ h.nn) :: t).map(refIndent ++ _.nn.stripPrefix(defIndent)).mkString("\n", "\n", "")
+        val header = if !hasNextLineAfterEqualsSign then h else s"\n$refIndent  $h"
+        header.nn ++ t.map(refIndent ++ _.nn.stripPrefix(defIndent)).mkString("\n", "\n", "")
       case Nil => rhs
 
   private def definitionRequiresBrackets(tree: Tree)(using Context): Boolean =
@@ -236,7 +233,7 @@ final class PcInlineValueProvider(
       var idx = source.startOfLine(offset)
       val pad = new StringBuilder
       while (idx != offset && idx < source.content().length && source.content()(idx).isWhitespace) {
-        pad.append(if (idx < source.content().length && source.content()(idx) == '\t') '\t' else ' ')
+        pad.append(source.content()(idx))
         idx += 1
       }
       pad.result()
@@ -262,6 +259,8 @@ final class PcInlineValueProvider(
             case _ => false
         }
         .map(_.fullNameBackticked)
+      val hasNextLineAfterEqualsSign =
+        definition.tree.sourcePos.startLine != definition.tree.rhs.sourcePos.startLine
       if conflictingSymbols.isEmpty then
         Right(
           Reference(
@@ -269,7 +268,8 @@ final class PcInlineValueProvider(
             stripIndentPrefix(
               extendWithSurroundingParens(definition.tree.rhs.sourcePos),
               occurrence.tree.startPos.startColumnIndentPadding,
-              definition.tree.startPos.startColumnIndentPadding
+              definition.tree.startPos.startColumnIndentPadding,
+              hasNextLineAfterEqualsSign
             ),
             occurrence.parent.map(p =>
               RangeOffset(p.sourcePos.start, p.sourcePos.end)
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
index 541340bd3f38..74af1d1c2a08 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InlineValueSuite.scala
@@ -430,6 +430,25 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments:
     )
 
   @Test def `i7137a` =
+    checkEdit(
+      """|def foo = {
+         |  val newValue =
+         |    val x = true
+         |    x
+         |  def bar =
+         |    val xx =new<<V>>alue
+         |}
+         |""".stripMargin,
+      """|def foo = {
+         |  def bar =
+         |    val xx =
+         |      val x = true
+         |      x
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `i7137b` =
       checkEdit(
         """|object O {
             |  def foo = {
@@ -454,6 +473,31 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments:
             |""".stripMargin
       )
 
+  @Test def `no-new-line` =
+    checkEdit(
+      """|object O {
+         |  val i: Option[Int] = ???
+         |  def foo = {
+         |    val newValue = i match
+         |      case Some(x) => x
+         |      case None => 0
+         |    def bar =
+         |      val xx = new<<V>>alue
+         |  }
+         |}
+         |""".stripMargin,
+      """|object O {
+         |  val i: Option[Int] = ???
+         |  def foo = {
+         |    def bar =
+         |      val xx = i match
+         |        case Some(x) => x
+         |        case None => 0
+         |  }
+         |}
+         |""".stripMargin
+    )
+
   def checkEdit(
       original: String,
       expected: String,

From a9fbdd229c8cf17d0ed57c4e800cef39a0afd418 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 5 May 2025 13:15:16 +0200
Subject: [PATCH 291/505] pc: fix: inline value when def indentation equals 2
 (#22990)

Co-authored-by: Robert Marek <64277069+susuro@users.noreply.github.com>
[Cherry-picked 48e83284826bdf026c2855bbaefd27f517db50c0][modified]

From aa55790df3d54756100051209e92f17ebe7c2b91 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 23 Apr 2025 13:52:55 -0700
Subject: [PATCH 292/505] Spliced position respects source file

[Cherry-picked 57807c6b50258eb9cceb09255857d475eb980abd]
---
 compiler/src/dotty/tools/dotc/report.scala         |  6 ++++--
 .../tools/dotc/typer/CrossVersionChecks.scala      | 14 +++++++++-----
 compiler/src/dotty/tools/dotc/util/Spans.scala     |  6 +++---
 tests/warn/i22795.check                            | 12 ++++++++++++
 tests/warn/i22795/lib_0.scala                      | 11 +++++++++++
 tests/warn/i22795/test_1.scala                     |  4 ++++
 6 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 tests/warn/i22795.check
 create mode 100644 tests/warn/i22795/lib_0.scala
 create mode 100644 tests/warn/i22795/test_1.scala

diff --git a/compiler/src/dotty/tools/dotc/report.scala b/compiler/src/dotty/tools/dotc/report.scala
index 7bc301184022..05020700f11b 100644
--- a/compiler/src/dotty/tools/dotc/report.scala
+++ b/compiler/src/dotty/tools/dotc/report.scala
@@ -21,7 +21,7 @@ object report:
     ctx.reporter.report(warning)
 
   def deprecationWarning(msg: Message, pos: SrcPos, origin: String = "")(using Context): Unit =
-    issueWarning(new DeprecationWarning(msg, pos.sourcePos, origin))
+    issueWarning(DeprecationWarning(msg, addInlineds(pos), origin))
 
   def migrationWarning(msg: Message, pos: SrcPos)(using Context): Unit =
     issueWarning(new MigrationWarning(msg, pos.sourcePos))
@@ -126,7 +126,9 @@ object report:
 
   private def addInlineds(pos: SrcPos)(using Context): SourcePosition =
     def recur(pos: SourcePosition, inlineds: List[Trees.Tree[?]]): SourcePosition = inlineds match
-      case inlined :: inlineds1 => pos.withOuter(recur(inlined.sourcePos, inlineds1))
+      case inlined :: inlineds =>
+        val outer = recur(inlined.sourcePos, inlineds)
+        pos.withOuter(outer)
       case Nil => pos
     recur(pos.sourcePos, tpd.enclosingInlineds)
 
diff --git a/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala
index ed96e3cacd4b..2122c10ad625 100644
--- a/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala
@@ -78,7 +78,8 @@ class CrossVersionChecks extends MiniPhase:
     do
       val msg = annot.argumentConstantString(0).map(msg => s": $msg").getOrElse("")
       val since = annot.argumentConstantString(1).map(version => s" (since: $version)").getOrElse("")
-      report.deprecationWarning(em"inheritance from $psym is deprecated$since$msg", parent.srcPos, origin=psym.showFullName)
+      val composed = em"inheritance from $psym is deprecated$since$msg"
+      report.deprecationWarning(composed, parent.srcPos, origin = psym.showFullName)
   }
 
   override def transformValDef(tree: ValDef)(using Context): ValDef =
@@ -166,16 +167,19 @@ object CrossVersionChecks:
    *  Also check for deprecation of the companion class for synthetic methods in the companion module.
    */
   private[CrossVersionChecks] def checkDeprecatedRef(sym: Symbol, pos: SrcPos)(using Context): Unit =
-    def maybeWarn(annotee: Symbol, annot: Annotation) = if !skipWarning(sym) then
+    def warn(annotee: Symbol, annot: Annotation) =
       val message = annot.argumentConstantString(0).filter(!_.isEmpty).map(": " + _).getOrElse("")
       val since = annot.argumentConstantString(1).filter(!_.isEmpty).map(" since " + _).getOrElse("")
-      report.deprecationWarning(em"${annotee.showLocated} is deprecated${since}${message}", pos, origin=annotee.showFullName)
+      val composed = em"${annotee.showLocated} is deprecated${since}${message}"
+      report.deprecationWarning(composed, pos, origin = annotee.showFullName)
     sym.getAnnotation(defn.DeprecatedAnnot) match
-      case Some(annot) => maybeWarn(sym, annot)
+      case Some(annot) => if !skipWarning(sym) then warn(sym, annot)
       case _ =>
         if sym.isAllOf(SyntheticMethod) then
           val companion = sym.owner.companionClass
-          if companion.is(CaseClass) then companion.getAnnotation(defn.DeprecatedAnnot).foreach(maybeWarn(companion, _))
+          if companion.is(CaseClass) then
+            for annot <- companion.getAnnotation(defn.DeprecatedAnnot) if !skipWarning(sym) do
+              warn(companion, annot)
 
   /** Decide whether the deprecation of `sym` should be ignored in this context.
    *
diff --git a/compiler/src/dotty/tools/dotc/util/Spans.scala b/compiler/src/dotty/tools/dotc/util/Spans.scala
index 7d4bbe0e8180..33346ad6da17 100644
--- a/compiler/src/dotty/tools/dotc/util/Spans.scala
+++ b/compiler/src/dotty/tools/dotc/util/Spans.scala
@@ -42,19 +42,19 @@ object Spans {
 
     /** The start of this span. */
     def start: Int = {
-      assert(exists)
+      assert(exists, "start of NoSpan")
       (coords & StartEndMask).toInt
     }
 
     /** The end of this span */
     def end: Int = {
-      assert(exists)
+      assert(exists, "end of NoSpan")
       ((coords >>> StartEndBits) & StartEndMask).toInt
     }
 
     /** The point of this span, returns start for synthetic spans */
     def point: Int = {
-      assert(exists)
+      assert(exists, "point of NoSpan")
       val poff = pointDelta
       if (poff == SyntheticPointDelta) start else start + poff
     }
diff --git a/tests/warn/i22795.check b/tests/warn/i22795.check
new file mode 100644
index 000000000000..2ce9b16e0477
--- /dev/null
+++ b/tests/warn/i22795.check
@@ -0,0 +1,12 @@
+
+-- Deprecation Warning: tests/warn/i22795/test_1.scala:4:7 -------------------------------------------------------------
+4 |  lib.m() // warn
+  |  ^^^^^^^
+  |  object A is deprecated
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from test_1.scala:5
+5 |
+  | ^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/warn/i22795/lib_0.scala b/tests/warn/i22795/lib_0.scala
new file mode 100644
index 000000000000..13225a865dc4
--- /dev/null
+++ b/tests/warn/i22795/lib_0.scala
@@ -0,0 +1,11 @@
+
+import scala.quoted._
+
+@deprecated object A
+
+object lib:
+  inline def m() = ${mImpl}
+
+  def mImpl(using Quotes): Expr[Any] =
+    import quotes.reflect._
+    Ref(Symbol.classSymbol("A$").companionModule).asExpr
diff --git a/tests/warn/i22795/test_1.scala b/tests/warn/i22795/test_1.scala
new file mode 100644
index 000000000000..e75ca03d5cf6
--- /dev/null
+++ b/tests/warn/i22795/test_1.scala
@@ -0,0 +1,4 @@
+//> using options -deprecation
+
+@main def Test = println:
+  lib.m() // warn

From 3cc873b3e7d841fe95569e88010097af1ed89ccd Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Wed, 30 Apr 2025 10:07:18 +0200
Subject: [PATCH 293/505] fix: make pc actions work for re-exported symbols

---
 compiler/src/dotty/tools/dotc/ast/tpd.scala   |  2 +-
 .../src/dotty/tools/dotc/typer/Namer.scala    |  2 +-
 .../dotty/tools/pc/MetalsInteractive.scala    |  2 +-
 .../src/main/dotty/tools/pc/PcCollector.scala | 13 +++---
 .../main/dotty/tools/pc/PcSymbolSearch.scala  |  4 +-
 .../dotty/tools/pc/WithCompilationUnit.scala  |  4 +-
 .../pc/utils/InteractiveEnrichments.scala     |  2 +-
 .../tests/definition/PcDefinitionSuite.scala  | 38 +++++++++++++++++-
 .../highlight/DocumentHighlightSuite.scala    | 40 +++++++++++++++++++
 .../tools/pc/tests/hover/HoverDefnSuite.scala | 17 ++++++++
 .../pc/tests/tokens/SemanticTokensSuite.scala |  8 ++++
 11 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
index df220271ba4c..33997c4656f5 100644
--- a/compiler/src/dotty/tools/dotc/ast/tpd.scala
+++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -1518,7 +1518,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
    * @param selectorPredicate A test to find the selector to use.
    * @return The symbols imported.
    */
-  def importedSymbols(imp: Import,
+  def importedSymbols(imp: ImportOrExport,
                       selectorPredicate: untpd.ImportSelector => Boolean = util.common.alwaysTrue)
                      (using Context): List[Symbol] =
     imp.selectors.find(selectorPredicate) match
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index 4f779e4a9c71..75f738abd00e 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1296,7 +1296,7 @@ class Namer { typer: Typer =>
             val ddef = tpd.DefDef(forwarder.asTerm, prefss => {
               val forwarderCtx = ctx.withOwner(forwarder)
               val (pathRefss, methRefss) = prefss.splitAt(extensionParamsCount(path.tpe.widen))
-              val ref = path.appliedToArgss(pathRefss).select(sym.asTerm)
+              val ref = path.appliedToArgss(pathRefss).select(sym.asTerm).withSpan(span.focus)
               val rhs = ref.appliedToArgss(adaptForwarderParams(Nil, sym.info, methRefss))
                 .etaExpandCFT(using forwarderCtx)
               if forwarder.isInlineMethod then
diff --git a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
index 8c3e52080c93..60a884eb2934 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala
@@ -135,7 +135,7 @@ object MetalsInteractive:
           (sym, sym.info, None)
         )
 
-      case (imp: Import) :: _ =>
+      case (imp: ImportOrExport) :: _ =>
         importedSymbols(imp, _.span.contains(pos.span)).map(sym =>
           (sym, sym.info, None)
         )
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
index d145272ba01d..52a6299c79fe 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
@@ -63,7 +63,8 @@ trait PcCollector[T]:
           o.span.exists && o.span.point == named.symbol.owner.span.point
         )
 
-    def soughtOrOverride(sym: Symbol) =
+    def soughtOrOverride(sym0: Symbol) =
+      val sym = if sym0.is(Flags.Exported) then sym0.sourceSymbol else sym0
       sought(sym) || sym.allOverriddenSymbols.exists(sought(_))
 
     def soughtTreeFilter(tree: Tree): Boolean =
@@ -76,7 +77,7 @@ trait PcCollector[T]:
         case df: NamedDefTree
             if soughtOrOverride(df.symbol) && !df.symbol.isSetter =>
           true
-        case imp: Import if owners(imp.expr.symbol) => true
+        case imp: ImportOrExport if owners(imp.expr.symbol) => true
         case _ => false
 
     def soughtFilter(f: Symbol => Boolean): Boolean =
@@ -115,11 +116,13 @@ trait PcCollector[T]:
          */
         case ident: Ident if ident.isCorrectSpan && filter(ident) =>
           // symbols will differ for params in different ext methods, but source pos will be the same
-          if soughtFilter(_.sourcePos == ident.symbol.sourcePos)
+          val symbol = if ident.symbol.is(Flags.Exported) then ident.symbol.sourceSymbol else ident.symbol
+          if soughtFilter(_.sourcePos == symbol.sourcePos)
           then
             occurrences + collect(
               ident,
-              ident.sourcePos
+              ident.sourcePos,
+              Some(symbol)
             )
           else occurrences
         /**
@@ -228,7 +231,7 @@ trait PcCollector[T]:
          * For traversing import selectors:
          * import scala.util.<<Try>>
          */
-        case imp: Import if filter(imp) =>
+        case imp: ImportOrExport if filter(imp) =>
           imp.selectors
             .collect {
               case sel: ImportSelector
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcSymbolSearch.scala b/presentation-compiler/src/main/dotty/tools/pc/PcSymbolSearch.scala
index fd3d74f16c16..7d1e53e1ddb2 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcSymbolSearch.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcSymbolSearch.scala
@@ -49,7 +49,7 @@ trait PcSymbolSearch:
   lazy val soughtSymbols: Option[(Set[Symbol], SourcePosition)] =
     soughtSymbols(path)
 
-  def soughtSymbols(path: List[Tree]): Option[(Set[Symbol], SourcePosition)] =
+  private def soughtSymbols(path: List[Tree]): Option[(Set[Symbol], SourcePosition)] =
     val sought = path match
       /* reference of an extension paramter
        * extension [EF](<<xs>>: List[EF])
@@ -148,7 +148,7 @@ trait PcSymbolSearch:
       /* Import selectors:
        * import scala.util.Tr@@y
        */
-      case (imp: Import) :: _ if imp.span.contains(pos.span) =>
+      case (imp: ImportOrExport) :: _ if imp.span.contains(pos.span) =>
         imp
           .selector(pos.span)
           .map(sym => (symbolAlternatives(sym), sym.sourcePos))
diff --git a/presentation-compiler/src/main/dotty/tools/pc/WithCompilationUnit.scala b/presentation-compiler/src/main/dotty/tools/pc/WithCompilationUnit.scala
index 8110db269b3b..56be6614bbd4 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/WithCompilationUnit.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/WithCompilationUnit.scala
@@ -76,7 +76,9 @@ class WithCompilationUnit(
         }
       else Set.empty
     val all =
-      if sym.is(Flags.ModuleClass) then
+      if sym.is(Flags.Exported) then
+        Set(sym, sym.sourceSymbol)
+      else if sym.is(Flags.ModuleClass) then
         Set(sym, sym.companionModule, sym.companionModule.companion)
       else if sym.isClass then
         Set(sym, sym.companionModule, sym.companion.moduleClass)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
index fb5e56085e15..43a3e3c28be4 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
@@ -339,7 +339,7 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
     end enclosedChildren
   end extension
 
-  extension (imp: Import)
+  extension (imp: ImportOrExport)
     def selector(span: Span)(using Context): Option[Symbol] =
       for sel <- imp.selectors.find(_.span.contains(span))
       yield imp.expr.symbol.info.member(sel.name).symbol
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
index a3f09b97d3f8..b530e37f3ebd 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/definition/PcDefinitionSuite.scala
@@ -28,7 +28,8 @@ class PcDefinitionSuite extends BasePcDefinitionSuite:
       MockLocation("scala/Predef.Ensuring#ensuring(+2).", "Predef.scala"),
       MockLocation("scala/Predef.Ensuring#ensuring(+3).", "Predef.scala"),
       MockLocation("scala/collection/immutable/List#`::`().", "List.scala"),
-      MockLocation("scala/package.List.", "package.scala")
+      MockLocation("scala/package.List.", "package.scala"),
+      MockLocation("scala/collection/immutable/Vector.", "Vector.scala"),
     )
 
   override def definitions(offsetParams: OffsetParams): List[Location] =
@@ -603,3 +604,38 @@ class PcDefinitionSuite extends BasePcDefinitionSuite:
         |""".stripMargin
     )
 
+  @Test def i7256 =
+    check(
+      """|object Test:
+         |  def <<methodA>>: Unit = ???
+         |export Test.me@@thodA
+         |""".stripMargin
+    )
+
+  @Test def `i7256-2` =
+    check(
+      """|object Test:
+         |  def <<methodA>>: Unit = ???
+         |  def methodB: Unit = ???
+         |export Test.{me@@thodA, methodB}
+         |""".stripMargin
+    )
+
+  @Test def `i7256-3` =
+    check(
+      """|object Test:
+         |  def <<methodA>>: Unit = ???
+         |  def methodB: Unit = ???
+         |export Test.{methodA, methodB}
+         |
+         |val i = met@@hodA
+         |""".stripMargin
+    )
+
+  @Test def i7427 =
+    check(
+      """|package a
+         |object Repro:
+         |    export scala.collection.immutable.V/*scala/collection/immutable/Vector. Vector.scala*/@@ector
+         |""".stripMargin
+    )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
index 4809bc5cd5b8..5c29b18fee28 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
@@ -1486,5 +1486,45 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite:
         |""".stripMargin
     )
 
+  @Test def i7256 =
+    check(
+      """|package a
+         |object Test:
+         |  def <<methodA>>: Unit = ???
+         |export Test.<<me@@thodA>>
+         |val i = <<methodA>>
+         |""".stripMargin
+    )
+
+  @Test def `i7256-2` =
+    check(
+      """|object Test:
+         |  def <<methodA>>: Unit = ???
+         |  def methodB: Unit = ???
+         |export Test.{<<me@@thodA>>, methodB}
+         |val i = <<methodA>>
+         |""".stripMargin
+    )
+
+
+  @Test def `i7256-3` =
+    check(
+      """|object Test:
+         |  def <<methodA>>: Unit = ???
+         |  def methodB: Unit = ???
+         |export Test.<<methodA>>
+         |val i = <<met@@hodA>>
+         |val j = <<methodA>>
+         |""".stripMargin
+    )
+
+  @Test def `i7256-4` =
+    check(
+      """|object Test:
+         |  class <<Foo>>
+         |  object <<Foo>>
+         |export Test.<<F@@oo>>
+         |""".stripMargin
+    )
 
 end DocumentHighlightSuite
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala
index f4ce4473e60a..6a544fb3a6bc 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala
@@ -238,3 +238,20 @@ class HoverDefnSuite extends BaseHoverSuite:
          |""".stripMargin,
       "val foo: Int".hover
     )
+
+  @Test def i7256 =
+    check(
+      """|object Test:
+         |  def methodA: Unit = ???
+         |export Test.me@@thodA
+         |""".stripMargin,
+      """|**Expression type**:
+         |```scala
+         |=> Unit
+         |```
+         |**Symbol signature**:
+         |```scala
+         |def methodA: Unit
+         |```
+         |""".stripMargin
+    )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
index aebdf7f6c04e..e3cb3edbd8ba 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
@@ -459,3 +459,11 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite:
          |  end <<foo>>/*class,definition*/
          |""".stripMargin
    )
+
+  @Test def i7256 =
+    check(
+      """|object <<Test>>/*class*/:
+         |  def <<methodA>>/*method,definition*/: <<Unit>>/*class,abstract*/ = <<???>>/*method*/
+         |export <<Test>>/*class*/.<<methodA>>/*method*/
+         |""".stripMargin
+    )

From a0ad3792ae71571999bf0efdcb7ef5f88172eefe Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 5 May 2025 13:16:07 +0200
Subject: [PATCH 294/505] fix: make pc actions work for re-exported symbols

[Cherry-picked c4531d4e4931762d5bda4fd5afc15bb7548ce627][modified]

From 25ce3a54c92a1f826ad69f03437ce1d5feda6fe9 Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Thu, 1 May 2025 15:43:26 +0200
Subject: [PATCH 295/505] pc: Implement code action 'convert to named lambda
 parameters' (#22799)

Associated Metals PR: scalameta/metals#6669

Add a code action that converts a wildcard lambda to a lambda with named
parameters. It supports Scala 3 only at the moment.

e.g.

![converttonamedlambdaparameters](https://github.com/user-attachments/assets/93561630-b626-4cff-8248-806e4c32744a)

![converttonamedlambdaparameters1](https://github.com/user-attachments/assets/292ad14f-be8b-4535-b4e4-45819f14da9e)
[Cherry-picked 43118de53ba294c7ac7966c1d4543d9bc9cc0109]
---
 .../pc/PcConvertToNamedLambdaParameters.scala | 153 ++++++++++++++
 .../tools/pc/ScalaPresentationCompiler.scala  |  47 +++--
 .../tools/pc/utils/TermNameInference.scala    |  56 ++++++
 .../ConvertToNamedLambdaParametersSuite.scala | 187 ++++++++++++++++++
 4 files changed, 422 insertions(+), 21 deletions(-)
 create mode 100644 presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala
 create mode 100644 presentation-compiler/src/main/dotty/tools/pc/utils/TermNameInference.scala
 create mode 100644 presentation-compiler/test/dotty/tools/pc/tests/edit/ConvertToNamedLambdaParametersSuite.scala

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala b/presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala
new file mode 100644
index 000000000000..2ca50107c36b
--- /dev/null
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala
@@ -0,0 +1,153 @@
+package dotty.tools.pc
+
+import java.nio.file.Paths
+import java.util as ju
+
+import scala.jdk.CollectionConverters.*
+import scala.meta.pc.OffsetParams
+
+import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Flags
+import dotty.tools.dotc.interactive.Interactive
+import dotty.tools.dotc.interactive.InteractiveDriver
+import dotty.tools.dotc.util.SourceFile
+import dotty.tools.dotc.util.SourcePosition
+import org.eclipse.lsp4j as l
+import dotty.tools.pc.utils.InteractiveEnrichments.*
+import dotty.tools.pc.utils.TermNameInference.*
+
+/**
+ * Facilitates the code action that converts a wildcard lambda to a lambda with named parameters
+ * e.g.
+ *
+ * List(1, 2).map(<<_>> + 1) => List(1, 2).map(i => i + 1)
+ */
+final class PcConvertToNamedLambdaParameters(
+    driver: InteractiveDriver,
+    params: OffsetParams
+):
+  import PcConvertToNamedLambdaParameters._
+
+  def convertToNamedLambdaParameters: ju.List[l.TextEdit] = {
+    val uri = params.uri
+    val filePath = Paths.get(uri)
+    driver.run(
+      uri,
+      SourceFile.virtual(filePath.toString, params.text),
+    )
+    given newctx: Context = driver.localContext(params)
+    val pos = driver.sourcePosition(params)
+    val trees = driver.openedTrees(uri)
+    val treeList = Interactive.pathTo(trees, pos)
+    // Extractor for a lambda function (needs context, so has to be defined here)
+    val LambdaExtractor = Lambda(using newctx)
+    // select the most inner wildcard lambda
+    val firstLambda = treeList.collectFirst {
+      case LambdaExtractor(params, rhsFn) if params.forall(isWildcardParam) =>
+        params -> rhsFn
+    }
+
+    firstLambda match {
+      case Some((params, lambda)) =>
+        // avoid names that are either defined or referenced in the lambda
+        val namesToAvoid = allDefAndRefNamesInTree(lambda)
+        // compute parameter names based on the type of the parameter
+        val computedParamNames: List[String] =
+          params.foldLeft(List.empty[String]) { (acc, param) =>
+            val name = singleLetterNameStream(param.tpe.typeSymbol.name.toString())
+              .find(n => !namesToAvoid.contains(n) && !acc.contains(n))
+            acc ++ name.toList
+          }
+        if computedParamNames.size == params.size then
+          val paramReferenceEdits = params.zip(computedParamNames).flatMap { (param, paramName) =>
+            val paramReferencePosition = findParamReferencePosition(param, lambda)
+            paramReferencePosition.toList.map { pos =>
+              val position = pos.toLsp
+              val range = new l.Range(
+                position.getStart(),
+                position.getEnd()
+              )
+              new l.TextEdit(range, paramName)
+            }
+          }
+          val paramNamesStr = computedParamNames.mkString(", ")
+          val paramDefsStr =
+            if params.size == 1 then paramNamesStr
+            else s"($paramNamesStr)"
+          val defRange = new l.Range(
+            lambda.sourcePos.toLsp.getStart(),
+            lambda.sourcePos.toLsp.getStart()
+          )
+          val paramDefinitionEdits = List(
+            new l.TextEdit(defRange, s"$paramDefsStr => ")
+          )
+          (paramDefinitionEdits ++ paramReferenceEdits).asJava
+        else
+          List.empty.asJava
+      case _ =>
+        List.empty.asJava
+    }
+  }
+
+end PcConvertToNamedLambdaParameters
+
+object PcConvertToNamedLambdaParameters:
+  val codeActionId = "ConvertToNamedLambdaParameters"
+
+  class Lambda(using Context):
+    def unapply(tree: tpd.Block): Option[(List[tpd.ValDef], tpd.Tree)] = tree match {
+      case tpd.Block((ddef @ tpd.DefDef(_, tpd.ValDefs(params) :: Nil, _, body: tpd.Tree)) :: Nil, tpd.Closure(_, meth, _))
+      if ddef.symbol == meth.symbol =>
+        params match {
+          case List(param) =>
+            // lambdas with multiple wildcard parameters are represented as a single parameter function and a block with wildcard valdefs
+            Some(multipleUnderscoresFromBody(param, body))
+          case _ => Some(params -> body)
+        }
+      case _ => None
+    }
+  end Lambda
+
+  private def multipleUnderscoresFromBody(param: tpd.ValDef, body: tpd.Tree)(using Context): (List[tpd.ValDef], tpd.Tree) = body match {
+    case tpd.Block(defs, expr) if param.symbol.is(Flags.Synthetic) =>
+      val wildcardParamDefs = defs.collect {
+        case valdef: tpd.ValDef if isWildcardParam(valdef) => valdef
+      }
+      if wildcardParamDefs.size == defs.size then wildcardParamDefs -> expr
+      else List(param) -> body
+    case _ => List(param) -> body
+  }
+
+  def isWildcardParam(param: tpd.ValDef)(using Context): Boolean =
+    param.name.toString.startsWith("_$") && param.symbol.is(Flags.Synthetic)
+
+  def findParamReferencePosition(param: tpd.ValDef, lambda: tpd.Tree)(using Context): Option[SourcePosition] =
+    var pos: Option[SourcePosition] = None
+    object FindParamReference extends tpd.TreeTraverser:
+      override def traverse(tree: tpd.Tree)(using Context): Unit =
+        tree match
+          case ident @ tpd.Ident(_) if ident.symbol == param.symbol =>
+            pos = Some(tree.sourcePos)
+          case _ =>
+            traverseChildren(tree)
+    FindParamReference.traverse(lambda)
+    pos
+  end findParamReferencePosition
+
+  def allDefAndRefNamesInTree(tree: tpd.Tree)(using Context): List[String] =
+    object FindDefinitionsAndRefs extends tpd.TreeAccumulator[List[String]]:
+      override def apply(x: List[String], tree: tpd.Tree)(using Context): List[String] =
+        tree match
+          case tpd.DefDef(name, _, _, _) =>
+            super.foldOver(x :+ name.toString, tree)
+          case tpd.ValDef(name, _, _) =>
+            super.foldOver(x :+ name.toString, tree)
+          case tpd.Ident(name) =>
+            super.foldOver(x :+ name.toString, tree)
+          case _ =>
+            super.foldOver(x, tree)
+    FindDefinitionsAndRefs.foldOver(Nil, tree)
+  end allDefAndRefNamesInTree
+
+end PcConvertToNamedLambdaParameters
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index 0359e21dae89..81bad6a2976d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -61,7 +61,8 @@ case class ScalaPresentationCompiler(
      CodeActionId.ImplementAbstractMembers,
      CodeActionId.ExtractMethod,
      CodeActionId.InlineValue,
-     CodeActionId.InsertInferredType
+     CodeActionId.InsertInferredType,
+     PcConvertToNamedLambdaParameters.codeActionId
    ).asJava
 
   def this() = this("", None, Nil, Nil)
@@ -82,26 +83,30 @@ case class ScalaPresentationCompiler(
     codeActionPayload: Optional[T]
    ): CompletableFuture[ju.List[TextEdit]] =
      (codeActionId, codeActionPayload.asScala) match
-       case (
-             CodeActionId.ConvertToNamedArguments,
-             Some(argIndices: ju.List[_])
-           ) =>
-         val payload =
-          argIndices.asScala.collect { case i: Integer => i.toInt }.toSet
-         convertToNamedArguments(params, payload)
-       case (CodeActionId.ImplementAbstractMembers, _) =>
-         implementAbstractMembers(params)
-       case (CodeActionId.InsertInferredType, _) =>
-         insertInferredType(params)
-       case (CodeActionId.InlineValue, _) =>
-         inlineValue(params)
-       case (CodeActionId.ExtractMethod, Some(extractionPos: OffsetParams)) =>
-         params match {
-           case range: RangeParams =>
-             extractMethod(range, extractionPos)
-           case _ => failedFuture(new IllegalArgumentException(s"Expected range parameters"))
-         }
-       case (id, _) => failedFuture(new IllegalArgumentException(s"Unsupported action id $id"))
+        case (
+              CodeActionId.ConvertToNamedArguments,
+              Some(argIndices: ju.List[_])
+            ) =>
+          val payload =
+            argIndices.asScala.collect { case i: Integer => i.toInt }.toSet
+          convertToNamedArguments(params, payload)
+        case (CodeActionId.ImplementAbstractMembers, _) =>
+          implementAbstractMembers(params)
+        case (CodeActionId.InsertInferredType, _) =>
+          insertInferredType(params)
+        case (CodeActionId.InlineValue, _) =>
+          inlineValue(params)
+        case (CodeActionId.ExtractMethod, Some(extractionPos: OffsetParams)) =>
+          params match {
+            case range: RangeParams =>
+              extractMethod(range, extractionPos)
+            case _ => failedFuture(new IllegalArgumentException(s"Expected range parameters"))
+          }
+        case (PcConvertToNamedLambdaParameters.codeActionId, _) =>
+          compilerAccess.withNonInterruptableCompiler(List.empty[l.TextEdit].asJava, params.token) {
+            access => PcConvertToNamedLambdaParameters(access.compiler(), params).convertToNamedLambdaParameters
+          }(params.toQueryContext)
+        case (id, _) => failedFuture(new IllegalArgumentException(s"Unsupported action id $id"))
 
   private def failedFuture[T](e: Throwable): CompletableFuture[T] =
     val f = new CompletableFuture[T]()
diff --git a/presentation-compiler/src/main/dotty/tools/pc/utils/TermNameInference.scala b/presentation-compiler/src/main/dotty/tools/pc/utils/TermNameInference.scala
new file mode 100644
index 000000000000..a1a09968325c
--- /dev/null
+++ b/presentation-compiler/src/main/dotty/tools/pc/utils/TermNameInference.scala
@@ -0,0 +1,56 @@
+package dotty.tools.pc.utils
+
+/**
+ * Helpers for generating variable names based on the desired types.
+ */
+object TermNameInference {
+
+  /** Single character names for types. (`Int` => `i`, `i1`, `i2`, ...) */
+  def singleLetterNameStream(typeName: String): LazyList[String] = {
+    sanitizeInput(typeName).fold(saneNamesStream) { typeName1 =>
+      val firstCharStr = typeName1.headOption.getOrElse('x').toLower.toString
+      numberedStreamFromName(firstCharStr)
+    }
+  }
+
+  /** Names only from upper case letters (`OnDemandSymbolIndex` => `odsi`, `odsi1`, `odsi2`, ...) */
+  def shortNameStream(typeName: String): LazyList[String] = {
+    sanitizeInput(typeName).fold(saneNamesStream) { typeName1 =>
+      val upperCases = typeName1.filter(_.isUpper).map(_.toLower)
+      val name = if (upperCases.isEmpty) typeName1 else upperCases
+      numberedStreamFromName(name)
+    }
+  }
+
+  /** Names from lower case letters (`OnDemandSymbolIndex` => `onDemandSymbolIndex`, `onDemandSymbolIndex1`, ...) */
+  def fullNameStream(typeName: String): LazyList[String] = {
+    sanitizeInput(typeName).fold(saneNamesStream) { typeName1 =>
+      val withFirstLower =
+        typeName1.headOption.map(_.toLower).getOrElse('x').toString + typeName1.drop(1)
+      numberedStreamFromName(withFirstLower)
+    }
+  }
+
+  /** A lazy list of names: a, b, ..., z, aa, ab, ..., az, ba, bb, ... */
+  def saneNamesStream: LazyList[String] = {
+    val letters = ('a' to 'z').map(_.toString)
+    def computeNext(acc: String): String = {
+      if (acc.last == 'z')
+        computeNext(acc.init) + letters.head
+      else
+        acc.init + letters(letters.indexOf(acc.last) + 1)
+    }
+    def loop(acc: String): LazyList[String] =
+      acc #:: loop(computeNext(acc))
+    loop("a")
+  }
+
+  private def sanitizeInput(typeName: String): Option[String] =
+    val typeName1 = typeName.filter(_.isLetterOrDigit)
+    Option.when(typeName1.nonEmpty)(typeName1)
+
+  private def numberedStreamFromName(name: String): LazyList[String] = {
+    val rest = LazyList.from(1).map(name + _)
+    name #:: rest
+  }
+}
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/ConvertToNamedLambdaParametersSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/ConvertToNamedLambdaParametersSuite.scala
new file mode 100644
index 000000000000..c1ab229fc216
--- /dev/null
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/ConvertToNamedLambdaParametersSuite.scala
@@ -0,0 +1,187 @@
+package dotty.tools.pc.tests.edit
+
+import java.net.URI
+import java.util.Optional
+
+import scala.meta.internal.jdk.CollectionConverters.*
+import scala.meta.internal.metals.CompilerOffsetParams
+import scala.meta.pc.CodeActionId
+import scala.meta.pc.DisplayableException
+import scala.language.unsafeNulls
+
+import dotty.tools.pc.base.BaseCodeActionSuite
+import dotty.tools.pc.utils.TextEdits
+import dotty.tools.pc.PcConvertToNamedLambdaParameters
+
+import org.eclipse.lsp4j as l
+import org.junit.{Test, Ignore}
+
+class ConvertToNamedLambdaParametersSuite extends BaseCodeActionSuite:
+
+  @Test def `Int => Int function in map` =
+  checkEdit(
+    """|object A{
+      |  val a = List(1, 2).map(<<_>> + 1)
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(1, 2).map(i => i + 1)
+      |}""".stripMargin
+  )
+
+  @Test def `Int => Int function in map with another wildcard lambda` =
+  checkEdit(
+    """|object A{
+      |  val a = List(1, 2).map(<<_>> + 1).map(_ + 1)
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(1, 2).map(i => i + 1).map(_ + 1)
+      |}""".stripMargin
+  )
+
+  @Test def `String => String function in map` =
+  checkEdit(
+    """|object A{
+      |  val a = List("a", "b").map(<<_>> + "c")
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List("a", "b").map(s => s + "c")
+      |}""".stripMargin
+  )
+
+  @Test def `Person => Person function to custom method` =
+  checkEdit(
+    """|object A{
+      |  case class Person(name: String, age: Int)
+      |  val bob = Person("Bob", 30)
+      |  def m[A](f: Person => A): A = f(bob)
+      |  m(_<<.>>name)
+      |}
+      |""".stripMargin,
+    """|object A{
+      |  case class Person(name: String, age: Int)
+      |  val bob = Person("Bob", 30)
+      |  def m[A](f: Person => A): A = f(bob)
+      |  m(p => p.name)
+      |}
+      |""".stripMargin
+  )
+
+  @Test def `(String, Int) => Int function in map with multiple underscores` =
+  checkEdit(
+    """|object A{
+      |  val a = List(("a", 1), ("b", 2)).map(<<_>> + _)
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(("a", 1), ("b", 2)).map((s, i) => s + i)
+      |}""".stripMargin
+  )
+
+  @Test def `Int => Int function in map with multiple underscores` =
+  checkEdit(
+    """|object A{
+      |  val a = List(1, 2).map(x => x -> (x + 1)).map(<<_>> + _)
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(1, 2).map(x => x -> (x + 1)).map((i, i1) => i + i1)
+      |}""".stripMargin
+  )
+
+  @Test def `Int => Float function in nested lambda 1` =
+  checkEdit(
+    """|object A{
+      |  val a = List(1, 2).flatMap(List(_).flatMap(v => List(v, v + 1).map(<<_>>.toFloat)))
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(1, 2).flatMap(List(_).flatMap(v => List(v, v + 1).map(i => i.toFloat)))
+      |}""".stripMargin
+  )
+
+  @Test def `Int => Float function in nested lambda 2` =
+  checkEdit(
+    """|object A{
+      |  val a = List(1, 2).flatMap(List(<<_>>).flatMap(v => List(v, v + 1).map(_.toFloat)))
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(1, 2).flatMap(i => List(i).flatMap(v => List(v, v + 1).map(_.toFloat)))
+      |}""".stripMargin
+  )
+
+  @Test def `Int => Float function in nested lambda with shadowing` =
+  checkEdit(
+    """|object A{
+      |  val a = List(1, 2).flatMap(List(<<_>>).flatMap(i => List(i, i + 1).map(_.toFloat)))
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(1, 2).flatMap(i1 => List(i1).flatMap(i => List(i, i + 1).map(_.toFloat)))
+      |}""".stripMargin
+  )
+
+  @Test def `(String, String, String, String, String, String, String) => String function in map` =
+  checkEdit(
+    """|object A{
+      |  val a = List(
+      |    ("a", "b", "c", "d", "e", "f", "g"),
+      |    ("h", "i", "j", "k", "l", "m", "n")
+      |  ).map(_<< >>+ _ + _ + _ + _ + _ + _)
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(
+      |    ("a", "b", "c", "d", "e", "f", "g"),
+      |    ("h", "i", "j", "k", "l", "m", "n")
+      |  ).map((s, s1, s2, s3, s4, s5, s6) => s + s1 + s2 + s3 + s4 + s5 + s6)
+      |}""".stripMargin
+  )
+
+  @Test def `Long => Long with match and wildcard pattern` =
+  checkEdit(
+    """|object A{
+      |  val a = List(1L, 2L).map(_ match {
+      |    case 1L => 1L
+      |    case _ => <<2L>>
+      |  })
+      |}""".stripMargin,
+    """|object A{
+      |  val a = List(1L, 2L).map(l => l match {
+      |    case 1L => 1L
+      |    case _ => 2L
+      |  })
+      |}""".stripMargin
+  )
+
+  @Ignore
+  @Test def `Int => Int eta-expansion in map` =
+    checkEdit(
+      """|object A{
+        |  def f(x: Int): Int = x + 1
+        |  val a = List(1, 2).map(<<f>>)
+        |}""".stripMargin,
+      """|object A{
+        |  def f(x: Int): Int = x + 1
+        |  val a = List(1, 2).map(i => f(i))
+        |}""".stripMargin
+    )
+
+  def checkEdit(
+      original: String,
+      expected: String,
+      compat: Map[String, String] = Map.empty
+  ): Unit =
+    val edits = convertToNamedLambdaParameters(original)
+    val (code, _, _) = params(original)
+    val obtained = TextEdits.applyEdits(code, edits)
+    assertNoDiff(expected, obtained)
+
+  def convertToNamedLambdaParameters(
+      original: String,
+      filename: String = "file:/A.scala"
+  ): List[l.TextEdit] = {
+    val (code, _, offset) = params(original)
+    val result = presentationCompiler
+      .codeAction(
+        CompilerOffsetParams(URI.create(filename), code, offset, cancelToken),
+        PcConvertToNamedLambdaParameters.codeActionId,
+        Optional.empty()
+      )
+      .get()
+    result.asScala.toList
+  }

From 4b7d6f146681ef945dd777d36e653c4d42c79844 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 28 Apr 2025 12:15:16 +0200
Subject: [PATCH 296/505] Revert "Fix inline proxy generation for opaque types
 referencing other opaque types"

This reverts commit bf7bfa5057873b88cb6fb156894290fab6b0aae7.

[Cherry-picked fc41883ef1f8bde16e2eecc60af9a4ef807e6177]
---
 .../dotty/tools/dotc/inlines/Inliner.scala    | 46 +------------------
 tests/pos/22359a.scala                        | 15 ------
 tests/pos/22359b.scala                        | 17 -------
 tests/pos/i17243.scala                        | 17 -------
 4 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 tests/pos/22359a.scala
 delete mode 100644 tests/pos/22359b.scala
 delete mode 100644 tests/pos/i17243.scala

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 63a99104685f..ea7d3405b0ea 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -165,28 +165,9 @@ object Inliner:
           else Nil
         case _ => Nil
       val refinements = openOpaqueAliases(cls.givenSelfType)
-
-      // Map references in the refinements from the proxied termRef
-      // to the recursive type of the refined type
-      // e.g.: Obj.type{type A = Obj.B; type B = Int} -> Obj.type{type A = <recthis>.B; type B = Int}
-      def mapRecTermRefReferences(recType: RecType, refinedType: Type) =
-        new TypeMap {
-          def apply(tp: Type) = tp match
-            case RefinedType(a: RefinedType, b, info) => RefinedType(apply(a), b, apply(info))
-            case RefinedType(a, b, info) => RefinedType(a, b, apply(info))
-            case TypeRef(prefix, des) => TypeRef(apply(prefix), des)
-            case termRef: TermRef if termRef == ref => recType.recThis
-            case _ => mapOver(tp)
-        }.apply(refinedType)
-
       val refinedType = refinements.foldLeft(ref: Type): (parent, refinement) =>
         RefinedType(parent, refinement._1, TypeAlias(refinement._2))
-
-      val recType = RecType.closeOver ( recType =>
-        mapRecTermRefReferences(recType, refinedType)
-      )
-
-      val refiningSym = newSym(InlineBinderName.fresh(), Synthetic, recType, span)
+      val refiningSym = newSym(InlineBinderName.fresh(), Synthetic, refinedType, span)
       refiningSym.termRef
 
     def unapply(refiningRef: TermRef)(using Context): Option[TermRef] =
@@ -441,9 +422,7 @@ class Inliner(val call: tpd.Tree)(using Context):
             val refiningRef = OpaqueProxy(ref, cls, call.span)
             val refiningSym = refiningRef.symbol.asTerm
             val refinedType = refiningRef.info
-            val refiningDef = addProxiesForRecurrentOpaques(
-              ValDef(refiningSym, tpd.ref(ref).cast(refinedType), inferred = true).withSpan(span)
-            )
+            val refiningDef = ValDef(refiningSym, tpd.ref(ref).cast(refinedType), inferred = true).withSpan(span)
             inlining.println(i"add opaque alias proxy $refiningDef for $ref in $tp")
             bindingsBuf += refiningDef
             opaqueProxies += ((ref, refiningSym.termRef))
@@ -463,27 +442,6 @@ class Inliner(val call: tpd.Tree)(using Context):
           }
     )
 
-  /** Transforms proxies that reference other opaque types, like for:
-   * object Obj1 { opaque type A = Int }
-   * object Obj2 { opaque type B = A }
-   * and proxy$1 of type Obj2.type{type B = Obj1.A}
-   * creates proxy$2 of type Obj1.type{type A = Int}
-   * and transforms proxy$1 into Obj2.type{type B = proxy$2.A}
-   */
-  private def addProxiesForRecurrentOpaques(binding: ValDef)(using Context): ValDef =
-    def fixRefinedTypes(ref: Type): Unit  =
-      ref match
-        case recType: RecType => fixRefinedTypes(recType.underlying)
-        case RefinedType(parent, name, info) =>
-          addOpaqueProxies(info.widen, binding.span, true)
-          fixRefinedTypes(parent)
-        case _ =>
-    fixRefinedTypes(binding.symbol.info)
-    binding.symbol.info = mapOpaques.typeMap(binding.symbol.info)
-    mapOpaques.transform(binding).asInstanceOf[ValDef]
-      .showing(i"transformed this binding exposing opaque aliases: $result", inlining)
-  end addProxiesForRecurrentOpaques
-
   /** If `binding` contains TermRefs that refer to objects with opaque
    *  type aliases, add proxy definitions that expose these aliases
    *  and substitute such TermRefs with theproxies. Example from pos/opaque-inline1.scala:
diff --git a/tests/pos/22359a.scala b/tests/pos/22359a.scala
deleted file mode 100644
index a3b9ef63257a..000000000000
--- a/tests/pos/22359a.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-opaque type NT[N <: Tuple, V <: Tuple] = V
-opaque type System = NT[Tuple1["wires"], Tuple1[Any]]
-
-extension [N <: Tuple, V <: Tuple] (x: NT[N, V]) {
-  inline def apply(n: Int): Any =
-    x.productElement(n)
-}
-
-extension (system: System) {
-  inline def foo =
-    system.apply(0)
-}
-
-val simulation: System = ???
-val _ = simulation.foo
diff --git a/tests/pos/22359b.scala b/tests/pos/22359b.scala
deleted file mode 100644
index f6b7cbb462c1..000000000000
--- a/tests/pos/22359b.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-object Obj2:
-  opaque type NT[N <: Tuple, V <: Tuple] = V
-
-  extension [N <: Tuple, V <: Tuple] (x: NT[N, V]) {
-    inline def apply(n: Int): Any =
-      x.productElement(n)
-  }
-
-object Obj:
-  opaque type System = Obj2.NT[Tuple1["wires"], Tuple1[Any]]
-
-  extension (system: System) {
-    inline def foo = system.apply(0)
-  }
-import Obj._
-val simulation: System = ???
-val _ = simulation.foo
diff --git a/tests/pos/i17243.scala b/tests/pos/i17243.scala
deleted file mode 100644
index 3d42495b26b0..000000000000
--- a/tests/pos/i17243.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-object Opaque:
-  opaque type A = Int
-
-  val va: A = 1
-
-  inline def a(x: A) =
-    x + 1
-
-object Opaque2:
-  opaque type B = Opaque.A
-
-  val vb: B = Opaque.va
-
-  inline def b(x: B) = Opaque.a(x)
-
-@main def Test() =
-  print(Opaque2.b(Opaque2.vb))

From 90b7c230f49ef9a3d38fcd5fc178db95b6c075f5 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 28 Apr 2025 12:23:02 +0200
Subject: [PATCH 297/505] Partially revert
 c8c8cf5f1d87fceb1713af6d81ac9a689a90a4ac (leaving the test)

[Cherry-picked c4a6bed12cf004ad455f8d667517c045f6168a21]
---
 compiler/src/dotty/tools/dotc/inlines/Inliner.scala | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index ea7d3405b0ea..99121f8187ee 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -386,9 +386,6 @@ class Inliner(val call: tpd.Tree)(using Context):
    */
   private val opaqueProxies = new mutable.ListBuffer[(TermRef, TermRef)]
 
-  /** TermRefs for which we already started synthesising proxies */
-  private val visitedTermRefs = new mutable.HashSet[TermRef]
-
   protected def hasOpaqueProxies = opaqueProxies.nonEmpty
 
   /** Map first halves of opaqueProxies pairs to second halves, using =:= as equality */
@@ -416,9 +413,8 @@ class Inliner(val call: tpd.Tree)(using Context):
         for cls <- ref.widen.baseClasses do
           if cls.containsOpaques
              && (forThisProxy || inlinedMethod.isContainedIn(cls))
-             && !visitedTermRefs.contains(ref)
+             && mapRef(ref).isEmpty
           then
-            visitedTermRefs += ref
             val refiningRef = OpaqueProxy(ref, cls, call.span)
             val refiningSym = refiningRef.symbol.asTerm
             val refinedType = refiningRef.info

From f40594c8116e7ce016cb245ee774d4b7f02f5cb4 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 28 Apr 2025 12:34:00 +0200
Subject: [PATCH 298/505] Add regression tests

[Cherry-picked ae756ad1d1e562eff3d2e1f2d249790ab6e1434b]
---
 tests/pos/i22974a/Maybe_1.scala | 14 ++++++++++++++
 tests/pos/i22974a/macro_1.scala |  6 ++++++
 tests/pos/i22974a/main_2.scala  |  6 ++++++
 tests/pos/i22974b.scala         | 18 ++++++++++++++++++
 tests/pos/i22974c.scala         | 18 ++++++++++++++++++
 5 files changed, 62 insertions(+)
 create mode 100644 tests/pos/i22974a/Maybe_1.scala
 create mode 100644 tests/pos/i22974a/macro_1.scala
 create mode 100644 tests/pos/i22974a/main_2.scala
 create mode 100644 tests/pos/i22974b.scala
 create mode 100644 tests/pos/i22974c.scala

diff --git a/tests/pos/i22974a/Maybe_1.scala b/tests/pos/i22974a/Maybe_1.scala
new file mode 100644
index 000000000000..bd4964b29582
--- /dev/null
+++ b/tests/pos/i22974a/Maybe_1.scala
@@ -0,0 +1,14 @@
+package pack
+import Maybe._
+opaque type Maybe[+A] >: (Absent | Present[A]) = Absent | Present[A]
+object Maybe:
+  sealed abstract class Absent
+  case object Absent extends Absent
+  object internal:
+    case class PresentAbsent(val depth: Int)
+  opaque type Present[+A] = A | internal.PresentAbsent
+
+  extension [A](self: Maybe[A]) {
+    inline def flatten[B]: Maybe[B] = ???
+    inline def isDefined: Boolean = ???
+  }
diff --git a/tests/pos/i22974a/macro_1.scala b/tests/pos/i22974a/macro_1.scala
new file mode 100644
index 000000000000..61d7783bd38a
--- /dev/null
+++ b/tests/pos/i22974a/macro_1.scala
@@ -0,0 +1,6 @@
+import scala.quoted._
+
+inline def passThorugh(inline condition: Boolean): Any =
+  ${ passThorughImpl('{condition}) }
+
+def passThorughImpl(condition: Expr[Boolean])(using Quotes): Expr[Any] = condition
diff --git a/tests/pos/i22974a/main_2.scala b/tests/pos/i22974a/main_2.scala
new file mode 100644
index 000000000000..a0b55aff7f52
--- /dev/null
+++ b/tests/pos/i22974a/main_2.scala
@@ -0,0 +1,6 @@
+object Test {
+  def main(): Unit =
+    import pack.Maybe
+    val res: Maybe[Maybe[Int]] = ???
+    passThorugh(res.flatten.isDefined)
+}
diff --git a/tests/pos/i22974b.scala b/tests/pos/i22974b.scala
new file mode 100644
index 000000000000..4f6e23c0f97d
--- /dev/null
+++ b/tests/pos/i22974b.scala
@@ -0,0 +1,18 @@
+object outer:
+  opaque type Queue = Queue.Unsafe
+  object Queue:
+    abstract class Unsafe
+    opaque type Unbounded = Queue
+    object Unbounded:
+      inline def initWith()(f: Unbounded => Unit): Unit =
+        f(Unsafe.init())
+
+      opaque type Unsafe <: Queue.Unsafe = Queue
+      object Unsafe:
+        def init[A](): Unsafe = ???
+
+object Resource:
+  def run: Unit =
+    outer.Queue.Unbounded.initWith() { q =>
+      ???
+    }
diff --git a/tests/pos/i22974c.scala b/tests/pos/i22974c.scala
new file mode 100644
index 000000000000..77833340de19
--- /dev/null
+++ b/tests/pos/i22974c.scala
@@ -0,0 +1,18 @@
+object other:
+  sealed abstract class Absent
+  case object Absent extends Absent
+  case class PresentAbsent(val depth: Int)
+  opaque type Present[+A] = A | PresentAbsent
+  opaque type Maybe[+A] >: (Absent | Present[A]) = Absent | Present[A]
+
+  extension [A](self: Maybe[A]) {
+    inline def flatten[B]: Maybe[B] = if self.isEmpty then Absent else ???
+    def isEmpty: Boolean = self.isInstanceOf[Absent]
+  }
+
+class Test {
+  def main(): Unit =
+    import other.Maybe
+    val res: Maybe[Maybe[Int]] = ???
+    res.flatten
+}

From 1bcf664b64cd08a84939278fb312e72849505f22 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Sat, 3 May 2025 12:18:26 +0200
Subject: [PATCH 299/505] fix: synthesise value of `this.type` in `ValueOf`

[Cherry-picked dc19b2fb49dbb486f4c37b866aa4d272515ac4d7]
---
 compiler/src/dotty/tools/dotc/typer/Synthesizer.scala | 2 ++
 tests/pos/i23086.scala                                | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 tests/pos/i23086.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
index dca270f683c9..2c85294a3a94 100644
--- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
@@ -231,6 +231,8 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
             withNoErrors(success(Literal(Constant(()))))
           case n: TermRef =>
             withNoErrors(success(ref(n)))
+          case ts: ThisType =>
+            withNoErrors(success(This(ts.cls)))
           case tp =>
             EmptyTreeNoError
       case _ =>
diff --git a/tests/pos/i23086.scala b/tests/pos/i23086.scala
new file mode 100644
index 000000000000..2f8ee8689ad4
--- /dev/null
+++ b/tests/pos/i23086.scala
@@ -0,0 +1,2 @@
+class Test:
+  val _: this.type = summon[ValueOf[this.type]].value

From a24d4eecd20530879d887b12fd99622ac6e712b8 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Mon, 5 May 2025 02:13:31 -0700
Subject: [PATCH 300/505] Improved edit span for import (#23083)

Left less vertical space when deleting lines of import.

Extracted from local branch of
https://github.com/scala/scala3/pull/22316
[Cherry-picked 0ae343ff5d032fb87661458913d61e63c5523657]
---
 .../tools/dotc/transform/CheckUnused.scala      | 17 ++++++++++++++++-
 tests/rewrites/unused.check                     | 13 +++++++++++++
 tests/rewrites/unused.scala                     | 17 +++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 2940abaeac79..e0f55e1d04f1 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -670,6 +670,7 @@ object CheckUnused:
       else
         // If the rest of the line is blank, include it in the final edit position. (Delete trailing whitespace.)
         // If for deletion, and the prefix of the line is also blank, then include that, too. (Del blank line.)
+        // If deleting a blank line and surrounded by blank lines, remove an adjoining blank line.
         def editPosAt(srcPos: SrcPos, forDeletion: Boolean): SrcPos =
           val start = srcPos.span.start
           val end = srcPos.span.end
@@ -682,7 +683,21 @@ object CheckUnused:
           val bump = if (deleteLine) 1 else 0 // todo improve to include offset of next line, endline + 1
           val p0 = srcPos.span
           val p1 = if (next >= 0 && emptyRight) p0.withEnd(next + bump) else p0
-          val p2 = if (deleteLine) p1.withStart(prev + 1) else p1
+          val p2 =
+            if deleteLine then
+              var newStart = prev + 1
+              if srcPos.line > 1 then
+                val source = srcPos.sourcePos.source
+                import source.{lineToOffset, lineToOffsetOpt, offsetToLine}
+                val startLine = offsetToLine(start)
+                val endLine = offsetToLine(end)
+                val preceding = lineToOffset(startLine - 1)
+                lineToOffsetOpt(endLine + 2) match
+                case Some(succeeding) if lineToOffset(startLine) - preceding == 1 && succeeding - end == 2 =>
+                  newStart = preceding
+                case _ =>
+              p1.withStart(newStart)
+            else p1
           srcPos.sourcePos.withSpan(p2)
         def actionsOf(actions: (SrcPos, String)*): List[CodeAction] =
           val patches = actions.map((srcPos, replacement) => ActionPatch(srcPos.sourcePos, replacement)).toList
diff --git a/tests/rewrites/unused.check b/tests/rewrites/unused.check
index 1ff93bfb6ef2..585dc46ec39e 100644
--- a/tests/rewrites/unused.check
+++ b/tests/rewrites/unused.check
@@ -53,3 +53,16 @@ package p11:
 package p12:
   import java.lang.System, java.lang.Runnable
   class C extends Runnable { def run() = System.out.println() }
+
+package p13:
+  import java.lang.{Runnable,
+
+                    System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p14:
+  import collection.mutable
+
+  import mutable.ListBuffer
+
+  def buf = ListBuffer.empty[String]
diff --git a/tests/rewrites/unused.scala b/tests/rewrites/unused.scala
index 85a83c7c0015..866a36a7ca4b 100644
--- a/tests/rewrites/unused.scala
+++ b/tests/rewrites/unused.scala
@@ -59,3 +59,20 @@ package p11:
 package p12:
   import collection.mutable, java.lang.System, java.lang.Runnable
   class C extends Runnable { def run() = System.out.println() }
+
+package p13:
+  import java.lang.{Runnable,
+
+                    Thread, // leave one blank line instead of two
+
+                    System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p14:
+  import collection.mutable
+
+  import java.lang.{Runnable, Thread}
+
+  import mutable.ListBuffer
+
+  def buf = ListBuffer.empty[String]

From 79cc32238ec95fbce05bdfafe5e412525d831933 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 5 May 2025 14:53:41 +0200
Subject: [PATCH 301/505] bugfix: Fix incompatibilities between LTS nad Next

---
 .../dotty/tools/pc/PcConvertToNamedLambdaParameters.scala     | 4 ++--
 tests/warn/i23033.scala                                       | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala b/presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala
index 2ca50107c36b..5479a223bcce 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala
@@ -30,11 +30,11 @@ final class PcConvertToNamedLambdaParameters(
   import PcConvertToNamedLambdaParameters._
 
   def convertToNamedLambdaParameters: ju.List[l.TextEdit] = {
-    val uri = params.uri
+    val uri = params.uri.nn
     val filePath = Paths.get(uri)
     driver.run(
       uri,
-      SourceFile.virtual(filePath.toString, params.text),
+      SourceFile.virtual(filePath.toString, params.text.nn),
     )
     given newctx: Context = driver.localContext(params)
     val pos = driver.sourcePosition(params)
diff --git a/tests/warn/i23033.scala b/tests/warn/i23033.scala
index 6170664e05e2..33601c785c26 100644
--- a/tests/warn/i23033.scala
+++ b/tests/warn/i23033.scala
@@ -9,5 +9,3 @@ object Test {
 }
 object Useful:
   given [T](using @unused ec: ExecutionContext): AnyRef with {}
-object Syntax:
-  given [T] => (@unused ec: ExecutionContext) => AnyRef

From bdc181e703c9bed63a64fc5b4d5915b513d7d805 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 7 May 2025 17:04:23 +0200
Subject: [PATCH 302/505] chore: Bump reference version to 3.3.6

---
 project/Build.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index b11589490264..dd02d5f2fc06 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -88,7 +88,7 @@ object Build {
    *
    *  Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
    */
-  val referenceVersion = "3.3.6-RC3"
+  val referenceVersion = "3.3.6"
 
   /** Version of the Scala compiler targeted in the current release cycle
    *  Contains a version without RC/SNAPSHOT/NIGHTLY specific suffixes

From d3e0b374a51a84ea81cc2189ff9e8bebb3a363b9 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Thu, 8 May 2025 13:46:12 +0200
Subject: [PATCH 303/505] Fix publishing chocolatey packages in LTS

---
 .github/workflows/publish-chocolatey.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/publish-chocolatey.yml b/.github/workflows/publish-chocolatey.yml
index 3b31728a50ba..eef550e9d2f7 100644
--- a/.github/workflows/publish-chocolatey.yml
+++ b/.github/workflows/publish-chocolatey.yml
@@ -35,5 +35,4 @@ jobs:
         with:
           name: scala.nupkg
       - name: Publish the package to Chocolatey
-        run: choco push scala.nupkg --source https://push.chocolatey.org/ --api-key ${{ secrets.API-KEY }}
-        
\ No newline at end of file
+        run: choco push scala.${{inputs.version}}.nupkg --source https://push.chocolatey.org/ --api-key ${{ secrets.API-KEY }}

From bc0917bfefd48c38336787ae7383c8272819a928 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 29 Apr 2025 14:09:05 -0700
Subject: [PATCH 304/505] Enclosing package p.q not visible as q

[Cherry-picked e392382a04262e5f6b094b9b5876cdd742d2c455]
---
 .../tools/dotc/transform/CheckUnused.scala    | 13 +++++-----
 tests/warn/i23047.scala                       | 25 +++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 tests/warn/i23047.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index e0f55e1d04f1..e235bd6befb7 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -338,15 +338,15 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     var cachePoint: Context = NoContext // last context with Resolved cache
     var importer: ImportSelector | Null = null // non-null for import context
     var precedence = NoPrecedence // of current resolution
+    var enclosed = false // true if sym is owner of an enclosing context
     var done = false
     var cached = false
     val ctxs = ctx.outersIterator
     while !done && ctxs.hasNext do
       val cur = ctxs.next()
-      if cur.owner eq sym then
-        addCached(cachePoint, Definition)
-        return // found enclosing definition
-      else if isLocal then
+      if cur.owner.userSymbol == sym && !sym.is(Package) then
+        enclosed = true // found enclosing definition, don't register the reference
+      if isLocal then
         if cur.owner eq sym.owner then
           done = true // for local def, just checking that it is not enclosing
       else
@@ -387,7 +387,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
                 candidate = cur
                 importer = sel
         else if checkMember(cur.owner) then
-          if sym.srcPos.sourcePos.source == ctx.source then
+          if sym.is(Package) || sym.srcPos.sourcePos.source == ctx.source then
             precedence = Definition
             candidate = cur
             importer = null // ignore import in same scope; we can't check nesting level
@@ -397,7 +397,8 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
             candidate = cur
     end while
     // record usage and possibly an import
-    refInfos.refs.addOne(sym)
+    if !enclosed then
+      refInfos.refs.addOne(sym)
     if candidate != NoContext && candidate.isImportContext && importer != null then
       refInfos.sels.put(importer, ())
     // possibly record that we have performed this look-up
diff --git a/tests/warn/i23047.scala b/tests/warn/i23047.scala
new file mode 100644
index 000000000000..1922797c3185
--- /dev/null
+++ b/tests/warn/i23047.scala
@@ -0,0 +1,25 @@
+//> using options -Wunused:imports
+
+package some.example:
+  package demo:
+
+    import some.example // no warn because enclosing package example is not available as a simple name in some
+
+    object Main {
+
+      def generic[T](x: Any): T = null.asInstanceOf[T]
+
+      def main(args: Array[String]): Unit = {
+        generic[example.Util](0)
+
+        import some.example.demo.Main // warn
+        println(Main)
+
+        import some.example.demo // warn because enclosing package demo is available as a simple name
+        println(demo.Main)
+      }
+    }
+
+package some.example:
+
+  class Util

From 4c1d38ae934b2a9547fb54b8f6605f5a4aab24c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Rochala?=
 <48657087+rochala@users.noreply.github.com>
Date: Tue, 6 May 2025 13:29:08 +0200
Subject: [PATCH 305/505] Use untpd.Tree instead of tpd.Tree for
 SelectionRangeProvider (#22702)

Thanks to @NPCRUS @Yummy-Yums for taking a part in a spree. Sorry for
taking that long to create a PR, but I was unavailable.

Fixes #22566

---------

Co-authored-by: NPCRUS <npcrus@gmail.com>
Co-authored-by: Yummy-Yums <sailewalderbs@gmail.com>
---
 .../tools/pc/SelectionRangeProvider.scala     |  53 ++++----
 .../tools/pc/tests/SelectionRangeSuite.scala  | 121 +++++++++++++++++-
 project/Build.scala                           |   5 +
 3 files changed, 152 insertions(+), 27 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala
index 7973f4103ff6..42760f38d9af 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala
@@ -6,7 +6,8 @@ import java.util as ju
 import scala.jdk.CollectionConverters._
 import scala.meta.pc.OffsetParams
 
-import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.ast.untpd.*
+import dotty.tools.dotc.ast.NavigateAST
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
@@ -23,10 +24,7 @@ import org.eclipse.lsp4j.SelectionRange
  * @param compiler Metals Global presentation compiler wrapper.
  * @param params offset params converted from the selectionRange params.
  */
-class SelectionRangeProvider(
-    driver: InteractiveDriver,
-    params: ju.List[OffsetParams]
-):
+class SelectionRangeProvider(driver: InteractiveDriver, params: ju.List[OffsetParams]):
 
   /**
    * Get the seletion ranges for the provider params
@@ -44,10 +42,13 @@ class SelectionRangeProvider(
       val source = SourceFile.virtual(filePath.toString, text)
       driver.run(uri, source)
       val pos = driver.sourcePosition(param)
-      val path =
-        Interactive.pathTo(driver.openedTrees(uri), pos)(using ctx)
+      val unit = driver.compilationUnits(uri)
 
-      val bareRanges = path
+      val untpdPath: List[Tree] = NavigateAST
+        .pathTo(pos.span, List(unit.untpdTree), true).collect:
+          case untpdTree: Tree => untpdTree
+
+      val bareRanges = untpdPath
         .flatMap(selectionRangesFromTree(pos))
 
       val comments =
@@ -78,31 +79,31 @@ class SelectionRangeProvider(
   end selectionRange
 
   /** Given a tree, create a seq of [[SelectionRange]]s corresponding to that tree. */
-  private def selectionRangesFromTree(pos: SourcePosition)(tree: tpd.Tree)(using Context) =
+  private def selectionRangesFromTree(pos: SourcePosition)(tree: Tree)(using Context) =
     def toSelectionRange(srcPos: SourcePosition) =
       val selectionRange = new SelectionRange()
       selectionRange.setRange(srcPos.toLsp)
       selectionRange
 
-    val treeSelectionRange = toSelectionRange(tree.sourcePos)
+    val treeSelectionRange = Seq(toSelectionRange(tree.sourcePos))
+
+    def allArgsSelectionRange(args: List[Tree]): Option[SelectionRange] =
+      args match
+        case Nil => None
+        case list =>
+          val srcPos = list.head.sourcePos
+          val lastSpan = list.last.span
+          val allArgsSrcPos = SourcePosition(srcPos.source, srcPos.span union lastSpan, srcPos.outer)
+          if allArgsSrcPos.contains(pos) then Some(toSelectionRange(allArgsSrcPos))
+          else None
 
     tree match
-      case tpd.DefDef(name, paramss, tpt, rhs) =>
-        // If source position is within a parameter list, add a selection range covering that whole list.
-        val selectedParams =
-          paramss
-            .iterator
-            .flatMap: // parameter list to a sourcePosition covering the whole list
-              case Seq(param) => Some(param.sourcePos)
-              case params @ Seq(head, tail*) =>
-                val srcPos = head.sourcePos
-                val lastSpan = tail.last.span
-                Some(SourcePosition(srcPos.source, srcPos.span union lastSpan, srcPos.outer))
-              case Seq() => None
-            .find(_.contains(pos))
-            .map(toSelectionRange)
-        selectedParams ++ Seq(treeSelectionRange)
-      case _ => Seq(treeSelectionRange)
+      case DefDef(_, paramss, _, _) => paramss.flatMap(allArgsSelectionRange) ++ treeSelectionRange
+      case Apply(_, args) => allArgsSelectionRange(args) ++ treeSelectionRange
+      case TypeApply(_, args) => allArgsSelectionRange(args) ++ treeSelectionRange
+      case UnApply(_, _, pattern) => allArgsSelectionRange(pattern) ++ treeSelectionRange
+      case Function(args, body) => allArgsSelectionRange(args) ++ treeSelectionRange
+      case _ => treeSelectionRange
 
   private def setParent(
       child: SelectionRange,
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
index 143d998a0ec1..578c8e8bede4 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
@@ -75,6 +75,12 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
            |    b <- Some(2)
            |  } yield a + b
            |}""".stripMargin,
+        """|object Main extends App {
+           |  val total = for {
+           |    >>region>>a <- Some(1)<<region<<
+           |    b <- Some(2)
+           |  } yield a + b
+           |}""".stripMargin,
         """|object Main extends App {
            |  val total = >>region>>for {
            |    a <- Some(1)
@@ -102,7 +108,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
       )
     )
 
-  @Test def `function params` =
+  @Test def `function-params-1` =
     check(
       """|object Main extends App {
          |  def func(a@@: Int, b: Int) =
@@ -124,6 +130,32 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
       )
     )
 
+  @Test def `function-params-2` =
+    check(
+      """|object Main extends App {
+         |  val func = (a@@: Int, b: Int) =>
+         |    a + b
+         |}""".stripMargin,
+      List[String](
+        """|object Main extends App {
+           |  val func = (>>region>>a: Int<<region<<, b: Int) =>
+           |    a + b
+           |}""".stripMargin,
+        """|object Main extends App {
+           |  val func = (>>region>>a: Int, b: Int<<region<<) =>
+           |    a + b
+           |}""".stripMargin,
+        """|object Main extends App {
+           |  val func = >>region>>(a: Int, b: Int) =>
+           |    a + b<<region<<
+           |}""".stripMargin,
+        """|object Main extends App {
+           |  >>region>>val func = (a: Int, b: Int) =>
+           |    a + b<<region<<
+           |}""".stripMargin
+      )
+  )
+
   @Test def `def - type params` =
     check(
       "object Main extends App { def foo[Type@@ <: T1, B](hi: Int, b: Int, c:Int) = ??? }",
@@ -133,3 +165,90 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
         "object Main extends App { >>region>>def foo[Type <: T1, B](hi: Int, b: Int, c:Int) = ???<<region<< }"
       )
     )
+
+
+  @Test def `arithmetic` =
+    check(
+      """|object Main extends App {
+         |  def x = 12 * (34 + 5@@6)
+         |}""".stripMargin,
+      List(
+        """|object Main extends App {
+           |  def x = 12 * (34 + >>region>>56<<region<<)
+           |}""".stripMargin,
+        """|object Main extends App {
+           |  def x = 12 * (>>region>>34 + 56<<region<<)
+           |}""".stripMargin,
+        """|object Main extends App {
+           |  def x = 12 * >>region>>(34 + 56)<<region<<
+           |}""".stripMargin,
+        """|object Main extends App {
+           |  def x = >>region>>12 * (34 + 56)<<region<<
+           |}""".stripMargin
+      )
+    )
+
+  @Test def `function` =
+    check(
+      "val hello = (aaa: Int, bb@@b: Int, ccc: Int) => ???",
+      List(
+        "val hello = (aaa: Int, >>region>>bbb: Int<<region<<, ccc: Int) => ???",
+        "val hello = (>>region>>aaa: Int, bbb: Int, ccc: Int<<region<<) => ???",
+        "val hello = >>region>>(aaa: Int, bbb: Int, ccc: Int) => ???<<region<<",
+        ">>region>>val hello = (aaa: Int, bbb: Int, ccc: Int) => ???<<region<<",
+      )
+    )
+
+  @Test def `defdef` =
+    check(
+      "def hello(aaa: Int, bb@@b: Int, ccc: Int) = ???",
+      List(
+        "def hello(aaa: Int, >>region>>bbb: Int<<region<<, ccc: Int) = ???",
+        "def hello(>>region>>aaa: Int, bbb: Int, ccc: Int<<region<<) = ???",
+        ">>region>>def hello(aaa: Int, bbb: Int, ccc: Int) = ???<<region<<",
+      )
+    )
+
+  @Test def `apply` =
+    check(
+      "def hello = List(111, 2@@22, 333)",
+      List(
+        "def hello = List(111, >>region>>222<<region<<, 333)",
+        "def hello = List(>>region>>111, 222, 333<<region<<)",
+        "def hello = >>region>>List(111, 222, 333)<<region<<",
+        ">>region>>def hello = List(111, 222, 333)<<region<<",
+      )
+    )
+
+  @Test def `type-apply` =
+    check(
+      "def hello = Map[String, I@@nt]()",
+      List(
+        "def hello = Map[String, >>region>>Int<<region<<]()",
+        "def hello = Map[>>region>>String, Int<<region<<]()",
+        "def hello = >>region>>Map[String, Int]<<region<<()",
+        "def hello = >>region>>Map[String, Int]()<<region<<",
+        ">>region>>def hello = Map[String, Int]()<<region<<",
+      )
+    )
+
+  @Test def `unapply` =
+    check(
+      "val List(aaa, b@@bb, ccc) = List(111, 222, 333)",
+      List(
+        "val List(aaa, >>region>>bbb<<region<<, ccc) = List(111, 222, 333)",
+        "val List(>>region>>aaa, bbb, ccc<<region<<) = List(111, 222, 333)",
+        "val >>region>>List(aaa, bbb, ccc)<<region<< = List(111, 222, 333)",
+        ">>region>>val List(aaa, bbb, ccc) = List(111, 222, 333)<<region<<",
+      )
+    )
+
+  @Test def `single` =
+    check(
+      "def hello = List(2@@22)",
+      List(
+        "def hello = List(>>region>>222<<region<<)",
+        "def hello = >>region>>List(222)<<region<<",
+        ">>region>>def hello = List(222)<<region<<",
+      )
+    )
diff --git a/project/Build.scala b/project/Build.scala
index dd02d5f2fc06..6a60918b6140 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -1242,6 +1242,11 @@ object Build {
       libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.16" % mtagsVersion % SourceDeps),
       ivyConfigurations += SourceDeps.hide,
       transitiveClassifiers := Seq("sources"),
+      scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings
+      publishLocal := publishLocal.dependsOn( // It is best to publish all together. It is not rare to make changes in both compiler / presentation compiler and it can get misaligned
+        `scala3-compiler-bootstrapped` / publishLocal,
+        `scala3-library-bootstrapped` / publishLocal,
+      ).value,
       Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Ysafe-init"),
       Compile / sourceGenerators += Def.task {
         val s = streams.value

From eb6b188dfc57fe3a3d2c4c908599fb65e6923330 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 12 May 2025 12:16:15 +0200
Subject: [PATCH 306/505] Use untpd.Tree instead of tpd.Tree for
 SelectionRangeProvider (#22702)

Thanks to @NPCRUS @Yummy-Yums for taking a part in a spree. Sorry for
taking that long to create a PR, but I was unavailable.

Fixes #22566

---------

Co-authored-by: NPCRUS <npcrus@gmail.com>
Co-authored-by: Yummy-Yums <sailewalderbs@gmail.com>
[Cherry-picked 107a2f1c82ffe21cf6a013d93a7e1142f9219d33][modified]

From f6dae08471f95884334e30666d6ca14a9ab4ad65 Mon Sep 17 00:00:00 2001
From: Yoonjae Jeon <yoonjae.jeon@devsisters.com>
Date: Fri, 2 May 2025 22:40:14 +0900
Subject: [PATCH 307/505] Fix incorrect warning on type ascription for
 backquoted identifiers in patterns

address reviews

minor fix

[Cherry-picked c85982c0596221f8702f4eb855d99bd0ac4f13af]
---
 .../src/dotty/tools/dotc/parsing/Parsers.scala    |  6 +++++-
 tests/neg/i15784.check                            | 14 ++++++++++++++
 tests/neg/i15784.scala                            |  8 +++++++-
 tests/pos/i15784.scala                            | 15 +++++++++++++--
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 701e37ffa462..9d53dfa3585d 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -2960,7 +2960,11 @@ object Parsers {
     def pattern1(location: Location = Location.InPattern): Tree =
       val p = pattern2()
       if in.isColon then
-        val isVariableOrNumber = isVarPattern(p) || p.isInstanceOf[Number]
+        val isVariable = unsplice(p) match {
+          case x: Ident => x.name.isVarPattern
+          case _ => false
+        }
+        val isVariableOrNumber = isVariable || p.isInstanceOf[Number]
         if !isVariableOrNumber then
           report.gradualErrorOrMigrationWarning(
             em"""Type ascriptions after patterns other than:
diff --git a/tests/neg/i15784.check b/tests/neg/i15784.check
index c1540b33d956..7d015689950d 100644
--- a/tests/neg/i15784.check
+++ b/tests/neg/i15784.check
@@ -10,3 +10,17 @@
   |                      Not found: A
   |
   | longer explanation available when compiling with `-explain`
+-- Warning: tests/neg/i15784.scala:7:8 ---------------------------------------------------------------------------------
+7 |  case X: Int => X  // warn
+  |        ^
+  |        Type ascriptions after patterns other than:
+  |          * variable pattern, e.g. `case x: String =>`
+  |          * number literal pattern, e.g. `case 10.5: Double =>`
+  |        are no longer supported. Remove the type ascription or move it to a separate variable pattern.
+-- Warning: tests/neg/i15784.scala:10:12 -------------------------------------------------------------------------------
+10 |  case `Int`: Int => `Int` // warn
+   |            ^
+   |            Type ascriptions after patterns other than:
+   |              * variable pattern, e.g. `case x: String =>`
+   |              * number literal pattern, e.g. `case 10.5: Double =>`
+   |            are no longer supported. Remove the type ascription or move it to a separate variable pattern.
diff --git a/tests/neg/i15784.scala b/tests/neg/i15784.scala
index a58a27fb3cfa..4be909198eaa 100644
--- a/tests/neg/i15784.scala
+++ b/tests/neg/i15784.scala
@@ -1,4 +1,10 @@
 def i15784 = List(42) match
   case List(_, Rest @ `a`) => Rest // error
   case List(_, Rest @ A) => Rest // error 
-  case _ => ???
\ No newline at end of file
+  case _ => ???
+
+def case2 = 42 match
+  case X: Int => X  // warn
+
+def case3 = 42 match
+  case `Int`: Int => `Int` // warn
diff --git a/tests/pos/i15784.scala b/tests/pos/i15784.scala
index ab4b82638a42..dff40f4a4ddc 100644
--- a/tests/pos/i15784.scala
+++ b/tests/pos/i15784.scala
@@ -1,8 +1,19 @@
-def i15784 = List(42) match
+//> using options -Werror
+
+def case1 = List(42) match
   case List(_, rest @ _*) => rest
+  case _ => ???
+
+def case2 = List(42) match
   case List(_, Rest @ _*) => Rest
+  case _ => ???
+
+def case3 = List(42) match
   case List(_, `Rest` @ _*) => Rest
   case _ => ???
 
-def i15784_auxiliary = 42 match
+def case4 = 42 match
   case `type` : Int => `type`
+
+def case5 = 42 match
+  case X @ (_: Int) => 32

From 9ea3490b76755907282f0c3196dd40d34fe985dc Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 30 Apr 2025 07:43:25 -0700
Subject: [PATCH 308/505] REPL wrapper is not ctx.outer

[Cherry-picked c5d5214f9b0955574d594abe256762932ed7589e]
---
 compiler/src/dotty/tools/dotc/transform/CheckUnused.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index e235bd6befb7..552732445d5e 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -456,7 +456,7 @@ object CheckUnused:
         if inliners == 0
           && languageImport(imp.expr).isEmpty
           && !imp.isGeneratedByEnum
-          && !ctx.outer.owner.name.isReplWrapperName
+          && !ctx.owner.name.isReplWrapperName
         then
           imps.put(imp, ())
       case tree: Bind =>

From fcfe738697868d207d3e18e0507841888b4192a2 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Wed, 7 May 2025 01:19:06 -0700
Subject: [PATCH 309/505] Improve checking LHS of Assign (#22977)

Fixes #22970

Simple example showing how awkward this is compared to a traversal,
where there is more control when descending.

Previously, it "ignored" the LHS of Assign to avoid taking `x = y` as
ref to `x` instead of assignment to.

Now, "mark" the LHS as assignment, so `transformIdent` and `Select` set
a "mode" flag, such that `x` is correctly taken as either a ref or
assign to `x`.

Probably there is more complex syntax to handle as LHS, but I haven't
had coffee yet.
[Cherry-picked 9bee7565ed49a914464b7b5f0263752045bc896d]
---
 .../tools/dotc/transform/CheckUnused.scala    | 28 +++++++++++++------
 tests/warn/i15503a.scala                      |  8 ++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 552732445d5e..6105298e4ec8 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -52,6 +52,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     tree
 
   override def transformIdent(tree: Ident)(using Context): tree.type =
+    refInfos.isAssignment = tree.hasAttachment(AssignmentTarget)
     if tree.symbol.exists then
       // if in an inline expansion, resolve at summonInline (synthetic pos) or in an enclosing call site
       val resolving =
@@ -68,10 +69,12 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         resolveUsage(tree.symbol, tree.name, tree.typeOpt.importPrefix.skipPackageObject)
     else if tree.hasType then
       resolveUsage(tree.tpe.classSymbol, tree.name, tree.tpe.importPrefix.skipPackageObject)
+    refInfos.isAssignment = false
     tree
 
   // import x.y; y may be rewritten x.y, also import x.z as y
   override def transformSelect(tree: Select)(using Context): tree.type =
+    refInfos.isAssignment = tree.hasAttachment(AssignmentTarget)
     val name = tree.removeAttachment(OriginalName).getOrElse(nme.NO_NAME)
     inline def isImportable = tree.qualifier.srcPos.isSynthetic
       && tree.qualifier.tpe.match
@@ -92,6 +95,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         resolveUsage(tree.symbol, name, tree.qualifier.tpe)
     else if !ignoreTree(tree) then
       refUsage(tree.symbol)
+    refInfos.isAssignment = false
     tree
 
   override def transformLiteral(tree: Literal)(using Context): tree.type =
@@ -113,13 +117,10 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     ctx
 
   override def prepareForAssign(tree: Assign)(using Context): Context =
-    tree.lhs.putAttachment(Ignore, ()) // don't take LHS reference as a read
+    tree.lhs.putAttachment(AssignmentTarget, ()) // don't take LHS reference as a read
     ctx
   override def transformAssign(tree: Assign)(using Context): tree.type =
-    tree.lhs.removeAttachment(Ignore)
-    val sym = tree.lhs.symbol
-    if sym.exists then
-      refInfos.asss.addOne(sym)
+    tree.lhs.removeAttachment(AssignmentTarget)
     tree
 
   override def prepareForMatch(tree: Match)(using Context): Context =
@@ -269,7 +270,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   // if sym is not an enclosing element, record the reference
   def refUsage(sym: Symbol)(using Context): Unit =
     if !ctx.outersIterator.exists(cur => cur.owner eq sym) then
-      refInfos.refs.addOne(sym)
+      refInfos.addRef(sym)
 
   /** Look up a reference in enclosing contexts to determine whether it was introduced by a definition or import.
    *  The binding of highest precedence must then be correct.
@@ -328,7 +329,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
         case none =>
 
     // Avoid spurious NoSymbol and also primary ctors which are never warned about.
-    // Selections C.this.toString should be already excluded, but backtopped here for eq, etc.
+    // Selections C.this.toString should be already excluded, but backstopped here for eq, etc.
     if !sym.exists || sym.isPrimaryConstructor || sym.isEffectiveRoot || defn.topClasses(sym.owner) then return
 
     // Find the innermost, highest precedence. Contexts have no nesting levels but assume correctness.
@@ -398,7 +399,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     end while
     // record usage and possibly an import
     if !enclosed then
-      refInfos.refs.addOne(sym)
+      refInfos.addRef(sym)
     if candidate != NoContext && candidate.isImportContext && importer != null then
       refInfos.sels.put(importer, ())
     // possibly record that we have performed this look-up
@@ -437,6 +438,9 @@ object CheckUnused:
   /** Ignore reference. */
   val Ignore = Property.StickyKey[Unit]
 
+  /** Tree is LHS of Assign. */
+  val AssignmentTarget = Property.StickyKey[Unit]
+
   class PostTyper extends CheckUnused(PhaseMode.Aggregate, "PostTyper")
 
   class PostInlining extends CheckUnused(PhaseMode.Report, "PostInlining")
@@ -481,6 +485,14 @@ object CheckUnused:
 
     val inlined = Stack.empty[SrcPos] // enclosing call.srcPos of inlined code (expansions)
     var inliners = 0 // depth of inline def (not inlined yet)
+
+    // instead of refs.addOne, use addRef to distinguish a read from a write to var
+    var isAssignment = false
+    def addRef(sym: Symbol): Unit =
+      if isAssignment then
+        asss.addOne(sym)
+      else
+        refs.addOne(sym)
   end RefInfos
 
   // Symbols already resolved in the given Context (with name and prefix of lookup).
diff --git a/tests/warn/i15503a.scala b/tests/warn/i15503a.scala
index 884261e140a7..8fc97888b584 100644
--- a/tests/warn/i15503a.scala
+++ b/tests/warn/i15503a.scala
@@ -460,3 +460,11 @@ package ancient:
     }
   }
 end ancient
+
+object `i22970 assign lhs was ignored`:
+  object X:
+    var global = 0
+  object Main:
+    import X.global // no warn
+    def main(args: Array[String]): Unit =
+      global = 1

From c88073557a035939d27e7505f44e55573549adf1 Mon Sep 17 00:00:00 2001
From: Dolphin von Chips <td2505052@gmail.com>
Date: Wed, 7 May 2025 09:11:45 +0300
Subject: [PATCH 310/505] Handle comparing with TypeVar in
 mergeRefinedOrApplied

Closes #23032

[Cherry-picked 9b060ec20aabe0f74934050a2be5a91799a1ce20]
---
 compiler/src/dotty/tools/dotc/core/TypeOps.scala | 10 +++++++++-
 tests/pos/i23032.scala                           |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i23032.scala

diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
index 8f87eddb6cef..c985ed23274b 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
@@ -284,7 +284,15 @@ object TypeOps:
           }
         case AndType(tp11, tp12) =>
           mergeRefinedOrApplied(tp11, tp2) & mergeRefinedOrApplied(tp12, tp2)
-        case tp1: TypeParamRef if tp1 == tp2 => tp1
+        case tp1: TypeParamRef =>
+          tp2.stripTypeVar match
+            case tp2: TypeParamRef if tp1 == tp2 => tp1
+            case _ => fail
+        case tp1: TypeVar =>
+          tp2 match
+            case tp2: TypeVar if tp1 == tp2 => tp1
+            case tp2: TypeParamRef if tp1.stripTypeVar == tp2 => tp2
+            case _ => fail
         case _ => fail
       }
     }
diff --git a/tests/pos/i23032.scala b/tests/pos/i23032.scala
new file mode 100644
index 000000000000..7e56d0f8b153
--- /dev/null
+++ b/tests/pos/i23032.scala
@@ -0,0 +1,2 @@
+def f[F[_], T, U]: F[T] | F[U] = ???
+def x = f.toString

From 6195995c9f7784ec5d77956e162b1908d24c2ec7 Mon Sep 17 00:00:00 2001
From: Yoonjae Jeon <yoonjae.jeon@devsisters.com>
Date: Wed, 7 May 2025 22:13:17 +0900
Subject: [PATCH 311/505] patvar: adjust caret in error message

---
 .../dotty/tools/dotc/parsing/Parsers.scala    |  2 +-
 tests/neg/i15784.check                        | 24 +++++++++----------
 tests/neg/t5702-neg-bad-and-wild.check        |  7 ------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 9d53dfa3585d..628fa50211c3 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -2971,7 +2971,7 @@ object Parsers {
                 |  * variable pattern, e.g. `case x: String =>`
                 |  * number literal pattern, e.g. `case 10.5: Double =>`
                 |are no longer supported. Remove the type ascription or move it to a separate variable pattern.""",
-            in.sourcePos(),
+            p.sourcePos,
             warnFrom = `3.3`,
             errorFrom = future
           )
diff --git a/tests/neg/i15784.check b/tests/neg/i15784.check
index 7d015689950d..d8c9c193c7dc 100644
--- a/tests/neg/i15784.check
+++ b/tests/neg/i15784.check
@@ -10,17 +10,17 @@
   |                      Not found: A
   |
   | longer explanation available when compiling with `-explain`
--- Warning: tests/neg/i15784.scala:7:8 ---------------------------------------------------------------------------------
+-- Warning: tests/neg/i15784.scala:7:7 ---------------------------------------------------------------------------------
 7 |  case X: Int => X  // warn
-  |        ^
-  |        Type ascriptions after patterns other than:
-  |          * variable pattern, e.g. `case x: String =>`
-  |          * number literal pattern, e.g. `case 10.5: Double =>`
-  |        are no longer supported. Remove the type ascription or move it to a separate variable pattern.
--- Warning: tests/neg/i15784.scala:10:12 -------------------------------------------------------------------------------
+  |       ^
+  |       Type ascriptions after patterns other than:
+  |         * variable pattern, e.g. `case x: String =>`
+  |         * number literal pattern, e.g. `case 10.5: Double =>`
+  |       are no longer supported. Remove the type ascription or move it to a separate variable pattern.
+-- Warning: tests/neg/i15784.scala:10:7 --------------------------------------------------------------------------------
 10 |  case `Int`: Int => `Int` // warn
-   |            ^
-   |            Type ascriptions after patterns other than:
-   |              * variable pattern, e.g. `case x: String =>`
-   |              * number literal pattern, e.g. `case 10.5: Double =>`
-   |            are no longer supported. Remove the type ascription or move it to a separate variable pattern.
+   |       ^^^^^
+   |       Type ascriptions after patterns other than:
+   |         * variable pattern, e.g. `case x: String =>`
+   |         * number literal pattern, e.g. `case 10.5: Double =>`
+   |       are no longer supported. Remove the type ascription or move it to a separate variable pattern.
diff --git a/tests/neg/t5702-neg-bad-and-wild.check b/tests/neg/t5702-neg-bad-and-wild.check
index 261b2a9e44d1..da6d551bd3b3 100644
--- a/tests/neg/t5702-neg-bad-and-wild.check
+++ b/tests/neg/t5702-neg-bad-and-wild.check
@@ -46,13 +46,6 @@
    |                    no pattern match extractor named * was found
    |
    | longer explanation available when compiling with `-explain`
--- Warning: tests/neg/t5702-neg-bad-and-wild.scala:13:22 ---------------------------------------------------------------
-13 |      case List(1, _*3:) =>  // error // error
-   |                      ^
-   |                  Type ascriptions after patterns other than:
-   |                    * variable pattern, e.g. `case x: String =>`
-   |                    * number literal pattern, e.g. `case 10.5: Double =>`
-   |                  are no longer supported. Remove the type ascription or move it to a separate variable pattern.
 -- Warning: tests/neg/t5702-neg-bad-and-wild.scala:22:20 ---------------------------------------------------------------
 22 |    val K(x @ _*) = k
    |                    ^

From 4e1b2be02378f96f0e7fa31e16b6d535cf0bcab2 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 12 May 2025 12:19:13 +0200
Subject: [PATCH 312/505] patvar: adjust caret in error message

[Cherry-picked c49ff7141a0102860b2d4ef24000dfbf7f0d6e87][modified]

From 3ebc82b63396d829adc389adc7c7aa2314e61357 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Mon, 28 Apr 2025 16:19:56 +0000
Subject: [PATCH 313/505] Fix `Constant` tag of `Expr(null: String)`

Co-authored-by: Hamza Remmal <hamza@remmal.net>
Co-authored-by: HarrisL2 <harris.yh.lau@gmail.com>
Co-authored-by: Abdullah Arif Jafri <abdullahjafri2001@gmail.com>

[Cherry-picked bbe2dde1ee10adc05ceece96ab82af8a66a21880]
---
 .../src/scala/quoted/runtime/impl/QuotesImpl.scala   |  2 +-
 tests/run-macros/i23008.check                        |  1 +
 tests/run-macros/i23008/Macros_1.scala               | 12 ++++++++++++
 tests/run-macros/i23008/Test_2.scala                 |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/run-macros/i23008.check
 create mode 100644 tests/run-macros/i23008/Macros_1.scala
 create mode 100644 tests/run-macros/i23008/Test_2.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index b6d0eae2fbbb..8d58632bb79c 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -2419,7 +2419,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
     end StringConstantTypeTest
 
     object StringConstant extends StringConstantModule:
-      def apply(x: String): StringConstant = dotc.core.Constants.Constant(x)
+      def apply(x: String): StringConstant = dotc.core.Constants.Constant(x: Any)
       def unapply(constant: StringConstant): Some[String] = Some(constant.stringValue)
     end StringConstant
 
diff --git a/tests/run-macros/i23008.check b/tests/run-macros/i23008.check
new file mode 100644
index 000000000000..19765bd501b6
--- /dev/null
+++ b/tests/run-macros/i23008.check
@@ -0,0 +1 @@
+null
diff --git a/tests/run-macros/i23008/Macros_1.scala b/tests/run-macros/i23008/Macros_1.scala
new file mode 100644
index 000000000000..052760dbf833
--- /dev/null
+++ b/tests/run-macros/i23008/Macros_1.scala
@@ -0,0 +1,12 @@
+import scala.quoted.*
+
+object Macros {
+  inline def buildString = ${buildStringCode}
+
+  def buildStringCode(using Quotes): Expr[String] = {
+    import quotes.reflect.*
+    val str: String = null
+    val exprString = Expr(str)
+    Expr(exprString.show)
+  }
+}
diff --git a/tests/run-macros/i23008/Test_2.scala b/tests/run-macros/i23008/Test_2.scala
new file mode 100644
index 000000000000..cf3cfffb50ac
--- /dev/null
+++ b/tests/run-macros/i23008/Test_2.scala
@@ -0,0 +1,2 @@
+@main def Test =
+  println(Macros.buildString)

From 29d76b90cf953da04ec1a556cf222e3230e9bb5f Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 30 Apr 2025 15:13:38 +0000
Subject: [PATCH 314/505] Accept `null` in `StringToExpr` but not in
 `StringConstant`

[Cherry-picked e0fbfde87a5faf9115db18dda4bfcda8fdbc21a5]
---
 compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala | 7 ++++++-
 library/src/scala/quoted/ToExpr.scala                   | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index 8d58632bb79c..b5b62816a448 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -2419,7 +2419,12 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
     end StringConstantTypeTest
 
     object StringConstant extends StringConstantModule:
-      def apply(x: String): StringConstant = dotc.core.Constants.Constant(x: Any)
+      def apply(x: String): StringConstant =
+        require(x != null, "StringConstant cannot be null")
+        // A `null` constant must be represented as a `NullConstant`, c.f. a
+        // constant with `tag == NullTag`, which is not a `StringConstant`.
+        // See issue 23008.
+        dotc.core.Constants.Constant(x)
       def unapply(constant: StringConstant): Some[String] = Some(constant.stringValue)
     end StringConstant
 
diff --git a/library/src/scala/quoted/ToExpr.scala b/library/src/scala/quoted/ToExpr.scala
index f9f3d00bcedf..e9cd06fd7ac9 100644
--- a/library/src/scala/quoted/ToExpr.scala
+++ b/library/src/scala/quoted/ToExpr.scala
@@ -77,7 +77,13 @@ object ToExpr {
   given StringToExpr[T <: String]: ToExpr[T] with {
     def apply(x: T)(using Quotes) =
       import quotes.reflect.*
-      Literal(StringConstant(x)).asExpr.asInstanceOf[Expr[T]]
+      val literal =
+        if (x: Any) == null then
+          // Can happen if called from code without `-Yexplicit-nulls`.
+          Literal(NullConstant())
+        else
+          Literal(StringConstant(x))
+      literal.asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default implementation of `ToExpr[Class[T]]` */

From e7aee4f2f7f4fbe5011d94e04f6d5c56ebf44805 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Thu, 8 May 2025 11:35:19 +0000
Subject: [PATCH 315/505] Do not handle `null` in `StringToExpr`

[Cherry-picked 2e3c803340b8b170d144debeff02e811522d2717]
---
 .../quoted/runtime/impl/QuotesImpl.scala      |  2 +-
 library/src/scala/quoted/Quotes.scala         |  5 ++++-
 library/src/scala/quoted/ToExpr.scala         |  8 +------
 tests/neg-macros/i23008.check                 | 21 +++++++++++++++++++
 .../i23008/Macro_1.scala}                     |  3 +--
 tests/neg-macros/i23008/Test_2.scala          |  1 +
 tests/run-macros/i23008.check                 |  1 -
 tests/run-macros/i23008/Test_2.scala          |  2 --
 8 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 tests/neg-macros/i23008.check
 rename tests/{run-macros/i23008/Macros_1.scala => neg-macros/i23008/Macro_1.scala} (77%)
 create mode 100644 tests/neg-macros/i23008/Test_2.scala
 delete mode 100644 tests/run-macros/i23008.check
 delete mode 100644 tests/run-macros/i23008/Test_2.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index b5b62816a448..13f144d45122 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -2420,7 +2420,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object StringConstant extends StringConstantModule:
       def apply(x: String): StringConstant =
-        require(x != null, "StringConstant cannot be null")
+        require(x != null, "value of StringConstant cannot be `null`")
         // A `null` constant must be represented as a `NullConstant`, c.f. a
         // constant with `tag == NullTag`, which is not a `StringConstant`.
         // See issue 23008.
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
index 544e9119a770..70d09b7e4841 100644
--- a/library/src/scala/quoted/Quotes.scala
+++ b/library/src/scala/quoted/Quotes.scala
@@ -3556,7 +3556,10 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Methods of the module object `val StringConstant` */
     trait StringConstantModule { this: StringConstant.type =>
-      /** Create a constant String value */
+      /** Create a constant String value
+       *
+       *  @throw `IllegalArgumentException` if the argument is `null`
+       */
       def apply(x: String): StringConstant
       /** Match String value constant and extract its value */
       def unapply(constant: StringConstant): Some[String]
diff --git a/library/src/scala/quoted/ToExpr.scala b/library/src/scala/quoted/ToExpr.scala
index e9cd06fd7ac9..f9f3d00bcedf 100644
--- a/library/src/scala/quoted/ToExpr.scala
+++ b/library/src/scala/quoted/ToExpr.scala
@@ -77,13 +77,7 @@ object ToExpr {
   given StringToExpr[T <: String]: ToExpr[T] with {
     def apply(x: T)(using Quotes) =
       import quotes.reflect.*
-      val literal =
-        if (x: Any) == null then
-          // Can happen if called from code without `-Yexplicit-nulls`.
-          Literal(NullConstant())
-        else
-          Literal(StringConstant(x))
-      literal.asExpr.asInstanceOf[Expr[T]]
+      Literal(StringConstant(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default implementation of `ToExpr[Class[T]]` */
diff --git a/tests/neg-macros/i23008.check b/tests/neg-macros/i23008.check
new file mode 100644
index 000000000000..c48fdb2fe6fc
--- /dev/null
+++ b/tests/neg-macros/i23008.check
@@ -0,0 +1,21 @@
+
+-- Error: tests/neg-macros/i23008/Test_2.scala:1:24 --------------------------------------------------------------------
+1 |@main def Test = Macros.buildString // error
+  |                 ^^^^^^^^^^^^^^^^^^
+  |                 Exception occurred while executing macro expansion.
+  |                 java.lang.IllegalArgumentException: requirement failed: value of StringConstant cannot be `null`
+  |                 	at scala.Predef$.require(Predef.scala:337)
+  |                 	at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2533)
+  |                 	at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2532)
+  |                 	at scala.quoted.ToExpr$StringToExpr.apply(ToExpr.scala:80)
+  |                 	at scala.quoted.ToExpr$StringToExpr.apply(ToExpr.scala:78)
+  |                 	at scala.quoted.Expr$.apply(Expr.scala:70)
+  |                 	at Macros$.buildStringCode(Macro_1.scala:9)
+  |
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Macro_1.scala:4
+4 |  inline def buildString = ${buildStringCode}
+  |                           ^^^^^^^^^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/run-macros/i23008/Macros_1.scala b/tests/neg-macros/i23008/Macro_1.scala
similarity index 77%
rename from tests/run-macros/i23008/Macros_1.scala
rename to tests/neg-macros/i23008/Macro_1.scala
index 052760dbf833..67bd091cd9f3 100644
--- a/tests/run-macros/i23008/Macros_1.scala
+++ b/tests/neg-macros/i23008/Macro_1.scala
@@ -6,7 +6,6 @@ object Macros {
   def buildStringCode(using Quotes): Expr[String] = {
     import quotes.reflect.*
     val str: String = null
-    val exprString = Expr(str)
-    Expr(exprString.show)
+    Expr(str)
   }
 }
diff --git a/tests/neg-macros/i23008/Test_2.scala b/tests/neg-macros/i23008/Test_2.scala
new file mode 100644
index 000000000000..5ebf2715cf14
--- /dev/null
+++ b/tests/neg-macros/i23008/Test_2.scala
@@ -0,0 +1 @@
+@main def Test = Macros.buildString // error
diff --git a/tests/run-macros/i23008.check b/tests/run-macros/i23008.check
deleted file mode 100644
index 19765bd501b6..000000000000
--- a/tests/run-macros/i23008.check
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/tests/run-macros/i23008/Test_2.scala b/tests/run-macros/i23008/Test_2.scala
deleted file mode 100644
index cf3cfffb50ac..000000000000
--- a/tests/run-macros/i23008/Test_2.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-@main def Test =
-  println(Macros.buildString)

From 3370e9669f5199d79a9905d39ba6c4ed9feca1b9 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Sat, 10 May 2025 14:54:06 +0200
Subject: [PATCH 316/505] bugfix: Fix enumeration issues when Value is imported
 (#23124)

This is still not a perfect fix, since we add the full prefix, but
that's the current status quo. Making prefixes shorter is something we
need to work on separately.
---
 .../main/dotty/tools/pc/IndexedContext.scala  | 34 ++++++++--
 .../dotty/tools/pc/InferredTypeProvider.scala |  4 +-
 .../pc/printer/ShortenedTypePrinter.scala     |  3 +-
 .../tests/edit/InsertInferredTypeSuite.scala  | 66 +++++++++++++++++++
 4 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala b/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
index aa4bc30d577b..3fbfafff3e38 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
@@ -23,13 +23,13 @@ sealed trait IndexedContext:
   given ctx: Context
   def scopeSymbols: List[Symbol]
   def rename(sym: Symbol): Option[String]
-  def findSymbol(name: Name): Option[List[Symbol]]
+  def findSymbol(name: Name, fromPrefix: Option[Type] = None): Option[List[Symbol]]
   def findSymbolInLocalScope(name: String): Option[List[Symbol]]
 
-  final def lookupSym(sym: Symbol): Result =
+  final def lookupSym(sym: Symbol, fromPrefix: Option[Type] = None): Result =
     def all(symbol: Symbol): Set[Symbol] = Set(symbol, symbol.companionModule, symbol.companionClass, symbol.companion).filter(_ != NoSymbol)
     val isRelated = all(sym) ++ all(sym.dealiasType)
-    findSymbol(sym.name) match
+    findSymbol(sym.name, fromPrefix) match
       case Some(symbols) if symbols.exists(isRelated) => Result.InScope
       case Some(symbols) if symbols.exists(isTermAliasOf(_, sym)) => Result.InScope
       case Some(symbols) if symbols.map(_.dealiasType).exists(isRelated) => Result.InScope
@@ -81,7 +81,7 @@ object IndexedContext:
 
   case object Empty extends IndexedContext:
     given ctx: Context = NoContext
-    def findSymbol(name: Name): Option[List[Symbol]] = None
+    def findSymbol(name: Name, fromPrefix: Option[Type]): Option[List[Symbol]] = None
     def findSymbolInLocalScope(name: String): Option[List[Symbol]] = None
     def scopeSymbols: List[Symbol] = List.empty
     def rename(sym: Symbol): Option[String] = None
@@ -111,11 +111,31 @@ object IndexedContext:
 
     override def findSymbolInLocalScope(name: String): Option[List[Symbol]] =
       names.get(name).map(_.map(_.symbol).toList).filter(_.nonEmpty)
-    def findSymbol(name: Name): Option[List[Symbol]] =
+    def findSymbol(name: Name, fromPrefix: Option[Type]): Option[List[Symbol]] =
       names
         .get(name.show)
-        .map(_.map(_.symbol).toList)
-        .orElse(defaultScopes(name))
+        .map { denots =>
+          def skipThisType(tp: Type): Type = tp match
+            case ThisType(prefix) => skipThisType(prefix)
+            case _ => tp
+
+          val filteredDenots = fromPrefix match
+            case Some(prefix) =>
+              val target = skipThisType(prefix)
+              denots.filter { denot =>
+                denot.prefix == NoPrefix ||
+                (denot.prefix match
+                  case tref: TermRef =>
+                    tref.termSymbol.info <:< target
+                  case otherPrefix =>
+                    otherPrefix <:< target
+                )
+              }
+            case None => denots
+
+          filteredDenots.map(_.symbol).toList
+        }
+        .orElse(defaultScopes(name)).filter(_.nonEmpty)
 
     def scopeSymbols: List[Symbol] =
       names.values.flatten.map(_.symbol).toList
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
index 2006774ae19b..fe6d6bb436d5 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
@@ -94,7 +94,8 @@ final class InferredTypeProvider(
         tpe match
           case tref: TypeRef =>
             indexedCtx.lookupSym(
-              tref.currentSymbol
+              tref.currentSymbol,
+              Some(tref.prefix)
             ) == IndexedContext.Result.InScope
           case AppliedType(tycon, args) =>
             isInScope(tycon) && args.forall(isInScope)
@@ -137,7 +138,6 @@ final class InferredTypeProvider(
             findNamePos(sourceText, vl, keywordOffset).endPos.toLsp
           adjustOpt.foreach(adjust => endPos.setEnd(adjust.adjustedEndPos))
           val spaceBefore = name.isOperatorName
-
           new TextEdit(
             endPos,
             printTypeAscription(optDealias(tpt.typeOpt), spaceBefore) + {
diff --git a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
index 7ae332a7c21c..c7530b87f801 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
@@ -174,14 +174,13 @@ class ShortenedTypePrinter(
         res.toPrefixText
     }
 
-
   override def toTextPrefixOf(tp: NamedType): Text = controlled {
     val maybeRenamedPrefix: Option[Text] = findRename(tp)
     def trimmedPrefix: Text =
       if !tp.designator.isInstanceOf[Symbol] && tp.typeSymbol == NoSymbol then
         super.toTextPrefixOf(tp)
       else
-        indexedCtx.lookupSym(tp.symbol) match
+        indexedCtx.lookupSym(tp.symbol, Some(tp.prefix)) match
           case _ if indexedCtx.rename(tp.symbol).isDefined => Text()
           // symbol is missing and is accessible statically, we can import it and add proper prefix
           case Result.Missing if isAccessibleStatically(tp.symbol) =>
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
index c1a84d6abb79..c574ed9bfc9f 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
@@ -970,6 +970,72 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite:
          |""".stripMargin
     )
 
+  @Test def `enums` =
+    checkEdit(
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  def day(d: Day.Value): Unit = ???
+         |  val <<d>> =
+         |    if (true) Day.Weekday
+         |    else Day.Weekend
+         |""".stripMargin,
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  def day(d: Day.Value): Unit = ???
+         |  val d: EnumerationValue.Day.Value =
+         |    if (true) Day.Weekday
+         |    else Day.Weekend
+         |""".stripMargin
+    )
+
+  @Test def `enums2` =
+    checkEdit(
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  val <<b>> =
+         |    if (true) True
+         |    else False
+         |""".stripMargin,
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  val b: Value =
+         |    if (true) True
+         |    else False
+         |""".stripMargin
+    )
+
   def checkEdit(
       original: String,
       expected: String

From c24c4c48d1a733a57f50c718f9c2f2a5190082fe Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 12 May 2025 12:20:30 +0200
Subject: [PATCH 317/505] bugfix: Fix enumeration issues when Value is imported
 (#23124)

This is still not a perfect fix, since we add the full prefix, but
that's the current status quo. Making prefixes shorter is something we
need to work on separately.
[Cherry-picked f784625a336f2f0c8c25ea47dfc8c9fe0147f08b][modified]

From 8e730c78baf8a776bf828d27db6063cdad3e84b6 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 12 May 2025 12:51:33 +0200
Subject: [PATCH 318/505] bugfix: Fix issue with changed lines in test

---
 tests/neg-macros/i23008.check | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/neg-macros/i23008.check b/tests/neg-macros/i23008.check
index c48fdb2fe6fc..7c6140c8b2d7 100644
--- a/tests/neg-macros/i23008.check
+++ b/tests/neg-macros/i23008.check
@@ -5,8 +5,8 @@
   |                 Exception occurred while executing macro expansion.
   |                 java.lang.IllegalArgumentException: requirement failed: value of StringConstant cannot be `null`
   |                 	at scala.Predef$.require(Predef.scala:337)
-  |                 	at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2533)
-  |                 	at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2532)
+  |                 	at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2423)
+  |                 	at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2422)
   |                 	at scala.quoted.ToExpr$StringToExpr.apply(ToExpr.scala:80)
   |                 	at scala.quoted.ToExpr$StringToExpr.apply(ToExpr.scala:78)
   |                 	at scala.quoted.Expr$.apply(Expr.scala:70)

From c28cc7bec631904b967484c847f622ba5a62e399 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Tue, 13 May 2025 20:13:08 +0200
Subject: [PATCH 319/505] improvement: Simplify match types when possible
 (#23146)

Fixes https://github.com/scalameta/metals/issues/7004
---
 .../pc/printer/ShortenedTypePrinter.scala     |  4 ++-
 .../pc/utils/InteractiveEnrichments.scala     |  3 +-
 .../pc/tests/completion/CompletionSuite.scala | 18 +++++------
 .../completion/CompletionTypeSuite.scala      | 30 +++++++++++++++++++
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
index c7530b87f801..91244f97673f 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
@@ -349,7 +349,9 @@ class ShortenedTypePrinter(
     val paramLabelss = label(methodParams)
     val extLabelss = label(extParams)
 
-    val returnType = tpe(gtpe.finalResultType)
+    val retType = gtpe.finalResultType
+    val simplified = if (retType.typeSymbol.isAliasType) retType else retType.deepDealiasAndSimplify
+    val returnType = tpe(simplified)
     def extensionSignatureString =
       val extensionSignature = paramssString(extLabelss, extParams)
       if extParams.nonEmpty then
diff --git a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
index 43a3e3c28be4..aaf3d6ddb1e7 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
@@ -407,12 +407,13 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
         case app @ AppliedType(tycon, params) =>
           AppliedType(tycon, params.map(_.deepDealias))
         case aliasingBounds: AliasingBounds =>
-          aliasingBounds.derivedAlias(aliasingBounds.alias.dealias)
+          aliasingBounds.derivedAlias(aliasingBounds.alias.deepDealiasAndSimplify)
         case TypeBounds(lo, hi) =>
           TypeBounds(lo.dealias, hi.dealias)
         case RefinedType(parent, name, refinedInfo) =>
           RefinedType(parent.dealias, name, refinedInfo.deepDealias)
         case dealised => dealised
+      dealiased.simplified
 
   extension[T] (list: List[T])
     def get(n: Int): Option[T] = if 0 <= n && n < list.size then Some(list(n)) else None
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
index bc9f158ca97c..1bae825f7fde 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -94,18 +94,18 @@ class CompletionSuite extends BaseCompletionSuite:
          |newBuilder[A]: Builder[A, List[A]]
          |apply[A](elems: A*): List[A]
          |concat[A](xss: Iterable[A]*): List[A]
-         |fill[A](n1: Int, n2: Int)(elem: => A): List[List[A] @uncheckedVariance]
-         |fill[A](n1: Int, n2: Int, n3: Int)(elem: => A): List[List[List[A]] @uncheckedVariance]
-         |fill[A](n1: Int, n2: Int, n3: Int, n4: Int)(elem: => A): List[List[List[List[A]]] @uncheckedVariance]
-         |fill[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int)(elem: => A): List[List[List[List[List[A]]]] @uncheckedVariance]
+         |fill[A](n1: Int, n2: Int)(elem: => A): List[List[A]]
+         |fill[A](n1: Int, n2: Int, n3: Int)(elem: => A): List[List[List[A]]]
+         |fill[A](n1: Int, n2: Int, n3: Int, n4: Int)(elem: => A): List[List[List[List[A]]]]
+         |fill[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int)(elem: => A): List[List[List[List[List[A]]]]]
          |fill[A](n: Int)(elem: => A): List[A]
          |iterate[A](start: A, len: Int)(f: A => A): List[A]
          |range[A: Integral](start: A, end: A): List[A]
          |range[A: Integral](start: A, end: A, step: A): List[A]
-         |tabulate[A](n1: Int, n2: Int)(f: (Int, Int) => A): List[List[A] @uncheckedVariance]
-         |tabulate[A](n1: Int, n2: Int, n3: Int)(f: (Int, Int, Int) => A): List[List[List[A]] @uncheckedVariance]
-         |tabulate[A](n1: Int, n2: Int, n3: Int, n4: Int)(f: (Int, Int, Int, Int) => A): List[List[List[List[A]]] @uncheckedVariance]
-         |tabulate[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int)(f: (Int, Int, Int, Int, Int) => A): List[List[List[List[List[A]]]] @uncheckedVariance]
+         |tabulate[A](n1: Int, n2: Int)(f: (Int, Int) => A): List[List[A]]
+         |tabulate[A](n1: Int, n2: Int, n3: Int)(f: (Int, Int, Int) => A): List[List[List[A]]]
+         |tabulate[A](n1: Int, n2: Int, n3: Int, n4: Int)(f: (Int, Int, Int, Int) => A): List[List[List[List[A]]]]
+         |tabulate[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int)(f: (Int, Int, Int, Int, Int) => A): List[List[List[List[List[A]]]]]
          |tabulate[A](n: Int)(f: Int => A): List[A]
          |unapplySeq[A](x: List[A] @uncheckedVariance): UnapplySeqWrapper[A]
          |unfold[A, S](init: S)(f: S => Option[(A, S)]): List[A]
@@ -116,7 +116,7 @@ class CompletionSuite extends BaseCompletionSuite:
          |ensuring(cond: List.type => Boolean, msg: => Any): List.type
          |fromSpecific(from: Any)(it: IterableOnce[Nothing]): List[Nothing]
          |fromSpecific(it: IterableOnce[Nothing]): List[Nothing]
-         |nn: List.type & List.type
+         |nn: List.type
          |toFactory(from: Any): Factory[Nothing, List[Nothing]]
          |formatted(fmtstr: String): String
          |→[B](y: B): (List.type, B)
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionTypeSuite.scala
index 46760b5d9465..b74041450cdf 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionTypeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionTypeSuite.scala
@@ -21,3 +21,33 @@ class CompletionTypeSuite extends BaseCompletionSuite:
       s"""|method[T <: FS](a: T): Nothing
           |""".stripMargin
     )
+
+  @Test def `long-types-match` =
+    check(
+      s"""|@main
+          |def run =
+          |  (1, 2).to@@
+          |""".stripMargin,
+      s"""|toString(): String
+          |toArray: Array[Object]
+          |toIArray: IArray[Object]
+          |toList: List[Int]
+          |productIterator: Iterator[Any]
+          |asInstanceOf[X0]: X0
+          |isInstanceOf[X0]: Boolean
+          |""".stripMargin
+    )
+
+  @Test def `union-types` =
+    check(
+      s"""|
+          |def itsAUnionType(): Int | String = ???
+          |
+          |def hello =
+          |  its@@
+          |
+          |
+          |""".stripMargin,
+      s"""|itsAUnionType(): Int | String
+          |""".stripMargin
+    )

From ba8677c5355e909d97b399ce08217c7381794e88 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 19 May 2025 11:29:08 +0200
Subject: [PATCH 320/505] improvement: Simplify match types when possible
 (#23146)

Fixes https://github.com/scalameta/metals/issues/7004
[Cherry-picked e5a935564d6eaac26c817fbc72439d62588159eb][modified]

From 1ceaaa8a7e5fac829f4f641c177456fbce46fc3e Mon Sep 17 00:00:00 2001
From: Dolphin von Chips <td2505052@gmail.com>
Date: Mon, 12 May 2025 18:58:32 +0300
Subject: [PATCH 321/505] Disallow empty parameter clauses in `extension`
 definition

[Cherry-picked 004579e201db041b7a0bcf42e761afcfe7c87daf]
---
 compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 10 ++++++++--
 tests/neg/extensions-can-only-have-using.scala      |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 tests/neg/extensions-can-only-have-using.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 628fa50211c3..26dded203710 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -3412,7 +3412,10 @@ object Parsers {
       // begin termParamClause
       inParensWithCommas {
         if in.token == RPAREN && paramOwner != ParamOwner.ExtensionPrefix && !impliedMods.is(Given)
-        then Nil
+        then
+          if paramOwner.takesOnlyUsingClauses then
+            syntaxError(em"`using` expected")
+          Nil
         else
           val clause =
             if paramOwner == ParamOwner.ExtensionPrefix
@@ -4060,7 +4063,10 @@ object Parsers {
         leadParamss += extParams
         isUsingClause(extParams)
       do ()
-      leadParamss ++= termParamClauses(ParamOwner.ExtensionFollow, numLeadParams)
+      // Empty parameter clauses are filtered out. They are already reported as syntax errors and are not
+      // allowed here.
+      val extFollowParams = termParamClauses(ParamOwner.ExtensionFollow, numLeadParams).filterNot(_.isEmpty)
+      leadParamss ++= extFollowParams
       if in.isColon then
         syntaxError(em"no `:` expected here")
         in.nextToken()
diff --git a/tests/neg/extensions-can-only-have-using.scala b/tests/neg/extensions-can-only-have-using.scala
new file mode 100644
index 000000000000..fcf451fc7258
--- /dev/null
+++ b/tests/neg/extensions-can-only-have-using.scala
@@ -0,0 +1,3 @@
+extension(x: Any)() // error
+  def f = 42
+val x = Nil.f

From b0d5cd59d3bc30615d29799ccc0ab0b0aa31e8aa Mon Sep 17 00:00:00 2001
From: Tomas Mikula <tomas.mikula@gmail.com>
Date: Sat, 22 Mar 2025 23:00:38 +0000
Subject: [PATCH 322/505] Don't StackOverflow when printing RecursiveType
 structure.

Fixes #22649.

[Cherry-picked 3a59413f0c81a2659b35ee2df92d4783d12186b3]
---
 .../runtime/impl/printers/Extractors.scala     | 18 +++++++++++++++---
 tests/run/i22649/Macro_1.scala                 |  9 +++++++++
 tests/run/i22649/Test_2.scala                  | 11 +++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 tests/run/i22649/Macro_1.scala
 create mode 100644 tests/run/i22649/Test_2.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala b/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala
index 726f2daf1788..a66dabc542e3 100644
--- a/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala
+++ b/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala
@@ -1,6 +1,7 @@
 package scala.quoted
 package runtime.impl.printers
 
+import scala.collection.mutable
 import scala.quoted.*
 
 object Extractors {
@@ -67,6 +68,12 @@ object Extractors {
     import quotes.reflect.*
 
     private val sb: StringBuilder = new StringBuilder
+    private var recTypeCounter = 0
+    private val recTypeIds = mutable.Map.empty[RecursiveType, Int]
+
+    private def nextRecTypeId(): Int =
+      recTypeCounter += 1
+      recTypeCounter
 
     def result(): String = sb.result()
 
@@ -226,9 +233,14 @@ object Extractors {
       case SuperType(thistpe, supertpe) =>
         this += "SuperType(" += thistpe += ", " += supertpe += ")"
       case RecursiveThis(binder) =>
-        this += "RecursiveThis(" += binder += ")"
-      case RecursiveType(underlying) =>
-        this += "RecursiveType(" += underlying += ")"
+        val id = recTypeIds.getOrElse(binder, -1)
+        if (id == -1)
+          this += "RecursiveThis(" += binder += ")"
+        else
+          this += "RecursiveThis(<rec" += id += ">)"
+      case rt @ RecursiveType(underlying) =>
+        val id = recTypeIds.getOrElseUpdate(rt, nextRecTypeId())
+        this += "RecursiveType(rec" += id += " => " += underlying += ")"
       case MethodType(argNames, argTypes, resType) =>
         this += "MethodType(" ++= argNames += ", " ++= argTypes += ", " += resType += ")"
       case PolyType(argNames, argBounds, resType) =>
diff --git a/tests/run/i22649/Macro_1.scala b/tests/run/i22649/Macro_1.scala
new file mode 100644
index 000000000000..14b94f1e7f5f
--- /dev/null
+++ b/tests/run/i22649/Macro_1.scala
@@ -0,0 +1,9 @@
+import scala.quoted.*
+
+inline def structureOf[T]: String =
+  ${ structureOfImpl[T] }
+
+private def structureOfImpl[T](using Quotes, Type[T]): Expr[String] =
+  import quotes.reflect.*
+  val str = Printer.TypeReprStructure.show(TypeRepr.of[T])
+  Expr(str)
diff --git a/tests/run/i22649/Test_2.scala b/tests/run/i22649/Test_2.scala
new file mode 100644
index 000000000000..16347ae66140
--- /dev/null
+++ b/tests/run/i22649/Test_2.scala
@@ -0,0 +1,11 @@
+@main def Test =
+  val str =
+    structureOf[{
+      type T
+      def make: T
+    }]
+
+  assert(
+    str == """RecursiveType(rec1 => Refinement(Refinement(TypeRef(ThisType(TypeRef(NoPrefix(), "lang")), "Object"), "T", TypeBounds(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Nothing"), TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Any"))), "make", ByNameType(TypeRef(RecursiveThis(<rec1>), "T"))))""",
+    s"Was $str"
+  )

From 5b3734a08639a7d49edc94f5c0b20bba68fec824 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Thu, 15 May 2025 02:37:48 -0700
Subject: [PATCH 323/505] Regression tests (#22521)

Tests for #19413, #20070 and #23122
---
 tests/neg/i19413.scala  | 14 ++++++++++++++
 tests/pos/i20070.scala  |  7 +++++++
 tests/warn/i23033.scala |  2 ++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/neg/i19413.scala
 create mode 100644 tests/pos/i20070.scala

diff --git a/tests/neg/i19413.scala b/tests/neg/i19413.scala
new file mode 100644
index 000000000000..92eb6ce611bd
--- /dev/null
+++ b/tests/neg/i19413.scala
@@ -0,0 +1,14 @@
+
+import hello.bla.* // error
+
+//transparent inline def hello: kla.type = kla // ok
+def hello: kla.type = kla
+
+object kla:
+  def ra = ???
+  object bla { val ra1 = 31 }
+
+//import kla.bla.ra1
+
+@main def test = println:
+  ra1
diff --git a/tests/pos/i20070.scala b/tests/pos/i20070.scala
new file mode 100644
index 000000000000..c3061239f6d7
--- /dev/null
+++ b/tests/pos/i20070.scala
@@ -0,0 +1,7 @@
+
+trait F[A]
+given F[Int] = new F {}
+def f[A: F] = { (x: A) => x }
+
+@main def test =
+  println(f[Int](1))
diff --git a/tests/warn/i23033.scala b/tests/warn/i23033.scala
index 33601c785c26..a2a1c515c2e1 100644
--- a/tests/warn/i23033.scala
+++ b/tests/warn/i23033.scala
@@ -9,3 +9,5 @@ object Test {
 }
 object Useful:
   given [T](using @unused ec: ExecutionContext): AnyRef with {}
+
+class i23122(@unused param: AnyRef)

From 626e87345d75276cd2a4d748330e6954055a8d42 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 19 May 2025 11:30:20 +0200
Subject: [PATCH 324/505] Regression tests (#22521)

Tests for #19413, #20070 and #23122
[Cherry-picked dfabe4f81c4da30c23ab87f9b5124965f79bd906][modified]

From f930f556806c84d5b247e37b981ab9a8796c8f53 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 13 May 2025 11:45:06 -0700
Subject: [PATCH 325/505] Improve Unit ascription escape hatch

[Cherry-picked 9e18bfeb60521d59328098f1dc9a7ddc838b3070]
---
 .../src/dotty/tools/dotc/ast/TreeInfo.scala   | 13 ++++++
 .../src/dotty/tools/dotc/typer/Typer.scala    |  5 ++-
 tests/warn/warn-value-discard.check           |  8 ++--
 tests/warn/warn-value-discard.scala           | 43 ++++++++++++++++---
 4 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
index 9efad31e9796..2582c1e86dc9 100644
--- a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
+++ b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
@@ -262,6 +262,19 @@ trait TreeInfo[T <: Untyped] { self: Trees.Instance[T] =>
     case _                            => false
   }
 
+  /** Expression was written `e: Unit` to quell warnings. Looks into adapted tree. */
+  def isAscribedToUnit(tree: Tree): Boolean =
+    import typer.Typer.AscribedToUnit
+       tree.hasAttachment(AscribedToUnit)
+    || {
+      def loop(tree: Tree): Boolean = tree match
+        case Apply(fn, _)     => fn.hasAttachment(AscribedToUnit) || loop(fn)
+        case TypeApply(fn, _) => fn.hasAttachment(AscribedToUnit) || loop(fn)
+        case Block(_, expr)   => expr.hasAttachment(AscribedToUnit) || loop(expr)
+        case _                => false
+      loop(tree)
+    }
+
   /** Does this CaseDef catch Throwable? */
   def catchesThrowable(cdef: CaseDef)(using Context): Boolean =
     catchesAllOf(cdef, defn.ThrowableType)
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index 035d57cfc230..1f1cf72e3e12 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -632,7 +632,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
       val checkedType = checkNotShadowed(ownType)
       val tree1 = checkedType match
         case checkedType: NamedType if !prefixIsElidable(checkedType) =>
-          ref(checkedType).withSpan(tree.span)
+          ref(checkedType).withSpan(tree.span).withAttachmentsFrom(tree)
         case _ =>
           tree.withType(checkedType)
       val tree2 = toNotNullTermRef(tree1, pt)
@@ -4236,7 +4236,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
            && !ctx.isAfterTyper
            && !tree.isInstanceOf[Inlined]
            && !isThisTypeResult(tree)
-           && !tree.hasAttachment(AscribedToUnit) then
+           && !isAscribedToUnit(tree)
+        then
           report.warning(ValueDiscarding(tree.tpe), tree.srcPos)
 
         return tpd.Block(tree1 :: Nil, unitLiteral)
diff --git a/tests/warn/warn-value-discard.check b/tests/warn/warn-value-discard.check
index dcd6d62c00e0..03ada5c68621 100644
--- a/tests/warn/warn-value-discard.check
+++ b/tests/warn/warn-value-discard.check
@@ -2,12 +2,12 @@
 27 |    mutable.Set.empty[String].remove("") // warn
    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |    discarded non-Unit value of type Boolean. Add `: Unit` to discard silently.
--- [E175] Potential Issue Warning: tests/warn/warn-value-discard.scala:39:41 -------------------------------------------
-39 |    mutable.Set.empty[String].subtractOne("") // warn
+-- [E175] Potential Issue Warning: tests/warn/warn-value-discard.scala:37:41 -------------------------------------------
+37 |    mutable.Set.empty[String].subtractOne("") // warn
    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |    discarded non-Unit value of type scala.collection.mutable.Set[String]. Add `: Unit` to discard silently.
--- [E175] Potential Issue Warning: tests/warn/warn-value-discard.scala:59:4 --------------------------------------------
-59 |    mutable.Set.empty[String] += "" // warn
+-- [E175] Potential Issue Warning: tests/warn/warn-value-discard.scala:57:4 --------------------------------------------
+57 |    mutable.Set.empty[String] += "" // warn
    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |    discarded non-Unit value of type scala.collection.mutable.Set[String]. Add `: Unit` to discard silently.
 -- [E175] Potential Issue Warning: tests/warn/warn-value-discard.scala:15:35 -------------------------------------------
diff --git a/tests/warn/warn-value-discard.scala b/tests/warn/warn-value-discard.scala
index 8bb9aebf515b..93c2c056b67c 100644
--- a/tests/warn/warn-value-discard.scala
+++ b/tests/warn/warn-value-discard.scala
@@ -26,11 +26,9 @@ class ValueDiscardTest:
     // --> Warning
     mutable.Set.empty[String].remove("") // warn
 
-  // TODO IMHO we don't need to support this,
-  // as it's just as easy to add a @nowarn annotation as a Unit ascription
-  //def removeAscribed(): Unit = {
-  //  mutable.Set.empty[String].remove(""): Unit    // nowarn
-  //}
+  def removeAscribed(): Unit = {
+    mutable.Set.empty[String].remove(""): Unit    // nowarn
+  }
 
   def subtract(): Unit =
     // - Set#subtractOne returns this.type
@@ -63,4 +61,37 @@ class ValueDiscardTest:
     // - receiver is a local variable
     // --> No warning
     val s: mutable.Set[String] = mutable.Set.empty[String]
-    s += ""
\ No newline at end of file
+    s += ""
+
+// see also tests/warn/21557.scala
+class UnitAscription:
+  import scala.concurrent.*, ExecutionContext.Implicits.given
+
+  case class C(c: Int):
+    def f(i: Int, j: Int = c) = i + j
+
+  def f(i: Int, j: Int = 27) = i + j
+
+  def g[A]: List[A] = Nil
+
+  def i: Int = 42
+
+  def `default arg is inline`: Unit =
+    f(i = 42): Unit // nowarn
+
+  def `default arg requires block`: Unit =
+    C(27).f(i = 42): Unit // nowarn
+
+  def `application requires implicit arg`: Unit =
+    Future(42): Unit // nowarn
+
+  def `application requires inferred type arg`: Unit =
+    g: Unit // nowarn
+
+  def `implicit selection from this`: Unit =
+    i: Unit // nowarn
+
+object UnitAscription:
+  def g[A]: List[A] = Nil
+  def `application requires inferred type arg`: Unit =
+    g: Unit // nowarn UnitAscription.g

From f0eb6e35969180f487926fddb84b7bd9528d8765 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 19 May 2025 12:41:15 +0200
Subject: [PATCH 326/505] bugfix: Fix after changes in presentation compiler

---
 .../main/dotty/tools/pc/CompletionItemResolver.scala |  2 +-
 .../src/main/dotty/tools/pc/HoverProvider.scala      | 10 +++++-----
 .../main/dotty/tools/pc/InferredTypeProvider.scala   |  2 +-
 .../main/dotty/tools/pc/PcInlayHintsProvider.scala   |  2 +-
 .../dotty/tools/pc/SymbolInformationProvider.scala   |  4 ++--
 .../tools/pc/completions/MatchCaseCompletions.scala  | 12 ++++++------
 .../tools/pc/completions/SingletonCompletions.scala  |  2 +-
 .../tools/pc/utils/InteractiveEnrichments.scala      | 10 +++++-----
 tests/pos/i20070.scala                               |  7 -------
 9 files changed, 22 insertions(+), 29 deletions(-)
 delete mode 100644 tests/pos/i20070.scala

diff --git a/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala b/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
index ffd7377c8181..f7fdb1c36e6d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
@@ -62,7 +62,7 @@ object CompletionItemResolver extends ItemResolver:
     if companion == NoSymbol || gsym.is(JavaDefined) then
       if gsymDoc.isEmpty() then
         if gsym.isAliasType then
-          fullDocstring(gsym.info.deepDealias.typeSymbol, search)
+          fullDocstring(gsym.info.deepDealiasAndSimplify.typeSymbol, search)
         else if gsym.is(Method) then
           gsym.info.finalResultType match
             case tr @ TermRef(_, sym) =>
diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
index 6c1ffa7d7fac..f26112ed9fdc 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -108,7 +108,7 @@ object HoverProvider:
             if symbol.name == nme.selectDynamic || symbol.name == nme.applyDynamic =>
           fallbackToDynamics(path, printer, contentType)
         case symbolTpes @ ((symbol, tpe, _) :: _) =>
-          val exprTpw = tpe.widenTermRefExpr.deepDealias
+          val exprTpw = tpe.widenTermRefExpr.deepDealiasAndSimplify
           val hoverString =
             tpw match
               // https://github.com/lampepfl/dotty/issues/8891
@@ -123,7 +123,7 @@ object HoverProvider:
                   if tpe != NoType then tpe
                   else tpw
 
-                printer.hoverSymbol(sym, finalTpe.deepDealias)
+                printer.hoverSymbol(sym, finalTpe.deepDealiasAndSimplify)
             end match
           end hoverString
 
@@ -177,7 +177,7 @@ object HoverProvider:
             val resultType =
               rest match
                 case Select(_, asInstanceOf) :: TypeApply(_, List(tpe)) :: _ if asInstanceOf == nme.asInstanceOfPM =>
-                    tpe.tpe.widenTermRefExpr.deepDealias
+                    tpe.tpe.widenTermRefExpr.deepDealiasAndSimplify
                 case _ if n == nme.selectDynamic => tpe.resultType
                 case _ => tpe
 
@@ -202,9 +202,9 @@ object HoverProvider:
             findRefinement(parent)
           case _ => None
 
-      val refTpe = sel.typeOpt.widen.deepDealias match
+      val refTpe = sel.typeOpt.widen.deepDealiasAndSimplify match
         case r: RefinedType => Some(r)
-        case t: (TermRef | TypeProxy) => Some(t.termSymbol.info.deepDealias)
+        case t: (TermRef | TypeProxy) => Some(t.termSymbol.info.deepDealiasAndSimplify)
         case _ => None
 
       refTpe.flatMap(findRefinement).asJava
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
index fe6d6bb436d5..bce3968a0aef 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
@@ -102,7 +102,7 @@ final class InferredTypeProvider(
           case _ => true
       if isInScope(tpe)
       then tpe
-      else tpe.deepDealias
+      else tpe.deepDealiasAndSimplify
 
     val printer = ShortenedTypePrinter(
       symbolSearch,
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 0f69e16831a0..6dcbe53570d5 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -140,7 +140,7 @@ class PcInlayHintsProvider(
             isInScope(tycon) && args.forall(isInScope)
           case _ => true
       if isInScope(tpe) then tpe
-      else tpe.deepDealias(using indexedCtx.ctx)
+      else tpe.deepDealiasAndSimplify(using indexedCtx.ctx)
 
     val dealiased = optDealias(tpe)
     val tpeStr = printer.tpe(dealiased)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala
index 8bed605a87f8..09805fc76040 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/SymbolInformationProvider.scala
@@ -11,7 +11,7 @@ import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols.*
-import dotty.tools.pc.utils.InteractiveEnrichments.deepDealias
+import dotty.tools.pc.utils.InteractiveEnrichments.deepDealiasAndSimplify
 import dotty.tools.pc.SemanticdbSymbols
 import dotty.tools.pc.utils.InteractiveEnrichments.allSymbols
 import dotty.tools.pc.utils.InteractiveEnrichments.stripBackticks
@@ -51,7 +51,7 @@ class SymbolInformationProvider(using Context):
           collect(classSym)
           visited.toList.map(SemanticdbSymbols.symbolName)
         val dealisedSymbol =
-          if sym.isAliasType then sym.info.deepDealias.typeSymbol else sym
+          if sym.isAliasType then sym.info.deepDealiasAndSimplify.typeSymbol else sym
         val classOwner =
           sym.ownersIterator.drop(1).find(s => s.isClass || s.is(Flags.Module))
         val overridden = sym.denot.allOverriddenSymbols.toList
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
index 536163d6dacb..044b1d6c73f9 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
@@ -93,7 +93,7 @@ object CaseKeywordCompletion:
                     case (Ident(v), tpe) => v.decoded == value
                     case (Select(_, v), tpe) => v.decoded == value
                     case t => false
-                  .map((_, id) => argPts(id).widen.deepDealias)
+                  .map((_, id) => argPts(id).widen.deepDealiasAndSimplify)
           /* Parent is a function expecting a case match expression */
           case TreeApply(fun, _) if !fun.tpe.isErroneous =>
             fun.tpe.paramInfoss match
@@ -103,12 +103,12 @@ object CaseKeywordCompletion:
                   ) =>
                 val args = head.argTypes.init
                 if args.length > 1 then
-                  Some(definitions.tupleType(args).widen.deepDealias)
-                else args.headOption.map(_.widen.deepDealias)
+                  Some(definitions.tupleType(args).widen.deepDealiasAndSimplify)
+                else args.headOption.map(_.widen.deepDealiasAndSimplify)
               case _ => None
           case _ => None
       case sel =>
-          Some(sel.tpe.widen.deepDealias)
+          Some(sel.tpe.widen.deepDealiasAndSimplify)
 
     selTpe
       .collect { case selTpe if selTpe != NoType =>
@@ -279,8 +279,8 @@ object CaseKeywordCompletion:
       clientSupportsSnippets
     )
 
-    val tpeStr = printer.tpe(selector.tpe.widen.deepDealias.bounds.hi)
-    val tpe = selector.typeOpt.widen.deepDealias.bounds.hi match
+    val tpeStr = printer.tpe(selector.tpe.widen.deepDealiasAndSimplify.bounds.hi)
+    val tpe = selector.typeOpt.widen.deepDealiasAndSimplify.bounds.hi match
       case tr @ TypeRef(_, _) => tr.underlying
       case t => t
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/SingletonCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/SingletonCompletions.scala
index 53c4e01980bc..621ef2e5c158 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/SingletonCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/SingletonCompletions.scala
@@ -42,7 +42,7 @@ object SingletonCompletions:
     } yield value
 
   private def collectSingletons(tpe: Type)(using Context): List[Constant] =
-    tpe.deepDealias match
+    tpe.deepDealiasAndSimplify match
       case ConstantType(value) => List(value)
       case OrType(tpe1, tpe2) =>
         collectSingletons(tpe1) ++ collectSingletons(tpe2)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
index aaf3d6ddb1e7..395c55eaaff4 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/utils/InteractiveEnrichments.scala
@@ -178,7 +178,7 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
       if sym.is(Module) then sym.companionClass else sym.companionModule
 
     def dealiasType: Symbol =
-      if sym.isType then sym.info.deepDealias.typeSymbol else sym
+      if sym.isType then sym.info.deepDealiasAndSimplify.typeSymbol else sym
 
     def nameBackticked: String = nameBackticked(Set.empty[String])
 
@@ -402,16 +402,16 @@ object InteractiveEnrichments extends CommonMtagsEnrichments:
   end extension
 
   extension (tpe: Type)
-    def deepDealias(using Context): Type =
-      tpe.dealias match
+    def deepDealiasAndSimplify(using Context): Type =
+      val dealiased = tpe.dealias match
         case app @ AppliedType(tycon, params) =>
-          AppliedType(tycon, params.map(_.deepDealias))
+          AppliedType(tycon, params.map(_.deepDealiasAndSimplify))
         case aliasingBounds: AliasingBounds =>
           aliasingBounds.derivedAlias(aliasingBounds.alias.deepDealiasAndSimplify)
         case TypeBounds(lo, hi) =>
           TypeBounds(lo.dealias, hi.dealias)
         case RefinedType(parent, name, refinedInfo) =>
-          RefinedType(parent.dealias, name, refinedInfo.deepDealias)
+          RefinedType(parent.dealias, name, refinedInfo.deepDealiasAndSimplify)
         case dealised => dealised
       dealiased.simplified
 
diff --git a/tests/pos/i20070.scala b/tests/pos/i20070.scala
deleted file mode 100644
index c3061239f6d7..000000000000
--- a/tests/pos/i20070.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-
-trait F[A]
-given F[Int] = new F {}
-def f[A: F] = { (x: A) => x }
-
-@main def test =
-  println(f[Int](1))

From 3b1284b4340e4a4900b06827bf6086197f5d0071 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 16 May 2025 10:27:51 -0700
Subject: [PATCH 327/505] Pre-tweaking

[Cherry-picked 0ba8a31bb058232416f4f19997c8703c50576c05]
---
 .../dotty/tools/backend/jvm/Primitives.scala  |  9 +++---
 .../dotc/core/classfile/ClassfileParser.scala | 28 ++++++++-----------
 .../tools/dotc/printing/Formatting.scala      |  1 +
 .../dotty/tools/dotc/reporting/messages.scala |  6 ++--
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/compiler/src/dotty/tools/backend/jvm/Primitives.scala b/compiler/src/dotty/tools/backend/jvm/Primitives.scala
index c9ddfeab24e1..b173736b946c 100644
--- a/compiler/src/dotty/tools/backend/jvm/Primitives.scala
+++ b/compiler/src/dotty/tools/backend/jvm/Primitives.scala
@@ -150,13 +150,12 @@ object Primitives {
   case object XOR extends LogicalOp
 
   /** Signals the beginning of a series of concatenations.
-    *  On the JVM platform, it should create a new StringBuffer
-    */
+   *  On the JVM platform, it should create a new StringBuilder.
+   */
   case object StartConcat extends Primitive
 
-  /**
-   * type: (buf) => STR
-   * jvm : It should turn the StringBuffer into a String.
+  /** type: (buf) => STR
+   *  jvm : It should turn the StringBuilder into a String.
    */
   case object EndConcat extends Primitive
 
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
index cd4cf3c0dd3a..d62b88bb31b5 100644
--- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
+++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
@@ -194,27 +194,21 @@ class ClassfileParser(
      *  Updates the read pointer of 'in'. */
     def parseParents: List[Type] = {
       val superType =
-        if (classRoot.symbol == defn.ComparableClass ||
-                 classRoot.symbol == defn.JavaCloneableClass ||
-                 classRoot.symbol == defn.JavaSerializableClass) {
-          // Treat these interfaces as universal traits
-          in.nextChar
+        val superClass = in.nextChar
+        // Treat these interfaces as universal traits
+        if classRoot.symbol == defn.ComparableClass
+        || classRoot.symbol == defn.JavaCloneableClass
+        || classRoot.symbol == defn.JavaSerializableClass
+        then
           defn.AnyType
-        }
         else
-          pool.getSuperClass(in.nextChar).typeRef
+          pool.getSuperClass(superClass).typeRef
       val ifaceCount = in.nextChar
-      var ifaces = for (i <- (0 until ifaceCount).toList) yield pool.getSuperClass(in.nextChar).typeRef
-        // Dotty deviation: was
-        //    var ifaces = for (i <- List.range(0, ifaceCount)) ...
-        // This does not typecheck because the type parameter of List is now lower-bounded by Int | Char.
-        // Consequently, no best implicit for the "Integral" evidence parameter of "range"
-        // is found. Previously, this worked because of weak conformance, which has been dropped.
-
+      val ifaces = List.fill(ifaceCount.toInt):
+        pool.getSuperClass(in.nextChar).typeRef
       superType :: ifaces
     }
 
-
     val result = unpickleOrParseInnerClasses()
     if (!result.isDefined) {
       var classInfo: Type = TempClassInfoType(parseParents, instanceScope, classRoot.symbol)
@@ -233,8 +227,8 @@ class ClassfileParser(
         moduleRoot.setPrivateWithin(privateWithin)
         moduleRoot.sourceModule.setPrivateWithin(privateWithin)
 
-      for (i <- 0 until in.nextChar) parseMember(method = false)
-      for (i <- 0 until in.nextChar) parseMember(method = true)
+      for (_ <- 0 until in.nextChar) parseMember(method = false)
+      for (_ <- 0 until in.nextChar) parseMember(method = true)
 
       classRoot.registerCompanion(moduleRoot.symbol)
       moduleRoot.registerCompanion(classRoot.symbol)
diff --git a/compiler/src/dotty/tools/dotc/printing/Formatting.scala b/compiler/src/dotty/tools/dotc/printing/Formatting.scala
index c88f71f2d07d..9c90a7746918 100644
--- a/compiler/src/dotty/tools/dotc/printing/Formatting.scala
+++ b/compiler/src/dotty/tools/dotc/printing/Formatting.scala
@@ -129,6 +129,7 @@ object Formatting {
       given Show[Class[?]]                            = ShowAny
       given Show[Throwable]                           = ShowAny
       given Show[StringBuffer]                        = ShowAny
+      given Show[StringBuilder]                       = ShowAny
       given Show[CompilationUnit]                     = ShowAny
       given Show[Phases.Phase]                        = ShowAny
       given Show[TyperState]                          = ShowAny
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index ecd11289c959..0cf8296e3bc8 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3098,7 +3098,7 @@ extends ReferenceMsg(CannotBeAccessedID):
       case _ =>
         i"none of the overloaded alternatives named $name can"
     val where = if (ctx.owner.exists) i" from ${ctx.owner.enclosingClass}" else ""
-    val whyNot = new StringBuffer
+    val whyNot = new StringBuilder
     for alt <- alts do
       val cls = alt.owner.enclosingSubClass
       val owner = if cls.exists then cls else alt.owner
@@ -3106,10 +3106,10 @@ extends ReferenceMsg(CannotBeAccessedID):
         if alt.is(Protected) then
           if alt.privateWithin.exists && alt.privateWithin != owner then
             if owner.is(Final) then alt.privateWithin.showLocated
-            else alt.privateWithin.showLocated + ", or " + owner.showLocated + " or one of its subclasses"
+            else s"${alt.privateWithin.showLocated}, or ${owner.showLocated} or one of its subclasses"
           else
             if owner.is(Final) then owner.showLocated
-            else owner.showLocated + " or one of its subclasses"
+            else s"${owner.showLocated} or one of its subclasses"
         else
           alt.privateWithin.orElse(owner).showLocated
       val accessMod = if alt.is(Protected) then "protected" else "private"

From ac349825c0cf9db33bd907936c746a9dac2f1c2d Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 14 May 2025 17:34:06 -0700
Subject: [PATCH 328/505] Missing ctors from class path are private

[Cherry-picked da86c2ce419f4160956dcb6fb66ea70c9e85cdf3]
---
 .../core/unpickleScala2/Scala2Unpickler.scala    | 16 ++++++++++------
 tests/neg/i15144.scala                           | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 tests/neg/i15144.scala

diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
index f1f5222b73a1..de43df8e119d 100644
--- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
@@ -64,9 +64,15 @@ object Scala2Unpickler {
     denot.info = PolyType.fromParams(denot.owner.typeParams, denot.info)
   }
 
-  def ensureConstructor(cls: ClassSymbol, clsDenot: ClassDenotation, scope: Scope)(using Context): Unit = {
-    if (scope.lookup(nme.CONSTRUCTOR) == NoSymbol) {
-      val constr = newDefaultConstructor(cls)
+  def ensureConstructor(cls: ClassSymbol, clsDenot: ClassDenotation, scope: Scope)(using Context): Unit =
+    doEnsureConstructor(cls, clsDenot, scope, fromScala2 = true)
+
+  private def doEnsureConstructor(cls: ClassSymbol, clsDenot: ClassDenotation, scope: Scope, fromScala2: Boolean)
+      (using Context): Unit =
+    if scope.lookup(nme.CONSTRUCTOR) == NoSymbol then
+      val constr =
+        if fromScala2 || cls.isAllOf(Trait | JavaDefined) then newDefaultConstructor(cls)
+        else newConstructor(cls, Private, paramNames = Nil, paramTypes = Nil)
       // Scala 2 traits have a constructor iff they have initialization code
       // In dotc we represent that as !StableRealizable, which is also owner.is(NoInits)
       if clsDenot.flagsUNSAFE.is(Trait) then
@@ -74,8 +80,6 @@ object Scala2Unpickler {
         clsDenot.setFlag(NoInits)
       addConstructorTypeParams(constr)
       cls.enter(constr, scope)
-    }
-  }
 
   def setClassInfo(denot: ClassDenotation, info: Type, fromScala2: Boolean, selfInfo: Type = NoType)(using Context): Unit = {
     val cls = denot.classSymbol
@@ -109,7 +113,7 @@ object Scala2Unpickler {
       if (tsym.exists) tsym.setFlag(TypeParam)
       else denot.enter(tparam, decls)
     }
-    if (!denot.flagsUNSAFE.isAllOf(JavaModule)) ensureConstructor(cls, denot, decls)
+    if (!denot.flagsUNSAFE.isAllOf(JavaModule)) doEnsureConstructor(cls, denot, decls, fromScala2)
 
     val scalacCompanion = denot.classSymbol.scalacLinkedClass
 
diff --git a/tests/neg/i15144.scala b/tests/neg/i15144.scala
new file mode 100644
index 000000000000..af73a9c08e03
--- /dev/null
+++ b/tests/neg/i15144.scala
@@ -0,0 +1,16 @@
+//> using options --release 11
+// test: -jvm 17+
+// Must be tested where release target < current JVM.
+// Maybe a bug that ct.sym is not used if release == JVM version.
+
+import java.time.Instant
+
+class C:
+  def f: Instant = new Instant // error
+  def g: Instant = Instant() // error
+  def p: P = new P // error
+
+class P private ()
+
+@main def test() = println:
+  C().f

From c8ed940b002d2beccb00bd5473523b3fe69bfa17 Mon Sep 17 00:00:00 2001
From: rochala <rochala@tutanota.com>
Date: Mon, 19 May 2025 13:32:18 +0200
Subject: [PATCH 329/505] Desugar doc fix

[Cherry-picked 2a683e35be0439156a33b01f2c8561ca08525562]
---
 compiler/src/dotty/tools/dotc/ast/Desugar.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
index 0f4421698240..5d3df980e7db 100644
--- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -1487,18 +1487,18 @@ object desugar {
   /** Map n-ary function `(x1: T1, ..., xn: Tn) => body` where n != 1 to unary function as follows:
    *
    *    (x$1: (T1, ..., Tn)) => {
-   *      def x1: T1 = x$1._1
+   *      val x1: T1 = x$1._1
    *      ...
-   *      def xn: Tn = x$1._n
+   *      val xn: Tn = x$1._n
    *      body
    *    }
    *
    *  or if `isGenericTuple`
    *
    *    (x$1: (T1, ... Tn) => {
-   *      def x1: T1 = x$1.apply(0)
+   *      val x1: T1 = x$1.apply(0)
    *      ...
-   *      def xn: Tn = x$1.apply(n-1)
+   *      val xn: Tn = x$1.apply(n-1)
    *      body
    *    }
    *

From 3e4b8fdb42c5159c36fd638f896745a7fead8556 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Wed, 21 May 2025 08:13:56 +0200
Subject: [PATCH 330/505] improvement: Add environement variable for those
 working on presentation-compiler or scaladoc (#23210)

I hope no one is against this, since this would be a nice improvement
over changing this every time.
[Cherry-picked a1b5d439ad2bb31df98eade2bd9a6e09271c8336]
---
 project/Build.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index 6a60918b6140..ac9c34a78e40 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -414,7 +414,7 @@ object Build {
     "scala2-library-tasty"
   )
 
-  val enableBspAllProjects = false
+  val enableBspAllProjects = sys.env.get("ENABLE_BSP_ALL_PROJECTS").map(_.toBoolean).getOrElse(false)
 
   // Settings used when compiling dotty with a non-bootstrapped dotty
   lazy val commonBootstrappedSettings = commonDottySettings ++ Seq(

From ab33bb14bfc602572c0fdcf7aac5576704c5992e Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Wed, 21 May 2025 11:19:56 +0200
Subject: [PATCH 331/505] chore: filter allowed source versions by import and
 by settings

---
 compiler/src/dotty/tools/dotc/config/SourceVersion.scala | 9 ++++++++-
 .../dotty/tools/dotc/config/ScalaSettingsTests.scala     | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
index b8fa7994ce0c..77d8ad058879 100644
--- a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
+++ b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
@@ -21,10 +21,17 @@ enum SourceVersion:
   def isAtMost(v: SourceVersion) = stable.ordinal <= v.ordinal
 
 object SourceVersion extends Property.Key[SourceVersion]:
+
   def defaultSourceVersion = `3.3`
 
+  /* Illegal source versions that may not appear in the settings `-source:<...>` */
+  val illegalInSettings = List(`never`)
+
+  /* Illegal source versions that may not appear as an import `import scala.language.<...>` */
+  val illegalInImports  = List(`never`)
+
   /** language versions that may appear in a language import, are deprecated, but not removed from the standard library. */
-  val illegalSourceVersionNames = List("3.1-migration").map(_.toTermName)
+  val illegalSourceVersionNames = "3.1-migration" :: illegalInImports.map(_.toString.toTermName)
 
   /** language versions that the compiler recognises. */
   val validSourceVersionNames = values.toList.map(_.toString.toTermName)
diff --git a/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala b/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
index d6ef59e9f00a..45038a790c37 100644
--- a/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
+++ b/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
@@ -199,4 +199,11 @@ class ScalaSettingsTests:
     )
     assertEquals(result, Right(reporting.Action.Error))
 
+  @Test def `illegal source versions are not accepted when parsing the settings`: Unit =
+    for source <- SourceVersion.illegalInSettings do
+      val settings = ScalaSettings
+      val result = settings.processArguments(List("-source", source.toString()), true)
+      assertEquals(0, result.warnings.length)
+      assertEquals(1, result.errors.length)
+
 end ScalaSettingsTests

From 0ea554bfe9a79d967ad54a4419877de8ebc41b91 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 26 May 2025 13:15:58 +0200
Subject: [PATCH 332/505] chore: filter allowed source versions by import and
 by settings

[Cherry-picked 473f8ce7adb7cbf507c618b9f2a409836f14b790][modified]

From 2b859acf299b87fa8447bab9ad84fd61d625678e Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Wed, 21 May 2025 11:57:54 +0200
Subject: [PATCH 333/505] chore: add `3.1-migration` in the compiler

[Cherry-picked acacffe872ea679aaa9b80fb3de9a24d44f8d2b3]
---
 compiler/src/dotty/tools/dotc/config/SourceVersion.scala | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
index 77d8ad058879..e36077a31579 100644
--- a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
+++ b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
@@ -6,7 +6,8 @@ import core.Decorators.*
 import util.Property
 
 enum SourceVersion:
-  case `3.0-migration`, `3.0`, `3.1` // Note: do not add `3.1-migration` here, 3.1 is the same language as 3.0.
+  case `3.0-migration`, `3.0` 
+  case `3.1-migration`, `3.1`
   case `3.2-migration`, `3.2`
   case `3.3-migration`, `3.3`
   case `future-migration`, `future`
@@ -25,10 +26,10 @@ object SourceVersion extends Property.Key[SourceVersion]:
   def defaultSourceVersion = `3.3`
 
   /* Illegal source versions that may not appear in the settings `-source:<...>` */
-  val illegalInSettings = List(`never`)
+  val illegalInSettings = List(`3.1-migration`, `never`)
 
   /* Illegal source versions that may not appear as an import `import scala.language.<...>` */
-  val illegalInImports  = List(`never`)
+  val illegalInImports  = List(`3.1-migration`, `never`)
 
   /** language versions that may appear in a language import, are deprecated, but not removed from the standard library. */
   val illegalSourceVersionNames = "3.1-migration" :: illegalInImports.map(_.toString.toTermName)

From bbe2201bdefd7e845d26687a3251d56dcd800f51 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Wed, 21 May 2025 13:26:38 +0200
Subject: [PATCH 334/505] chore: Bump mtags to 1.5.3 (#23208)

[Cherry-picked d5ca220d45608e1f6b2babd12dedda11be7aefd1]
---
 .../main/dotty/tools/pc/AutoImportsProvider.scala |  2 +-
 .../dotty/tools/pc/CompilerSearchVisitor.scala    |  4 ++--
 .../dotty/tools/pc/ExtractMethodProvider.scala    |  2 +-
 .../src/main/dotty/tools/pc/HoverProvider.scala   |  4 ++--
 .../main/dotty/tools/pc/InferExpectedType.scala   |  2 +-
 .../dotty/tools/pc/InferredTypeProvider.scala     |  2 +-
 .../dotty/tools/pc/PcInlayHintsProvider.scala     |  2 +-
 .../dotty/tools/pc/Scala3CompilerAccess.scala     |  2 +-
 .../tools/pc/ScalaPresentationCompiler.scala      | 15 ++++++++-------
 .../dotty/tools/pc/SignatureHelpProvider.scala    |  2 +-
 .../pc/completions/AmmoniteFileCompletions.scala  |  2 +-
 .../tools/pc/completions/CompletionProvider.scala |  2 +-
 .../dotty/tools/pc/completions/Completions.scala  |  2 +-
 .../pc/completions/InterpolatorCompletions.scala  |  2 +-
 .../pc/completions/MatchCaseCompletions.scala     |  2 +-
 .../pc/completions/OverrideCompletions.scala      |  2 +-
 .../tools/pc/printer/ShortenedTypePrinter.scala   |  2 +-
 .../dotty/tools/pc/base/BaseInlayHintsSuite.scala | 14 ++++++++------
 .../tools/pc/tests/CompilerCachingSuite.scala     |  4 ++--
 project/Build.scala                               |  2 +-
 20 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
index 0a6178eae106..97ec396abcf1 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala
@@ -4,7 +4,7 @@ import java.nio.file.Paths
 
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.*
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.pc.AutoImportsResultImpl
 import scala.meta.pc.*
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala b/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala
index 9fb84ee1f513..d03aeac31c88 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala
@@ -4,7 +4,7 @@ import java.util.logging.Level
 import java.util.logging.Logger
 
 import scala.meta.internal.metals.Report
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.pc.*
 import scala.util.control.NonFatal
 
@@ -35,7 +35,7 @@ class CompilerSearchVisitor(
       false
     case NonFatal(e) =>
       reports.incognito.create(
-        Report(
+        () => Report(
           "is_public",
           s"""Symbol: $sym""".stripMargin,
           e
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala
index 00cde67873d5..bd44878aa11a 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala
@@ -2,7 +2,7 @@ package dotty.tools.pc
 
 import java.nio.file.Paths
 
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.pc.ExtractMethodUtils
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.RangeParams
diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
index f26112ed9fdc..c97abb07d576 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -3,7 +3,7 @@ package dotty.tools.pc
 import java.util as ju
 
 import scala.meta.internal.metals.Report
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.pc.ScalaHover
 import scala.meta.pc.ContentType
 import scala.meta.pc.HoverSignature
@@ -86,7 +86,7 @@ object HoverProvider:
           s"$uri::$posId"
         )
       end report
-      reportContext.unsanitized.create(report, ifVerbose = true)
+      reportContext.unsanitized.create(() => report, /*ifVerbose =*/ true)
       ju.Optional.empty().nn
     else
       val skipCheckOnName =
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
index 67f7f43aa030..1483b4bc9b33 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
@@ -21,7 +21,7 @@ import dotty.tools.pc.printer.ShortenedTypePrinter
 import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.SymbolSearch
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
index bce3968a0aef..5cb85177927b 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
@@ -3,7 +3,7 @@ package dotty.tools.pc
 import java.nio.file.Paths
 
 import scala.annotation.tailrec
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.PresentationCompilerConfig
 import scala.meta.pc.SymbolSearch
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 6dcbe53570d5..0fe3b64a4f7d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -5,7 +5,7 @@ import java.nio.file.Paths
 
 import scala.annotation.tailrec
 
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 import dotty.tools.pc.printer.ShortenedTypePrinter
 import scala.meta.internal.pc.InlayHints
diff --git a/presentation-compiler/src/main/dotty/tools/pc/Scala3CompilerAccess.scala b/presentation-compiler/src/main/dotty/tools/pc/Scala3CompilerAccess.scala
index 1443fbcf37cc..f6fc48e5ae67 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/Scala3CompilerAccess.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/Scala3CompilerAccess.scala
@@ -3,7 +3,7 @@ package dotty.tools.pc
 import java.util.concurrent.ScheduledExecutorService
 
 import scala.concurrent.ExecutionContextExecutor
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.pc.CompilerAccess
 import scala.meta.pc.PresentationCompilerConfig
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index 81bad6a2976d..2f218687296f 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -15,11 +15,10 @@ import scala.jdk.CollectionConverters._
 import scala.language.unsafeNulls
 import scala.meta.internal.metals.CompilerVirtualFileParams
 import scala.meta.internal.metals.EmptyCancelToken
-import scala.meta.internal.metals.EmptyReportContext
+import scala.meta.pc.reports.EmptyReportContext
 import scala.meta.internal.metals.PcQueryContext
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.metals.ReportLevel
-import scala.meta.internal.metals.StdReportContext
 import scala.meta.internal.mtags.CommonMtagsEnrichments.*
 import scala.meta.internal.pc.CompilerAccess
 import scala.meta.internal.pc.DefinitionResultImpl
@@ -54,8 +53,11 @@ case class ScalaPresentationCompiler(
     folderPath: Option[Path] = None,
     reportsLevel: ReportLevel = ReportLevel.Info,
     completionItemPriority: CompletionItemPriority = (_: String) => 0,
+    reportContext: ReportContext = EmptyReportContext()
 ) extends PresentationCompiler:
 
+  given ReportContext = reportContext
+
   override def supportedCodeActions(): ju.List[String] = List(
      CodeActionId.ConvertToNamedArguments,
      CodeActionId.ImplementAbstractMembers,
@@ -72,10 +74,6 @@ case class ScalaPresentationCompiler(
   private val forbiddenOptions = Set("-print-lines", "-print-tasty")
   private val forbiddenDoubleOptions = Set.empty[String]
 
-  given ReportContext =
-    folderPath
-      .map(StdReportContext(_, _ => buildTargetName, reportsLevel))
-      .getOrElse(EmptyReportContext)
 
   override def codeAction[T](
     params: OffsetParams,
@@ -513,6 +511,9 @@ case class ScalaPresentationCompiler(
   def withSearch(search: SymbolSearch): PresentationCompiler =
     copy(search = search)
 
+  override def withReportContext(reportContext: ReportContext): PresentationCompiler =
+    copy(reportContext = reportContext)
+
   def withWorkspace(workspace: Path): PresentationCompiler =
     copy(folderPath = Some(workspace))
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala
index 5f925ea80ee7..423ca5d8db89 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala
@@ -13,7 +13,7 @@ import dotty.tools.pc.utils.InteractiveEnrichments.*
 import org.eclipse.lsp4j as l
 
 import scala.jdk.CollectionConverters.*
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.SymbolDocumentation
 import scala.meta.pc.SymbolSearch
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/AmmoniteFileCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/AmmoniteFileCompletions.scala
index 81337c7d8dcb..58552545355d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/AmmoniteFileCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/AmmoniteFileCompletions.scala
@@ -63,7 +63,7 @@ object AmmoniteFileCompletions:
       )
 
     def matches(file: Path): Boolean =
-      (Files.isDirectory(file) || file.toAbsolutePath().toString.isAmmoniteScript) &&
+      (Files.isDirectory(file) || file.toAbsolutePath().toString.isScalaScript) &&
         query.exists(q => CompletionFuzzy.matches(q.nn, file.getFileName().toString))
 
     (split, workspace) match
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
index ef9f77eb58fc..f1645f76cf97 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -4,7 +4,7 @@ package completions
 import java.nio.file.Path
 
 import scala.jdk.CollectionConverters._
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.PresentationCompilerConfig
 import scala.meta.pc.SymbolSearch
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
index 050ab50dae49..d7b3cf2ae50e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
@@ -5,7 +5,7 @@ import java.nio.file.Path
 import java.nio.file.Paths
 
 import scala.collection.mutable
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.mtags.CoursierComplete
 import scala.meta.internal.pc.{IdentifierComparator, MemberOrdering, CompletionFuzzy}
 import scala.meta.pc.*
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/InterpolatorCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/InterpolatorCompletions.scala
index da46e5167834..9cceff7310c6 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/InterpolatorCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/InterpolatorCompletions.scala
@@ -1,7 +1,7 @@
 package dotty.tools.pc.completions
 
 import scala.collection.mutable.ListBuffer
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.pc.CompletionFuzzy
 import scala.meta.internal.pc.InterpolationSplice
 import scala.meta.pc.PresentationCompilerConfig
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
index 044b1d6c73f9..a6122e9ba857 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
@@ -6,7 +6,7 @@ import java.net.URI
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 import scala.jdk.CollectionConverters._
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.pc.CompletionFuzzy
 import scala.meta.pc.PresentationCompilerConfig
 import scala.meta.pc.SymbolSearch
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
index 8123bc8fa216..807f959a2406 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
@@ -4,7 +4,7 @@ package completions
 import java.util as ju
 
 import scala.jdk.CollectionConverters._
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.PresentationCompilerConfig
 import scala.meta.pc.PresentationCompilerConfig.OverrideDefFormat
diff --git a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
index 91244f97673f..3d8882f5eb19 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
@@ -2,7 +2,7 @@ package dotty.tools.pc.printer
 
 import scala.collection.mutable
 import scala.meta.internal.jdk.CollectionConverters.*
-import scala.meta.internal.metals.ReportContext
+import scala.meta.pc.reports.ReportContext
 import scala.meta.internal.mtags.KeywordWrapper
 import scala.meta.pc.SymbolDocumentation
 import scala.meta.pc.SymbolSearch
diff --git a/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala
index 7d29e6c4dda9..32c6ad26c6a5 100644
--- a/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala
@@ -30,12 +30,14 @@ class BaseInlayHintsSuite extends BasePCSuite {
       withPkg.length()
     )
     val pcParams = CompilerInlayHintsParams(
-      rangeParams,
-      true,
-      true,
-      true,
-      true,
-      hintsInPatternMatch
+      rangeParams = rangeParams,
+      inferredTypes = true,
+      typeParameters = true,
+      implicitParameters = true,
+      byNameParameters = true,
+      implicitConversions = true,
+      namedParameters = true,
+      hintsInPatternMatch = hintsInPatternMatch
     )
 
     val inlayHints = presentationCompiler
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
index b2d837e2ff50..1327c8dab91e 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
@@ -8,9 +8,9 @@ import org.junit.{Before, Test}
 import scala.language.unsafeNulls
 import scala.meta.internal.metals.CompilerOffsetParams
 import scala.meta.internal.metals.EmptyCancelToken
-import scala.meta.internal.metals.EmptyReportContext
 import scala.meta.internal.metals.PcQueryContext
 import scala.meta.pc.OffsetParams
+import scala.meta.pc.reports.EmptyReportContext
 import scala.concurrent.Future
 import scala.concurrent.Await
 import scala.meta.pc.VirtualFileParams
@@ -42,7 +42,7 @@ class CompilerCachingSuite extends BasePCSuite:
         }(emptyQueryContext).get(timeout.length, timeout.unit)
       case _ => throw IllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
 
-  private def emptyQueryContext = PcQueryContext(None, () => "")(using EmptyReportContext)
+  private def emptyQueryContext = PcQueryContext(None, () => "")(using EmptyReportContext())
 
   @Before
   def beforeEach: Unit =
diff --git a/project/Build.scala b/project/Build.scala
index ac9c34a78e40..af982d26516d 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -1229,7 +1229,7 @@ object Build {
       BuildInfoPlugin.buildInfoDefaultSettings
 
   lazy val presentationCompilerSettings = {
-    val mtagsVersion = "1.5.1"
+    val mtagsVersion = "1.5.3"
     Seq(
       libraryDependencies ++= Seq(
         "org.lz4" % "lz4-java" % "1.8.0",

From eaabe52958a5ec0f93229ff7acca21fe6ebd43bb Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Tue, 20 May 2025 16:07:16 +0200
Subject: [PATCH 335/505] fix: handle multiple params lists in for infer type

---
 .../tools/dotc/config/SourceVersion.scala     |   5 +-
 .../dotty/tools/pc/ApplyArgsExtractor.scala   | 269 +++++++++++++++++
 .../tools/pc/CompilerSearchVisitor.scala      |   2 +-
 .../main/dotty/tools/pc/HoverProvider.scala   |   2 +-
 .../dotty/tools/pc/InferExpectedType.scala    |  73 +++--
 .../pc/completions/NamedArgCompletions.scala  | 284 ++----------------
 .../pc/tests/InferExpectedTypeSuite.scala     |  45 +++
 7 files changed, 371 insertions(+), 309 deletions(-)
 create mode 100644 presentation-compiler/src/main/dotty/tools/pc/ApplyArgsExtractor.scala

diff --git a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
index e36077a31579..b59d89818483 100644
--- a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
+++ b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
@@ -6,11 +6,12 @@ import core.Decorators.*
 import util.Property
 
 enum SourceVersion:
-  case `3.0-migration`, `3.0` 
+  case `3.0-migration`, `3.0`
   case `3.1-migration`, `3.1`
   case `3.2-migration`, `3.2`
   case `3.3-migration`, `3.3`
   case `future-migration`, `future`
+  case `never`    // needed for MigrationVersion.errorFrom if we never want to issue an error
 
   val isMigrating: Boolean = toString.endsWith("-migration")
 
@@ -32,7 +33,7 @@ object SourceVersion extends Property.Key[SourceVersion]:
   val illegalInImports  = List(`3.1-migration`, `never`)
 
   /** language versions that may appear in a language import, are deprecated, but not removed from the standard library. */
-  val illegalSourceVersionNames = "3.1-migration" :: illegalInImports.map(_.toString.toTermName)
+  val illegalSourceVersionNames = illegalInImports.map(_.toString.toTermName)
 
   /** language versions that the compiler recognises. */
   val validSourceVersionNames = values.toList.map(_.toString.toTermName)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ApplyArgsExtractor.scala b/presentation-compiler/src/main/dotty/tools/pc/ApplyArgsExtractor.scala
new file mode 100644
index 000000000000..9384a0b43e8b
--- /dev/null
+++ b/presentation-compiler/src/main/dotty/tools/pc/ApplyArgsExtractor.scala
@@ -0,0 +1,269 @@
+package dotty.tools.pc
+
+import scala.util.Try
+
+import dotty.tools.dotc.ast.Trees.ValDef
+import dotty.tools.dotc.ast.tpd.*
+import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Flags
+import dotty.tools.dotc.core.Flags.Method
+import dotty.tools.dotc.core.Names.Name
+import dotty.tools.dotc.core.StdNames.*
+import dotty.tools.dotc.core.SymDenotations.NoDenotation
+import dotty.tools.dotc.core.Symbols.defn
+import dotty.tools.dotc.core.Symbols.NoSymbol
+import dotty.tools.dotc.core.Symbols.Symbol
+import dotty.tools.dotc.core.Types.*
+import dotty.tools.pc.IndexedContext
+import dotty.tools.pc.utils.InteractiveEnrichments.*
+import scala.annotation.tailrec
+import dotty.tools.dotc.core.Denotations.SingleDenotation
+import dotty.tools.dotc.core.Denotations.MultiDenotation
+import dotty.tools.dotc.util.Spans.Span
+
+object ApplyExtractor:
+  def unapply(path: List[Tree])(using Context): Option[Apply] =
+    path match
+      case ValDef(_, _, _) :: Block(_, app: Apply) :: _
+          if !app.fun.isInfix => Some(app)
+      case rest =>
+        def getApplyForContextFunctionParam(path: List[Tree]): Option[Apply] =
+          path match
+            // fun(arg@@)
+            case (app: Apply) :: _ => Some(app)
+            // fun(arg@@), where fun(argn: Context ?=> SomeType)
+            // recursively matched for multiple context arguments, e.g. Context1 ?=> Context2 ?=> SomeType
+            case (_: DefDef) :: Block(List(_), _: Closure) :: rest =>
+              getApplyForContextFunctionParam(rest)
+            case _ => None
+        for
+          app <- getApplyForContextFunctionParam(rest)
+          if !app.fun.isInfix
+        yield app
+    end match
+
+
+object ApplyArgsExtractor:
+  def getArgsAndParams(
+    optIndexedContext: Option[IndexedContext],
+    apply: Apply,
+    span: Span
+  )(using Context): List[(List[Tree], List[ParamSymbol])] =
+    def collectArgss(a: Apply): List[List[Tree]] =
+      def stripContextFuntionArgument(argument: Tree): List[Tree] =
+        argument match
+          case Block(List(d: DefDef), _: Closure) =>
+            d.rhs match
+              case app: Apply =>
+                app.args
+              case b @ Block(List(_: DefDef), _: Closure) =>
+                stripContextFuntionArgument(b)
+              case _ => Nil
+          case v => List(v)
+
+      val args = a.args.flatMap(stripContextFuntionArgument)
+      a.fun match
+        case app: Apply => collectArgss(app) :+ args
+        case _ => List(args)
+    end collectArgss
+
+    val method = apply.fun
+
+    val argss = collectArgss(apply)
+
+    def fallbackFindApply(sym: Symbol) =
+      sym.info.member(nme.apply) match
+        case NoDenotation => Nil
+        case den => List(den.symbol)
+
+      // fallback for when multiple overloaded methods match the supplied args
+    def fallbackFindMatchingMethods() =
+      def matchingMethodsSymbols(
+        indexedContext: IndexedContext,
+        method: Tree
+      ): List[Symbol] =
+        method match
+          case Ident(name) => indexedContext.findSymbol(name).getOrElse(Nil)
+          case Select(This(_), name) => indexedContext.findSymbol(name).getOrElse(Nil)
+          case sel @ Select(from, name) =>
+            val symbol = from.symbol
+            val ownerSymbol =
+              if symbol.is(Method) && symbol.owner.isClass then
+                Some(symbol.owner)
+              else Try(symbol.info.classSymbol).toOption
+            ownerSymbol.map(sym =>  sym.info.member(name)).collect{
+              case single: SingleDenotation => List(single.symbol)
+              case multi: MultiDenotation => multi.allSymbols
+            }.getOrElse(Nil)
+          case Apply(fun, _) => matchingMethodsSymbols(indexedContext, fun)
+          case _ => Nil
+      val matchingMethods =
+        for
+          indexedContext <- optIndexedContext.toList
+          potentialMatch <- matchingMethodsSymbols(indexedContext, method)
+          if potentialMatch.is(Flags.Method) &&
+                potentialMatch.vparamss.length >= argss.length &&
+                Try(potentialMatch.isAccessibleFrom(apply.symbol.info)).toOption
+                  .getOrElse(false) &&
+                potentialMatch.vparamss
+                  .zip(argss)
+                  .reverse
+                  .zipWithIndex
+                  .forall { case (pair, index) =>
+                    FuzzyArgMatcher(potentialMatch.tparams)
+                      .doMatch(allArgsProvided = index != 0, span)
+                      .tupled(pair)
+                    }
+        yield potentialMatch
+      matchingMethods
+    end fallbackFindMatchingMethods
+
+    val matchingMethods: List[Symbol] =
+      if method.symbol.paramSymss.nonEmpty then
+        val allArgsAreSupplied =
+          val vparamss = method.symbol.vparamss
+          vparamss.length == argss.length && vparamss
+            .zip(argss)
+            .lastOption
+            .exists { case (baseParams, baseArgs) =>
+              baseArgs.length == baseParams.length
+            }
+        // ```
+        //  m(arg : Int)
+        //  m(arg : Int, anotherArg : Int)
+        //  m(a@@)
+        // ```
+        // complier will choose the first `m`, so we need to manually look for the other one
+        if allArgsAreSupplied then
+          val foundPotential = fallbackFindMatchingMethods()
+          if foundPotential.contains(method.symbol) then foundPotential
+          else method.symbol :: foundPotential
+        else List(method.symbol)
+      else if method.symbol.is(Method) || method.symbol == NoSymbol then
+        fallbackFindMatchingMethods()
+      else fallbackFindApply(method.symbol)
+      end if
+    end matchingMethods
+
+    matchingMethods.map { methodSym =>
+      val vparamss = methodSym.vparamss
+
+      // get params and args we are interested in
+      // e.g.
+      // in the following case, the interesting args and params are
+      // - params: [apple, banana]
+      // - args: [apple, b]
+      // ```
+      // def curry(x: Int)(apple: String, banana: String) = ???
+      // curry(1)(apple = "test", b@@)
+      // ```
+      val (baseParams0, baseArgs) =
+        vparamss.zip(argss).lastOption.getOrElse((Nil, Nil))
+
+      val baseParams: List[ParamSymbol] =
+        def defaultBaseParams = baseParams0.map(JustSymbol(_))
+        @tailrec
+        def getRefinedParams(refinedType: Type, level: Int): List[ParamSymbol] =
+          if level > 0 then
+            val resultTypeOpt =
+              refinedType match
+                case RefinedType(AppliedType(_, args), _, _) => args.lastOption
+                case AppliedType(_, args) => args.lastOption
+                case _ => None
+            resultTypeOpt match
+              case Some(resultType) => getRefinedParams(resultType, level - 1)
+              case _ => defaultBaseParams
+          else
+            refinedType match
+              case RefinedType(AppliedType(_, args), _, MethodType(ri)) =>
+                baseParams0.zip(ri).zip(args).map { case ((sym, name), arg) =>
+                  RefinedSymbol(sym, name, arg)
+                }
+              case _ => defaultBaseParams
+        // finds param refinements for lambda expressions
+        // val hello: (x: Int, y: Int) => Unit = (x, _) => println(x)
+        @tailrec
+        def refineParams(method: Tree, level: Int): List[ParamSymbol] =
+          method match
+            case Select(Apply(f, _), _) => refineParams(f, level + 1)
+            case Select(h, name) =>
+              // for Select(foo, name = apply) we want `foo.symbol`
+              if name == nme.apply then getRefinedParams(h.symbol.info, level)
+              else getRefinedParams(method.symbol.info, level)
+            case Apply(f, _) =>
+              refineParams(f, level + 1)
+            case _ => getRefinedParams(method.symbol.info, level)
+        refineParams(method, 0)
+      end baseParams
+      (baseArgs, baseParams)
+    }
+
+  extension (method: Symbol)
+    def vparamss(using Context) = method.filteredParamss(_.isTerm)
+    def tparams(using Context) = method.filteredParamss(_.isType).flatten
+    def filteredParamss(f: Symbol => Boolean)(using Context) =
+      method.paramSymss.filter(params => params.forall(f))
+sealed trait ParamSymbol:
+  def name: Name
+  def info: Type
+  def symbol: Symbol
+  def nameBackticked(using Context) = name.decoded.backticked
+
+case class JustSymbol(symbol: Symbol)(using Context) extends ParamSymbol:
+  def name: Name = symbol.name
+  def info: Type = symbol.info
+
+case class RefinedSymbol(symbol: Symbol, name: Name, info: Type)
+    extends ParamSymbol
+
+
+class FuzzyArgMatcher(tparams: List[Symbol])(using Context):
+
+  /**
+   * A heuristic for checking if the passed arguments match the method's arguments' types.
+   * For non-polymorphic methods we use the subtype relation (`<:<`)
+   * and for polymorphic methods we use a heuristic.
+   * We check the args types not the result type.
+   */
+  def doMatch(
+      allArgsProvided: Boolean,
+      span: Span
+  )(expectedArgs: List[Symbol], actualArgs: List[Tree]) =
+    (expectedArgs.length == actualArgs.length ||
+      (!allArgsProvided && expectedArgs.length >= actualArgs.length)) &&
+      actualArgs.zipWithIndex.forall {
+        case (arg: Ident, _) if arg.span.contains(span) => true
+        case (NamedArg(name, arg), _) =>
+          expectedArgs.exists { expected =>
+            expected.name == name && (!arg.hasType || arg.typeOpt.unfold
+              .fuzzyArg_<:<(expected.info))
+          }
+        case (arg, i) =>
+          !arg.hasType || arg.typeOpt.unfold.fuzzyArg_<:<(expectedArgs(i).info)
+      }
+
+  extension (arg: Type)
+    def fuzzyArg_<:<(expected: Type) =
+      if tparams.isEmpty then arg <:< expected
+      else arg <:< substituteTypeParams(expected)
+    def unfold =
+      arg match
+        case arg: TermRef => arg.underlying
+        case e => e
+
+  private def substituteTypeParams(t: Type): Type =
+    t match
+      case e if tparams.exists(_ == e.typeSymbol) =>
+        val matchingParam = tparams.find(_ == e.typeSymbol).get
+        matchingParam.info match
+          case b @ TypeBounds(_, _) => WildcardType(b)
+          case _ => WildcardType
+      case o @ OrType(e1, e2) =>
+        OrType(substituteTypeParams(e1), substituteTypeParams(e2), o.isSoft)
+      case AndType(e1, e2) =>
+        AndType(substituteTypeParams(e1), substituteTypeParams(e2))
+      case AppliedType(et, eparams) =>
+        AppliedType(et, eparams.map(substituteTypeParams))
+      case _ => t
+
+end FuzzyArgMatcher
diff --git a/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala b/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala
index d03aeac31c88..54e0ca3fc4a9 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala
@@ -34,7 +34,7 @@ class CompilerSearchVisitor(
       logger.log(Level.WARNING, err.getMessage())
       false
     case NonFatal(e) =>
-      reports.incognito.create(
+      reports.incognito.nn.create(
         () => Report(
           "is_public",
           s"""Symbol: $sym""".stripMargin,
diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
index c97abb07d576..6e8e3209c9d7 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -86,7 +86,7 @@ object HoverProvider:
           s"$uri::$posId"
         )
       end report
-      reportContext.unsanitized.create(() => report, /*ifVerbose =*/ true)
+      reportContext.unsanitized.nn.create(() => report, /*ifVerbose =*/ true)
       ju.Optional.empty().nn
     else
       val skipCheckOnName =
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
index 1483b4bc9b33..33e918d98e52 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
@@ -1,15 +1,11 @@
 package dotty.tools.pc
 
-import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.ast.tpd.*
-import dotty.tools.dotc.core.Constants.Constant
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.StdNames
-import dotty.tools.dotc.core.Symbols
 import dotty.tools.dotc.core.Symbols.defn
 import dotty.tools.dotc.core.Types.*
-import dotty.tools.dotc.core.Types.Type
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.typer.Applications.unapplyArgs
@@ -76,7 +72,7 @@ object InterCompletionType:
       case Try(block, _, _) :: rest if block.span.contains(span) => inferType(rest, span)
       case CaseDef(_, _, body) :: Try(_, cases, _) :: rest if body.span.contains(span) && cases.exists(_.span.contains(span)) => inferType(rest, span)
       case If(cond, _, _) :: rest if !cond.span.contains(span) => inferType(rest, span)
-      case If(cond, _, _) :: rest if cond.span.contains(span) => Some(Symbols.defn.BooleanType)
+      case If(cond, _, _) :: rest if cond.span.contains(span) => Some(defn.BooleanType)
       case CaseDef(_, _, body) :: Match(_, cases) :: rest if body.span.contains(span) && cases.exists(_.span.contains(span)) =>
         inferType(rest, span)
       case NamedArg(_, arg) :: rest if arg.span.contains(span) => inferType(rest, span)
@@ -97,39 +93,38 @@ object InterCompletionType:
         if ind < 0 then None
         else unapplyArgs(fun.tpe.finalResultType, fun, pats, NoSourcePosition).lift(ind)
       // f(@@)
-      case (app: Apply) :: rest =>
-        val param =
-          for {
-            ind <- app.args.zipWithIndex.collectFirst {
-              case (arg, id) if arg.span.contains(span) => id
-            }
-            params <- app.symbol.paramSymss.find(!_.exists(_.isTypeParam))
-            param <- params.get(ind)
-          } yield param.info
-        param match
-          // def f[T](a: T): T = ???
-          // f[Int](@@)
-          // val _: Int = f(@@)
-          case Some(t : TypeRef) if t.symbol.is(Flags.TypeParam) =>
-            for {
-              (typeParams, args) <-
-                app match
-                  case Apply(TypeApply(fun, args), _) =>
-                    val typeParams = fun.symbol.paramSymss.headOption.filter(_.forall(_.isTypeParam))
-                    typeParams.map((_, args.map(_.tpe)))
-                  // val f: (j: "a") => Int
-                  // f(@@)
-                  case Apply(Select(v, StdNames.nme.apply), _) =>
-                      v.symbol.info match
-                        case AppliedType(des, args) =>
-                          Some((des.typeSymbol.typeParams, args))
-                        case _ => None
-                  case _ => None
-              ind = typeParams.indexOf(t.symbol)
-              tpe <- args.get(ind)
-              if !tpe.isErroneous
-            } yield tpe
-          case Some(tpe) => Some(tpe)
-          case _ => None
+      case ApplyExtractor(app) =>
+        val argsAndParams = ApplyArgsExtractor.getArgsAndParams(None, app, span).headOption
+        argsAndParams.flatMap:
+          case (args, params) =>
+            val idx = args.indexWhere(_.span.contains(span))
+            val param =
+              if idx >= 0 && params.length > idx then Some(params(idx).info)
+              else None
+            param match
+              // def f[T](a: T): T = ???
+              // f[Int](@@)
+              // val _: Int = f(@@)
+              case Some(t : TypeRef) if t.symbol.is(Flags.TypeParam) =>
+                for
+                  (typeParams, args) <-
+                    app match
+                      case Apply(TypeApply(fun, args), _) =>
+                        val typeParams = fun.symbol.paramSymss.headOption.filter(_.forall(_.isTypeParam))
+                        typeParams.map((_, args.map(_.tpe)))
+                      // val f: (j: "a") => Int
+                      // f(@@)
+                      case Apply(Select(v, StdNames.nme.apply), _) =>
+                          v.symbol.info match
+                            case AppliedType(des, args) =>
+                              Some((des.typeSymbol.typeParams, args))
+                            case _ => None
+                      case _ => None
+                  ind = typeParams.indexOf(t.symbol)
+                  tpe <- args.get(ind)
+                  if !tpe.isErroneous
+                yield tpe
+              case Some(tpe) => Some(tpe)
+              case _ => None
       case _ => None
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
index 7b88d8edfbc8..faf6d715d8cf 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
@@ -2,37 +2,23 @@ package dotty.tools.pc.completions
 
 import scala.util.Try
 
-import dotty.tools.dotc.ast.Trees.ValDef
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.ast.untpd
 import dotty.tools.dotc.core.Constants.Constant
-import dotty.tools.dotc.core.ContextOps.localContext
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
-import dotty.tools.dotc.core.Flags.Method
 import dotty.tools.dotc.core.NameKinds.DefaultGetterName
 import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.StdNames.*
-import dotty.tools.dotc.core.SymDenotations.NoDenotation
-import dotty.tools.dotc.core.Symbols
 import dotty.tools.dotc.core.Symbols.defn
-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.AppliedType
-import dotty.tools.dotc.core.Types.MethodType
-import dotty.tools.dotc.core.Types.OrType
-import dotty.tools.dotc.core.Types.RefinedType
-import dotty.tools.dotc.core.Types.TermRef
-import dotty.tools.dotc.core.Types.Type
-import dotty.tools.dotc.core.Types.TypeBounds
-import dotty.tools.dotc.core.Types.WildcardType
+import dotty.tools.dotc.core.Types.*
 import dotty.tools.pc.IndexedContext
 import dotty.tools.pc.utils.InteractiveEnrichments.*
 import scala.annotation.tailrec
-import dotty.tools.dotc.core.Denotations.Denotation
-import dotty.tools.dotc.core.Denotations.MultiDenotation
-import dotty.tools.dotc.core.Denotations.SingleDenotation
+import dotty.tools.pc.ApplyArgsExtractor
+import dotty.tools.pc.ParamSymbol
+import dotty.tools.pc.ApplyExtractor
 
 object NamedArgCompletions:
 
@@ -43,36 +29,13 @@ object NamedArgCompletions:
       clientSupportsSnippets: Boolean,
   )(using ctx: Context): List[CompletionValue] =
     path match
-      case (ident: Ident) :: ValDef(_, _, _) :: Block(_, app: Apply) :: _
-          if !app.fun.isInfix =>
+      case (ident: Ident) :: ApplyExtractor(app) =>
         contribute(
-          Some(ident),
+          ident,
           app,
           indexedContext,
           clientSupportsSnippets,
         )
-      case (ident: Ident) :: rest =>
-        def getApplyForContextFunctionParam(path: List[Tree]): Option[Apply] =
-          path match
-            // fun(arg@@)
-            case (app: Apply) :: _ => Some(app)
-            // fun(arg@@), where fun(argn: Context ?=> SomeType)
-            // recursively matched for multiple context arguments, e.g. Context1 ?=> Context2 ?=> SomeType
-            case (_: DefDef) :: Block(List(_), _: Closure) :: rest =>
-              getApplyForContextFunctionParam(rest)
-            case _ => None
-        val contribution =
-          for
-            app <- getApplyForContextFunctionParam(rest)
-            if !app.fun.isInfix
-          yield
-            contribute(
-              Some(ident),
-              app,
-              indexedContext,
-              clientSupportsSnippets,
-            )
-        contribution.getOrElse(Nil)
       case (app: Apply) :: _ =>
         /**
          * def foo(aaa: Int, bbb: Int, ccc: Int) = ???
@@ -86,7 +49,7 @@ object NamedArgCompletions:
         untypedPath match
           case (ident: Ident) :: (app: Apply) :: _ =>
             contribute(
-              Some(ident),
+              ident,
               app,
               indexedContext,
               clientSupportsSnippets,
@@ -99,7 +62,7 @@ object NamedArgCompletions:
   end contribute
 
   private def contribute(
-      ident: Option[Ident],
+      ident: Ident,
       apply: Apply,
       indexedContext: IndexedContext,
       clientSupportsSnippets: Boolean,
@@ -110,155 +73,14 @@ object NamedArgCompletions:
         case Literal(Constant(null)) => true // nullLiteral
         case _ => false
 
-    def collectArgss(a: Apply): List[List[Tree]] =
-      def stripContextFuntionArgument(argument: Tree): List[Tree] =
-        argument match
-          case Block(List(d: DefDef), _: Closure) =>
-            d.rhs match
-              case app: Apply =>
-                app.args
-              case b @ Block(List(_: DefDef), _: Closure) =>
-                stripContextFuntionArgument(b)
-              case _ => Nil
-          case v => List(v)
-
-      val args = a.args.flatMap(stripContextFuntionArgument)
-      a.fun match
-        case app: Apply => collectArgss(app) :+ args
-        case _ => List(args)
-    end collectArgss
-
-    val method = apply.fun
-
-    val argss = collectArgss(apply)
-
-    def fallbackFindApply(sym: Symbol) =
-      sym.info.member(nme.apply) match
-        case NoDenotation => Nil
-        case den => List(den.symbol)
-
-    // fallback for when multiple overloaded methods match the supplied args
-    def fallbackFindMatchingMethods() =
-      def matchingMethodsSymbols(
-          method: Tree
-      ): List[Symbol] =
-        method match
-          case Ident(name) => indexedContext.findSymbol(name).getOrElse(Nil)
-          case Select(This(_), name) => indexedContext.findSymbol(name).getOrElse(Nil)
-          case sel @ Select(from, name) =>
-            val symbol = from.symbol
-            val ownerSymbol =
-              if symbol.is(Method) && symbol.owner.isClass then
-                Some(symbol.owner)
-              else Try(symbol.info.classSymbol).toOption
-            ownerSymbol.map(sym =>  sym.info.member(name)).collect{
-              case single: SingleDenotation => List(single.symbol)
-              case multi: MultiDenotation => multi.allSymbols
-            }.getOrElse(Nil)
-          case Apply(fun, _) => matchingMethodsSymbols(fun)
-          case _ => Nil
-      val matchingMethods =
-        for
-          potentialMatch <- matchingMethodsSymbols(method)
-          if potentialMatch.is(Flags.Method) &&
-                potentialMatch.vparamss.length >= argss.length &&
-                Try(potentialMatch.isAccessibleFrom(apply.symbol.info)).toOption
-                  .getOrElse(false) &&
-                potentialMatch.vparamss
-                  .zip(argss)
-                  .reverse
-                  .zipWithIndex
-                  .forall { case (pair, index) =>
-                    FuzzyArgMatcher(potentialMatch.tparams)
-                      .doMatch(allArgsProvided = index != 0, ident)
-                      .tupled(pair)
-                    }
-        yield potentialMatch
-      matchingMethods
-    end fallbackFindMatchingMethods
-
-    val matchingMethods: List[Symbols.Symbol] =
-      if method.symbol.paramSymss.nonEmpty then
-        val allArgsAreSupplied =
-          val vparamss = method.symbol.vparamss
-          vparamss.length == argss.length && vparamss
-            .zip(argss)
-            .lastOption
-            .exists { case (baseParams, baseArgs) =>
-              baseArgs.length == baseParams.length
-            }
-        // ```
-        //  m(arg : Int)
-        //  m(arg : Int, anotherArg : Int)
-        //  m(a@@)
-        // ```
-        // complier will choose the first `m`, so we need to manually look for the other one
-        if allArgsAreSupplied then
-          val foundPotential = fallbackFindMatchingMethods()
-          if foundPotential.contains(method.symbol) then foundPotential
-          else method.symbol :: foundPotential
-        else List(method.symbol)
-      else if method.symbol.is(Method) || method.symbol == NoSymbol then
-        fallbackFindMatchingMethods()
-      else fallbackFindApply(method.symbol)
-      end if
-    end matchingMethods
-
-    val allParams = matchingMethods.flatMap { methodSym =>
-      val vparamss = methodSym.vparamss
+    val argsAndParams = ApplyArgsExtractor.getArgsAndParams(
+      Some(indexedContext),
+      apply,
+      ident.span
+    )
 
-      // get params and args we are interested in
-      // e.g.
-      // in the following case, the interesting args and params are
-      // - params: [apple, banana]
-      // - args: [apple, b]
-      // ```
-      // def curry(x: Int)(apple: String, banana: String) = ???
-      // curry(1)(apple = "test", b@@)
-      // ```
-      val (baseParams0, baseArgs) =
-        vparamss.zip(argss).lastOption.getOrElse((Nil, Nil))
-
-      val baseParams: List[ParamSymbol] =
-        def defaultBaseParams = baseParams0.map(JustSymbol(_))
-        @tailrec
-        def getRefinedParams(refinedType: Type, level: Int): List[ParamSymbol] =
-          if level > 0 then
-            val resultTypeOpt =
-              refinedType match
-                case RefinedType(AppliedType(_, args), _, _) => args.lastOption
-                case AppliedType(_, args) => args.lastOption
-                case _ => None
-            resultTypeOpt match
-              case Some(resultType) => getRefinedParams(resultType, level - 1)
-              case _ => defaultBaseParams
-          else
-            refinedType match
-              case RefinedType(AppliedType(_, args), _, MethodType(ri)) =>
-                baseParams0.zip(ri).zip(args).map { case ((sym, name), arg) =>
-                  RefinedSymbol(sym, name, arg)
-                }
-              case _ => defaultBaseParams
-        // finds param refinements for lambda expressions
-        // val hello: (x: Int, y: Int) => Unit = (x, _) => println(x)
-        @tailrec
-        def refineParams(method: Tree, level: Int): List[ParamSymbol] =
-          method match
-            case Select(Apply(f, _), _) => refineParams(f, level + 1)
-            case Select(h, name) =>
-              // for Select(foo, name = apply) we want `foo.symbol`
-              if name == nme.apply then getRefinedParams(h.symbol.info, level)
-              else getRefinedParams(method.symbol.info, level)
-            case Apply(f, _) =>
-              refineParams(f, level + 1)
-            case _ => getRefinedParams(method.symbol.info, level)
-        refineParams(method, 0)
-      end baseParams
-
-      val args = ident
-        .map(i => baseArgs.filterNot(_ == i))
-        .getOrElse(baseArgs)
-        .filterNot(isUselessLiteral)
+    val allParams = argsAndParams.flatMap { case (baseArgs, baseParams) =>
+      val args = baseArgs.filterNot( a => a == ident || isUselessLiteral(a))
 
       @tailrec
       def isDefaultArg(t: Tree): Boolean = t match
@@ -293,9 +115,8 @@ object NamedArgCompletions:
       )
     }
 
-    val prefix = ident
-      .map(_.name.toString)
-      .getOrElse("")
+    val prefix =
+      ident.name.toString
       .replace(Cursor.value, "")
       .nn
 
@@ -330,7 +151,7 @@ object NamedArgCompletions:
         allParams.exists(param => param.name.startsWith(prefix))
       def isExplicitlyCalled = suffix.startsWith(prefix)
       def hasParamsToFill = allParams.count(!_.symbol.is(Flags.HasDefault)) > 1
-      if clientSupportsSnippets && matchingMethods.length == 1 && (shouldShow || isExplicitlyCalled) && hasParamsToFill
+      if clientSupportsSnippets && argsAndParams.length == 1 && (shouldShow || isExplicitlyCalled) && hasParamsToFill
       then
         val editText = allParams.zipWithIndex
           .collect {
@@ -375,73 +196,4 @@ object NamedArgCompletions:
     ) ::: findPossibleDefaults() ::: fillAllFields()
   end contribute
 
-  extension (method: Symbols.Symbol)
-    def vparamss(using Context) = method.filteredParamss(_.isTerm)
-    def tparams(using Context) = method.filteredParamss(_.isType).flatten
-    def filteredParamss(f: Symbols.Symbol => Boolean)(using Context) =
-      method.paramSymss.filter(params => params.forall(f))
 end NamedArgCompletions
-
-class FuzzyArgMatcher(tparams: List[Symbols.Symbol])(using Context):
-
-  /**
-   * A heuristic for checking if the passed arguments match the method's arguments' types.
-   * For non-polymorphic methods we use the subtype relation (`<:<`)
-   * and for polymorphic methods we use a heuristic.
-   * We check the args types not the result type.
-   */
-  def doMatch(
-      allArgsProvided: Boolean,
-      ident: Option[Ident]
-  )(expectedArgs: List[Symbols.Symbol], actualArgs: List[Tree]) =
-    (expectedArgs.length == actualArgs.length ||
-      (!allArgsProvided && expectedArgs.length >= actualArgs.length)) &&
-      actualArgs.zipWithIndex.forall {
-        case (arg: Ident, _) if ident.contains(arg) => true
-        case (NamedArg(name, arg), _) =>
-          expectedArgs.exists { expected =>
-            expected.name == name && (!arg.hasType || arg.typeOpt.unfold
-              .fuzzyArg_<:<(expected.info))
-          }
-        case (arg, i) =>
-          !arg.hasType || arg.typeOpt.unfold.fuzzyArg_<:<(expectedArgs(i).info)
-      }
-
-  extension (arg: Type)
-    def fuzzyArg_<:<(expected: Type) =
-      if tparams.isEmpty then arg <:< expected
-      else arg <:< substituteTypeParams(expected)
-    def unfold =
-      arg match
-        case arg: TermRef => arg.underlying
-        case e => e
-
-  private def substituteTypeParams(t: Type): Type =
-    t match
-      case e if tparams.exists(_ == e.typeSymbol) =>
-        val matchingParam = tparams.find(_ == e.typeSymbol).get
-        matchingParam.info match
-          case b @ TypeBounds(_, _) => WildcardType(b)
-          case _ => WildcardType
-      case o @ OrType(e1, e2) =>
-        OrType(substituteTypeParams(e1), substituteTypeParams(e2), o.isSoft)
-      case AndType(e1, e2) =>
-        AndType(substituteTypeParams(e1), substituteTypeParams(e2))
-      case AppliedType(et, eparams) =>
-        AppliedType(et, eparams.map(substituteTypeParams))
-      case _ => t
-
-end FuzzyArgMatcher
-
-sealed trait ParamSymbol:
-  def name: Name
-  def info: Type
-  def symbol: Symbol
-  def nameBackticked(using Context) = name.decoded.backticked
-
-case class JustSymbol(symbol: Symbol)(using Context) extends ParamSymbol:
-  def name: Name = symbol.name
-  def info: Type = symbol.info
-
-case class RefinedSymbol(symbol: Symbol, name: Name, info: Type)
-    extends ParamSymbol
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala
index ccdc68ef1cad..ba96488471b6 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala
@@ -290,3 +290,48 @@ class InferExpectedTypeSuite extends BasePCSuite:
       """|C
          |""".stripMargin // ideally A
     )
+
+  @Test def `multiple-args-lists` =
+    check(
+      """|def m(i: Int)(s: String) = ???
+         |val x = m(@@)
+         |""".stripMargin,
+      """|Int
+         |""".stripMargin
+    )
+
+  @Test def `multiple-args-lists-2` =
+    check(
+      """|def m(i: Int)(s: String) = ???
+         |val x = m(1)(@@)
+         |""".stripMargin,
+      """|String
+        |""".stripMargin
+    )
+
+  @Test def `extension-methods` =
+    check(
+      """|extension (i: Int) {
+         |  def method(s: String): Unit = ()
+         |}
+         |
+         |def testIt =
+         |  7.method(@@)
+         |""".stripMargin,
+      """|String
+         |""".stripMargin
+    )
+
+  @Test def `implicit-methods` =
+    check(
+      """|object I
+         |implicit class Xtension(i: I.type) {
+         |  def method(s: String): Unit = ()
+         |}
+         |
+         |def testIt =
+         |  I.method(@@)
+         |""".stripMargin,
+      """|String
+         |""".stripMargin
+    )

From 2f7b57d65631509d3cce8f271f6759e8960a0d23 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 26 May 2025 14:02:33 +0200
Subject: [PATCH 336/505] fix: handle multiple params lists in for infer type

[Cherry-picked 9d9e18033f3e86b7fb7c6f993b33f52dde33600b][modified]

From fddbdc76435b5fe8d6e9b4e929cf20160f6bb713 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 21 May 2025 09:46:15 +0000
Subject: [PATCH 337/505] Fix incorrect warning with -no-indent

[Cherry-picked 2072eba01ab67eed3aa4f0368510a88b00f65690]
---
 compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 2 +-
 tests/pos/i21749.scala                              | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i21749.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 26dded203710..4048e820d281 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -680,7 +680,7 @@ object Parsers {
     def checkNextNotIndented(): Unit =
       if in.isNewLine then
         val nextIndentWidth = in.indentWidth(in.next.offset)
-        if in.currentRegion.indentWidth < nextIndentWidth then
+        if in.currentRegion.indentWidth < nextIndentWidth && in.currentRegion.closedBy == OUTDENT then
           warning(em"Line is indented too far to the right, or a `{` or `:` is missing", in.next.offset)
 
 /* -------- REWRITES ----------------------------------------------------------- */
diff --git a/tests/pos/i21749.scala b/tests/pos/i21749.scala
new file mode 100644
index 000000000000..6180b629f06b
--- /dev/null
+++ b/tests/pos/i21749.scala
@@ -0,0 +1,9 @@
+//> using options -Xfatal-warnings -no-indent
+
+object Test {
+  1 match {
+    case 1 =>
+      case class Test(name: String)
+      Nil
+  }
+}

From 1928f5fd982bd82d15c6c9bb28ba4cebb2fff16f Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 9 May 2025 11:17:44 -0700
Subject: [PATCH 338/505] Mention extension in unused param warning

[Cherry-picked 2d2da2e554a82c9da9f2f1f497686409631560b6]
---
 .../dotty/tools/dotc/reporting/messages.scala | 18 ++++++++----
 .../tools/dotc/transform/CheckUnused.scala    | 10 ++++---
 tests/warn/i15503g.check                      | 28 +++++++++++++++++++
 tests/warn/i15503g.scala                      | 11 ++++++--
 4 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 tests/warn/i15503g.check

diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 0cf8296e3bc8..08e2e773b04e 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3174,23 +3174,29 @@ extends SyntaxMsg(VolatileOnValID):
 
 
 class UnusedSymbol(errorText: String, val actions: List[CodeAction] = Nil)(using Context)
-extends Message(UnusedSymbolID) {
+extends Message(UnusedSymbolID):
   def kind = MessageKind.UnusedSymbol
 
   override def msg(using Context) = errorText
   override def explain(using Context) = ""
   override def actions(using Context) = this.actions
-}
 
 object UnusedSymbol:
   def imports(actions: List[CodeAction])(using Context): UnusedSymbol = UnusedSymbol(i"unused import", actions)
   def localDefs(using Context): UnusedSymbol = UnusedSymbol(i"unused local definition")
-  def explicitParams(using Context): UnusedSymbol = UnusedSymbol(i"unused explicit parameter")
-  def implicitParams(using Context): UnusedSymbol = UnusedSymbol(i"unused implicit parameter")
+  def explicitParams(sym: Symbol)(using Context): UnusedSymbol =
+    UnusedSymbol(i"unused explicit parameter${paramAddendum(sym)}")
+  def implicitParams(sym: Symbol)(using Context): UnusedSymbol =
+    UnusedSymbol(i"unused implicit parameter${paramAddendum(sym)}")
   def privateMembers(using Context): UnusedSymbol = UnusedSymbol(i"unused private member")
   def patVars(using Context): UnusedSymbol = UnusedSymbol(i"unused pattern variable")
-  def unsetLocals(using Context): UnusedSymbol = UnusedSymbol(i"unset local variable, consider using an immutable val instead")
-  def unsetPrivates(using Context): UnusedSymbol = UnusedSymbol(i"unset private variable, consider using an immutable val instead")
+  def unsetLocals(using Context): UnusedSymbol =
+    UnusedSymbol(i"unset local variable, consider using an immutable val instead")
+  def unsetPrivates(using Context): UnusedSymbol =
+    UnusedSymbol(i"unset private variable, consider using an immutable val instead")
+  private def paramAddendum(sym: Symbol)(using Context): String =
+    if sym.denot.owner.is(ExtensionMethod) then i" in extension ${sym.denot.owner}"
+    else ""
 
 final class QuotedTypeMissing(tpe: Type)(using Context) extends StagingMessage(QuotedTypeMissingID):
 
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 6105298e4ec8..41ecd9e6c299 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -538,6 +538,8 @@ object CheckUnused:
     val warnings = ArrayBuilder.make[MessageInfo]
     def warnAt(pos: SrcPos)(msg: UnusedSymbol, origin: String = ""): Unit = warnings.addOne((msg, pos, origin))
     val infos = refInfos
+    //println(infos.defs.mkString("DEFS\n", "\n", "\n---"))
+    //println(infos.refs.mkString("REFS\n", "\n", "\n---"))
 
     def checkUnassigned(sym: Symbol, pos: SrcPos) =
       if sym.isLocalToBlock then
@@ -578,7 +580,7 @@ object CheckUnused:
             if aliasSym.isAllOf(PrivateParamAccessor, butNot = CaseAccessor) && !infos.refs(alias.symbol) then
               if aliasSym.is(Local) then
                 if ctx.settings.WunusedHas.explicits then
-                  warnAt(pos)(UnusedSymbol.explicitParams)
+                  warnAt(pos)(UnusedSymbol.explicitParams(aliasSym))
               else
                 if ctx.settings.WunusedHas.privates then
                   warnAt(pos)(UnusedSymbol.privateMembers)
@@ -592,7 +594,7 @@ object CheckUnused:
           && !sym.name.isInstanceOf[DerivedName]
           && !ctx.platform.isMainMethod(m)
         then
-          warnAt(pos)(UnusedSymbol.explicitParams)
+          warnAt(pos)(UnusedSymbol.explicitParams(sym))
       end checkExplicit
       // begin
       if !infos.skip(m)
@@ -632,9 +634,9 @@ object CheckUnused:
                  aliasSym.isAllOf(PrivateParamAccessor, butNot = CaseAccessor)
               || aliasSym.isAllOf(Protected | ParamAccessor, butNot = CaseAccessor) && m.owner.is(Given)
             if checking && !infos.refs(alias.symbol) then
-              warnAt(pos)(UnusedSymbol.implicitParams)
+              warnAt(pos)(UnusedSymbol.implicitParams(aliasSym))
         else
-          warnAt(pos)(UnusedSymbol.implicitParams)
+          warnAt(pos)(UnusedSymbol.implicitParams(sym))
 
     def checkLocal(sym: Symbol, pos: SrcPos) =
       if ctx.settings.WunusedHas.locals
diff --git a/tests/warn/i15503g.check b/tests/warn/i15503g.check
new file mode 100644
index 000000000000..105df82e8a1a
--- /dev/null
+++ b/tests/warn/i15503g.check
@@ -0,0 +1,28 @@
+-- [E198] Unused Symbol Warning: tests/warn/i15503g.scala:8:17 ---------------------------------------------------------
+8 |  private def f2(a: Int) = default_int // warn
+  |                 ^
+  |                 unused explicit parameter
+-- [E198] Unused Symbol Warning: tests/warn/i15503g.scala:9:31 ---------------------------------------------------------
+9 |  private def f3(a: Int)(using Int) = a // warn
+  |                               ^
+  |                               unused implicit parameter
+-- [E198] Unused Symbol Warning: tests/warn/i15503g.scala:10:17 --------------------------------------------------------
+10 |  private def f4(a: Int)(using Int) = default_int // warn // warn
+   |                 ^
+   |                 unused explicit parameter
+-- [E198] Unused Symbol Warning: tests/warn/i15503g.scala:10:31 --------------------------------------------------------
+10 |  private def f4(a: Int)(using Int) = default_int // warn // warn
+   |                               ^
+   |                               unused implicit parameter
+-- [E198] Unused Symbol Warning: tests/warn/i15503g.scala:11:17 --------------------------------------------------------
+11 |  private def f6(a: Int)(using Int) = summon[Int] // warn
+   |                 ^
+   |                 unused explicit parameter
+-- [E198] Unused Symbol Warning: tests/warn/i15503g.scala:23:18 --------------------------------------------------------
+23 |    def isAnIssue(y: A): Boolean = x == x // warn
+   |                  ^
+   |                  unused explicit parameter in extension method isAnIssue
+-- [E198] Unused Symbol Warning: tests/warn/i15503g.scala:29:30 --------------------------------------------------------
+29 |  extension (s: String)(using Show) // warn not used in repeat
+   |                              ^
+   |                              unused implicit parameter in extension method repeat
diff --git a/tests/warn/i15503g.scala b/tests/warn/i15503g.scala
index cfbfcdb04d1e..f63f7ea73475 100644
--- a/tests/warn/i15503g.scala
+++ b/tests/warn/i15503g.scala
@@ -1,4 +1,4 @@
-//> using options  -Wunused:params
+//> using options -Wunused:params
 
 /* This goes around the "trivial method" detection */
 object Foo {
@@ -15,10 +15,17 @@ object Foo {
   private def g2(x: Int) = ??? // OK
 }
 
-package foo.test.i17101:
+object i17101:
   type Test[A] = A
   extension[A] (x: Test[A]) { // OK
     def value: A = x
     def causesIssue: Unit = println("oh no")
     def isAnIssue(y: A): Boolean = x == x // warn
   }
+
+object i23125:
+  trait Show:
+    def show(s: String) = s
+  extension (s: String)(using Show) // warn not used in repeat
+    def echo = println(summon[Show].show(s))
+    def repeat = s * 2

From 41751cbc88888502c4c6e5a01af06d92fb4951e0 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 21 May 2025 14:01:19 +0000
Subject: [PATCH 339/505] Only keep denotation for methods in IntegrateMap

[Cherry-picked 8e14a348cdbf056e23584e7440b51eb7c48c6155]
---
 .../src/dotty/tools/dotc/core/Types.scala     |  2 +-
 tests/pos/i23217.scala                        | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i23217.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index d6521270ea3d..28995d4ddf13 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -3770,7 +3770,7 @@ object Types extends TypeUtils {
         if tp.prefix eq pre then tp
         else
           pre match
-            case ref: ParamRef if (ref.binder eq self) && tp.symbol.exists =>
+            case ref: ParamRef if (ref.binder eq self) && tp.symbol.exists && tp.symbol.is(Method) =>
               NamedType(pre, tp.name, tp.denot.asSeenFrom(pre))
             case _ =>
               tp.derivedSelect(pre)
diff --git a/tests/pos/i23217.scala b/tests/pos/i23217.scala
new file mode 100644
index 000000000000..cf3427a2649e
--- /dev/null
+++ b/tests/pos/i23217.scala
@@ -0,0 +1,20 @@
+trait HasA[T]:
+  type A = T
+
+object Test1:
+  def foo1(h: HasA[?])(a: h.A): Unit = {}
+
+  def foo2(h1: HasA[?])(a1: h1.A): Unit =
+    foo1(h1)(a1)
+
+  def foo3(h1: HasA[?], a1: h1.A): Unit =
+    foo1(h1)(a1)
+
+object Test2:
+  def bar1(h: HasA[?], a: h.A): Unit = {}
+
+  def bar2(h1: HasA[?], a1: h1.A): Unit =
+    bar1(h1, a1)
+
+  def foo3(h1: HasA[?])(a1: h1.A): Unit =
+    bar2(h1, a1)

From 580b44ad2cf5595279213bd71486f65cb754084d Mon Sep 17 00:00:00 2001
From: MatthieuSLR9 <160244482+MatthieuSLR9@users.noreply.github.com>
Date: Thu, 22 May 2025 11:12:37 +0200
Subject: [PATCH 340/505] Fix SemantiDB production of method signature with
 shadowed parameters (#23161)

---
 .../dotty/tools/dotc/semanticdb/TypeOps.scala |  6 +-
 .../dotc/config/ScalaSettingsTests.scala      |  2 +-
 .../expect/ShadowedParameters.expect.scala    | 27 ++++++
 .../expect/ShadowedParameters.scala           | 27 ++++++
 tests/semanticdb/metac.expect                 | 87 +++++++++++++++++++
 5 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 tests/semanticdb/expect/ShadowedParameters.expect.scala
 create mode 100644 tests/semanticdb/expect/ShadowedParameters.scala

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
index 2d98535657a2..11467e216aba 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
@@ -96,7 +96,11 @@ class TypeOps:
             // We try to find the "actual" binder of <y>: `inner`,
             // and register them to the symbol table with `(<y>, inner) -> <y>`
             // instead of `("y", outer) -> <y>`
-            if lam.paramNames.contains(sym.name) then
+            // We must also check for parameter shadowing such as def shadowParam(x: Int) = {val x = true}
+            // We skip param symbol check if owner is not a LambdaType for proper MatchType paramRef entry in the paramRefSymtab
+            // for more information: https://github.com/scala/scala3/pull/23161#discussion_r2097755983
+
+            if (sym.is(Flags.Param) || !sym.owner.info.isInstanceOf[LambdaType]) &&  lam.paramNames.contains(sym.name) then
               paramRefSymtab((lam, sym.name)) = sym
             else
               enterParamRef(lam.resType)
diff --git a/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala b/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
index 45038a790c37..69dffdce87ba 100644
--- a/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
+++ b/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
@@ -201,7 +201,7 @@ class ScalaSettingsTests:
 
   @Test def `illegal source versions are not accepted when parsing the settings`: Unit =
     for source <- SourceVersion.illegalInSettings do
-      val settings = ScalaSettings
+      val settings = new ScalaSettings
       val result = settings.processArguments(List("-source", source.toString()), true)
       assertEquals(0, result.warnings.length)
       assertEquals(1, result.errors.length)
diff --git a/tests/semanticdb/expect/ShadowedParameters.expect.scala b/tests/semanticdb/expect/ShadowedParameters.expect.scala
new file mode 100644
index 000000000000..10cc77d08c44
--- /dev/null
+++ b/tests/semanticdb/expect/ShadowedParameters.expect.scala
@@ -0,0 +1,27 @@
+package example
+
+class Shadow/*<-example::Shadow#*/{
+
+    def shadowParam/*<-example::Shadow#shadowParam().*/(x/*<-example::Shadow#shadowParam().(x)*/: Int/*->scala::Int#*/)= {
+        val x/*<-local0*/ = true
+    }
+
+    def curriedParams/*<-example::Shadow#curriedParams().*/(x/*<-example::Shadow#curriedParams().(x)*/: Int/*->scala::Int#*/)(y/*<-example::Shadow#curriedParams().(y)*/: List/*->scala::package.List#*/[Int/*->scala::Int#*/]) = {
+        val x/*<-local1*/ = "shadow"
+        val y/*<-local2*/ = 1
+    }
+
+
+    def multiParams/*<-example::Shadow#multiParams().*/(x/*<-example::Shadow#multiParams().(x)*/: List/*->scala::package.List#*/[Int/*->scala::Int#*/], y/*<-example::Shadow#multiParams().(y)*/: String/*->scala::Predef.String#*/) = {
+        val x/*<-local3*/ = 1
+        val y/*<-local4*/ = List/*->scala::package.List.*/(1,2,3)
+    }
+
+
+    def shadowInParamBlock/*<-example::Shadow#shadowInParamBlock().*/(x/*<-example::Shadow#shadowInParamBlock().(x)*/: Int/*->scala::Int#*/, y/*<-example::Shadow#shadowInParamBlock().(y)*/: Int/*->scala::Int#*/) = {
+        val y/*<-local5*/ = 1
+        {
+            val x/*<-local6*/ = 2
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/semanticdb/expect/ShadowedParameters.scala b/tests/semanticdb/expect/ShadowedParameters.scala
new file mode 100644
index 000000000000..3b191e1b1c3f
--- /dev/null
+++ b/tests/semanticdb/expect/ShadowedParameters.scala
@@ -0,0 +1,27 @@
+package example
+
+class Shadow{
+
+    def shadowParam(x: Int)= {
+        val x = true
+    }
+
+    def curriedParams(x: Int)(y: List[Int]) = {
+        val x = "shadow"
+        val y = 1
+    }
+    
+
+    def multiParams(x: List[Int], y: String) = {
+        val x = 1
+        val y = List(1,2,3)
+    }
+
+    
+    def shadowInParamBlock(x: Int, y: Int) = {
+        val y = 1
+        {
+            val x = 2
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 4e3dee9d79a6..80cfc754c057 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -3446,6 +3446,93 @@ Occurrences:
 [13:17..13:17): <- selfs/C6#`<init>`().
 [13:27..13:28): B -> selfs/B#
 
+expect/ShadowedParameters.scala
+-------------------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => ShadowedParameters.scala
+Text => empty
+Language => Scala
+Symbols => 20 entries
+Occurrences => 31 entries
+Diagnostics => 14 entries
+Synthetics => 1 entries
+
+Symbols:
+example/Shadow# => class Shadow extends Object { self: Shadow => +5 decls }
+example/Shadow#`<init>`(). => primary ctor <init> (): Shadow
+example/Shadow#curriedParams(). => method curriedParams (param x: Int)(param y: List[Int]): Unit
+example/Shadow#curriedParams().(x) => param x: Int
+example/Shadow#curriedParams().(y) => param y: List[Int]
+example/Shadow#multiParams(). => method multiParams (param x: List[Int], param y: String): Unit
+example/Shadow#multiParams().(x) => param x: List[Int]
+example/Shadow#multiParams().(y) => param y: String
+example/Shadow#shadowInParamBlock(). => method shadowInParamBlock (param x: Int, param y: Int): Unit
+example/Shadow#shadowInParamBlock().(x) => param x: Int
+example/Shadow#shadowInParamBlock().(y) => param y: Int
+example/Shadow#shadowParam(). => method shadowParam (param x: Int): Unit
+example/Shadow#shadowParam().(x) => param x: Int
+local0 => val local x: Boolean
+local1 => val local x: String
+local2 => val local y: Int
+local3 => val local x: Int
+local4 => val local y: List[Int]
+local5 => val local y: Int
+local6 => val local x: Int
+
+Occurrences:
+[0:8..0:15): example <- example/
+[2:6..2:12): Shadow <- example/Shadow#
+[4:4..4:4): <- example/Shadow#`<init>`().
+[4:8..4:19): shadowParam <- example/Shadow#shadowParam().
+[4:20..4:21): x <- example/Shadow#shadowParam().(x)
+[4:23..4:26): Int -> scala/Int#
+[5:12..5:13): x <- local0
+[8:8..8:21): curriedParams <- example/Shadow#curriedParams().
+[8:22..8:23): x <- example/Shadow#curriedParams().(x)
+[8:25..8:28): Int -> scala/Int#
+[8:30..8:31): y <- example/Shadow#curriedParams().(y)
+[8:33..8:37): List -> scala/package.List#
+[8:38..8:41): Int -> scala/Int#
+[9:12..9:13): x <- local1
+[10:12..10:13): y <- local2
+[14:8..14:19): multiParams <- example/Shadow#multiParams().
+[14:20..14:21): x <- example/Shadow#multiParams().(x)
+[14:23..14:27): List -> scala/package.List#
+[14:28..14:31): Int -> scala/Int#
+[14:34..14:35): y <- example/Shadow#multiParams().(y)
+[14:37..14:43): String -> scala/Predef.String#
+[15:12..15:13): x <- local3
+[16:12..16:13): y <- local4
+[16:16..16:20): List -> scala/package.List.
+[20:8..20:26): shadowInParamBlock <- example/Shadow#shadowInParamBlock().
+[20:27..20:28): x <- example/Shadow#shadowInParamBlock().(x)
+[20:30..20:33): Int -> scala/Int#
+[20:35..20:36): y <- example/Shadow#shadowInParamBlock().(y)
+[20:38..20:41): Int -> scala/Int#
+[21:12..21:13): y <- local5
+[23:16..23:17): x <- local6
+
+Diagnostics:
+[4:20..4:21): [warning] unused explicit parameter
+[5:12..5:13): [warning] unused local definition
+[8:22..8:23): [warning] unused explicit parameter
+[8:30..8:31): [warning] unused explicit parameter
+[9:12..9:13): [warning] unused local definition
+[10:12..10:13): [warning] unused local definition
+[14:20..14:21): [warning] unused explicit parameter
+[14:34..14:35): [warning] unused explicit parameter
+[15:12..15:13): [warning] unused local definition
+[16:12..16:13): [warning] unused local definition
+[20:27..20:28): [warning] unused explicit parameter
+[20:35..20:36): [warning] unused explicit parameter
+[21:12..21:13): [warning] unused local definition
+[23:16..23:17): [warning] unused local definition
+
+Synthetics:
+[16:16..16:20):List => *.apply[Int]
+
 expect/StructuralTypes.scala
 ----------------------------
 

From 04d4dc2117ae13c67e2bd4d9cdf28d0bd6146b35 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 26 May 2025 14:10:12 +0200
Subject: [PATCH 341/505] Fix SemantiDB production of method signature with
 shadowed parameters (#23161)

[Cherry-picked 3080a70b5867e4c24485d3cc1b46d1b7ef507da4][modified]

From b96a461e99fc855723e3c986bf7834caeaae995f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Rochala?=
 <48657087+rochala@users.noreply.github.com>
Date: Thu, 22 May 2025 11:44:18 +0200
Subject: [PATCH 342/505] Fix completion mode filtering + optimize
 scopeCompletions (#23172)

I've changed scopeCompletions to lazy val to memoize because I beliveve
we don't need to recompute it. The actual fix is at the comment. There
is no need to create a new Completer just to filter all of remaining
completions at later stage.

Fixes #23150
---
 .../tools/dotc/interactive/Completion.scala   | 19 ++++++++------
 .../pc/tests/completion/CompletionSuite.scala | 25 +++++++++++++++++++
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index 81afc68e2342..c841184675fc 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -242,9 +242,7 @@ object Completion:
       case tpd.Select(qual @ tpd.This(_), _) :: _ if qual.span.isSynthetic      => completer.scopeCompletions.names
       case StringContextApplication(qual) =>
         completer.scopeCompletions.names ++ completer.selectionCompletions(qual)
-      case tpd.Select(qual, _) :: _               if qual.typeOpt.hasSimpleKind =>
-        completer.selectionCompletions(qual)
-      case tpd.Select(qual, _) :: _                                             => Map.empty
+      case tpd.Select(qual, _) :: _                                             => completer.selectionCompletions(qual)
       case (tree: tpd.ImportOrExport) :: _                                      => completer.directMemberCompletions(tree.expr)
       case _                                                                    => completer.scopeCompletions.names
 
@@ -367,7 +365,7 @@ object Completion:
    *  For the results of all `xyzCompletions` methods term names and type names are always treated as different keys in the same map
    *  and they never conflict with each other.
    */
-  class Completer(val mode: Mode, pos: SourcePosition, untpdPath: List[untpd.Tree], matches: Name => Boolean):
+  class Completer(val mode: Mode, pos: SourcePosition, untpdPath: List[untpd.Tree], matches: Name => Boolean)(using Context):
     /** Completions for terms and types that are currently in scope:
      *  the members of the current class, local definitions and the symbols that have been imported,
      *  recursively adding completions from outer scopes.
@@ -381,7 +379,7 @@ object Completion:
      *    (even if the import follows it syntactically)
      *  - a more deeply nested import shadowing a member or a local definition causes an ambiguity
      */
-    def scopeCompletions(using context: Context): CompletionResult =
+    lazy val scopeCompletions: CompletionResult =
 
       /** Temporary data structure representing denotations with the same name introduced in a given scope
        *  as a member of a type, by a local definition or by an import clause
@@ -475,9 +473,15 @@ object Completion:
     def selectionCompletions(qual: tpd.Tree)(using Context): CompletionMap =
       val adjustedQual = widenQualifier(qual)
 
-      implicitConversionMemberCompletions(adjustedQual) ++
+      if qual.symbol.is(Package) then
+        directMemberCompletions(adjustedQual)
+      else if qual.typeOpt.hasSimpleKind then
+        implicitConversionMemberCompletions(adjustedQual) ++
         extensionCompletions(adjustedQual) ++
         directMemberCompletions(adjustedQual)
+      else
+        Map.empty
+
 
     /** Completions for members of `qual`'s type.
      *  These include inherited definitions but not members added by extensions or implicit conversions
@@ -584,8 +588,7 @@ object Completion:
       // There are four possible ways for an extension method to be applicable
 
       // 1. The extension method is visible under a simple name, by being defined or inherited or imported in a scope enclosing the reference.
-      val termCompleter = new Completer(Mode.Term, pos, untpdPath, matches)
-      val extMethodsInScope = termCompleter.scopeCompletions.names.toList.flatMap:
+      val extMethodsInScope = scopeCompletions.names.toList.flatMap:
         case (name, denots) => denots.collect:
           case d: SymDenotation if d.isTerm && d.termRef.symbol.is(Extension) => (d.termRef, name.asTermName)
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
index 1bae825f7fde..84ee3129b0ea 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -2203,3 +2203,28 @@ class CompletionSuite extends BaseCompletionSuite:
         |""".stripMargin,
       ""
     )
+
+  @Test def `no-completions-on-package-selection` =
+    check(
+      """package one.@@
+        |""".stripMargin,
+      ""
+    )
+
+  @Test def `no-extension-completion-on-packages` =
+    check(
+      """object M:
+        |  scala.runt@@
+        |""".stripMargin,
+      """runtime scala
+        |PartialFunction scala""".stripMargin // those are the actual members of scala
+    )
+
+  @Test def `no-extension-completions-on-package-objects` =
+    check(
+      """package object magic { def test: Int = ??? }
+        |object M:
+        |  magic.@@
+        |""".stripMargin,
+      "test: Int"
+    )

From 708d541cab1e6aacee4a7912fdefcfc7a9ec8af8 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 26 May 2025 14:21:11 +0200
Subject: [PATCH 343/505] Fix completion mode filtering + optimize
 scopeCompletions (#23172)

I've changed scopeCompletions to lazy val to memoize because I beliveve
we don't need to recompute it. The actual fix is at the comment. There
is no need to create a new Completer just to filter all of remaining
completions at later stage.

Fixes #23150
[Cherry-picked 1eee888622273a1d0f8cd1053f8ce1029c4f0193][modified]

From c8842f2f8e45cd4532010dcb83991a485448ee77 Mon Sep 17 00:00:00 2001
From: Alexander <azazf93@gmail.com>
Date: Tue, 20 May 2025 22:37:24 +0300
Subject: [PATCH 344/505] Fix #20335: Try extension or implicit conversion for
 arguments with type mismatch error

[Cherry-picked 063209676d5effb2b2fbcbebd70546ef8854a734]
---
 .../dotty/tools/dotc/reporting/messages.scala |  2 +-
 .../dotty/tools/dotc/typer/ProtoTypes.scala   | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 08e2e773b04e..2fe847d6aff1 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -60,7 +60,7 @@ trait ShowMatchTrace(tps: Type*)(using Context) extends Message:
   override def msgPostscript(using Context): String =
     super.msgPostscript ++ matchReductionAddendum(tps*)
 
-abstract class TypeMismatchMsg(found: Type, expected: Type)(errorId: ErrorMessageID)(using Context)
+abstract class TypeMismatchMsg(found: Type, val expected: Type)(errorId: ErrorMessageID)(using Context)
 extends Message(errorId), ShowMatchTrace(found, expected):
   def kind = MessageKind.TypeMismatch
   def explain(using Context) = err.whyNoMatchStr(found, expected)
diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
index db2faa2b28fd..61029e7ae255 100644
--- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -391,21 +391,25 @@ object ProtoTypes {
      *    - t2 is a ascription (t22: T) and t1 is at the outside of t22
      *    - t2 is a closure (...) => t22 and t1 is at the outside of t22
      */
-    def hasInnerErrors(t: Tree)(using Context): Boolean = t match
-      case Typed(expr, tpe) => hasInnerErrors(expr)
-      case closureDef(mdef) => hasInnerErrors(mdef.rhs)
+    def hasInnerErrors(t: Tree, argType: Option[Type])(using Context): Boolean = t match
+      case Typed(expr, tpe) => hasInnerErrors(expr, argType)
+      case closureDef(mdef) => hasInnerErrors(mdef.rhs, argType)
       case _ =>
         t.existsSubTree { t1 =>
           if t1.typeOpt.isError
             && t.span.toSynthetic != t1.span.toSynthetic
             && t.typeOpt != t1.typeOpt then
             typr.println(i"error subtree $t1 of $t with ${t1.typeOpt}, spans = ${t1.span}, ${t.span}")
-            true
+            t1.typeOpt match
+              case errorType: ErrorType if errorType.msg.isInstanceOf[TypeMismatchMsg] =>
+                val typeMismtachMsg = errorType.msg.asInstanceOf[TypeMismatchMsg]
+                !argType.contains(typeMismtachMsg.expected)
+              case _ => true
           else
             false
         }
 
-    private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean)(using Context): Tree = {
+    private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean, argType: Option[Type])(using Context): Tree = {
       var targ = state.typedArg(arg)
       if (targ == null)
         untpd.functionWithUnknownParamType(arg) match {
@@ -423,7 +427,7 @@ object ProtoTypes {
             targ = typerFn(arg)
             // TODO: investigate why flow typing is not working on `targ`
             if ctx.reporter.hasUnreportedErrors then
-              if hasInnerErrors(targ.nn) then
+              if hasInnerErrors(targ.nn, argType) then
                 state.errorArgs += arg
             else
               state.typedArg = state.typedArg.updated(arg, targ.nn)
@@ -451,7 +455,7 @@ object ProtoTypes {
           val protoTyperState = ctx.typerState
           val oldConstraint = protoTyperState.constraint
           val args1 = args.mapWithIndexConserve((arg, idx) =>
-            cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false))
+            cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false, None))
           val newConstraint = protoTyperState.constraint
 
           if !args1.exists(arg => isUndefined(arg.tpe)) then state.typedArgs = args1
@@ -498,7 +502,8 @@ object ProtoTypes {
       val locked = ctx.typerState.ownedVars
       val targ = cacheTypedArg(arg,
         typer.typedUnadapted(_, wideFormal, locked)(using argCtx),
-        force = true)
+        force = true,
+        Some(wideFormal))
       val targ1 = typer.adapt(targ, wideFormal, locked)
       if wideFormal eq formal then targ1
       else checkNoWildcardCaptureForCBN(targ1)

From 7650d0aae052bc3b090b15495762467ff7bea26f Mon Sep 17 00:00:00 2001
From: Alexander <azazf93@gmail.com>
Date: Wed, 21 May 2025 20:11:48 +0300
Subject: [PATCH 345/505] add test case for #20335

[Cherry-picked 6fcab69e758e050a687731abd98de063ac44324a]
---
 .../src/dotty/tools/dotc/typer/ProtoTypes.scala    | 13 ++++++++-----
 tests/pos/i20335.scala                             | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 tests/pos/i20335.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
index 61029e7ae255..f8bbd6989a0f 100644
--- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -391,7 +391,7 @@ object ProtoTypes {
      *    - t2 is a ascription (t22: T) and t1 is at the outside of t22
      *    - t2 is a closure (...) => t22 and t1 is at the outside of t22
      */
-    def hasInnerErrors(t: Tree, argType: Option[Type])(using Context): Boolean = t match
+    def hasInnerErrors(t: Tree, argType: Type)(using Context): Boolean = t match
       case Typed(expr, tpe) => hasInnerErrors(expr, argType)
       case closureDef(mdef) => hasInnerErrors(mdef.rhs, argType)
       case _ =>
@@ -402,14 +402,17 @@ object ProtoTypes {
             typr.println(i"error subtree $t1 of $t with ${t1.typeOpt}, spans = ${t1.span}, ${t.span}")
             t1.typeOpt match
               case errorType: ErrorType if errorType.msg.isInstanceOf[TypeMismatchMsg] =>
+                // if error is caused by an argument type mismatch,
+                // then return false to try to find an extension.
+                // see i20335.scala for test case.
                 val typeMismtachMsg = errorType.msg.asInstanceOf[TypeMismatchMsg]
-                !argType.contains(typeMismtachMsg.expected)
+                argType != typeMismtachMsg.expected
               case _ => true
           else
             false
         }
 
-    private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean, argType: Option[Type])(using Context): Tree = {
+    private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean, argType: Type)(using Context): Tree = {
       var targ = state.typedArg(arg)
       if (targ == null)
         untpd.functionWithUnknownParamType(arg) match {
@@ -455,7 +458,7 @@ object ProtoTypes {
           val protoTyperState = ctx.typerState
           val oldConstraint = protoTyperState.constraint
           val args1 = args.mapWithIndexConserve((arg, idx) =>
-            cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false, None))
+            cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false, NoType))
           val newConstraint = protoTyperState.constraint
 
           if !args1.exists(arg => isUndefined(arg.tpe)) then state.typedArgs = args1
@@ -503,7 +506,7 @@ object ProtoTypes {
       val targ = cacheTypedArg(arg,
         typer.typedUnadapted(_, wideFormal, locked)(using argCtx),
         force = true,
-        Some(wideFormal))
+        wideFormal)
       val targ1 = typer.adapt(targ, wideFormal, locked)
       if wideFormal eq formal then targ1
       else checkNoWildcardCaptureForCBN(targ1)
diff --git a/tests/pos/i20335.scala b/tests/pos/i20335.scala
new file mode 100644
index 000000000000..81d1cbd9f760
--- /dev/null
+++ b/tests/pos/i20335.scala
@@ -0,0 +1,14 @@
+import java.time.OffsetDateTime
+import scala.concurrent.duration.*
+
+val dateTime: OffsetDateTime = OffsetDateTime.now()
+
+implicit class DateTimeOps(val dateTime: OffsetDateTime) {
+  def plus(amount: FiniteDuration): OffsetDateTime =
+    dateTime
+}
+
+def test = {
+  dateTime.plus(Duration.Zero)
+  dateTime.plus(if (true) Duration.Zero else Duration.Zero)
+}
\ No newline at end of file

From f06448c05e18f59986ec0d84f158768ff58aa49a Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Mon, 19 May 2025 18:00:54 +0200
Subject: [PATCH 346/505] chore: have a better error message when context
 bounds are not allowed

Co-authored-by: ajafri2001 <abdullahjafri2001@gmail.com>
Co-authored-by: jan-pieter <jpieter@gmail.com>
---
 .../src/dotty/tools/dotc/parsing/Parsers.scala | 11 ++++++++---
 .../tools/dotc/reporting/ErrorMessageID.scala  |  3 +++
 .../dotty/tools/dotc/reporting/messages.scala  |  8 ++++++++
 tests/neg/i22552.check                         | 18 +++++++++---------
 tests/neg/i22660.check                         |  4 ++++
 tests/neg/i22660.scala                         |  2 ++
 6 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 tests/neg/i22660.check
 create mode 100644 tests/neg/i22660.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 4048e820d281..03bba910e348 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -67,7 +67,6 @@ object Parsers {
       this == Given || this == ExtensionFollow
     def acceptsVariance =
       this == Class || this == CaseClass || this == Type
-
   end ParamOwner
 
   enum ParseKind:
@@ -3283,7 +3282,7 @@ object Parsers {
         ok
 
       def typeParam(): TypeDef = {
-        val isAbstractOwner = paramOwner == ParamOwner.Type || paramOwner == ParamOwner.TypeParam
+        val isAbstractOwner = (paramOwner == ParamOwner.Type || paramOwner == ParamOwner.TypeParam)
         val start = in.offset
         var mods = annotsAsMods() | Param
         if paramOwner == ParamOwner.Class || paramOwner == ParamOwner.CaseClass then
@@ -3304,7 +3303,13 @@ object Parsers {
             }
             else ident().toTypeName
           val hkparams = typeParamClauseOpt(ParamOwner.Type)
-          val bounds = if (isAbstractOwner) typeBounds() else typeParamBounds(name)
+          // val bounds = if (isAbstractOwner) typeBounds() else typeParamBounds(name)
+          val bounds = typeParamBounds(name) match
+            case bounds: TypeBoundsTree => bounds
+            case bounds: ContextBounds if !isAbstractOwner => bounds
+            case ContextBounds(bounds, cxBounds) =>
+              for cbound <- cxBounds do  report.error(IllegalContextBounds(), cbound.srcPos)
+              bounds
           TypeDef(name, lambdaAbstract(hkparams, bounds)).withMods(mods)
         }
       }
diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index d3ac238fbc5c..896e00a46053 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -225,6 +225,9 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case FormatInterpolationErrorID // errorNumber: 209
   case ValueClassCannotExtendAliasOfAnyValID // errorNumber: 210
   case MatchIsNotPartialFunctionID // errorNumber: 211
+  case OnlyFullyDependentAppliedConstructorTypeID // errorNumber: 212
+  case PointlessAppliedConstructorTypeID // errorNumber: 213
+  case IllegalContextBoundsID // errorNumber: 214
 
   def errorNumber = ordinal - 1
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 2fe847d6aff1..71ab24cf4941 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3255,3 +3255,11 @@ class MatchIsNotPartialFunction(using Context) extends SyntaxMsg(MatchIsNotParti
        |
        |Efficient operations will use `applyOrElse` to avoid computing the match twice,
        |but the `apply` body would be executed "per element" in the example."""
+
+final class IllegalContextBounds(using Context) extends SyntaxMsg(IllegalContextBoundsID):
+  override protected def msg(using Context): String =
+    i"Context bounds are not allowed in this position"
+
+  override protected def explain(using Context): String = ""
+
+end IllegalContextBounds
diff --git a/tests/neg/i22552.check b/tests/neg/i22552.check
index 910c8ad44c11..f6713b480699 100644
--- a/tests/neg/i22552.check
+++ b/tests/neg/i22552.check
@@ -1,12 +1,12 @@
--- [E040] Syntax Error: tests/neg/i22552.scala:3:10 --------------------------------------------------------------------
+-- [E214] Syntax Error: tests/neg/i22552.scala:3:10 --------------------------------------------------------------------
 3 |  type A[X: TC]                     // error
-  |          ^
-  |          ']' expected, but ':' found
--- [E040] Syntax Error: tests/neg/i22552.scala:4:13 --------------------------------------------------------------------
+  |          ^^^^
+  |          Context bounds are not allowed in this position
+-- [E214] Syntax Error: tests/neg/i22552.scala:4:13 --------------------------------------------------------------------
 4 |  type C = [X: TC] =>> List[X]      // error
-  |             ^
-  |             ']' expected, but ':' found
--- [E040] Syntax Error: tests/neg/i22552.scala:5:13 --------------------------------------------------------------------
+  |             ^^^^
+  |             Context bounds are not allowed in this position
+-- [E214] Syntax Error: tests/neg/i22552.scala:5:13 --------------------------------------------------------------------
 5 |  type D = [X: TC] => () => List[X] // error
-  |             ^
-  |             ']' expected, but ':' found
+  |             ^^^^
+  |             Context bounds are not allowed in this position
diff --git a/tests/neg/i22660.check b/tests/neg/i22660.check
new file mode 100644
index 000000000000..22c8b68654e3
--- /dev/null
+++ b/tests/neg/i22660.check
@@ -0,0 +1,4 @@
+-- [E214] Syntax Error: tests/neg/i22660.scala:2:10 --------------------------------------------------------------------
+2 |type Foo[T: Equatable] // error
+  |          ^^^^^^^^^^^
+  |          Context bounds are not allowed in this position
diff --git a/tests/neg/i22660.scala b/tests/neg/i22660.scala
new file mode 100644
index 000000000000..650ceac4f48c
--- /dev/null
+++ b/tests/neg/i22660.scala
@@ -0,0 +1,2 @@
+trait Equatable[T]
+type Foo[T: Equatable] // error

From 0a3abeefb5495262144d6c416ce8653da1c2ebac Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 26 May 2025 14:51:27 +0200
Subject: [PATCH 347/505] chore: have a better error message when context
 bounds are not allowed

Co-authored-by: ajafri2001 <abdullahjafri2001@gmail.com>
Co-authored-by: jan-pieter <jpieter@gmail.com>

[Cherry-picked 7294607fed48226f1237ad1db53d8dd9cab16921][modified]

From fba0da3c05f32bc59f1fea10ac1e2c3492d224e4 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Fri, 23 May 2025 10:06:07 +0200
Subject: [PATCH 348/505] Tighten condition when to do SAM type conversion

 - No conversion from contextual lambdas
 - No conversion after erasure

Fixes #23234

[Cherry-picked 5170dca03f12f8c2b070f9250fc9e39fbc130d3e]
---
 compiler/src/dotty/tools/dotc/typer/Typer.scala | 3 ++-
 tests/neg-custom-args/captures/i23234.scala     | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 tests/neg-custom-args/captures/i23234.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index 1f1cf72e3e12..b89dea1276be 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -1701,7 +1701,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
           case mt: MethodType =>
             pt.findFunctionType match {
               case SAMType(samMeth, samParent)
-              if !defn.isFunctionNType(samParent) && mt <:< samMeth =>
+              if !ctx.erasedTypes && !defn.isFunctionNType(samParent)
+                  && mt <:< samMeth && !mt.isImplicitMethod =>
                 if defn.isContextFunctionType(mt.resultType) then
                   report.error(
                     em"""Implementation restriction: cannot convert this expression to `$samParent`
diff --git a/tests/neg-custom-args/captures/i23234.scala b/tests/neg-custom-args/captures/i23234.scala
new file mode 100644
index 000000000000..61d7123c8b78
--- /dev/null
+++ b/tests/neg-custom-args/captures/i23234.scala
@@ -0,0 +1,5 @@
+abstract class MyFun:
+  def apply(x: Int): Int
+
+object Test:
+  val myFun: MyFun = (x: Int) ?=> x + 10 // error
\ No newline at end of file

From 545917ef929053a011dac3db7c541dbf2362d767 Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Thu, 22 May 2025 13:36:07 +0200
Subject: [PATCH 349/505] Try to handle SkolemTypes in SingletonTypeTree during
 pickling

[Cherry-picked 1f839bb2bacade9abcfc6329e94eabb388870423]
---
 .../src/dotty/tools/dotc/core/tasty/TreePickler.scala    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
index 75fcaaf544a3..0ebe67834b36 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
@@ -630,8 +630,13 @@ class TreePickler(pickler: TastyPickler) {
         case tree: TypeTree =>
           pickleType(tree.tpe)
         case SingletonTypeTree(ref) =>
-          writeByte(SINGLETONtpt)
-          pickleTree(ref)
+          val tp = ref.tpe
+          val tp1 = tp.deskolemized
+          if tp1 ne tp then
+            pickleType(tp1)
+          else
+            writeByte(SINGLETONtpt)
+            pickleTree(ref)
         case RefinedTypeTree(parent, refinements) =>
           if (refinements.isEmpty) pickleTree(parent)
           else {

From 79f047a9f75b1d2751fa59cf65073776c3c93f42 Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Thu, 22 May 2025 13:48:00 +0200
Subject: [PATCH 350/505] Add test

[Cherry-picked 23c094edde7b07c4793b1373637dcd940e4a4ced]
---
 tests/pos/i23194.scala | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tests/pos/i23194.scala

diff --git a/tests/pos/i23194.scala b/tests/pos/i23194.scala
new file mode 100644
index 000000000000..347b98efd877
--- /dev/null
+++ b/tests/pos/i23194.scala
@@ -0,0 +1,14 @@
+class R[T] extends annotation.StaticAnnotation
+
+class A[T]:
+  val next: A[T] = null
+  val self: this.type = this
+  val selfnext: this.next.type = this.next
+  def f: (A[T] @R[this.type], A[T] @R[this.next.type]) = ???
+  def g: (A[T] @R[self.type], A[T] @R[selfnext.type]) = ???
+
+class Test:
+  def test =
+    val (a, b) = A[String]().f
+    val (a2, b2) = A[String]().g
+  
\ No newline at end of file

From ce21145c1372e1d9429d59d895775308b4c22720 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 26 May 2025 16:15:33 +0200
Subject: [PATCH 351/505] bugfix: Fix issues with tests

---
 compiler/src/dotty/tools/dotc/config/ScalaSettings.scala | 3 ++-
 tests/neg/indentRight.scala                              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index 075ea2423f86..4e544718645b 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -37,7 +37,8 @@ object ScalaSettings:
     ScalaRelease.values.toList.map(_.show)
 
   def supportedSourceVersions: List[String] =
-    SourceVersion.values.toList.map(_.toString)
+    SourceVersion.values.diff(SourceVersion.illegalInSettings)
+      .map(_.toString).toList
 
   def defaultClasspath: String = sys.env.getOrElse("CLASSPATH", ".")
 
diff --git a/tests/neg/indentRight.scala b/tests/neg/indentRight.scala
index 8eb9deb23389..e76c83a02c23 100644
--- a/tests/neg/indentRight.scala
+++ b/tests/neg/indentRight.scala
@@ -24,8 +24,8 @@ object Test {
   }
 
   trait A
-    case class B() extends A  // error: Line is indented too far to the right
-    case object C extends A   // error: Line is indented too far to the right
+    case class B() extends A
+    case object C extends A
 
   if (true)   // OK
     println("hi")

From df218e4720f16312a1ca0825de5d8d24c17d50c0 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Fri, 30 May 2025 10:29:16 +0200
Subject: [PATCH 352/505] Upgrade sbt to 1.11.0

[Cherry-picked bd6d784f4a3fe5ce3472fa3ae04ead4c31bfefe1]
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 73df629ac1a7..6520f6981d5a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.11.0

From 2edb6363a27573eed45f5ffa84395bd179a95810 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Fri, 30 May 2025 10:30:23 +0200
Subject: [PATCH 353/505] Use sbt built-in sonatype central releasing instead
 of using xerial/sbt-sonatype plugin

---
 .github/workflows/ci.yaml | 4 ++--
 project/Build.scala       | 7 +++++--
 project/plugins.sbt       | 2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b22a44c7db7c..fdd3fa99f764 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -605,7 +605,7 @@ jobs:
       - name: Publish Nightly
         if: "steps.not_yet_published.outcome == 'success'"
         run: |
-          ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease"
+          ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaRelease"
 
   nightly_documentation:
     runs-on: [self-hosted, Linux]
@@ -746,7 +746,7 @@ jobs:
           ./dist/target/sha256sum.txt
 
       - name: Publish Release
-        run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleUpload"
+        run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload"
 
 
   open_issue_on_failure:
diff --git a/project/Build.scala b/project/Build.scala
index af982d26516d..d6a97933362b 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -16,7 +16,6 @@ import sbt.plugins.SbtPlugin
 import sbt.ScriptedPlugin.autoImport._
 import xerial.sbt.pack.PackPlugin
 import xerial.sbt.pack.PackPlugin.autoImport._
-import xerial.sbt.Sonatype.autoImport._
 import com.typesafe.tools.mima.plugin.MimaPlugin.autoImport._
 import org.scalajs.sbtplugin.ScalaJSPlugin
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
@@ -1915,7 +1914,11 @@ object Build {
   lazy val publishSettings = Seq(
     publishMavenStyle := true,
     isSnapshot := version.value.contains("SNAPSHOT"),
-    publishTo := sonatypePublishToBundle.value,
+    publishTo := {
+      val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
+      if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
+      else localStaging.value
+    },
     publishConfiguration ~= (_.withOverwrite(true)),
     publishLocalConfiguration ~= (_.withOverwrite(true)),
     projectID ~= {id =>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f8e2aa37126b..3ce5f69d81c1 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,8 +8,6 @@ libraryDependencySchemes +=
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
-
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.17")

From b5cf0658982e693d5228c6ca7fe3263b23145989 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 2 Jun 2025 13:46:10 +0200
Subject: [PATCH 354/505] Use sbt built-in sonatype central releasing instead
 of using xerial/sbt-sonatype plugin

[Cherry-picked cf83d87cd09de0c94f9bab85ad592c78aca4867f][modified]

From 336101428f11afb6296d44b498f156ae306354c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zieli=C5=84ski=20Patryk?=
 <75637004+zielinsky@users.noreply.github.com>
Date: Fri, 30 May 2025 14:49:48 +0200
Subject: [PATCH 355/505] add selection ranges for more names (#23257)

Add selection ranges for more names.

Porting https://github.com/scalameta/metals/pull/7446
[Cherry-picked dec859f35f8bb90d473f2e4a815eff7601b14dc5]
---
 .../tools/pc/SelectionRangeProvider.scala     | 32 +++++++++++++------
 .../tools/pc/tests/SelectionRangeSuite.scala  | 29 +++++++++++++++++
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala
index 42760f38d9af..09c44b105555 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala
@@ -85,6 +85,9 @@ class SelectionRangeProvider(driver: InteractiveDriver, params: ju.List[OffsetPa
       selectionRange.setRange(srcPos.toLsp)
       selectionRange
 
+    def maybeToSelectionRange(srcPos: SourcePosition): Option[SelectionRange] =
+      if srcPos.contains(pos) then Some(toSelectionRange(srcPos)) else None
+
     val treeSelectionRange = Seq(toSelectionRange(tree.sourcePos))
 
     def allArgsSelectionRange(args: List[Tree]): Option[SelectionRange] =
@@ -94,16 +97,25 @@ class SelectionRangeProvider(driver: InteractiveDriver, params: ju.List[OffsetPa
           val srcPos = list.head.sourcePos
           val lastSpan = list.last.span
           val allArgsSrcPos = SourcePosition(srcPos.source, srcPos.span union lastSpan, srcPos.outer)
-          if allArgsSrcPos.contains(pos) then Some(toSelectionRange(allArgsSrcPos))
-          else None
-
-    tree match
-      case DefDef(_, paramss, _, _) => paramss.flatMap(allArgsSelectionRange) ++ treeSelectionRange
-      case Apply(_, args) => allArgsSelectionRange(args) ++ treeSelectionRange
-      case TypeApply(_, args) => allArgsSelectionRange(args) ++ treeSelectionRange
-      case UnApply(_, _, pattern) => allArgsSelectionRange(pattern) ++ treeSelectionRange
-      case Function(args, body) => allArgsSelectionRange(args) ++ treeSelectionRange
-      case _ => treeSelectionRange
+          maybeToSelectionRange(allArgsSrcPos)
+
+    val allSelectionRanges: Iterable[SelectionRange] = tree match
+      case vdef @ ValDef(_, _, _) =>
+        maybeToSelectionRange(vdef.namePos)
+      case tdef @ TypeDef(_, _) =>
+        maybeToSelectionRange(tdef.namePos)
+      case mdef @ ModuleDef(_, _) =>
+        maybeToSelectionRange(mdef.namePos)
+      case DefDef(_, paramss, _, _) =>
+        paramss.flatMap(allArgsSelectionRange)
+      case Apply(_, args) =>
+        allArgsSelectionRange(args)
+      case TypeApply(_, args) =>
+        allArgsSelectionRange(args)
+      case Function(args, _) =>
+        allArgsSelectionRange(args)
+      case _ => Seq.empty
+    allSelectionRanges ++ treeSelectionRange
 
   private def setParent(
       child: SelectionRange,
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
index 578c8e8bede4..18879301a8fb 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala
@@ -115,6 +115,10 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
          |    a + b
          |}""".stripMargin,
       List[String](
+        """|object Main extends App {
+           |  def func(>>region>>a<<region<<: Int, b: Int) =
+           |    a + b
+           |}""".stripMargin,
         """|object Main extends App {
            |  def func(>>region>>a: Int<<region<<, b: Int) =
            |    a + b
@@ -137,6 +141,10 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
          |    a + b
          |}""".stripMargin,
       List[String](
+        """|object Main extends App {
+           |  val func = (>>region>>a<<region<<: Int, b: Int) =>
+           |    a + b
+           |}""".stripMargin,
         """|object Main extends App {
            |  val func = (>>region>>a: Int<<region<<, b: Int) =>
            |    a + b
@@ -160,6 +168,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
     check(
       "object Main extends App { def foo[Type@@ <: T1, B](hi: Int, b: Int, c:Int) = ??? }",
       List(
+        "object Main extends App { def foo[>>region>>Type<<region<< <: T1, B](hi: Int, b: Int, c:Int) = ??? }",
         "object Main extends App { def foo[>>region>>Type <: T1<<region<<, B](hi: Int, b: Int, c:Int) = ??? }",
         "object Main extends App { def foo[>>region>>Type <: T1, B<<region<<](hi: Int, b: Int, c:Int) = ??? }",
         "object Main extends App { >>region>>def foo[Type <: T1, B](hi: Int, b: Int, c:Int) = ???<<region<< }"
@@ -192,6 +201,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
     check(
       "val hello = (aaa: Int, bb@@b: Int, ccc: Int) => ???",
       List(
+        "val hello = (aaa: Int, >>region>>bbb<<region<<: Int, ccc: Int) => ???",
         "val hello = (aaa: Int, >>region>>bbb: Int<<region<<, ccc: Int) => ???",
         "val hello = (>>region>>aaa: Int, bbb: Int, ccc: Int<<region<<) => ???",
         "val hello = >>region>>(aaa: Int, bbb: Int, ccc: Int) => ???<<region<<",
@@ -203,6 +213,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
     check(
       "def hello(aaa: Int, bb@@b: Int, ccc: Int) = ???",
       List(
+        "def hello(aaa: Int, >>region>>bbb<<region<<: Int, ccc: Int) = ???",
         "def hello(aaa: Int, >>region>>bbb: Int<<region<<, ccc: Int) = ???",
         "def hello(>>region>>aaa: Int, bbb: Int, ccc: Int<<region<<) = ???",
         ">>region>>def hello(aaa: Int, bbb: Int, ccc: Int) = ???<<region<<",
@@ -252,3 +263,21 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
         ">>region>>def hello = List(222)<<region<<",
       )
     )
+
+  @Test def `constructor-argument` =
+    check(
+      "class Foo(val ar@@g: Int)",
+      List(
+        """class Foo(val >>region>>arg<<region<<: Int)""",
+        """class Foo(>>region>>val arg: Int<<region<<)""",
+      )
+    )
+
+  @Test def `object-backticked` =
+    check(
+      "object `Foo B@@ar Baz` extends SomeTrait",
+      List(
+        """object `>>region>>Foo Bar Baz<<region<<` extends SomeTrait""",
+        """>>region>>object `Foo Bar Baz` extends SomeTrait<<region<<""",
+      )
+    )

From a65a470038ec8d147795cdf01c5152e3d6a2cb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zieli=C5=84ski=20Patryk?=
 <75637004+zielinsky@users.noreply.github.com>
Date: Fri, 30 May 2025 21:04:33 +0200
Subject: [PATCH 356/505] Add inlay hints for by-name parameters (#23283)

Add `=>` hints for function parameters that are passed by name.

Porting https://github.com/scalameta/metals/pull/7404
---
 .../dotty/tools/pc/PcInlayHintsProvider.scala |  48 +++++++
 .../pc/tests/inlayHints/InlayHintsSuite.scala | 119 +++++++++++++++++-
 2 files changed, 162 insertions(+), 5 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 0fe3b64a4f7d..30474ffe0ed7 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -116,6 +116,29 @@ class PcInlayHintsProvider(
               InlayHintKind.Type,
             )
             .addDefinition(adjustedPos.start)
+      case ByNameParameters(byNameParams) =>
+        def adjustByNameParameterPos(pos: SourcePosition): SourcePosition =
+          val adjusted = adjustPos(pos)
+          val start = text.indexWhere(!_.isWhitespace, adjusted.start)
+          val end = text.lastIndexWhere(!_.isWhitespace, adjusted.end - 1)
+
+          val startsWithBrace = text.lift(start).contains('{')
+          val endsWithBrace = text.lift(end).contains('}')
+
+          if startsWithBrace && endsWithBrace then
+            adjusted.withStart(start + 1)
+          else
+            adjusted
+
+        byNameParams.foldLeft(inlayHints) {
+          case (ih, pos) => 
+            val adjusted = adjustByNameParameterPos(pos)
+            ih.add(
+              adjusted.startPos.toLsp,
+              List(LabelPart("=> ")),
+              InlayHintKind.Parameter
+            )
+        }
       case _ => inlayHints
 
   private def toLabelParts(
@@ -388,3 +411,28 @@ object InferredType:
     index >= 0 && index < afterDef.size && afterDef(index) == '@'
 
 end InferredType
+
+object ByNameParameters:
+  def unapply(tree: Tree)(using params: InlayHintsParams, ctx: Context): Option[List[SourcePosition]] =
+    def shouldSkipSelect(sel: Select) = 
+      isForComprehensionMethod(sel) || sel.symbol.name == nme.unapply
+
+    if (params.byNameParameters()){
+      tree match
+        case Apply(TypeApply(sel: Select, _), _) if shouldSkipSelect(sel) => 
+          None 
+        case Apply(sel: Select, _) if shouldSkipSelect(sel) => 
+          None
+        case Apply(fun, args) =>
+          val funTp = fun.typeOpt.widenTermRefExpr
+          val params = funTp.paramInfoss.flatten
+          Some(
+            args
+            .zip(params)
+            .collect {
+              case (tree, param) if param.isByName => tree.sourcePos
+            }
+          )
+        case _ => None
+    } else None
+end ByNameParameters
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
index 1fb9cb51ae80..0b68c7461d01 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
@@ -611,17 +611,17 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |class DemoSpec {
         |  import ScalatestMock._
         |
-        |  /*StringTestOps<<(6:17)>>(*/"foo"/*)*/ should {
-        |    /*StringTestOps<<(6:17)>>(*/"checkThing1"/*)*/ in {
+        |  /*StringTestOps<<(6:17)>>(*/"foo"/*)*/ should {/*=> */
+        |    /*StringTestOps<<(6:17)>>(*/"checkThing1"/*)*/ in {/*=> */
         |      checkThing1[String]/*(using instancesString<<(10:15)>>)*/
         |    }/*(using here<<(5:15)>>)*/
-        |    /*StringTestOps<<(6:17)>>(*/"checkThing2"/*)*/ in {
+        |    /*StringTestOps<<(6:17)>>(*/"checkThing2"/*)*/ in {/*=> */
         |      checkThing2[String]/*(using instancesString<<(10:15)>>, instancesString<<(10:15)>>)*/
         |    }/*(using here<<(5:15)>>)*/
         |  }/*(using subjectRegistrationFunction<<(3:15)>>)*/
         |
-        |  /*StringTestOps<<(6:17)>>(*/"bar"/*)*/ should {
-        |    /*StringTestOps<<(6:17)>>(*/"checkThing1"/*)*/ in {
+        |  /*StringTestOps<<(6:17)>>(*/"bar"/*)*/ should {/*=> */
+        |    /*StringTestOps<<(6:17)>>(*/"checkThing1"/*)*/ in {/*=> */
         |      checkThing1[String]/*(using instancesString<<(10:15)>>)*/
         |    }/*(using here<<(5:15)>>)*/
         |  }/*(using subjectRegistrationFunction<<(3:15)>>)*/
@@ -1055,4 +1055,113 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |}
          |""".stripMargin
     )
+
+  @Test def `by-name-regular` =
+    check(
+      """|object Main:
+         |  def foo(x: => Int, y: Int, z: => Int)(w: Int, v: => Int): Unit = ()
+         |  foo(1, 2, 3)(4, 5)
+         |""".stripMargin,
+      """|object Main:
+         |  def foo(x: => Int, y: Int, z: => Int)(w: Int, v: => Int): Unit = ()
+         |  foo(/*=> */1, 2, /*=> */3)(4, /*=> */5)
+         |""".stripMargin
+    )
+
+  @Test def `by-name-block` =
+    check(
+      """|object Main:
+         |  def Future[A](arg: => A): A = arg
+         |
+         |  Future(1 + 2)
+         |  Future {
+         |    1 + 2
+         |  }
+         |  Future {
+         |    val x = 1
+         |    val y = 2
+         |    x + y
+         |  }
+         |  Some(Option(2)
+         |    .getOrElse {
+         |      List(1,2)
+         |        .headOption
+         |    })
+         |""".stripMargin,
+      """|object Main:
+         |  def Future[A](arg: => A): A = arg
+         |
+         |  Future/*[Int<<scala/Int#>>]*/(/*=> */1 + 2)
+         |  Future/*[Int<<scala/Int#>>]*/ {/*=> */
+         |    1 + 2
+         |  }
+         |  Future/*[Int<<scala/Int#>>]*/ {/*=> */
+         |    val x/*: Int<<scala/Int#>>*/ = 1
+         |    val y/*: Int<<scala/Int#>>*/ = 2
+         |    x + y
+         |  }
+         |  Some/*[Int<<scala/Int#>> | Option<<scala/Option#>>[Int<<scala/Int#>>]]*/(Option/*[Int<<scala/Int#>>]*/(2)
+         |    .getOrElse/*[Int<<scala/Int#>> | Option<<scala/Option#>>[Int<<scala/Int#>>]]*/ {/*=> */
+         |      List/*[Int<<scala/Int#>>]*/(1,2)
+         |        .headOption
+         |    })
+         |""".stripMargin
+    )
+
+  @Test def `by-name-for-comprehension` =
+    check(
+      """|object Main:
+         |  case class Test[A](v: A):
+         |     def flatMap(f: => (A => Test[Int])): Test[Int] = f(v)
+         |     def map(f: => (A => Int)): Test[Int] = Test(f(v))
+         |
+         |  def main(args: Array[String]): Unit =
+         |    val result: Test[Int] = for {
+         |      a <- Test(10)
+         |      b <- Test(20)
+         |    } yield a + b
+         |
+         |""".stripMargin,
+      """|object Main:
+         |  case class Test[A](v: A):
+         |     def flatMap(f: => (A => Test[Int])): Test[Int] = f(v)
+         |     def map(f: => (A => Int)): Test[Int] = Test/*[Int<<scala/Int#>>]*/(f(v))
+         |
+         |  def main(args: Array[String]): Unit =
+         |    val result: Test[Int] = for {
+         |      a <- Test/*[Int<<scala/Int#>>]*/(10)
+         |      b <- Test/*[Int<<scala/Int#>>]*/(20)
+         |    } yield a + b
+         |
+         |""".stripMargin,
+    )
+
+  @Test def `by-name-for-comprehension-generic` =
+    check(
+      """|object Main:
+         |  case class Test[A](v: A):
+         |     def flatMap[B](f: => (A => Test[B])): Test[B] = f(v)
+         |     def map[B](f: => (A => B)): Test[B] = Test(f(v))
+         |
+         |  def main(args: Array[String]): Unit =
+         |    val result: Test[Int] = for {
+         |      a <- Test(10)
+         |      b <- Test(20)
+         |    } yield a + b
+         |
+         |""".stripMargin,
+      """|object Main:
+         |  case class Test[A](v: A):
+         |     def flatMap[B](f: => (A => Test[B])): Test[B] = f(v)
+         |     def map[B](f: => (A => B)): Test[B] = Test/*[B<<(4:13)>>]*/(f(v))
+         |
+         |  def main(args: Array[String]): Unit =
+         |    val result: Test[Int] = for {
+         |      a <- Test/*[Int<<scala/Int#>>]*/(10)
+         |      b <- Test/*[Int<<scala/Int#>>]*/(20)
+         |    } yield a + b
+         |
+         |""".stripMargin,
+    )
+
 }

From e675dc798d4f08145927b041d629826c44692fc9 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 2 Jun 2025 14:26:02 +0200
Subject: [PATCH 357/505] Add inlay hints for by-name parameters (#23283)

Add `=>` hints for function parameters that are passed by name.

Porting https://github.com/scalameta/metals/pull/7404
[Cherry-picked fd72f1a64f5f7f7608ec55ed967806f68e1aa783][modified]

From eafc4584bbc9148999352e50f35d92a9c92b84f4 Mon Sep 17 00:00:00 2001
From: Katarzyna Marek <kasia@marek.net>
Date: Fri, 30 May 2025 21:28:49 +0200
Subject: [PATCH 358/505] Add jpath to VirtualFile (for pc) (#23203)

https://github.com/scalameta/metals/issues/7460
[Cherry-picked 7c3ddc3d72f5442faa3eee94aad88ac1b762f50e]
---
 .../dotty/tools/dotc/util/SourceFile.scala    |  3 +--
 compiler/src/dotty/tools/io/VirtualFile.scala | 23 +++++++++++++++++--
 .../src/tests/macros/metals7460.scala         | 20 ++++++++++++++++
 .../tools/pc/tests/hover/HoverTermSuite.scala | 16 +++++++++++++
 4 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 presentation-compiler-testcases/src/tests/macros/metals7460.scala

diff --git a/compiler/src/dotty/tools/dotc/util/SourceFile.scala b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
index 7cad81b4096d..167af75a0a92 100644
--- a/compiler/src/dotty/tools/dotc/util/SourceFile.scala
+++ b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
@@ -228,8 +228,7 @@ object SourceFile {
    *  It relies on SourceFile#virtual implementation to create the virtual file.
    */
   def virtual(uri: URI, content: String): SourceFile =
-    val path = Paths.get(uri).toString
-    SourceFile.virtual(path, content)
+    SourceFile(new VirtualFile(Paths.get(uri), content.getBytes(StandardCharsets.UTF_8)), content.toCharArray)
 
   /** Returns the relative path of `source` within the `reference` path
    *
diff --git a/compiler/src/dotty/tools/io/VirtualFile.scala b/compiler/src/dotty/tools/io/VirtualFile.scala
index 9d290a9b0e6a..e87faa0b86f9 100644
--- a/compiler/src/dotty/tools/io/VirtualFile.scala
+++ b/compiler/src/dotty/tools/io/VirtualFile.scala
@@ -40,15 +40,34 @@ class VirtualFile(val name: String, override val path: String) extends AbstractF
     this.content = content
   }
 
+  /**
+    * Initializes this instance with the specified path
+    * and a name taken from the last path element.
+    *
+    * @param path the path of the virtual file to be created
+    * @param content the initial contents of the virtual file
+    * @return     the created virtual file
+    */
+  def this(path: JPath, content: Array[Byte]) = {
+    this(path.getFileName().toString(), path.toString())
+    this.content = content
+    this.jpath_ = path
+  }
+
   private var content = Array.emptyByteArray
 
+  private var jpath_ : JPath = null
+
   def absolute: AbstractFile = this
 
-  /** Returns null. */
-  def jpath: JPath = null
+  /** Returns path, which might be a non-existing file or null. */
+  def jpath: JPath = jpath_
 
   override def sizeOption: Option[Int] = Some(content.length)
 
+  /** Always returns true, even if jpath is a non-existing file. */
+  override def exists: Boolean = true
+
   def input : InputStream = new ByteArrayInputStream(content)
 
   override def output: OutputStream = {
diff --git a/presentation-compiler-testcases/src/tests/macros/metals7460.scala b/presentation-compiler-testcases/src/tests/macros/metals7460.scala
new file mode 100644
index 000000000000..0b9b1ca494b2
--- /dev/null
+++ b/presentation-compiler-testcases/src/tests/macros/metals7460.scala
@@ -0,0 +1,20 @@
+package tests.macros
+
+import scala.quoted.*
+
+object Macros7460 {
+
+  transparent inline def foo: String =
+    ${ fooImpl }
+
+  private def fooImpl(using Quotes): Expr[String] =
+    Expr("foo...")
+
+  transparent inline def bar: String =
+    ${ barImpl }
+
+  private def barImpl(using Quotes): Expr[String] =
+    quotes.reflect.Position.ofMacroExpansion.sourceFile.getJPath.get // this line is the culprit
+    Expr("bar...")
+
+}
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
index b2170d0e32b5..e0501d4c9496 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -731,3 +731,19 @@ class HoverTermSuite extends BaseHoverSuite:
          |""".stripMargin,
          "def valueOf($name: String): Foo".hover
     )
+
+  @Test def `i7460` =
+    check(
+      """|package tests.macros
+         |def m = Macros7460.foo.sub@@string(2, 4)
+         |""".stripMargin,
+         "def substring(x$0: Int, x$1: Int): String".hover
+    )
+
+  @Test def `i7460-2` =
+    check(
+      """|package tests.macros
+         |def m = Macros7460.bar.sub@@string(2, 4)
+         |""".stripMargin,
+         "def substring(x$0: Int, x$1: Int): String".hover
+    )

From c1a7900b610bf23f656533256dd0f42b7d840de8 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Sat, 31 May 2025 08:56:58 +0200
Subject: [PATCH 359/505] Add credentials for central.sonatype.com, remove
 credentials for oss.sonatype.org

[Cherry-picked 33e89e984e2523feaa9b94c566f98a10b5fdedb3]
---
 project/Build.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index d6a97933362b..80e63806689c 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -286,7 +286,7 @@ object Build {
       for {
         username <- sys.env.get("SONATYPE_USER")
         password <- sys.env.get("SONATYPE_PW")
-      } yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)
+      } yield Credentials("Sonatype Nexus Repository Manager", "central.sonatype.com", username, password)
     ).toList,
     PgpKeys.pgpPassphrase := sys.env.get("PGP_PW").map(_.toCharArray()),
     PgpKeys.useGpgPinentry := true,

From 7b102bcea24d834fe6326acba969061427de8f9f Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Tue, 3 Jun 2025 05:06:00 -0700
Subject: [PATCH 360/505] Dealias for unused param check (#23256)

Fixes #23250

The check for "unused implicit parameter" considers the type of the
parameter, but it should dealias first.

In addition, take an abstract type as not warnable, unless it has an
upper bound that is warnable (has non-universal members).

Note that `isSingleton` dealiases.

There was an ancient (OG) typo of `&` for `&&` which has gone unfixed
despite other edits. The right operand was always just an instanceof.
Not sure if the previous idiom saves an opcode, but now it looks like
other code nearby.
[Cherry-picked 2d1865510867aba338813e0ac265f6a8fa70ed35]
---
 .../dotty/tools/dotc/core/SymDenotations.scala |  2 +-
 .../tools/dotc/transform/CheckUnused.scala     |  6 +++---
 tests/warn/i17314.scala                        |  4 ++--
 tests/warn/i23250.scala                        | 17 +++++++++++++++++
 tests/warn/i23250b.scala                       | 18 ++++++++++++++++++
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 tests/warn/i23250.scala
 create mode 100644 tests/warn/i23250b.scala

diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
index 00530c3a6936..889e3d12a98c 100644
--- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -684,7 +684,7 @@ object SymDenotations {
       isAbstractOrAliasType && !isAbstractOrParamType
 
     /** Is this symbol an abstract or alias type? */
-    final def isAbstractOrAliasType: Boolean = isType & !isClass
+    final def isAbstractOrAliasType: Boolean = isType && !isClass
 
     /** Is this symbol an abstract type or type parameter? */
     final def isAbstractOrParamType(using Context): Boolean = this.isOneOf(DeferredOrTypeParam)
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 41ecd9e6c299..7c08ed7415b8 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -613,14 +613,14 @@ object CheckUnused:
         || m.hasAnnotation(dd.UnusedAnnot)          // param of unused method
         || sym.owner.name.isContextFunction         // a ubiquitous parameter
         || sym.isCanEqual
-        || sym.info.typeSymbol.match                // more ubiquity
+        || sym.info.dealias.typeSymbol.match        // more ubiquity
            case dd.DummyImplicitClass | dd.SubTypeClass | dd.SameTypeClass => true
            case tps =>
              tps.isMarkerTrait // no members to use; was only if sym.name.is(ContextBoundParamName)
              ||                // but consider NotGiven
              tps.hasAnnotation(dd.LanguageFeatureMetaAnnot)
         || sym.info.isSingleton // DSL friendly
-        || sym.info.isInstanceOf[RefinedType] // can't be expressed as a context bound
+        || sym.info.dealias.isInstanceOf[RefinedType] // can't be expressed as a context bound
       if ctx.settings.WunusedHas.implicits
         && !infos.skip(m)
         && !m.isEffectivelyOverride
@@ -943,7 +943,7 @@ object CheckUnused:
     def isCanEqual: Boolean =
       sym.isOneOf(GivenOrImplicit) && sym.info.finalResultType.baseClasses.exists(_.derivesFrom(defn.CanEqualClass))
     def isMarkerTrait: Boolean =
-      sym.isClass && sym.info.allMembers.forall: d =>
+      sym.info.hiBound.allMembers.forall: d =>
         val m = d.symbol
         !m.isTerm || m.isSelfSym || m.is(Method) && (m.owner == defn.AnyClass || m.owner == defn.ObjectClass)
     def isEffectivelyPrivate: Boolean =
diff --git a/tests/warn/i17314.scala b/tests/warn/i17314.scala
index cff90d843c38..3b5a486a6785 100644
--- a/tests/warn/i17314.scala
+++ b/tests/warn/i17314.scala
@@ -1,4 +1,4 @@
-//> using options -Wunused:all -deprecation -feature
+//> using options -Wunused:all -deprecation -feature -Werror
 
 import java.net.URI
 
@@ -10,7 +10,7 @@ object circelike {
   type Configuration
   trait ConfiguredCodec[T]
   object ConfiguredCodec:
-    inline final def derived[A](using conf: Configuration)(using inline mirror: Mirror.Of[A]): ConfiguredCodec[A] = // warn // warn
+    inline final def derived[A](using conf: Configuration)(using inline mirror: Mirror.Of[A]): ConfiguredCodec[A] =
       class InlinedConfiguredCodec extends ConfiguredCodec[A]:
         val codec = summonInline[Codec[URI]] // simplification
       new InlinedConfiguredCodec
diff --git a/tests/warn/i23250.scala b/tests/warn/i23250.scala
new file mode 100644
index 000000000000..ac9183ed1fd1
--- /dev/null
+++ b/tests/warn/i23250.scala
@@ -0,0 +1,17 @@
+//> using options -Wunused:all -Werror
+
+trait MonadError[F[_], E]
+type MonadThrow[F[_]] = MonadError[F, Throwable]
+
+trait MetaStreams[F[_]]:
+  def use[A]: F[A] = ???
+trait WriteResult
+
+trait MetaStreamsSyntax:
+  extension [F[_]](ms: MetaStreams[F])(using MonadThrow[F])
+    def setMaxAge(): F[WriteResult] =
+      summon[MonadThrow[F]]
+      ms.use[WriteResult]
+
+    def setTruncateBefore(): F[WriteResult] =
+      ms.use[WriteResult]
diff --git a/tests/warn/i23250b.scala b/tests/warn/i23250b.scala
new file mode 100644
index 000000000000..f9e18559fb46
--- /dev/null
+++ b/tests/warn/i23250b.scala
@@ -0,0 +1,18 @@
+//> using options -Wunused:all
+
+trait Memberly:
+  def member: Int
+
+object Members:
+  type MemberType <: Memberly
+  type Empty
+
+object Test:
+  import Members.*
+
+  type MT = MemberType
+  def membered(using MT) = println() // warn abstract type offers member in upper bound
+  def remembered(using mt: MT) = mt.member
+
+  type Ignore = Empty
+  def emptily(using Ignore) = println()

From 8660aad9bec9de201a297b24db44532d714a7ccc Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Tue, 3 Jun 2025 05:14:20 -0700
Subject: [PATCH 361/505] Warn trivial recursion with module prefix (#23278)

Fixes #23277

First, loosen the test for whether to warn for `module.recur()`. The
`this` assignment has a RHS that is not pure (because of module init)
but `isStable` (and not significant with respect to the warning).

Second, avoid emitting such a `this` assignment if the prefix is the
enclosing module. The existing code checks for a prefix that is
`Enclosing.this`.

Other "aliasing" prefixes are not considered, such as a method with
result `this.type`, since they could execute arbitrary intended effects.
[Cherry-picked 451cc745a8cdcc01b2a4e4f7bf1d2d9d57541a04]
---
 .../dotty/tools/dotc/transform/TailRec.scala  |  6 ++++-
 tests/warn/i23277.scala                       | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tests/warn/i23277.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
index 158b72f7abdb..e1bd3136f895 100644
--- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
@@ -194,7 +194,8 @@ class TailRec extends MiniPhase {
         def isInfiniteRecCall(tree: Tree): Boolean = {
           def tailArgOrPureExpr(stat: Tree): Boolean = stat match {
             case stat: ValDef if stat.name.is(TailTempName) || !stat.symbol.is(Mutable) => tailArgOrPureExpr(stat.rhs)
-            case Assign(lhs: Ident, rhs) if lhs.symbol.name.is(TailLocalName) => tailArgOrPureExpr(rhs)
+            case Assign(lhs: Ident, rhs) if lhs.symbol.name.is(TailLocalName) =>
+              tailArgOrPureExpr(rhs) || varForRewrittenThis.exists(_ == lhs.symbol && rhs.tpe.isStable)
             case Assign(lhs: Ident, rhs: Ident) => lhs.symbol == rhs.symbol
             case stat: Ident if stat.symbol.name.is(TailLocalName) => true
             case _ => tpd.isPureExpr(stat)
@@ -343,6 +344,9 @@ class TailRec extends MiniPhase {
               case prefix: This if prefix.symbol == enclosingClass =>
                 // Avoid assigning `this = this`
                 assignParamPairs
+              case prefix if prefix.symbol.is(Module) && prefix.symbol.moduleClass == enclosingClass =>
+                // Avoid assigning `this = MyObject`
+                assignParamPairs
               case _ =>
                 (getVarForRewrittenThis(), noTailTransform(prefix)) :: assignParamPairs
 
diff --git a/tests/warn/i23277.scala b/tests/warn/i23277.scala
new file mode 100644
index 000000000000..f99f5a373d43
--- /dev/null
+++ b/tests/warn/i23277.scala
@@ -0,0 +1,22 @@
+
+enum Test:
+  case One
+  case Two(i: Int)
+
+object Test:
+  object Two:
+    def apply(i: Int): Test.Two = Test.Two(i) // warn
+    def apply(i: Int, j: Int): Test.Two = new Test.Two(i+j)
+    def apply(i: Int, s: String): Two = Two(i, s) // warn because unprefixed Two is deemed pure
+    def apply(): Test.Two = other.apply() // nowarn prefix is method call
+    def other: this.type = this
+
+object R extends Runnable:
+  def r: this.type = this
+  override def run() = r.run()
+
+final class C(c: C):
+  def f(i: Int): Int = c.f(i)
+
+@main def main = println:
+  Test.Two(1)

From 0a557728ad2247e0173c4ba13426a7ef03d2ecb3 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Tue, 10 Jun 2025 19:51:44 +0200
Subject: [PATCH 362/505] Revert "Make overload pruning based on result types
 less aggressive (#21744)" in main (#23331)

Revert #21744 which already was reverted in 3.7.0 and 3.7.1 due to
introduced bugs.
Resolves #22713
[Cherry-picked a1831406ede4f6d2c8a4af69b28245e82cb297cd]
---
 .../dotty/tools/dotc/typer/Applications.scala    | 16 ++--------------
 tests/pos/i21410.scala                           | 12 ------------
 tests/pos/i21410b.scala                          | 10 ----------
 tests/pos/i21410c.scala                          | 11 -----------
 tests/pos/i22713.scala                           | 13 +++++++++++++
 5 files changed, 15 insertions(+), 47 deletions(-)
 delete mode 100644 tests/pos/i21410.scala
 delete mode 100644 tests/pos/i21410b.scala
 delete mode 100644 tests/pos/i21410c.scala
 create mode 100644 tests/pos/i22713.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 0d1b5595334e..dbb3f7808dba 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -1942,27 +1942,16 @@ trait Applications extends Compatibility {
   def resolveOverloaded(alts: List[TermRef], pt: Type)(using Context): List[TermRef] =
     record("resolveOverloaded")
 
-    /** Is `alt` a method or polytype whose approximated result type after the first value parameter
+    /** Is `alt` a method or polytype whose result type after the first value parameter
      *  section conforms to the expected type `resultType`? If `resultType`
      *  is a `IgnoredProto`, pick the underlying type instead.
-     *
-     *  Using an approximated result type is necessary to avoid false negatives
-     *  due to incomplete type inference such as in tests/pos/i21410.scala and tests/pos/i21410b.scala.
      */
     def resultConforms(altSym: Symbol, altType: Type, resultType: Type)(using Context): Boolean =
       resultType.revealIgnored match {
         case resultType: ValueType =>
           altType.widen match {
             case tp: PolyType => resultConforms(altSym, instantiateWithTypeVars(tp), resultType)
-            case tp: MethodType =>
-              val wildRes = wildApprox(tp.resultType)
-
-              class ResultApprox extends AvoidWildcardsMap:
-                // Avoid false negatives by approximating to a lower bound
-                variance = -1
-
-              val approx = ResultApprox()(wildRes)
-              constrainResult(altSym, approx, resultType)
+            case tp: MethodType => constrainResult(altSym, tp.resultType, resultType)
             case _ => true
           }
         case _ => true
@@ -2308,7 +2297,6 @@ trait Applications extends Compatibility {
       if t.exists && alt.symbol.exists then
         val (trimmed, skipped) = trimParamss(t.stripPoly, alt.symbol.rawParamss)
         val mappedSym = alt.symbol.asTerm.copy(info = t)
-        mappedSym.annotations = alt.symbol.annotations
         mappedSym.rawParamss = trimmed
         val (pre, totalSkipped) = mappedAltInfo(alt.symbol) match
           case Some((pre, prevSkipped)) =>
diff --git a/tests/pos/i21410.scala b/tests/pos/i21410.scala
deleted file mode 100644
index c3ba3ea862bc..000000000000
--- a/tests/pos/i21410.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-class A
-object Test:
-  type F[X] <: Any = X match
-    case A => Int
-
-  def foo[T](x: String): T = ???
-  def foo[U](x: U): F[U] = ???
-
-  val x1 = foo(A())
-  val y: Int = x1
-
-  val x2: Int = foo(A()) // error
diff --git a/tests/pos/i21410b.scala b/tests/pos/i21410b.scala
deleted file mode 100644
index a17ad59bc59e..000000000000
--- a/tests/pos/i21410b.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-object Test:
-  def foo[T](x: Option[T]): T = ???
-  def foo[T <: Tuple](x: T): Tuple.Map[T, List] = ???
-
-  val tup: (Int, String) = (1, "")
-
-  val x = foo(tup)
-  val y: (List[Int], List[String]) = x
-
-  val x2: (List[Int], List[String]) = foo(tup) // error
diff --git a/tests/pos/i21410c.scala b/tests/pos/i21410c.scala
deleted file mode 100644
index 21f69fec20fa..000000000000
--- a/tests/pos/i21410c.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-class AppliedPIso[A, B]()
-case class User(age: Int)
-
-object Test:
-  extension [From, To](from: From)
-    def focus(): AppliedPIso[From, From] = ???
-    transparent inline def focus(inline lambda: (From => To)): Any = ???
-
-
-  val u = User(1)
-  val ap: AppliedPIso[User, User] = u.focus(_.age) // error
diff --git a/tests/pos/i22713.scala b/tests/pos/i22713.scala
new file mode 100644
index 000000000000..ec3e12cebaec
--- /dev/null
+++ b/tests/pos/i22713.scala
@@ -0,0 +1,13 @@
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.TimeUnit
+
+def Test = {
+  val worker: ScheduledExecutorService = ???
+  object Worker extends Runnable {
+    def fails(): Either[Exception, Unit] = Right(worker.schedule(this, 5, TimeUnit.NANOSECONDS))
+    def works(): Either[Exception, Unit] = Right {
+      worker.schedule(this, 5, TimeUnit.NANOSECONDS); ()
+    }
+    def run(): Unit = ???
+  }
+}

From 30bf449accbaa262211460f97abd3ea4e89c261b Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 3 Jun 2025 01:18:51 -0700
Subject: [PATCH 363/505] Erased fields are not nullable

[Cherry-picked ac914d9a4b9bd6cfec8d1e408e7db63483d063a3]
---
 .../transform/CollectNullableFields.scala     |  2 +-
 tests/run/i23305.scala                        | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 tests/run/i23305.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala b/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala
index 9433f7949163..8c3355d5f56b 100644
--- a/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala
@@ -60,7 +60,7 @@ class CollectNullableFields extends MiniPhase {
     val sym = tree.symbol
     val isNullablePrivateField =
       sym.isField &&
-      !sym.is(Lazy) &&
+      !sym.isOneOf(Lazy | Erased) &&
       !sym.owner.is(Trait) &&
       sym.initial.isAllOf(PrivateLocal) &&
       // We need `isNullableClassAfterErasure` and not `isNullable` because
diff --git a/tests/run/i23305.scala b/tests/run/i23305.scala
new file mode 100644
index 000000000000..22cfe04339fc
--- /dev/null
+++ b/tests/run/i23305.scala
@@ -0,0 +1,24 @@
+//> using options -language:experimental.erasedDefinitions
+
+erased trait DBMeta[A]
+
+trait Table[A]
+
+case class Saved[A]()
+object Saved {
+  def table[A](using dbm: DBMeta[A]): Table[Saved[A]] = new Table[Saved[A]] {}
+}
+
+case class deleteBulk[A](as: List[Saved[A]])(using dbm: DBMeta[A], tbl: Table[A]) {
+  final given savedTable: Table[Saved[A]] = Saved.table[A]
+}
+
+case class Foo()
+object Foo {
+  given dbMeta: DBMeta[Foo] = new DBMeta[Foo] {}
+  given table: Table[Foo] = new Table[Foo] {}
+}
+
+@main def Test =
+  val del = deleteBulk(List(Saved[Foo]()))
+  del.savedTable

From 4d7a34ee491a6a7f588d2637cafdd3168ad9c3d6 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 20 Jun 2025 11:11:41 +0200
Subject: [PATCH 364/505] Take inferred or explicit refinement result for
 unused check

---
 .../tools/dotc/transform/CheckUnused.scala    | 32 ++++++++++---------
 tests/warn/i22681.scala                       | 10 +++---
 tests/warn/i23323.scala                       | 14 ++++++++
 3 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 tests/warn/i23323.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 7c08ed7415b8..3353139f61c4 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -159,9 +159,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
   override def prepareForValDef(tree: ValDef)(using Context): Context =
     if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
       refInfos.register(tree)
-    tree.tpt match
-    case RefinedTypeTree(_, refinements) => relax(tree.rhs, refinements)
-    case _ =>
+    relax(tree.rhs, tree.tpt.tpe)
     ctx
   override def transformValDef(tree: ValDef)(using Context): tree.type =
     traverseAnnotations(tree.symbol)
@@ -183,9 +181,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
       refInfos.inliners += 1
     else if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
       refInfos.register(tree)
-    tree.tpt match
-    case RefinedTypeTree(_, refinements) => relax(tree.rhs, refinements)
-    case _ =>
+    relax(tree.rhs, tree.tpt.tpe)
     ctx
   override def transformDefDef(tree: DefDef)(using Context): tree.type =
     traverseAnnotations(tree.symbol)
@@ -902,15 +898,21 @@ object CheckUnused:
       case tree => traverseChildren(tree)
 
   // NoWarn members in tree that correspond to refinements; currently uses only names.
-  def relax(tree: Tree, refinements: List[Tree])(using Context): Unit =
-    val names = refinements.collect { case named: NamedDefTree => named.name }.toSet
-    val relaxer = new TreeTraverser:
-      def traverse(tree: Tree)(using Context) =
-        tree match
-        case tree: NamedDefTree if names(tree.name) => tree.withAttachment(NoWarn, ())
-        case _ =>
-        traverseChildren(tree)
-    relaxer.traverse(tree)
+  def relax(tree: Tree, tpe: Type)(using Context): Unit =
+    def refinements(tpe: Type, names: List[Name]): List[Name] =
+      tpe match
+      case RefinedType(parent, refinedName, refinedInfo) => refinedName :: refinements(parent, names)
+      case _ => names
+    val refinedNames = refinements(tpe, Nil)
+    if !refinedNames.isEmpty then
+      val names = refinedNames.toSet
+      val relaxer = new TreeTraverser:
+        def traverse(tree: Tree)(using Context) =
+          tree match
+          case tree: NamedDefTree if names(tree.name) => tree.withAttachment(NoWarn, ())
+          case _ =>
+          traverseChildren(tree)
+      relaxer.traverse(tree)
 
   extension (nm: Name)
     inline def exists(p: Name => Boolean): Boolean = nm.ne(nme.NO_NAME) && p(nm)
diff --git a/tests/warn/i22681.scala b/tests/warn/i22681.scala
index f8b535084f6c..81f12923d4d6 100644
--- a/tests/warn/i22681.scala
+++ b/tests/warn/i22681.scala
@@ -6,12 +6,10 @@ trait T:
 
 class C:
   def f: Runnable { def u: Int } = new Runnable with T:
-    private def v = 42 // avoid g judged too trivial to warn
     def run() = ()
-    def g = v // warn, effectively private member is unused
-    def t = v // nowarn
-    def u = v // nowarn because leaked by refinement
+    def g = 42 // warn effectively private member is unused
+    def t = 42 // nowarn
+    def u = 42 // nowarn because leaked by refinement
   val v: Runnable { def u: Int } = new Runnable:
-    private def v = 42 // avoid g judged too trivial to warn
     def run() = ()
-    def u = v // nowarn because leaked by refinement
+    def u = 42 // nowarn because leaked by refinement
diff --git a/tests/warn/i23323.scala b/tests/warn/i23323.scala
new file mode 100644
index 000000000000..85a5b0646b6e
--- /dev/null
+++ b/tests/warn/i23323.scala
@@ -0,0 +1,14 @@
+//> using options -Wunused:all
+
+class C:
+  val x = new reflect.Selectable:
+    def f = 42
+    def g = 27
+  val y: Selectable = new reflect.Selectable:
+    def f = 42 // warn
+    def g = 27 // warn
+  val z = new scala.Selectable:
+    def f = 42
+    def g = 27
+    def selectDynamic(name: String): Any = ???
+    def applyDynamic(name: String)(args: Any*): Any = ???

From d77facb7bb6023b874a50cf393cb754c0ce89898 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 20 Jun 2025 11:12:50 +0200
Subject: [PATCH 365/505] Take inferred or explicit refinement result for
 unused check

[Cherry-picked 0163e4a71f874aef208e93f56ed0553edebdcc61][modified]

From 6d817fbbcaa8497afb25a39e4793ac0b9ed8692d Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Thu, 12 Jun 2025 07:37:21 +0200
Subject: [PATCH 366/505] improvement: Improve efficiency of completions
 (#23355)

There are two improvements here:
- isAbsent(force = false) which is already used in the codebase when we
care about performance
- we don't search for extension or implicit methods on empty query, as
we would have inverseSemanticdb invoked on every possible extension
method and it's quite inefficient
[Cherry-picked 99543c58470896f22341ff5931c7784af1cd02e4]
---
 .../dotty/tools/dotc/interactive/Completion.scala   |  2 +-
 .../dotty/tools/pc/completions/Completions.scala    |  2 +-
 .../tests/completion/CompletionExtensionSuite.scala | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index c841184675fc..227b4b520236 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -332,7 +332,7 @@ object Completion:
       (sym.companionClass.exists && sym.companionClass.is(Enum))
 
     sym.exists &&
-    !sym.isAbsent() &&
+    !sym.isAbsent(canForce = false) &&
     !sym.isPrimaryConstructor &&
     sym.sourceSymbol.exists &&
     (!sym.is(Package) || sym.is(ModuleClass)) &&
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
index d7b3cf2ae50e..0389d3fa2fab 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
@@ -590,7 +590,7 @@ class Completions(
         else false,
       )
       Some(search.search(query, buildTargetIdentifier, visitor).nn)
-    else if completionMode.is(Mode.Member) then
+    else if completionMode.is(Mode.Member) && query.nonEmpty then
       val visitor = new CompilerSearchVisitor(sym =>
         def isExtensionMethod = sym.is(ExtensionMethod) &&
           qualType.widenDealias <:< sym.extensionParam.info.widenDealias
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionExtensionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionExtensionSuite.scala
index e67c31329c1c..b41084af4a8e 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionExtensionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionExtensionSuite.scala
@@ -228,6 +228,10 @@ class CompletionExtensionSuite extends BaseCompletionSuite:
         |""".stripMargin
     )
 
+  /**
+   * For optimization, we don't show any completions here as it would bring
+   * every extension method into the completion list.
+   */
   @Test def `simple-empty` =
     check(
       """|package example
@@ -238,11 +242,13 @@ class CompletionExtensionSuite extends BaseCompletionSuite:
          |
          |def main = 100.@@
          |""".stripMargin,
-      """|incr: Int (extension)
-         |""".stripMargin,
+      "",
       filter = _.contains("(extension)")
     )
 
+  /**
+   * Some as above, but for implicit completions.
+   */
   @Test def `simple-empty-old` =
     check(
       """|package example
@@ -253,8 +259,7 @@ class CompletionExtensionSuite extends BaseCompletionSuite:
          |
          |def main = 100.@@
          |""".stripMargin,
-      """|testOps(b: Int): String (implicit)
-         |""".stripMargin,
+      "",
       filter = _.contains("(implicit)")
     )
 

From 0d6fecfcd0f2d9b664731e4634b8e47b506e436e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Thu, 12 Jun 2025 13:46:16 +0200
Subject: [PATCH 367/505] bugfix: Check in the collector for empty arrays
 (#23341)

[Cherry-picked 743ff05a007f5ef400215a178ef3a08d2ea2f603]
---
 .../src/main/dotty/tools/pc/PcCollector.scala | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
index 52a6299c79fe..5ca5b63df0ae 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
@@ -319,21 +319,24 @@ object EndMarker:
       implicit ct: Context
   ): Option[SourcePosition] =
     val name = df.name.toString().stripSuffix("$")
-    val endMarkerLine =
-      sourceText.slice(df.span.start, df.span.end).split('\n').last
-    val index = endMarkerLine.length() - name.length()
-    if index < 0 then None
-    else
-      val (possiblyEndMarker, possiblyEndMarkerName) =
-        endMarkerLine.splitAt(index)
-      Option.when(
-        possiblyEndMarkerName == name &&
-          endMarkerRegex.matches(possiblyEndMarker)
-      )(
-        pos
-          .withStart(df.span.end - name.length())
-          .withEnd(df.span.end)
-      )
+    val lines = sourceText.slice(df.span.start, df.span.end).split('\n')
+
+    if lines.nonEmpty then
+      val endMarkerLine = lines.last
+      val index = endMarkerLine.length() - name.length()
+      if index < 0 then None
+      else
+        val (possiblyEndMarker, possiblyEndMarkerName) =
+          endMarkerLine.splitAt(index)
+        Option.when(
+          possiblyEndMarkerName == name &&
+            endMarkerRegex.matches(possiblyEndMarker)
+        )(
+          pos
+            .withStart(df.span.end - name.length())
+            .withEnd(df.span.end)
+        )
+    else None
   end getPosition
 end EndMarker
 

From eba393d49858696558a295629aad430ade0952d7 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Thu, 12 Jun 2025 13:46:43 +0200
Subject: [PATCH 368/505] improvement: Cache compilation on . and don't add
 CURSOR (#23356)

Adding CURSOR always makes the completions slower so if we can avoid it
we should.
[Cherry-picked 09d64c631f61191de4928c3e1c26fc7f556adc04]
---
 .../pc/completions/CompletionProvider.scala      |  7 ++++---
 .../tools/pc/tests/CompilerCachingSuite.scala    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
index f1645f76cf97..3d315d5cc26e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -176,9 +176,10 @@ class CompletionProvider(
     val text = params.text().nn
     val offset = params.offset().nn
     val query = Completion.naiveCompletionPrefix(text, offset)
-
-    if offset > 0 && text.charAt(offset - 1).isUnicodeIdentifierPart
-      && !CompletionProvider.allKeywords.contains(query) then false -> text
+    def isValidLastChar =
+      val lastChar = text.charAt(offset - 1)
+      lastChar.isUnicodeIdentifierPart || lastChar == '.'
+    if offset > 0 && isValidLastChar && !CompletionProvider.allKeywords.contains(query) then false -> text
     else
       val isStartMultilineComment =
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
index 1327c8dab91e..9a6f2af24efb 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
@@ -83,6 +83,22 @@ class CompilerCachingSuite extends BasePCSuite:
     assert(contextPostCursor == contextPostSecond)
     checkCompilationCount(4)
 
+  @Test
+  def `dot-compilation-does-not-corrupt-cache`: Unit =
+    val contextPreCompilation = getContext()
+
+    val fakeParams = CompilerOffsetParams(Paths.get("Test.scala").toUri(), "def hello = 1.", 14, EmptyCancelToken)
+    presentationCompiler.complete(fakeParams).get(timeout.length, timeout.unit)
+    val contextPostFirst = getContext()
+    assert(contextPreCompilation != contextPostFirst)
+    checkCompilationCount(4)
+
+    presentationCompiler.complete(fakeParams).get(timeout.length, timeout.unit)
+    val contextPostSecond = getContext()
+    assert(contextPreCompilation != contextPostFirst)
+    assert(contextPostSecond == contextPostFirst)
+    checkCompilationCount(4)
+
   @Test
   def `compilation-for-same-snippet-is-cached`: Unit =
     val contextPreCompilation = getContext()

From a8b329df032905a1dfce6bb90c950ff5b111b4ef Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Thu, 12 Jun 2025 13:46:43 +0200
Subject: [PATCH 369/505] Waiting for named fields

One would like to write
```
case tp @ ClassInfo(cls = cls) =>
```

[Cherry-picked 841a676dca5494c62589c65e0a15feebb81363ee]
---
 .../pc/completions/CompletionProvider.scala      |  7 ++++---
 .../tools/pc/tests/CompilerCachingSuite.scala    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
index f1645f76cf97..3d315d5cc26e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -176,9 +176,10 @@ class CompletionProvider(
     val text = params.text().nn
     val offset = params.offset().nn
     val query = Completion.naiveCompletionPrefix(text, offset)
-
-    if offset > 0 && text.charAt(offset - 1).isUnicodeIdentifierPart
-      && !CompletionProvider.allKeywords.contains(query) then false -> text
+    def isValidLastChar =
+      val lastChar = text.charAt(offset - 1)
+      lastChar.isUnicodeIdentifierPart || lastChar == '.'
+    if offset > 0 && isValidLastChar && !CompletionProvider.allKeywords.contains(query) then false -> text
     else
       val isStartMultilineComment =
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
index 1327c8dab91e..9a6f2af24efb 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
@@ -83,6 +83,22 @@ class CompilerCachingSuite extends BasePCSuite:
     assert(contextPostCursor == contextPostSecond)
     checkCompilationCount(4)
 
+  @Test
+  def `dot-compilation-does-not-corrupt-cache`: Unit =
+    val contextPreCompilation = getContext()
+
+    val fakeParams = CompilerOffsetParams(Paths.get("Test.scala").toUri(), "def hello = 1.", 14, EmptyCancelToken)
+    presentationCompiler.complete(fakeParams).get(timeout.length, timeout.unit)
+    val contextPostFirst = getContext()
+    assert(contextPreCompilation != contextPostFirst)
+    checkCompilationCount(4)
+
+    presentationCompiler.complete(fakeParams).get(timeout.length, timeout.unit)
+    val contextPostSecond = getContext()
+    assert(contextPreCompilation != contextPostFirst)
+    assert(contextPostSecond == contextPostFirst)
+    checkCompilationCount(4)
+
   @Test
   def `compilation-for-same-snippet-is-cached`: Unit =
     val contextPreCompilation = getContext()

From 0bbafae1d31c37039986b2e0ce20331375aefa30 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Thu, 12 Jun 2025 22:48:49 +0200
Subject: [PATCH 370/505] Fix insufficient number width allocated when using
 `-print-lines` (#23336)

[Cherry-picked 7d4fb6f5cfb57447acd21cdafa9ffd3cdd938986]
---
 compiler/src/dotty/tools/dotc/printing/Texts.scala     |  3 ++-
 compiler/src/dotty/tools/dotc/reporting/messages.scala |  2 +-
 tests/neg/19680.check                                  |  5 ++++-
 tests/neg/19680b.check                                 |  5 ++++-
 tests/neg/hidden-type-errors.check                     |  5 ++++-
 tests/neg/i18737.check                                 | 10 ++++++++--
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/printing/Texts.scala b/compiler/src/dotty/tools/dotc/printing/Texts.scala
index 475e2c6900d5..5909f8171843 100644
--- a/compiler/src/dotty/tools/dotc/printing/Texts.scala
+++ b/compiler/src/dotty/tools/dotc/printing/Texts.scala
@@ -139,7 +139,8 @@ object Texts {
 
     def mkString(width: Int, withLineNumbers: Boolean): String = {
       val sb = new StringBuilder
-      val numberWidth = if (withLineNumbers) (2 * maxLine.toString.length) + 2 else 0
+      // width display can be upto a range "n-n" where 1 <= n <= maxLine+1
+      val numberWidth = if (withLineNumbers) (2 * (maxLine + 1).toString.length) + 2 else 0
       layout(width - numberWidth).print(sb, numberWidth)
       sb.toString
     }
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 71ab24cf4941..d83558475741 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -352,7 +352,7 @@ class TypeMismatch(val found: Type, expected: Type, val inTree: Option[untpd.Tre
     ++ addenda.dropWhile(_.isEmpty).headOption.getOrElse(importSuggestions)
 
   override def explain(using Context) =
-    val treeStr = inTree.map(x => s"\nTree: ${x.show}").getOrElse("")
+    val treeStr = inTree.map(x => s"\nTree:\n\n${x.show}\n").getOrElse("")
     treeStr + "\n" + super.explain
 
 end TypeMismatch
diff --git a/tests/neg/19680.check b/tests/neg/19680.check
index 5bdaaad99c2a..f7547d6a4eee 100644
--- a/tests/neg/19680.check
+++ b/tests/neg/19680.check
@@ -7,7 +7,10 @@
   | Explanation (enabled by `-explain`)
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   |
-  | Tree: new Config()
+  | Tree:
+  |
+  | new Config()
+  |
   | I tried to show that
   |   Config
   | conforms to
diff --git a/tests/neg/19680b.check b/tests/neg/19680b.check
index 06ff26ee3289..6c5c60b29dee 100644
--- a/tests/neg/19680b.check
+++ b/tests/neg/19680b.check
@@ -7,7 +7,10 @@
   | Explanation (enabled by `-explain`)
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   |
-  | Tree: "hello"
+  | Tree:
+  |
+  | "hello"
+  |
   | I tried to show that
   |   ("hello" : String)
   | conforms to
diff --git a/tests/neg/hidden-type-errors.check b/tests/neg/hidden-type-errors.check
index 2f4a1748dc67..47f5d454c297 100644
--- a/tests/neg/hidden-type-errors.check
+++ b/tests/neg/hidden-type-errors.check
@@ -7,7 +7,10 @@
   | Explanation (enabled by `-explain`)
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   |
-  | Tree: t12717.A.bar("XXX")
+  | Tree:
+  |
+  | t12717.A.bar("XXX")
+  |
   | I tried to show that
   |   String
   | conforms to
diff --git a/tests/neg/i18737.check b/tests/neg/i18737.check
index f2067ad017cd..4f9ac50a784b 100644
--- a/tests/neg/i18737.check
+++ b/tests/neg/i18737.check
@@ -7,7 +7,10 @@
   | Explanation (enabled by `-explain`)
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   |
-  | Tree: v
+  | Tree:
+  |
+  | v
+  |
   | I tried to show that
   |   (v : String & Long)
   | conforms to
@@ -32,7 +35,10 @@
   | Explanation (enabled by `-explain`)
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   |
-  | Tree: v
+  | Tree:
+  |
+  | v
+  |
   | I tried to show that
   |   (v : String | Long)
   | conforms to

From 235b82a2eca3fe54b0bbf27701a9126deb1b224c Mon Sep 17 00:00:00 2001
From: anna herlihy <herlihyap@gmail.com>
Date: Fri, 13 Jun 2025 12:33:02 +0200
Subject: [PATCH 371/505] Test case for regression #23095 (#23359)

[Cherry-picked 4d50e5fff74c5cd40d21148ff3a2145947f089e9]
---
 tests/pos/i23095/defs.scala | 18 ++++++++++++++++++
 tests/pos/i23095/test.scala |  3 +++
 2 files changed, 21 insertions(+)
 create mode 100644 tests/pos/i23095/defs.scala
 create mode 100644 tests/pos/i23095/test.scala

diff --git a/tests/pos/i23095/defs.scala b/tests/pos/i23095/defs.scala
new file mode 100644
index 000000000000..085c63019ef6
--- /dev/null
+++ b/tests/pos/i23095/defs.scala
@@ -0,0 +1,18 @@
+import scala.compiletime.*
+import scala.deriving.*
+
+trait SeqStringCodec[A]:
+  def decode(value: Seq[String]): Either[Any, A]
+
+trait UrlForm
+trait FormCodec[A]
+
+object FormCodec {
+  inline given derived[A](using p: Mirror.ProductOf[A]): FormCodec[A] =
+    val codecs = summonAll[Tuple.Map[p.MirroredElemTypes, SeqStringCodec]].toArray
+    val values = codecs.map {
+      _.asInstanceOf[SeqStringCodec[?]]
+        .decode(List.empty[String])
+    }
+    ???
+}
diff --git a/tests/pos/i23095/test.scala b/tests/pos/i23095/test.scala
new file mode 100644
index 000000000000..cf7a321cbcdf
--- /dev/null
+++ b/tests/pos/i23095/test.scala
@@ -0,0 +1,3 @@
+given SeqStringCodec[Int] = ???
+given SeqStringCodec[String] = ???
+final case class Form(int: Int, string: String) derives FormCodec

From ef520ebf3f88db4a4dbb771f7fbeff71e3c749f6 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 12 Jun 2025 18:44:18 +0200
Subject: [PATCH 372/505] Check for error type before checking members of
 product in getUnapplySelectors

---
 tests/pos/i23156.scala | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 tests/pos/i23156.scala

diff --git a/tests/pos/i23156.scala b/tests/pos/i23156.scala
new file mode 100644
index 000000000000..35edef49bcc4
--- /dev/null
+++ b/tests/pos/i23156.scala
@@ -0,0 +1,6 @@
+object Unpack {
+  (1, 2) match {
+    case Unpack(first, _) => first
+  }
+  def unapply(e: (Int, Int)): Option[T] = ???
+}
\ No newline at end of file

From edc9d27e89b7ace8927b02426cdbf5f5d8b1098f Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 23 Jun 2025 16:31:05 +0200
Subject: [PATCH 373/505] Check for error type before checking members of
 product in getUnapplySelectors

[Cherry-picked 248b9f1bee04e79c965d0c9498cea6ad9333be05][modified]

From 8524b6990af8dcddb764cda3a2755ba1873dcd96 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Thu, 12 Jun 2025 18:53:25 +0200
Subject: [PATCH 374/505] move test to neg

[Cherry-picked af5d91129efd45883b8279fe0225540514bf2191]
---
 tests/{pos => neg}/i23156.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/{pos => neg}/i23156.scala (57%)

diff --git a/tests/pos/i23156.scala b/tests/neg/i23156.scala
similarity index 57%
rename from tests/pos/i23156.scala
rename to tests/neg/i23156.scala
index 35edef49bcc4..c8f01ab16857 100644
--- a/tests/pos/i23156.scala
+++ b/tests/neg/i23156.scala
@@ -2,5 +2,5 @@ object Unpack {
   (1, 2) match {
     case Unpack(first, _) => first
   }
-  def unapply(e: (Int, Int)): Option[T] = ???
+  def unapply(e: (Int, Int)): Option[T] = ??? // error
 }
\ No newline at end of file

From 6bf934c044fa23688572dca8232fab55503f8536 Mon Sep 17 00:00:00 2001
From: aherlihy <herlihyap@gmail.com>
Date: Fri, 13 Jun 2025 13:12:49 +0200
Subject: [PATCH 375/505] Move error check into productSelectorTypes

---
 compiler/src/dotty/tools/dotc/typer/Applications.scala | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index dbb3f7808dba..4d39e3243fc0 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -124,8 +124,11 @@ object Applications {
   }
 
   def productSelectorTypes(tp: Type, errorPos: SrcPos)(using Context): List[Type] = {
-    val sels = for (n <- Iterator.from(0)) yield extractorMemberType(tp, nme.selectorName(n), errorPos)
-    sels.takeWhile(_.exists).toList
+    if tp.isError then
+      Nil
+    else
+      val sels = for (n <- Iterator.from(0)) yield extractorMemberType(tp, nme.selectorName(n), errorPos)
+      sels.takeWhile(_.exists).toList
   }
 
   def tupleComponentTypes(tp: Type)(using Context): List[Type] =

From 712cc0e3880a2f9520f82e7c167bbf924fc11c0e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 23 Jun 2025 16:32:00 +0200
Subject: [PATCH 376/505] Move error check into productSelectorTypes

[Cherry-picked 4c2f6b3666440a3beceec0062bf426ac66da45eb][modified]

From 42e85907d0dd5071715568f2c435d276197c62ab Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Tue, 17 Jun 2025 12:45:43 +0200
Subject: [PATCH 377/505] bugfix: Check if symbol exists before calling methods
 on it (#23376)

Fixes https://github.com/scala/scala3/issues/23374
[Cherry-picked a1b5446110b8608695e05364bf7b4dc1c70e7279]
---
 .../src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
index b4a2067e5c43..076a7deda4b1 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
@@ -320,7 +320,7 @@ object ExtractSemanticDB:
                 registerDefinition(tree.symbol, selectSpan(tree), Set.empty, tree.source)
               case tree => registerDefinition(tree.symbol, tree.span, Set.empty, tree.source)
         case tree: NamedDefTree =>
-          if !tree.symbol.isAllOf(ModuleValCreationFlags) then
+          if tree.symbol.exists && !tree.symbol.isAllOf(ModuleValCreationFlags) then
             tree match {
               case tree: ValDef if tree.symbol.isAllOf(EnumValue) =>
                 tree.rhs match
@@ -379,7 +379,7 @@ object ExtractSemanticDB:
             traverseAnnotsOfDefinition(ctorSym)
             ctorParams(tree.constr.termParamss, tree.constr.leadingTypeParams, tree.body)
             registerDefinition(ctorSym, tree.constr.nameSpan.startPos, Set.empty, tree.source)
-        case tree: Apply =>
+        case tree: Apply if tree.fun.symbol.exists =>
           @tu lazy val genParamSymbol: Name => String = tree.fun.symbol.funParamSymbol
           traverse(tree.fun)
           synth.tryFindSynthetic(tree).foreach(synthetics.addOne)

From b27e4d58d25e3b9762d8c66f08eb08e84638dce1 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 10 Jun 2025 13:32:45 -0700
Subject: [PATCH 378/505] Nowarn extension taking params

[Cherry-picked ec9a060abac9d3e05b47f6897b878b55da03044f]
---
 .../dotty/tools/dotc/transform/CheckUnused.scala  |  8 ++++----
 tests/warn/i23349.scala                           | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 tests/warn/i23349.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 3353139f61c4..102ca8911727 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -582,11 +582,11 @@ object CheckUnused:
                   warnAt(pos)(UnusedSymbol.privateMembers)
         else if ctx.settings.WunusedHas.explicits
           && !sym.is(Synthetic) // param to setter is unused bc there is no field yet
-          && !(sym.owner.is(ExtensionMethod) && {
-            m.paramSymss.dropWhile(_.exists(_.isTypeParam)) match
-            case (h :: Nil) :: Nil => h == sym // param is the extended receiver
+          && !(sym.owner.is(ExtensionMethod) &&
+            m.paramSymss.dropWhile(_.exists(_.isTypeParam)).match
+            case (h :: Nil) :: _ => h == sym // param is the extended receiver
             case _ => false
-          })
+          )
           && !sym.name.isInstanceOf[DerivedName]
           && !ctx.platform.isMainMethod(m)
         then
diff --git a/tests/warn/i23349.scala b/tests/warn/i23349.scala
new file mode 100644
index 000000000000..c694c72af864
--- /dev/null
+++ b/tests/warn/i23349.scala
@@ -0,0 +1,15 @@
+//> using options -Wunused:explicits
+
+// An external class that doesn't get its own `copy` method.
+class Foo(val a: String, val b: Int)
+
+//
+// Example 1: add `copy` method via an extension method.
+//
+extension (self: Foo)
+  def copy(a: String = self.a, b: Int = self.b): Foo = Foo(a, b) // nowarn
+
+//
+// Example 2: implement `copyFoo` with parameter groups.
+//
+def copyFoo(foo: Foo)(a: String = foo.a, b: Int = foo.b): Foo = Foo(a, b) // warn

From 1ea615f9af52e1d0e8cecb7b844ab0ed3c3b524e Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 11 Jun 2025 08:35:45 -0700
Subject: [PATCH 379/505] Check if param was used in default arg getter

[Cherry-picked 0cbe43bd63e4a89c50b372908e68fff400e4728e]
---
 .../dotty/tools/dotc/transform/CheckUnused.scala  | 15 +++++++++++++--
 tests/warn/i15503e.scala                          |  2 +-
 tests/warn/i23349.scala                           |  9 +++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 102ca8911727..1d71ede7c54d 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -568,7 +568,7 @@ object CheckUnused:
         // A class param is unused if its param accessor is unused.
         // (The class param is not assigned to a field until constructors.)
         // A local param accessor warns as a param; a private accessor as a private member.
-        // Avoid warning for case class elements because they are aliased via unapply.
+        // Avoid warning for case class elements because they are aliased via unapply (i.e. may be extracted).
         if m.isPrimaryConstructor then
           val alias = m.owner.info.member(sym.name)
           if alias.exists then
@@ -589,6 +589,7 @@ object CheckUnused:
           )
           && !sym.name.isInstanceOf[DerivedName]
           && !ctx.platform.isMainMethod(m)
+          && !usedByDefaultGetter(sym, m)
         then
           warnAt(pos)(UnusedSymbol.explicitParams(sym))
       end checkExplicit
@@ -600,6 +601,16 @@ object CheckUnused:
         checkExplicit()
     end checkParam
 
+    // does the param have an alias in a default arg method that is used?
+    def usedByDefaultGetter(param: Symbol, meth: Symbol): Boolean =
+      val cls = meth.enclosingClass
+      val MethName = meth.name
+      cls.info.decls.exists: d =>
+        d.name match
+        case DefaultGetterName(MethName, _) =>
+          d.paramSymss.exists(_.exists(p => p.name == param.name && infos.refs(p)))
+        case _ => false
+
     def checkImplicit(sym: Symbol, pos: SrcPos) =
       val m = sym.owner
       def allowed =
@@ -631,7 +642,7 @@ object CheckUnused:
               || aliasSym.isAllOf(Protected | ParamAccessor, butNot = CaseAccessor) && m.owner.is(Given)
             if checking && !infos.refs(alias.symbol) then
               warnAt(pos)(UnusedSymbol.implicitParams(aliasSym))
-        else
+        else if !usedByDefaultGetter(sym, m) then
           warnAt(pos)(UnusedSymbol.implicitParams(sym))
 
     def checkLocal(sym: Symbol, pos: SrcPos) =
diff --git a/tests/warn/i15503e.scala b/tests/warn/i15503e.scala
index 63a9dea163d4..0a7fadc7189a 100644
--- a/tests/warn/i15503e.scala
+++ b/tests/warn/i15503e.scala
@@ -92,4 +92,4 @@ object UnwrapTyped:
     error("Compiler bug: `codeOf` was not evaluated by the compiler")
 
 object `default usage`:
-  def f(i: Int)(j: Int = i * 2) = j // warn I guess
+  def f(i: Int)(j: Int = i * 2) = j // ~warn~ I guess (see tests/warn/i23349.scala)
diff --git a/tests/warn/i23349.scala b/tests/warn/i23349.scala
index c694c72af864..ab1457994e43 100644
--- a/tests/warn/i23349.scala
+++ b/tests/warn/i23349.scala
@@ -1,4 +1,4 @@
-//> using options -Wunused:explicits
+//> using options -Wunused:explicits,implicits
 
 // An external class that doesn't get its own `copy` method.
 class Foo(val a: String, val b: Int)
@@ -12,4 +12,9 @@ extension (self: Foo)
 //
 // Example 2: implement `copyFoo` with parameter groups.
 //
-def copyFoo(foo: Foo)(a: String = foo.a, b: Int = foo.b): Foo = Foo(a, b) // warn
+def copyFoo(foo: Foo)(a: String = foo.a, b: Int = foo.b): Foo = Foo(a, b)
+
+class C:
+  def copyFoo(foo: Foo, bar: String)(a: String = foo.a, b: Int = foo.b)(c: String = bar): Foo = Foo(a, b) // warn c
+  def copyUsing(using foo: Foo, bar: String)(a: String = foo.a, b: Int = foo.b)(c: String = bar): Foo = // warn c
+    Foo(a, b)

From 363654c8194dbc3c57d7cdf6b2a0f587d6a4a256 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 11 Jun 2025 08:53:16 -0700
Subject: [PATCH 380/505] Check if class param was used in default arg getter

[Cherry-picked c02dea2c5b2f1bb035bc3a9167e740142dc99c8d]
---
 .../src/dotty/tools/dotc/transform/CheckUnused.scala | 12 +++++++++---
 tests/warn/i23349.scala                              |  6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 1d71ede7c54d..ba9ec167371e 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -573,7 +573,10 @@ object CheckUnused:
           val alias = m.owner.info.member(sym.name)
           if alias.exists then
             val aliasSym = alias.symbol
-            if aliasSym.isAllOf(PrivateParamAccessor, butNot = CaseAccessor) && !infos.refs(alias.symbol) then
+            if aliasSym.isAllOf(PrivateParamAccessor, butNot = CaseAccessor)
+              && !infos.refs(alias.symbol)
+              && !usedByDefaultGetter(sym, m)
+            then
               if aliasSym.is(Local) then
                 if ctx.settings.WunusedHas.explicits then
                   warnAt(pos)(UnusedSymbol.explicitParams(aliasSym))
@@ -603,7 +606,7 @@ object CheckUnused:
 
     // does the param have an alias in a default arg method that is used?
     def usedByDefaultGetter(param: Symbol, meth: Symbol): Boolean =
-      val cls = meth.enclosingClass
+      val cls = if meth.isPrimaryConstructor then meth.enclosingClass.companionModule else meth.enclosingClass
       val MethName = meth.name
       cls.info.decls.exists: d =>
         d.name match
@@ -640,7 +643,10 @@ object CheckUnused:
             val checking =
                  aliasSym.isAllOf(PrivateParamAccessor, butNot = CaseAccessor)
               || aliasSym.isAllOf(Protected | ParamAccessor, butNot = CaseAccessor) && m.owner.is(Given)
-            if checking && !infos.refs(alias.symbol) then
+            if checking
+              && !infos.refs(alias.symbol)
+              && !usedByDefaultGetter(sym, m)
+            then
               warnAt(pos)(UnusedSymbol.implicitParams(aliasSym))
         else if !usedByDefaultGetter(sym, m) then
           warnAt(pos)(UnusedSymbol.implicitParams(sym))
diff --git a/tests/warn/i23349.scala b/tests/warn/i23349.scala
index ab1457994e43..9ae7c291dd58 100644
--- a/tests/warn/i23349.scala
+++ b/tests/warn/i23349.scala
@@ -18,3 +18,9 @@ class C:
   def copyFoo(foo: Foo, bar: String)(a: String = foo.a, b: Int = foo.b)(c: String = bar): Foo = Foo(a, b) // warn c
   def copyUsing(using foo: Foo, bar: String)(a: String = foo.a, b: Int = foo.b)(c: String = bar): Foo = // warn c
     Foo(a, b)
+
+class K(k: Int)(s: String = "*"*k):
+  override val toString = s
+
+class KU(using k: Int)(s: String = "*"*k):
+  override val toString = s

From 52ee0c35d0cbe7b74124958c69e5813e8031f6da Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 11 Jun 2025 09:07:40 -0700
Subject: [PATCH 381/505] Unused check of secondary constructor param

[Cherry-picked aef0a253a6dea551e5e1691924e691ecc666fe39]
---
 compiler/src/dotty/tools/dotc/transform/CheckUnused.scala | 2 +-
 tests/warn/i23349.scala                                   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index ba9ec167371e..edfb8f9efa41 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -606,7 +606,7 @@ object CheckUnused:
 
     // does the param have an alias in a default arg method that is used?
     def usedByDefaultGetter(param: Symbol, meth: Symbol): Boolean =
-      val cls = if meth.isPrimaryConstructor then meth.enclosingClass.companionModule else meth.enclosingClass
+      val cls = if meth.isConstructor then meth.enclosingClass.companionModule else meth.enclosingClass
       val MethName = meth.name
       cls.info.decls.exists: d =>
         d.name match
diff --git a/tests/warn/i23349.scala b/tests/warn/i23349.scala
index 9ae7c291dd58..4d0fcfc759db 100644
--- a/tests/warn/i23349.scala
+++ b/tests/warn/i23349.scala
@@ -24,3 +24,7 @@ class K(k: Int)(s: String = "*"*k):
 
 class KU(using k: Int)(s: String = "*"*k):
   override val toString = s
+
+class KK(s: String):
+  def this(k: Int)(s: String = "*"*k) = this(s)
+  override val toString = s

From 40e33725b7587441f819d7c4a037eca1d9ffb5a5 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 17 Jun 2025 18:56:00 +0200
Subject: [PATCH 382/505] bugfix: Don't check scope members if not needed

This was causing a significant slowdown in most cases for lichess/lila and scope completions are mostly for printing, so we don't need to check so heavily if a member is valid.

[Cherry-picked 14a8cc5d8574b71082435b20ab27931ab926a044]
---
 .../tools/dotc/interactive/Completion.scala   | 19 ++++++++-----------
 .../tests/edit/InsertInferredTypeSuite.scala  |  5 ++---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index 227b4b520236..820dcd774530 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -51,9 +51,9 @@ object Completion:
     val completionContext = Interactive.contextOfPath(tpdPath).withPhase(Phases.typerPhase)
     inContext(completionContext):
       val untpdPath = Interactive.resolveTypedOrUntypedPath(tpdPath, pos)
-      val mode = completionMode(untpdPath, pos, forSymbolSearch = true)
       val rawPrefix = completionPrefix(untpdPath, pos)
-      val completer = new Completer(mode, pos, untpdPath, _ => true)
+      // Lazy mode is to avoid too many checks as it's mostly for printing types
+      val completer = new Completer(Mode.Lazy, pos, untpdPath, _ => true)
       completer.scopeCompletions
 
   /** Get possible completions from tree at `pos`
@@ -96,7 +96,7 @@ object Completion:
    *
    * Otherwise, provide no completion suggestion.
    */
-  def completionMode(path: List[untpd.Tree], pos: SourcePosition, forSymbolSearch: Boolean = false): Mode = path match
+  def completionMode(path: List[untpd.Tree], pos: SourcePosition): Mode = path match
     // Ignore `package foo@@` and `package foo.bar@@`
     case ((_: tpd.Select) | (_: tpd.Ident)):: (_ : tpd.PackageDef) :: _  => Mode.None
     case GenericImportSelector(sel) =>
@@ -109,14 +109,9 @@ object Completion:
     case untpd.Literal(Constants.Constant(_: String)) :: _ => Mode.Term | Mode.Scope // literal completions
     case (ref: untpd.RefTree) :: _ =>
       val maybeSelectMembers = if ref.isInstanceOf[untpd.Select] then Mode.Member else Mode.Scope
-      if (forSymbolSearch) then Mode.Term | Mode.Type | maybeSelectMembers
-      else if (ref.name.isTermName) Mode.Term | maybeSelectMembers
+      if (ref.name.isTermName) Mode.Term | maybeSelectMembers
       else if (ref.name.isTypeName) Mode.Type | maybeSelectMembers
       else Mode.None
-
-    case (_: tpd.TypeTree | _: tpd.MemberDef) :: _ if forSymbolSearch => Mode.Type | Mode.Term
-    case (_: tpd.CaseDef) :: _ if forSymbolSearch => Mode.Type | Mode.Term
-    case Nil if forSymbolSearch =>  Mode.Type | Mode.Term
     case _ => Mode.None
 
   /** When dealing with <errors> in varios palces we check to see if they are
@@ -623,7 +618,7 @@ object Completion:
     private def include(denot: SingleDenotation, nameInScope: Name)(using Context): Boolean =
       matches(nameInScope) &&
       completionsFilter(NoType, nameInScope) &&
-      isValidCompletionSymbol(denot.symbol, mode, isNew)
+      (mode.is(Mode.Lazy) || isValidCompletionSymbol(denot.symbol, mode, isNew))
 
     private def extractRefinements(site: Type)(using Context): Seq[SingleDenotation] =
       site match
@@ -653,7 +648,7 @@ object Completion:
 
       val members = site.memberDenots(completionsFilter, appendMemberSyms).collect {
         case mbr if include(mbr, mbr.name)
-                    && mbr.symbol.isAccessibleFrom(site) => mbr
+                    && (mode.is(Mode.Lazy) || mbr.symbol.isAccessibleFrom(site)) => mbr
       }
       val refinements = extractRefinements(site).filter(mbr => include(mbr, mbr.name))
 
@@ -716,3 +711,5 @@ object Completion:
 
     val Member: Mode = new Mode(16)
 
+    val Lazy: Mode = new Mode(32)
+
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
index c574ed9bfc9f..a5d940612d66 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
@@ -657,14 +657,13 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite:
          |object O{
          |  val <<foo>> = A.Foo(new A.`x-x`)
          |}""".stripMargin,
-      """|import A.Foo
-         |import A.`x-x`
+      """|import A.`x-x`
          |object A{
          |  class `x-x`
          |  case class Foo[A](i: A)
          |}
          |object O{
-         |  val foo: Foo[`x-x`] = A.Foo(new A.`x-x`)
+         |  val foo: A.Foo[`x-x`] = A.Foo(new A.`x-x`)
          |}
          |""".stripMargin
     )

From dd08f1252d7a8a14ba74c162dc154a017c08bd01 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Mon, 23 Jun 2025 20:59:57 +0200
Subject: [PATCH 383/505] [chore]: Add regression tests for #23237 (#23405)

Adds regression tests for #23237 to prevent reintroducing regression
from https://github.com/scala/scala3/pull/21744
[Cherry-picked 0a4b6ec74b392b019fafd341f83ec4b5aa804bad]
---
 tests/pos/i23237a.scala | 29 +++++++++++++++++++++++++++++
 tests/pos/i23237b.scala | 23 +++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 tests/pos/i23237a.scala
 create mode 100644 tests/pos/i23237b.scala

diff --git a/tests/pos/i23237a.scala b/tests/pos/i23237a.scala
new file mode 100644
index 000000000000..bcac4c6f7050
--- /dev/null
+++ b/tests/pos/i23237a.scala
@@ -0,0 +1,29 @@
+sealed trait Dim
+trait _2D extends Dim
+trait _3D extends Dim
+
+sealed abstract class IntVector[D]
+object IntVector{
+  def apply[D](d: Array[Int]): IntVector[D] = ???
+  def apply(x: Int, y: Int): IntVector2D = IntVector2D(x, y)
+  def apply(x: Int, y: Int, z: Int): IntVector3D = IntVector3D(x, y, z)
+}
+case class IntVector2D(i: Int, j: Int) extends IntVector[_2D]
+case class IntVector3D(i: Int, j: Int, k: Int) extends IntVector[_3D]
+
+type DiscreteImage[D, A] = DiscreteField[D, DiscreteImageDomain, A]
+class DiscreteField[D, DDomain[D] <: DiscreteDomain[D], A](val domain: DDomain[D], val data: IndexedSeq[A])  extends PartialFunction[PointId, A] {
+  override def apply(v1: PointId) = ???
+  override def isDefinedAt(ptId: PointId) = ???
+}
+object DiscreteField{
+    implicit class DiscreteImageOps[D, A](discreteField: DiscreteField[D, DiscreteImageDomain, A]) {
+      def apply(idx: IntVector[D]): A = ???
+      def isDefinedAt(idx: IntVector[D]): Boolean = ???
+  }
+}
+trait DiscreteDomain[D]
+trait DiscreteImageDomain[D] extends DiscreteDomain[D]
+final case class PointId(id: Int) extends AnyVal
+
+def test[S](img: DiscreteImage[_3D, S]) = img(IntVector(1, 2, 3))
diff --git a/tests/pos/i23237b.scala b/tests/pos/i23237b.scala
new file mode 100644
index 000000000000..b49df924e691
--- /dev/null
+++ b/tests/pos/i23237b.scala
@@ -0,0 +1,23 @@
+object types{
+  final case class vec2(x: Float, y: Float)
+  final case class vec4(x: Float, y: Float, z: Float, w: Float)
+  object vec4:
+    def apply(xy: vec2, z: Float, w: Float): vec4 = vec4(xy.x, xy.y, z, w)
+
+  opaque type Shader[In, Out] = In => Out
+  object Shader:
+    inline def apply[In, Out](f: In => Out): Shader[In, Out] = f
+    inline def apply[In](f: In => Unit): Shader[In, Unit]    = f
+    inline def apply(body: => Any): Shader[Unit, Unit] = (_: Unit) => body
+}
+import types.*
+
+class GLSLEnvTests {
+  case class FragEnv(UV: vec2)
+
+  inline def fragment: Shader[FragEnv, vec4] =
+    Shader { env =>
+      val x = env.UV
+      vec4(env.UV, 0.0f, 1.0f)
+    }
+}

From 46a8de443620fb8659276c2628f488463e659a7d Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 17 Mar 2025 17:58:22 -0700
Subject: [PATCH 384/505] standardize on -Vprint:... (still support -Xprint:...
 as alias)

---
 compiler/src/dotty/tools/dotc/Run.scala                |  2 +-
 compiler/src/dotty/tools/dotc/config/CliCommand.scala  |  4 ++--
 .../src/dotty/tools/dotc/config/ScalaSettings.scala    |  2 +-
 compiler/src/dotty/tools/dotc/core/Phases.scala        |  2 +-
 compiler/src/dotty/tools/dotc/transform/Recheck.scala  |  2 +-
 .../test/dotty/tools/dotc/printing/PrintingTest.scala  |  2 +-
 .../dotty/tools/dotc/semanticdb/SemanticdbTests.scala  |  2 +-
 compiler/test/dotty/tools/repl/ReplCompilerTests.scala |  2 +-
 docs/_docs/contributing/debugging/ide-debugging.md     |  2 +-
 docs/_docs/contributing/debugging/inspection.md        |  4 ++--
 docs/_docs/contributing/debugging/other-debugging.md   | 10 +++++-----
 docs/_docs/contributing/issues/cause.md                |  8 ++++----
 docs/_docs/contributing/issues/reproduce.md            |  6 +++---
 docs/_docs/reference/experimental/cc.md                |  2 +-
 docs/_spec/TODOreference/experimental/cc.md            |  2 +-
 project/scripts/options                                |  2 +-
 sbt-test/scala2-compat/i13332/build.sbt                |  4 ++--
 tests/disabled/partest/run/delambdafy_t6028.scala      |  2 +-
 tests/disabled/partest/run/delambdafy_t6555.scala      |  2 +-
 .../partest/run/delambdafy_uncurry_byname_inline.scala |  2 +-
 .../partest/run/delambdafy_uncurry_byname_method.scala |  2 +-
 .../partest/run/delambdafy_uncurry_inline.scala        |  2 +-
 .../partest/run/delambdafy_uncurry_method.scala        |  2 +-
 tests/disabled/partest/run/dynamic-applyDynamic.scala  |  4 ++--
 .../partest/run/dynamic-applyDynamicNamed.scala        |  2 +-
 tests/disabled/partest/run/dynamic-selectDynamic.scala |  2 +-
 tests/disabled/partest/run/dynamic-updateDynamic.scala |  2 +-
 tests/disabled/partest/run/existential-rangepos.scala  |  2 +-
 .../partest/run/t4287inferredMethodTypes.scala         |  4 ++--
 tests/disabled/partest/run/t5603.scala                 |  2 +-
 tests/disabled/partest/run/t5699.scala                 |  2 +-
 tests/disabled/partest/run/t6028.scala                 |  2 +-
 tests/disabled/partest/run/t6288.scala                 |  2 +-
 tests/disabled/partest/run/t6555.scala                 |  2 +-
 tests/disabled/partest/run/t7271.scala                 |  2 +-
 tests/pending/pos/t5777.scala                          |  2 +-
 tests/pos/annot-18064.scala                            |  2 +-
 tests/pos/i14152.scala                                 |  2 +-
 tests/pos/i8875.scala                                  |  4 ++--
 tests/pos/printbounds.scala                            |  2 +-
 tests/pos/test-implicits2.scala                        |  2 +-
 tests/pos/typeclass-scaling.scala                      |  2 +-
 tests/printing/annot-18064.scala                       |  2 +-
 tests/run/inline-numeric/test.scala                    |  2 +-
 44 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala
index 79b49653746b..88a69d7d7cd4 100644
--- a/compiler/src/dotty/tools/dotc/Run.scala
+++ b/compiler/src/dotty/tools/dotc/Run.scala
@@ -338,7 +338,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
             profiler.onPhase(phase):
               try units = phase.runOn(units)
               catch case _: InterruptedException => cancelInterrupted()
-            if (ctx.settings.Xprint.value.containsPhase(phase))
+            if (ctx.settings.Vprint.value.containsPhase(phase))
               for (unit <- units)
                 lastPrintedTree =
                   printTree(lastPrintedTree)(using ctx.fresh.setPhase(phase.next).setCompilationUnit(unit))
diff --git a/compiler/src/dotty/tools/dotc/config/CliCommand.scala b/compiler/src/dotty/tools/dotc/config/CliCommand.scala
index 5ec51c1b5b0f..ce97e15483fd 100644
--- a/compiler/src/dotty/tools/dotc/config/CliCommand.scala
+++ b/compiler/src/dotty/tools/dotc/config/CliCommand.scala
@@ -33,8 +33,8 @@ trait CliCommand:
     |<phases> means one or a comma-separated list of:
     |  - (partial) phase names with an optional "+" suffix to include the next phase
     |  - the string "all"
-    |  example: -Xprint:all prints all phases.
-    |  example: -Xprint:typer,mixin prints the typer and mixin phases.
+    |  example: -Vprint:all prints all phases.
+    |  example: -Vprint:typer,mixin prints the typer and mixin phases.
     |  example: -Ylog:erasure+ logs the erasure phase and the phase after the erasure phase.
     |           This is useful because during the tree transform of phase X, we often
     |           already are in phase X + 1.
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index 4e544718645b..ddd184c445f0 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -154,7 +154,7 @@ private sealed trait PluginSettings:
 private sealed trait VerboseSettings:
   self: SettingGroup =>
   val Vhelp: Setting[Boolean] = BooleanSetting("-V", "Print a synopsis of verbose options.")
-  val Xprint: Setting[List[String]] = PhasesSetting("-Vprint", "Print out program after", aliases = List("-Xprint"))
+  val Vprint: Setting[List[String]] = PhasesSetting("-Vprint", "Print out program after", aliases = List("-Xprint"))
   val XshowPhases: Setting[Boolean] = BooleanSetting("-Vphases", "List compiler phases.", aliases = List("-Xshow-phases"))
 
   val Vprofile: Setting[Boolean] = BooleanSetting("-Vprofile", "Show metrics about sources and internal representations to estimate compile-time complexity.")
diff --git a/compiler/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala
index 8d690a28a403..603328d18d44 100644
--- a/compiler/src/dotty/tools/dotc/core/Phases.scala
+++ b/compiler/src/dotty/tools/dotc/core/Phases.scala
@@ -300,7 +300,7 @@ object Phases {
      *  instance, it is possible to print trees after a given phase using:
      *
      *  ```bash
-     *  $ ./bin/scalac -Xprint:<phaseNameHere> sourceFile.scala
+     *  $ ./bin/scalac -Vprint:<phaseNameHere> sourceFile.scala
      *  ```
      */
     def phaseName: String
diff --git a/compiler/src/dotty/tools/dotc/transform/Recheck.scala b/compiler/src/dotty/tools/dotc/transform/Recheck.scala
index 2eebc2347eec..c727a65969c5 100644
--- a/compiler/src/dotty/tools/dotc/transform/Recheck.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Recheck.scala
@@ -149,7 +149,7 @@ abstract class Recheck extends Phase, SymTransformer:
      *  can be retrieved with `knownType`
      */
     private val keepAllTypes = inContext(ictx) {
-      ictx.settings.Xprint.value.containsPhase(thisPhase)
+      ictx.settings.Vprint.value.containsPhase(thisPhase)
     }
 
     /** Should type of `tree` be kept in an attachment so that it can be retrieved with
diff --git a/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala b/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala
index cfcade9be5ab..0d235bace899 100644
--- a/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala
+++ b/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala
@@ -27,7 +27,7 @@ class PrintingTest {
   def options(phase: String, flags: List[String]) =
     val outDir = ParallelTesting.defaultOutputDir + "printing" + File.pathSeparator
     File(outDir).mkdirs()
-    List(s"-Xprint:$phase", "-color:never", "-nowarn", "-d", outDir, "-classpath", TestConfiguration.basicClasspath) ::: flags
+    List(s"-Vprint:$phase", "-color:never", "-nowarn", "-d", outDir, "-classpath", TestConfiguration.basicClasspath) ::: flags
 
   private def compileFile(path: JPath, phase: String): Boolean = {
     val baseFilePath  = path.toString.stripSuffix(".scala")
diff --git a/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala b/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala
index de8c2c11f9c2..cdfb3cea5856 100644
--- a/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala
+++ b/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala
@@ -138,7 +138,7 @@ class SemanticdbTests:
       "-feature",
       "-deprecation",
       // "-Ydebug-flags",
-      // "-Xprint:extractSemanticDB",
+      // "-Vprint:extractSemanticDB",
       "-sourceroot", expectSrc.toString,
       "-classpath", target.toString,
       "-Xignore-scala2-macros",
diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
index 3d228e3721a2..1f65f7fa626f 100644
--- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
+++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
@@ -422,7 +422,7 @@ object ReplCompilerTests:
 
 end ReplCompilerTests
 
-class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Xprint:typer"):
+class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Vprint:typer"):
   @Test def i9111 = initially {
     run("""|enum E {
            |  case A
diff --git a/docs/_docs/contributing/debugging/ide-debugging.md b/docs/_docs/contributing/debugging/ide-debugging.md
index af817826565a..cca5d4849e5e 100644
--- a/docs/_docs/contributing/debugging/ide-debugging.md
+++ b/docs/_docs/contributing/debugging/ide-debugging.md
@@ -140,7 +140,7 @@ And concatenate the output into the classpath argument, which should already con
 
 In the `args` you can add any additional compiler option you want.
 
-For instance you can add `-Xprint:all` to print all the generated trees after each mega phase.
+For instance you can add `-Vprint:all` to print all the generated trees after each mega phase.
 
 Run `scalac -help` to get an overview of the available compiler options.
 
diff --git a/docs/_docs/contributing/debugging/inspection.md b/docs/_docs/contributing/debugging/inspection.md
index a80c3d3462ae..483f9db4474e 100644
--- a/docs/_docs/contributing/debugging/inspection.md
+++ b/docs/_docs/contributing/debugging/inspection.md
@@ -61,9 +61,9 @@ Sometimes you may want to stop the compiler after a certain phase, for example t
 knock-on errors from occurring from a bug in an earlier phase. Use the flag
 `-Ystop-after:<phase-name>` to prevent any phases executing afterwards.
 
-> e.g. `-Xprint:<phase>` where `phase` is a miniphase, will print after
+> e.g. `-Vprint:<phase>` where `phase` is a miniphase, will print after
 > the whole phase group is complete, which may be several miniphases after `phase`.
-> Instead you can use `-Ystop-after:<phase> -Xprint:<phase>` to stop
+> Instead you can use `-Ystop-after:<phase> -Vprint:<phase>` to stop
 > immediately after the miniphase and see the trees that you intended.
 
 ## Printing TASTy of a Class
diff --git a/docs/_docs/contributing/debugging/other-debugging.md b/docs/_docs/contributing/debugging/other-debugging.md
index 50be43db51ab..3879f3d8b53d 100644
--- a/docs/_docs/contributing/debugging/other-debugging.md
+++ b/docs/_docs/contributing/debugging/other-debugging.md
@@ -137,19 +137,19 @@ assertPositioned(tree.reporting(s"Tree is: $result"))
 To print out the trees you are compiling after the FrontEnd (scanner, parser, namer, typer) phases:
 
 ```shell
-scalac -Xprint:typer ../issues/Playground.scala
+scalac -Vprint:typer ../issues/Playground.scala
 ```
 
 To print out the trees after Frontend and CollectSuperCalls phases:
 
 ```shell
-scalac -Xprint:typer,collectSuperCalls ../issues/Playground.scala
+scalac -Vprint:typer,collectSuperCalls ../issues/Playground.scala
 ```
 
 To print out the trees after all phases:
 
 ```shell
-scalac -Xprint:all ../issues/Playground.scala
+scalac -Vprint:all ../issues/Playground.scala
 ```
 
 To find out the list of all the phases and their names, check out [this](https://github.com/lampepfl/dotty/blob/10526a7d0aa8910729b6036ee51942e05b71abf6/compiler/src/dotty/tools/dotc/Compiler.scala#L34) line in `Compiler.scala`. Each `Phase` object has `phaseName` defined on it, this is the phase name.
@@ -219,7 +219,7 @@ And is to be used as:
 scalac -Yprint-pos  ../issues/Playground.scala
 ```
 
-If used, all the trees output with `show` or via `-Xprint:typer` will also have positions attached to them, e.g.:
+If used, all the trees output with `show` or via `-Vprint:typer` will also have positions attached to them, e.g.:
 
 ```scala
 package <empty>@<Playground.scala:1> {
@@ -247,7 +247,7 @@ package <empty>@<Playground.scala:1> {
 Every [Positioned](https://github.com/lampepfl/dotty/blob/10526a7d0aa8910729b6036ee51942e05b71abf6/compiler/src/dotty/tools/dotc/ast/Positioned.scala) (a parent class of `Tree`) object has a `uniqueId` field. It is an integer that is unique for that tree and doesn't change from compile run to compile run. You can output these IDs from any printer (such as the ones used by `.show` and `-Xprint`) via `-Yshow-tree-ids` flag, e.g.:
 
 ```shell
-scalac -Xprint:typer -Yshow-tree-ids  ../issues/Playground.scala
+scalac -Vprint:typer -Yshow-tree-ids  ../issues/Playground.scala
 ```
 
 Gives:
diff --git a/docs/_docs/contributing/issues/cause.md b/docs/_docs/contributing/issues/cause.md
index e23f6d1f747f..b6bbb68a052f 100644
--- a/docs/_docs/contributing/issues/cause.md
+++ b/docs/_docs/contributing/issues/cause.md
@@ -18,10 +18,10 @@ As described in the [compiler lifecycle](../architecture/lifecycle.md#phases-2),
 each phase transforms the trees and types that represent your code in a certain
 way.
 
-To print the code as it is transformed through the compiler, use the compiler flag `-Xprint:all`.
+To print the code as it is transformed through the compiler, use the compiler flag `-Vprint:all`.
 After each phase group is completed, you will see the resulting trees representing the code.
 
-> It is recommended to test `-Xprint:all` on a single, small file, otherwise a lot of unnecessary
+> It is recommended to test `-Vprint:all` on a single, small file, otherwise a lot of unnecessary
 > output will be generated.
 
 ### Trace a Tree Creation Site
@@ -31,7 +31,7 @@ your search to the code of that phase. For example if you found a problematic tr
 `posttyper`, the problem most likely appears in the code of [PostTyper]. We can trace the exact point
 the tree was generated by looking for its unique ID, and then generating a stack trace at its creation:
 
-1. Run the compiler with `-Xprint:posttyper` and `-Yshow-tree-ids` flags.
+1. Run the compiler with `-Vprint:posttyper` and `-Yshow-tree-ids` flags.
    This will only print the trees of the `posttyper` phase. This time you should see the tree
    in question be printed alongside its ID. You'll see something like `println#223("Hello World"#37)`.
 2. Copy the ID of the desired tree.
@@ -43,7 +43,7 @@ Do not use a conditional breakpoint, the time overhead is very significant for a
 
 ### Enhanced Tree Printing
 
-As seen above `-Xprint:<phase>` can be enhanced with further configuration flags, found in
+As seen above `-Vprint:<phase>` can be enhanced with further configuration flags, found in
 [ScalaSettings]. For example, you can additionally print the type of a tree with `-Xprint-types`.
 
 ## Increasing Logging Output
diff --git a/docs/_docs/contributing/issues/reproduce.md b/docs/_docs/contributing/issues/reproduce.md
index ca5da324a867..cb26e7eb764e 100644
--- a/docs/_docs/contributing/issues/reproduce.md
+++ b/docs/_docs/contributing/issues/reproduce.md
@@ -39,9 +39,9 @@ $ scalac <OPTIONS> <FILE>
 
 Here are some useful debugging `<OPTIONS>`:
 
-* `-Xprint:PHASE1,PHASE2,...` or `-Xprint:all`: prints the `AST` after each
+* `-Vprint:PHASE1,PHASE2,...` or `-Vprint:all`: prints the `AST` after each
   specified phase. Phase names can be found by examining the
-  `dotty.tools.dotc.transform.*` classes for their `phaseName` field e.g., `-Xprint:erasure`.
+  `dotty.tools.dotc.transform.*` classes for their `phaseName` field e.g., `-Vprint:erasure`.
   You can discover all phases in the `dotty.tools.dotc.Compiler` class
 * `-Ylog:PHASE1,PHASE2,...` or `-Ylog:all`: enables `ctx.log("")` logging for
   the specified phase.
@@ -142,7 +142,7 @@ $ (rm -rv out || true) && mkdir out # clean up compiler output, create `out` dir
 
 scalac  # Invoke the compiler task defined by the Dotty sbt project
   -d $here/out  # All the artefacts go to the `out` folder created earlier
-  # -Xprint:typer  # Useful debug flags, commented out and ready for quick usage. Should you need one, you can quickly access it by uncommenting it.
+  # -Vprint:typer  # Useful debug flags, commented out and ready for quick usage. Should you need one, you can quickly access it by uncommenting it.
   # -Ydebug-error
   # -Yprint-debug
   # -Yprint-debug-owners
diff --git a/docs/_docs/reference/experimental/cc.md b/docs/_docs/reference/experimental/cc.md
index 162a4661e10c..ff7c01704b78 100644
--- a/docs/_docs/reference/experimental/cc.md
+++ b/docs/_docs/reference/experimental/cc.md
@@ -656,7 +656,7 @@ TBD
 
 The following options are relevant for capture checking.
 
- - **-Xprint:cc** Prints the program with capturing types as inferred by capture checking.
+ - **-Vprint:cc** Prints the program with capturing types as inferred by capture checking.
  - **-Ycc-debug** Gives more detailed, implementation-oriented information about capture checking, as described in the next section.
 
  The implementation supporting capture checking with these options is currently in branch `cc-experiment` on dotty.epfl.ch.
diff --git a/docs/_spec/TODOreference/experimental/cc.md b/docs/_spec/TODOreference/experimental/cc.md
index 878bc0a64ed6..c2011fbcbc88 100644
--- a/docs/_spec/TODOreference/experimental/cc.md
+++ b/docs/_spec/TODOreference/experimental/cc.md
@@ -655,7 +655,7 @@ TBD
 The following options are relevant for capture checking.
 
  - **-Ycc** Enables capture checking.
- - **-Xprint:cc** Prints the program with capturing types as inferred by capture checking.
+ - **-Vprint:cc** Prints the program with capturing types as inferred by capture checking.
  - **-Ycc-debug** Gives more detailed, implementation-oriented information about capture checking, as described in the next section.
 
  The implementation supporting capture checking with these options is currently in branch `cc-experiment` on dotty.epfl.ch.
diff --git a/project/scripts/options b/project/scripts/options
index 86d2c8fd8edb..c4f132d6750a 100644
--- a/project/scripts/options
+++ b/project/scripts/options
@@ -1,2 +1,2 @@
--Xprint:frontend -Ylog:frontend
+-Vprint:frontend -Ylog:frontend
 -Ycheck:all
diff --git a/sbt-test/scala2-compat/i13332/build.sbt b/sbt-test/scala2-compat/i13332/build.sbt
index 3d24ba92abe1..1482eca02955 100644
--- a/sbt-test/scala2-compat/i13332/build.sbt
+++ b/sbt-test/scala2-compat/i13332/build.sbt
@@ -10,5 +10,5 @@ lazy val app = project.in(file("app"))
   .dependsOn(lib)
   .settings(
     scalaVersion := scala3Version,
-    scalacOptions += "-Xprint:inlining"
-  )
\ No newline at end of file
+    scalacOptions += "-Vprint:inlining"
+  )
diff --git a/tests/disabled/partest/run/delambdafy_t6028.scala b/tests/disabled/partest/run/delambdafy_t6028.scala
index 0b7ef48c3df8..981b6b759ebc 100644
--- a/tests/disabled/partest/run/delambdafy_t6028.scala
+++ b/tests/disabled/partest/run/delambdafy_t6028.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Ydelambdafy:method -Xprint:lambdalift -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Ydelambdafy:method -Vprint:lambdalift -d " + testOutput.path
 
   override def code = """class T(classParam: Int) {
                         |  val field: Int = 0
diff --git a/tests/disabled/partest/run/delambdafy_t6555.scala b/tests/disabled/partest/run/delambdafy_t6555.scala
index a1dcfe790c3b..b40e1c0e4faf 100644
--- a/tests/disabled/partest/run/delambdafy_t6555.scala
+++ b/tests/disabled/partest/run/delambdafy_t6555.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:specialize -Ydelambdafy:method -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:specialize -Ydelambdafy:method -d " + testOutput.path
 
   override def code = "class Foo { val f = (param: Int) => param } "
 
diff --git a/tests/disabled/partest/run/delambdafy_uncurry_byname_inline.scala b/tests/disabled/partest/run/delambdafy_uncurry_byname_inline.scala
index 8f480fa80488..f8729e3c6710 100644
--- a/tests/disabled/partest/run/delambdafy_uncurry_byname_inline.scala
+++ b/tests/disabled/partest/run/delambdafy_uncurry_byname_inline.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar(x: => Int) = x
diff --git a/tests/disabled/partest/run/delambdafy_uncurry_byname_method.scala b/tests/disabled/partest/run/delambdafy_uncurry_byname_method.scala
index 1adeec843390..0c21c232ae2a 100644
--- a/tests/disabled/partest/run/delambdafy_uncurry_byname_method.scala
+++ b/tests/disabled/partest/run/delambdafy_uncurry_byname_method.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar(x: => Int) = x
diff --git a/tests/disabled/partest/run/delambdafy_uncurry_inline.scala b/tests/disabled/partest/run/delambdafy_uncurry_inline.scala
index b42b65f5bbda..b397189271d9 100644
--- a/tests/disabled/partest/run/delambdafy_uncurry_inline.scala
+++ b/tests/disabled/partest/run/delambdafy_uncurry_inline.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar = {
diff --git a/tests/disabled/partest/run/delambdafy_uncurry_method.scala b/tests/disabled/partest/run/delambdafy_uncurry_method.scala
index a988fb2ee7bf..db2ca7061985 100644
--- a/tests/disabled/partest/run/delambdafy_uncurry_method.scala
+++ b/tests/disabled/partest/run/delambdafy_uncurry_method.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar = {
diff --git a/tests/disabled/partest/run/dynamic-applyDynamic.scala b/tests/disabled/partest/run/dynamic-applyDynamic.scala
index b06041194c1e..65457a8b7b42 100644
--- a/tests/disabled/partest/run/dynamic-applyDynamic.scala
+++ b/tests/disabled/partest/run/dynamic-applyDynamic.scala
@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {
@@ -23,4 +23,4 @@ object Test extends DirectTest {
 import language.dynamics
 class D extends Dynamic {
   def applyDynamic(name: String)(value: Any) = ???
-}
\ No newline at end of file
+}
diff --git a/tests/disabled/partest/run/dynamic-applyDynamicNamed.scala b/tests/disabled/partest/run/dynamic-applyDynamicNamed.scala
index cc59f9058be9..929485982d82 100644
--- a/tests/disabled/partest/run/dynamic-applyDynamicNamed.scala
+++ b/tests/disabled/partest/run/dynamic-applyDynamicNamed.scala
@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {
diff --git a/tests/disabled/partest/run/dynamic-selectDynamic.scala b/tests/disabled/partest/run/dynamic-selectDynamic.scala
index bd6c138c5002..2b92bcbb7cdd 100644
--- a/tests/disabled/partest/run/dynamic-selectDynamic.scala
+++ b/tests/disabled/partest/run/dynamic-selectDynamic.scala
@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {
diff --git a/tests/disabled/partest/run/dynamic-updateDynamic.scala b/tests/disabled/partest/run/dynamic-updateDynamic.scala
index 80fe0ea35f4c..5d1518550f39 100644
--- a/tests/disabled/partest/run/dynamic-updateDynamic.scala
+++ b/tests/disabled/partest/run/dynamic-updateDynamic.scala
@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {
diff --git a/tests/disabled/partest/run/existential-rangepos.scala b/tests/disabled/partest/run/existential-rangepos.scala
index 7d2b0810d342..50335ac62cea 100644
--- a/tests/disabled/partest/run/existential-rangepos.scala
+++ b/tests/disabled/partest/run/existential-rangepos.scala
@@ -1,7 +1,7 @@
 import scala.tools.partest._
 
 object Test extends DirectTest {
-  override def extraSettings: String = "-usejavacp -Yrangepos -Xprint:patmat -Xprint-pos -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Yrangepos -Vprint:patmat -Xprint-pos -d " + testOutput.path
 
   override def code = """
 abstract class A[T] {
diff --git a/tests/disabled/partest/run/t4287inferredMethodTypes.scala b/tests/disabled/partest/run/t4287inferredMethodTypes.scala
index f14e672da88a..cc9c057899ad 100644
--- a/tests/disabled/partest/run/t4287inferredMethodTypes.scala
+++ b/tests/disabled/partest/run/t4287inferredMethodTypes.scala
@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Yinfer-argument-types -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Yinfer-argument-types -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
 class A(a: Int = A.a)
@@ -22,4 +22,4 @@ class B extends A {
       compile()
     }
   }
-}
\ No newline at end of file
+}
diff --git a/tests/disabled/partest/run/t5603.scala b/tests/disabled/partest/run/t5603.scala
index 77c2775cc353..c047fe7896b5 100644
--- a/tests/disabled/partest/run/t5603.scala
+++ b/tests/disabled/partest/run/t5603.scala
@@ -7,7 +7,7 @@ import scala.tools.nsc.reporters.ConsoleReporter
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:parser -Ystop-after:parser -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:parser -Ystop-after:parser -d " + testOutput.path
 
   override def code = """
     trait Greeting {
diff --git a/tests/disabled/partest/run/t5699.scala b/tests/disabled/partest/run/t5699.scala
index ec3b1d26b490..bdcdfed93583 100755
--- a/tests/disabled/partest/run/t5699.scala
+++ b/tests/disabled/partest/run/t5699.scala
@@ -7,7 +7,7 @@ object Test extends DirectTest {
     |public @interface MyAnnotation { String value(); }
   """.stripMargin
 
-  override def extraSettings: String = "-usejavacp -Ystop-after:typer -Xprint:parser"
+  override def extraSettings: String = "-usejavacp -Ystop-after:typer -Vprint:parser"
 
   override def show(): Unit = {
     // redirect err to out, for logging
diff --git a/tests/disabled/partest/run/t6028.scala b/tests/disabled/partest/run/t6028.scala
index a6f920c5bb67..6e4e179f1dfd 100644
--- a/tests/disabled/partest/run/t6028.scala
+++ b/tests/disabled/partest/run/t6028.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Ydelambdafy:inline -Xprint:lambdalift -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Ydelambdafy:inline -Vprint:lambdalift -d " + testOutput.path
 
   override def code = """class T(classParam: Int) {
                         |  val field: Int = 0
diff --git a/tests/disabled/partest/run/t6288.scala b/tests/disabled/partest/run/t6288.scala
index cf5865e95a0e..242555ac75a5 100644
--- a/tests/disabled/partest/run/t6288.scala
+++ b/tests/disabled/partest/run/t6288.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:patmat -Xprint-pos -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:patmat -Xprint-pos -d " + testOutput.path
 
   override def code =
     """
diff --git a/tests/disabled/partest/run/t6555.scala b/tests/disabled/partest/run/t6555.scala
index cc0e4d1bfadb..e1db058da1d7 100644
--- a/tests/disabled/partest/run/t6555.scala
+++ b/tests/disabled/partest/run/t6555.scala
@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:specialize -Ydelambdafy:inline -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:specialize -Ydelambdafy:inline -d " + testOutput.path
 
   override def code = "class Foo { val f = (param: Int) => param } "
 
diff --git a/tests/disabled/partest/run/t7271.scala b/tests/disabled/partest/run/t7271.scala
index 69d5ea377ea4..6eadb7816c0e 100644
--- a/tests/disabled/partest/run/t7271.scala
+++ b/tests/disabled/partest/run/t7271.scala
@@ -7,7 +7,7 @@ import scala.reflect.internal.Positions
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:parser -Ystop-after:parser -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:parser -Ystop-after:parser -d " + testOutput.path
 
   override def code = """
     class C {
diff --git a/tests/pending/pos/t5777.scala b/tests/pending/pos/t5777.scala
index 24cea3616346..0d703b5fcce0 100644
--- a/tests/pending/pos/t5777.scala
+++ b/tests/pending/pos/t5777.scala
@@ -23,7 +23,7 @@ object MyApp {
   val r1 = new Poly[BigInt.type](BigInt)
   (null.asInstanceOf[BigInt.E] : r1.ring.E)
 
-  // Oddly, -Xprint:typer reports that r and r1 have the same inferred type.
+  // Oddly, -Vprint:typer reports that r and r1 have the same inferred type.
   //
   // private[this] val r: Poly[BigInt.type] = new Poly[BigInt.type](BigInt);
   // <stable> <accessor> def r: Poly[BigInt.type] = MyApp.this.r;
diff --git a/tests/pos/annot-18064.scala b/tests/pos/annot-18064.scala
index b6a67ea9ebe7..465f627ff861 100644
--- a/tests/pos/annot-18064.scala
+++ b/tests/pos/annot-18064.scala
@@ -1,4 +1,4 @@
-//> using options "-Xprint:typer"
+//> using options "-Vprint:typer"
 
 class myAnnot[T]() extends annotation.Annotation
 
diff --git a/tests/pos/i14152.scala b/tests/pos/i14152.scala
index 2377d5ffeae3..d72180a7b5d4 100644
--- a/tests/pos/i14152.scala
+++ b/tests/pos/i14152.scala
@@ -25,6 +25,6 @@ def foo[F[_]](fn: [A] => Inv[A] => F[A]) =
   object O1 extends AnyRef
   val res0 = fn(new Inv(fn(new Inv[O1.type](O1))))
   val res1: F[F[O1.type]] = res0
-  res1 // checked with -Xprint:typer that this widens to Any
+  res1 // checked with -Vprint:typer that this widens to Any
        // instead of the original F[F[O1.type]]
        // or the incorrectly avoided F[? <: F[? <: Object]]
diff --git a/tests/pos/i8875.scala b/tests/pos/i8875.scala
index c0de263417e0..e4ac9e057f64 100644
--- a/tests/pos/i8875.scala
+++ b/tests/pos/i8875.scala
@@ -1,7 +1,7 @@
-//> using options -Xprint:getters
+//> using options -Vprint:getters
 
 class A {
   extension (a: Int) {
     def foo: Int = 1
   }
-}
\ No newline at end of file
+}
diff --git a/tests/pos/printbounds.scala b/tests/pos/printbounds.scala
index a3db104f4a33..87e74da90dc9 100644
--- a/tests/pos/printbounds.scala
+++ b/tests/pos/printbounds.scala
@@ -5,7 +5,7 @@ class Test {
 
   val x: Tree[_] = ???
 
-  val y = x // With -Xprint:typer this should print  val x: Tree[_] = x
+  val y = x // With -Vprint:typer this should print  val x: Tree[_] = x
             // used to print Tree[Nothing], which is confusing.
 
 }
diff --git a/tests/pos/test-implicits2.scala b/tests/pos/test-implicits2.scala
index 6d744395902e..7849c06e6dd1 100644
--- a/tests/pos/test-implicits2.scala
+++ b/tests/pos/test-implicits2.scala
@@ -1,6 +1,6 @@
 /* Compile with
 
-    dotc implicits2.scala -Xprint:typer -Xprint-types -verbose
+    dotc implicits2.scala -Vprint:typer -Xprint-types -verbose
 
     and verify that the inserted wrapString comes from Predef. You should see
 
diff --git a/tests/pos/typeclass-scaling.scala b/tests/pos/typeclass-scaling.scala
index 0db663de4989..8f2e5381c6f6 100644
--- a/tests/pos/typeclass-scaling.scala
+++ b/tests/pos/typeclass-scaling.scala
@@ -5,7 +5,7 @@ import scala.annotation.tailrec
 
 // The following command:
 //
-//     sc typeclass-scaling.scala -Xmax-inlines 100 -Xprint:typer -color:never -pagewidth 1000 >& x
+//     sc typeclass-scaling.scala -Xmax-inlines 100 -Vprint:typer -color:never -pagewidth 1000 >& x
 //
 // produces an output file with `wc` measures (lines/words/chars):
 //
diff --git a/tests/printing/annot-18064.scala b/tests/printing/annot-18064.scala
index b6a67ea9ebe7..465f627ff861 100644
--- a/tests/printing/annot-18064.scala
+++ b/tests/printing/annot-18064.scala
@@ -1,4 +1,4 @@
-//> using options "-Xprint:typer"
+//> using options "-Vprint:typer"
 
 class myAnnot[T]() extends annotation.Annotation
 
diff --git a/tests/run/inline-numeric/test.scala b/tests/run/inline-numeric/test.scala
index 9ca88aee0374..b77e8f3a4266 100644
--- a/tests/run/inline-numeric/test.scala
+++ b/tests/run/inline-numeric/test.scala
@@ -29,7 +29,7 @@ object tests:
     def a: Int = 0
     def b: Int = 1
 
-    val v1 = foo(a, b) // should be a + b * b // can check with -Xprint:inlining
+    val v1 = foo(a, b) // should be a + b * b // can check with -Vprint:inlining
     val v2 = foo(a.toShort, b.toShort) // should be a + b * b
 
     val v3 = div(BigDecimal(a), BigDecimal(b))(using BigDecimalAsIfIntegral) // should be BigDecimal(a) quot BigDecimal(b) remainder BigDecimal(b)

From a83f567bf8ea84b3449908d79be032c0ef621de5 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 30 Jun 2025 17:03:04 +0200
Subject: [PATCH 385/505] standardize on -Vprint:... (still support -Xprint:...
 as alias)

[Cherry-picked 60fa07aff6ececb219d012bbb368fd41504b3162][modified]

From a45a06b9fe6d435a30407971824f24762940f85c Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Tue, 24 Jun 2025 16:51:59 +0200
Subject: [PATCH 386/505] Fix bisect scripts - Maven metadata.xml releases are
 no longer ordered by release date (#23410)

Fixes bisect script which stopped to work correctly with latest
https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/maven-metadata.xml
revisions where releases are no longer sorted by date
[Cherry-picked 7093dad5d3a45421c2249dae4050409c87653905]
---
 project/scripts/bisect.scala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/project/scripts/bisect.scala b/project/scripts/bisect.scala
index fb53807f62b6..3552bb4383e7 100755
--- a/project/scripts/bisect.scala
+++ b/project/scripts/bisect.scala
@@ -12,6 +12,8 @@ import java.io.File
 import java.nio.file.attribute.PosixFilePermissions
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 
 val usageMessage = """
   |Usage:
@@ -154,7 +156,6 @@ case class ReleasesRange(first: Option[String], last: Option[String]):
       val index = releases.indexWhere(_.version == version)
       assert(index > 0, s"${version} matches no nightly compiler release")
       index
-
     val startIdx = first.map(releaseIndex(_)).getOrElse(0)
     val endIdx = last.map(releaseIndex(_) + 1).getOrElse(releases.length)
     val filtered = releases.slice(startIdx, endIdx).toVector
@@ -181,12 +182,15 @@ object Releases:
     re.findAllMatchIn(xml.mkString)
       .flatMap{ m => Option(m.group(1)).map(Release.apply) }
       .toVector
+      .sortBy: release =>
+        (release.version, release.date)
 
   def fromRange(range: ReleasesRange): Vector[Release] = range.filter(allReleases)
 
 case class Release(version: String):
   private val re = raw".+-bin-(\d{8})-(\w{7})-NIGHTLY".r
-  def date: String =
+  def date: LocalDate = LocalDate.parse(dateString, DateTimeFormatter.BASIC_ISO_DATE)
+  def dateString: String =
     version match
       case re(date, _) => date
       case _ => sys.error(s"Could not extract date from release name: $version")

From 1bb7fe07c83cb8958a6c9f6d2f15ccdee3022248 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Tue, 11 Mar 2025 13:23:37 +0100
Subject: [PATCH 387/505] Skip splice level checking for <refinement> symbols

This is safe to skip because <refinement> symbols can only be a part of
type refinement (where they reference that type), where it is impossible
to splice anything.

[Cherry-picked e989217a26916e58d2975c54f9a703235184e01a]
---
 .../src/dotty/tools/dotc/staging/HealType.scala    |  2 +-
 tests/pos/i22648.scala                             | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22648.scala

diff --git a/compiler/src/dotty/tools/dotc/staging/HealType.scala b/compiler/src/dotty/tools/dotc/staging/HealType.scala
index a73f884fbac9..509049e131c8 100644
--- a/compiler/src/dotty/tools/dotc/staging/HealType.scala
+++ b/compiler/src/dotty/tools/dotc/staging/HealType.scala
@@ -76,7 +76,7 @@ class HealType(pos: SrcPos)(using Context) extends TypeMap {
     tp match
       case tp @ NamedType(NoPrefix, _) if level > levelOf(tp.symbol) => tp.symbol
       case tp: NamedType if !tp.symbol.isStatic => levelInconsistentRootOfPath(tp.prefix)
-      case tp: ThisType if level > levelOf(tp.cls) => tp.cls
+      case tp: ThisType if level > levelOf(tp.cls) && !tp.cls.isRefinementClass => tp.cls
       case _ => NoSymbol
 
   /** Try to heal reference to type `T` used in a higher level than its definition.
diff --git a/tests/pos/i22648.scala b/tests/pos/i22648.scala
new file mode 100644
index 000000000000..e1c7f73bb15e
--- /dev/null
+++ b/tests/pos/i22648.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+def fooImpl(using Quotes): Expr[Any] =
+  '{
+    new AnyRef {
+      type T = Unit
+      def make: T = ()
+      def take(t: T): Unit = ()
+    }: {
+      type T
+      def make: T
+      def take(t: T): Unit
+    }
+  }

From 103ee2f719742c907f57d103f56c10b721dcde30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Zieli=C5=84ski?= <pzielinski@virtuslab.com>
Date: Tue, 10 Jun 2025 12:43:02 +0200
Subject: [PATCH 388/505] Port Inlay hints for name parameters

---
 .../dotty/tools/pc/PcInlayHintsProvider.scala | 124 +++++++++-----
 .../pc/tests/inlayHints/InlayHintsSuite.scala | 161 ++++++++++++------
 2 files changed, 197 insertions(+), 88 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 30474ffe0ed7..0ef7871f7dae 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -17,6 +17,8 @@ import scala.meta.pc.SymbolSearch
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
+import dotty.tools.dotc.core.NameOps.fieldName
+import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.StdNames.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
@@ -116,28 +118,44 @@ class PcInlayHintsProvider(
               InlayHintKind.Type,
             )
             .addDefinition(adjustedPos.start)
-      case ByNameParameters(byNameParams) =>
-        def adjustByNameParameterPos(pos: SourcePosition): SourcePosition =
-          val adjusted = adjustPos(pos)
-          val start = text.indexWhere(!_.isWhitespace, adjusted.start)
-          val end = text.lastIndexWhere(!_.isWhitespace, adjusted.end - 1)
+      case Parameters(isInfixFun, args) =>        
+        def isNamedParam(pos: SourcePosition): Boolean =
+          val start = text.indexWhere(!_.isWhitespace, pos.start)
+          val end = text.lastIndexWhere(!_.isWhitespace, pos.end - 1)
 
+          text.slice(start, end).contains('=')
+
+        def isBlockParam(pos: SourcePosition): Boolean =
+          val start = text.indexWhere(!_.isWhitespace, pos.start)
+          val end = text.lastIndexWhere(!_.isWhitespace, pos.end - 1)
           val startsWithBrace = text.lift(start).contains('{')
           val endsWithBrace = text.lift(end).contains('}')
 
-          if startsWithBrace && endsWithBrace then
-            adjusted.withStart(start + 1)
-          else
-            adjusted
-
-        byNameParams.foldLeft(inlayHints) {
-          case (ih, pos) => 
-            val adjusted = adjustByNameParameterPos(pos)
-            ih.add(
-              adjusted.startPos.toLsp,
-              List(LabelPart("=> ")),
-              InlayHintKind.Parameter
-            )
+          startsWithBrace && endsWithBrace
+
+        def adjustBlockParamPos(pos: SourcePosition): SourcePosition =
+            pos.withStart(pos.start + 1)
+
+
+        args.foldLeft(inlayHints) {
+          case (ih, (name, pos0, isByName)) =>
+            val pos = adjustPos(pos0)
+            val isBlock = isBlockParam(pos)
+            val namedLabel = 
+              if params.namedParameters() && !isInfixFun && !isBlock && !isNamedParam(pos) then s"${name} = " else ""
+            val byNameLabel = 
+              if params.byNameParameters() && isByName && (!isInfixFun || isBlock) then "=> " else ""
+
+            val labelStr = s"${namedLabel}${byNameLabel}"
+            val hintPos = if isBlock then adjustBlockParamPos(pos) else pos
+
+            if labelStr.nonEmpty then
+                ih.add(
+                  hintPos.startPos.toLsp,
+                  List(LabelPart(labelStr)),
+                  InlayHintKind.Parameter,
+                )
+            else ih
         }
       case _ => inlayHints
 
@@ -412,27 +430,55 @@ object InferredType:
 
 end InferredType
 
-object ByNameParameters:
-  def unapply(tree: Tree)(using params: InlayHintsParams, ctx: Context): Option[List[SourcePosition]] =
-    def shouldSkipSelect(sel: Select) = 
-      isForComprehensionMethod(sel) || sel.symbol.name == nme.unapply
+object Parameters:
+  def unapply(tree: Tree)(using params: InlayHintsParams, ctx: Context): Option[(Boolean, List[(Name, SourcePosition, Boolean)])] = 
+    def shouldSkipFun(fun: Tree)(using Context): Boolean = 
+      fun match
+        case sel: Select => isForComprehensionMethod(sel) || sel.symbol.name == nme.unapply
+        case _ => false
+
+    def isInfixFun(fun: Tree, args: List[Tree])(using Context): Boolean = 
+      val isInfixSelect = fun match
+        case Select(sel, _) => sel.isInfix
+        case _ => false
+      val source = fun.source
+      if args.isEmpty then isInfixSelect
+      else 
+        (!(fun.span.end until args.head.span.start)
+        .map(source.apply)
+        .contains('.') && fun.symbol.is(Flags.ExtensionMethod)) || isInfixSelect
+
+    def isRealApply(tree: Tree) =
+      !tree.symbol.isOneOf(Flags.GivenOrImplicit) && !tree.span.isZeroExtent
+
+    def getUnderlyingFun(tree: Tree): Tree =
+      tree match
+        case Apply(fun, _) => getUnderlyingFun(fun)
+        case TypeApply(fun, _) => getUnderlyingFun(fun)
+        case t => t
 
-    if (params.byNameParameters()){
+    if (params.namedParameters() || params.byNameParameters()) then
       tree match
-        case Apply(TypeApply(sel: Select, _), _) if shouldSkipSelect(sel) => 
-          None 
-        case Apply(sel: Select, _) if shouldSkipSelect(sel) => 
-          None
-        case Apply(fun, args) =>
-          val funTp = fun.typeOpt.widenTermRefExpr
-          val params = funTp.paramInfoss.flatten
-          Some(
-            args
-            .zip(params)
-            .collect {
-              case (tree, param) if param.isByName => tree.sourcePos
-            }
-          )
+        case Apply(fun, args) if isRealApply(fun) => 
+          val underlyingFun = getUnderlyingFun(fun)
+          if shouldSkipFun(underlyingFun) then
+            None
+          else
+            val funTp = fun.typeOpt.widenTermRefExpr
+            val paramNames = funTp.paramNamess.flatten
+            val paramInfos = funTp.paramInfoss.flatten
+            Some(
+              // Check if the function is an infix function or the underlying function is an infix function
+              isInfixFun(fun, args) || underlyingFun.isInfix,
+              (
+                args
+                .zip(paramNames)
+                .zip(paramInfos)
+                .collect {
+                  case ((arg, paramName), paramInfo) if !arg.span.isZeroExtent => (paramName.fieldName, arg.sourcePos, paramInfo.isByName)
+                }
+              )
+            )
         case _ => None
-    } else None
-end ByNameParameters
+    else None
+end Parameters
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
index 0b68c7461d01..f7243ca54d91 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
@@ -19,7 +19,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |  def foo()/*: Unit<<scala/Unit#>>*/ = {
         |    implicit val imp: Int = 2
         |    def addOne(x: Int)(implicit one: Int)/*: Int<<scala/Int#>>*/ = x + one
-        |    val x/*: Int<<scala/Int#>>*/ = addOne(1)/*(using imp<<(3:17)>>)*/
+        |    val x/*: Int<<scala/Int#>>*/ = addOne(/*x = */1)/*(using imp<<(3:17)>>)*/
         |  }
         |}
         |""".stripMargin
@@ -34,7 +34,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |""".stripMargin,
      """|object Main {
         |  def hello[T](t: T)/*: T<<(2:12)>>*/ = t
-        |  val x/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = hello/*[List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]]*/(List/*[Int<<scala/Int#>>]*/(1))
+        |  val x/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = hello/*[List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]]*/(/*t = */List/*[Int<<scala/Int#>>]*/(/*elems = */1))
         |}
         |""".stripMargin
     )
@@ -48,7 +48,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |""".stripMargin,
      """|object Main {
         |  def hello[T](t: T)/*: T<<(2:12)>>*/ = t
-        |  val x/*: Map<<scala/collection/immutable/Map#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = hello/*[Map<<scala/collection/immutable/Map#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]]*/(Map/*[Int<<scala/Int#>>, String<<java/lang/String#>>]*/((1,"abc")))
+        |  val x/*: Map<<scala/collection/immutable/Map#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = hello/*[Map<<scala/collection/immutable/Map#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]]*/(/*t = */Map/*[Int<<scala/Int#>>, String<<java/lang/String#>>]*/(/*elems = */(1,"abc")))
         |}
         |""".stripMargin,
     )
@@ -66,7 +66,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |object Main {
         |  implicit val imp: Int = 2
         |  def addOne(x: Int)(implicit one: Int)/*: Int<<scala/Int#>>*/ = x + one
-        |  val x/*: Int<<scala/Int#>>*/ = addOne(1)/*(using imp<<(3:15)>>)*/
+        |  val x/*: Int<<scala/Int#>>*/ = addOne(/*x = */1)/*(using imp<<(3:15)>>)*/
         |}
         |""".stripMargin
     )
@@ -81,7 +81,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |""".stripMargin,
      """|case class User(name: String)
         |object Main {
-        |  implicit def intToUser(x: Int): User = new User(x.toString)
+        |  implicit def intToUser(x: Int): User = new User(/*name = */x.toString)
         |  val y: User = /*intToUser<<(3:15)>>(*/1/*)*/
         |}
         |""".stripMargin
@@ -100,7 +100,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |object Main {
         |  implicit val imp: Int = 2
         |  def addOne(x: Int)(using one: Int)/*: Int<<scala/Int#>>*/ = x + one
-        |  val x/*: Int<<scala/Int#>>*/ = addOne(1)/*(using imp<<(3:15)>>)*/
+        |  val x/*: Int<<scala/Int#>>*/ = addOne(/*x = */1)/*(using imp<<(3:15)>>)*/
         |}
         |""".stripMargin
     )
@@ -115,7 +115,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |""".stripMargin,
      """|case class User(name: String)
         |object Main {
-        |  given intToUser: Conversion[Int, User] = User(_.toString)
+        |  given intToUser: Conversion[Int, User] = User(/*name = */_.toString)
         |  val y: User = /*intToUser<<(3:8)>>(*/1/*)*/
         |}
         |""".stripMargin
@@ -158,7 +158,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  val foo/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = List[Int](123)
+        |  val foo/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = List[Int](/*elems = */123)
         |}
         |""".stripMargin
     )
@@ -170,7 +170,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object O {
-        |  def m/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = 1 :: List/*[Int<<scala/Int#>>]*/(1)
+        |  def m/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = 1 :: List/*[Int<<scala/Int#>>]*/(/*elems = */1)
         |}
         |""".stripMargin
     )
@@ -182,7 +182,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  val foo/*: Map<<scala/collection/immutable/Map#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = Map/*[Int<<scala/Int#>>, String<<java/lang/String#>>]*/((1, "abc"))
+        |  val foo/*: Map<<scala/collection/immutable/Map#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = Map/*[Int<<scala/Int#>>, String<<java/lang/String#>>]*/(/*elems = */(1, "abc"))
         |}
         |""".stripMargin,
     )
@@ -206,7 +206,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  val foo/*: Buffer<<scala/collection/mutable/Buffer#>>[String<<java/lang/String#>>]*/ = List[String]("").toBuffer[String]
+        |  val foo/*: Buffer<<scala/collection/mutable/Buffer#>>[String<<java/lang/String#>>]*/ = List[String](/*elems = */"").toBuffer[String]
         |}
         |""".stripMargin,
     )
@@ -398,7 +398,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  val x/*: (Int<<scala/Int#>>, Int<<scala/Int#>>)*/ = Tuple2.apply/*[Int<<scala/Int#>>, Int<<scala/Int#>>]*/(1, 2)
+        |  val x/*: (Int<<scala/Int#>>, Int<<scala/Int#>>)*/ = Tuple2.apply/*[Int<<scala/Int#>>, Int<<scala/Int#>>]*/(/*_1 = */1, /*_2 = */2)
         |}
         |""".stripMargin
     )
@@ -410,7 +410,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  val x/*: (Int<<scala/Int#>>, Int<<scala/Int#>>)*/ = Tuple2/*[Int<<scala/Int#>>, Int<<scala/Int#>>]*/(1, 2)
+        |  val x/*: (Int<<scala/Int#>>, Int<<scala/Int#>>)*/ = Tuple2/*[Int<<scala/Int#>>, Int<<scala/Int#>>]*/(/*_1 = */1, /*_2 = */2)
         |}
         |""".stripMargin
     )
@@ -437,7 +437,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  val hd :: tail = List/*[Int<<scala/Int#>>]*/(1, 2)
+        |  val hd :: tail = List/*[Int<<scala/Int#>>]*/(/*elems = */1, 2)
         |}
         |""".stripMargin,
     )
@@ -451,7 +451,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  val x/*: Int<<scala/Int#>>*/ = List/*[Int<<scala/Int#>>]*/(1, 2) match {
+        |  val x/*: Int<<scala/Int#>>*/ = List/*[Int<<scala/Int#>>]*/(/*elems = */1, 2) match {
         |    case hd :: tail => hd
         |  }
         |}
@@ -467,7 +467,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |""".stripMargin,
      """|object Main {
         |case class Foo[A](x: A, y: A)
-        |  val Foo(fst/*: Int<<scala/Int#>>*/, snd/*: Int<<scala/Int#>>*/) = Foo/*[Int<<scala/Int#>>]*/(1, 2)
+        |  val Foo(fst/*: Int<<scala/Int#>>*/, snd/*: Int<<scala/Int#>>*/) = Foo/*[Int<<scala/Int#>>]*/(/*x = */1, /*y = */2)
         |}
         |""".stripMargin,
      hintsInPatternMatch = true
@@ -521,7 +521,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin,
      """|object Main {
-        |  List/*[Int<<scala/Int#>>]*/(1).collect/*[Int<<scala/Int#>>]*/ { case x => x }
+        |  List/*[Int<<scala/Int#>>]*/(/*elems = */1).collect/*[Int<<scala/Int#>>]*/ { case x => x }
         |  val x: PartialFunction[Int, Int] = {
         |    case 1 => 2
         |  }
@@ -651,11 +651,11 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |
         |object Main {
         |  def test(d: S[Int], f: S[Char]): AB[Int, String] = {
-        |    val x/*: S<<scala/collection/Set#>>[String<<java/lang/String#>>]*/ = d.map/*[String<<java/lang/String#>>]*/(_.toString)
+        |    val x/*: S<<scala/collection/Set#>>[String<<java/lang/String#>>]*/ = d.map/*[String<<java/lang/String#>>]*/(/*f = */_.toString)
         |    val y/*: S<<scala/collection/Set#>>[Char<<scala/Char#>>]*/ = f
         |    ???
         |  }
-        |  val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = test(Set/*[Int<<scala/Int#>>]*/(1), Set/*[Char<<scala/Char#>>]*/('a'))
+        |  val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = test(/*d = */Set/*[Int<<scala/Int#>>]*/(/*elems = */1), /*f = */Set/*[Char<<scala/Char#>>]*/(/*elems = */'a'))
         |}
         |""".stripMargin,
     )
@@ -697,7 +697,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |
         |given Ord[String] with
         |  def compare(x: String, y: String)/*: Int<<scala/Int#>>*/ =
-        |    /*augmentString<<scala/Predef.augmentString().>>(*/x/*)*/.compare(y)
+        |    /*augmentString<<scala/Predef.augmentString().>>(*/x/*)*/.compare(/*that = */y)
         |
         |""".stripMargin
     )
@@ -715,7 +715,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |object O {
         |  given Int = 1
         |  def test[T: Ordering](x: T)(using Int)/*: Nothing<<scala/Nothing#>>*/ = ???
-        |  test/*[Int<<scala/Int#>>]*/(1)/*(using Int<<scala/math/Ordering.Int.>>, given_Int<<(2:8)>>)*/
+        |  test/*[Int<<scala/Int#>>]*/(/*x = */1)/*(using Int<<scala/math/Ordering.Int.>>, given_Int<<(2:8)>>)*/
         |}
         |""".stripMargin
     )
@@ -731,7 +731,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
      """|package example
         |object O {
         |  def test[T: Ordering](x: T)/*: Nothing<<scala/Nothing#>>*/ = ???
-        |  test/*[Int<<scala/Int#>>]*/(1)/*(using Int<<scala/math/Ordering.Int.>>)*/
+        |  test/*[Int<<scala/Int#>>]*/(/*x = */1)/*(using Int<<scala/math/Ordering.Int.>>)*/
         |}
         |""".stripMargin
     )
@@ -747,7 +747,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
      """|package example
         |object O {
         |  def test[T: Ordering](x: T)(using Int)/*: Nothing<<scala/Nothing#>>*/ = ???
-        |  test/*[Int<<scala/Int#>>]*/(1)/*(using Int<<scala/math/Ordering.Int.>>)*/
+        |  test/*[Int<<scala/Int#>>]*/(/*x = */1)/*(using Int<<scala/math/Ordering.Int.>>)*/
         |}
         |""".stripMargin
     )
@@ -765,7 +765,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |object O {
         |  implicit val i: Int = 123
         |  def test[T: Ordering](x: T)(implicit v: Int)/*: Nothing<<scala/Nothing#>>*/ = ???
-        |  test/*[Int<<scala/Int#>>]*/(1)/*(using Int<<scala/math/Ordering.Int.>>, i<<(2:15)>>)*/
+        |  test/*[Int<<scala/Int#>>]*/(/*x = */1)/*(using Int<<scala/math/Ordering.Int.>>, i<<(2:15)>>)*/
         |}
         |""".stripMargin
     )
@@ -795,19 +795,19 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin,
       """|package example
          |object O {
-         |  val head :: tail = List/*[Int<<scala/Int#>>]*/(1)
-         |  List/*[Int<<scala/Int#>>]*/(1) match {
+         |  val head :: tail = List/*[Int<<scala/Int#>>]*/(/*elems = */1)
+         |  List/*[Int<<scala/Int#>>]*/(/*elems = */1) match {
          |    case head :: next =>
          |    case Nil =>
          |  }
-         |  Option/*[Option<<scala/Option#>>[Int<<scala/Int#>>]]*/(Option/*[Int<<scala/Int#>>]*/(1)) match {
+         |  Option/*[Option<<scala/Option#>>[Int<<scala/Int#>>]]*/(/*x = */Option/*[Int<<scala/Int#>>]*/(/*x = */1)) match {
          |    case Some(Some(value)) =>
          |    case None =>
          |  }
          |  val (local, _) = ("", 1.0)
-         |  val Some(x) = Option/*[Int<<scala/Int#>>]*/(1)
+         |  val Some(x) = Option/*[Int<<scala/Int#>>]*/(/*x = */1)
          |  for {
-         |    x <- List/*[(Int<<scala/Int#>>, Int<<scala/Int#>>)]*/((1,2))
+         |    x <- List/*[(Int<<scala/Int#>>, Int<<scala/Int#>>)]*/(/*elems = */(1,2))
          |    (z, y) = x
          |  } yield {
          |    x
@@ -842,19 +842,19 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin,
       """|package example
          |object O {
-         |  val head/*: Int<<scala/Int#>>*/ :: tail/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = List/*[Int<<scala/Int#>>]*/(1)
-         |  List/*[Int<<scala/Int#>>]*/(1) match {
+         |  val head/*: Int<<scala/Int#>>*/ :: tail/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = List/*[Int<<scala/Int#>>]*/(/*elems = */1)
+         |  List/*[Int<<scala/Int#>>]*/(/*elems = */1) match {
          |    case head/*: Int<<scala/Int#>>*/ :: next/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ =>
          |    case Nil =>
          |  }
-         |  Option/*[Option<<scala/Option#>>[Int<<scala/Int#>>]]*/(Option/*[Int<<scala/Int#>>]*/(1)) match {
+         |  Option/*[Option<<scala/Option#>>[Int<<scala/Int#>>]]*/(/*x = */Option/*[Int<<scala/Int#>>]*/(/*x = */1)) match {
          |    case Some(Some(value/*: Int<<scala/Int#>>*/)) =>
          |    case None =>
          |  }
          |  val (local/*: String<<java/lang/String#>>*/, _) = ("", 1.0)
-         |  val Some(x/*: Int<<scala/Int#>>*/) = Option/*[Int<<scala/Int#>>]*/(1)
+         |  val Some(x/*: Int<<scala/Int#>>*/) = Option/*[Int<<scala/Int#>>]*/(/*x = */1)
          |  for {
-         |    x/*: (Int<<scala/Int#>>, Int<<scala/Int#>>)*/ <- List/*[(Int<<scala/Int#>>, Int<<scala/Int#>>)]*/((1,2))
+         |    x/*: (Int<<scala/Int#>>, Int<<scala/Int#>>)*/ <- List/*[(Int<<scala/Int#>>, Int<<scala/Int#>>)]*/(/*elems = */(1,2))
          |    (z/*: Int<<scala/Int#>>*/, y/*: Int<<scala/Int#>>*/) = x
          |  } yield {
          |    x
@@ -956,7 +956,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |  case class B()
          |  implicit val theA: A = A()
          |  def foo(b: B)(implicit a: A): String = "aaa"
-         |  val g: String = foo(B())/*(using theA<<(4:15)>>)*/
+         |  val g: String = foo(/*b = */B())/*(using theA<<(4:15)>>)*/
          |}
          |""".stripMargin,
     )
@@ -975,7 +975,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin,
       """|object Main{
          |  def hello()(implicit string: String, integer: Int, long: Long): String = {
-         |    println(s"Hello $string, $long, $integer!")
+         |    println(/*x = */s"Hello $string, $long, $integer!")
          |  }
          |  implicit def theString(implicit i: Int): String = i.toString
          |  implicit def theInt(implicit l: Long): Int = l
@@ -999,7 +999,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin,
       """|object Main{
          |  def hello()(implicit string: String, integer: Int, long: Long): String = {
-         |    println(s"Hello $string, $long, $integer!")
+         |    println(/*x = */s"Hello $string, $long, $integer!")
          |  }
          |  implicit def theString(implicit i: Int): String = i.toString
          |  implicit def theInt: Int = 43
@@ -1064,7 +1064,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin,
       """|object Main:
          |  def foo(x: => Int, y: Int, z: => Int)(w: Int, v: => Int): Unit = ()
-         |  foo(/*=> */1, 2, /*=> */3)(4, /*=> */5)
+         |  foo(/*x = => */1, /*y = */2, /*z = => */3)(/*w = */4, /*v = => */5)
          |""".stripMargin
     )
 
@@ -1091,7 +1091,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
       """|object Main:
          |  def Future[A](arg: => A): A = arg
          |
-         |  Future/*[Int<<scala/Int#>>]*/(/*=> */1 + 2)
+         |  Future/*[Int<<scala/Int#>>]*/(/*arg = => */1 + 2)
          |  Future/*[Int<<scala/Int#>>]*/ {/*=> */
          |    1 + 2
          |  }
@@ -1100,9 +1100,9 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |    val y/*: Int<<scala/Int#>>*/ = 2
          |    x + y
          |  }
-         |  Some/*[Int<<scala/Int#>> | Option<<scala/Option#>>[Int<<scala/Int#>>]]*/(Option/*[Int<<scala/Int#>>]*/(2)
+         |  Some/*[Int<<scala/Int#>> | Option<<scala/Option#>>[Int<<scala/Int#>>]]*/(/*value = */Option/*[Int<<scala/Int#>>]*/(/*x = */2)
          |    .getOrElse/*[Int<<scala/Int#>> | Option<<scala/Option#>>[Int<<scala/Int#>>]]*/ {/*=> */
-         |      List/*[Int<<scala/Int#>>]*/(1,2)
+         |      List/*[Int<<scala/Int#>>]*/(/*elems = */1,2)
          |        .headOption
          |    })
          |""".stripMargin
@@ -1124,13 +1124,13 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin,
       """|object Main:
          |  case class Test[A](v: A):
-         |     def flatMap(f: => (A => Test[Int])): Test[Int] = f(v)
-         |     def map(f: => (A => Int)): Test[Int] = Test/*[Int<<scala/Int#>>]*/(f(v))
+         |     def flatMap(f: => (A => Test[Int])): Test[Int] = f(/*v1 = */v)
+         |     def map(f: => (A => Int)): Test[Int] = Test/*[Int<<scala/Int#>>]*/(/*v = */f(/*v1 = */v))
          |
          |  def main(args: Array[String]): Unit =
          |    val result: Test[Int] = for {
-         |      a <- Test/*[Int<<scala/Int#>>]*/(10)
-         |      b <- Test/*[Int<<scala/Int#>>]*/(20)
+         |      a <- Test/*[Int<<scala/Int#>>]*/(/*v = */10)
+         |      b <- Test/*[Int<<scala/Int#>>]*/(/*v = */20)
          |    } yield a + b
          |
          |""".stripMargin,
@@ -1152,16 +1152,79 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin,
       """|object Main:
          |  case class Test[A](v: A):
-         |     def flatMap[B](f: => (A => Test[B])): Test[B] = f(v)
-         |     def map[B](f: => (A => B)): Test[B] = Test/*[B<<(4:13)>>]*/(f(v))
+         |     def flatMap[B](f: => (A => Test[B])): Test[B] = f(/*v1 = */v)
+         |     def map[B](f: => (A => B)): Test[B] = Test/*[B<<(4:13)>>]*/(/*v = */f(/*v1 = */v))
          |
          |  def main(args: Array[String]): Unit =
          |    val result: Test[Int] = for {
-         |      a <- Test/*[Int<<scala/Int#>>]*/(10)
-         |      b <- Test/*[Int<<scala/Int#>>]*/(20)
+         |      a <- Test/*[Int<<scala/Int#>>]*/(/*v = */10)
+         |      b <- Test/*[Int<<scala/Int#>>]*/(/*v = */20)
          |    } yield a + b
          |
          |""".stripMargin,
     )
 
+  @Test def `by-name-method-infix-extension` =
+    check(
+      """|case class A[T, U](dummy: Int, name: U):
+         |  def compute: Int = 1
+         |
+         |object A:
+         |  extension [T, U](a: A[T, U])
+         |     def ++(other: => A[T, U]): Int = a.dummy + other.dummy + a.compute
+         |
+         |object Main:
+         |  val a = A[Int, String](0, "foo")
+         |  val res = a ++ a
+         |""".stripMargin,
+      """|case class A[T, U](dummy: Int, name: U):
+         |  def compute: Int = 1
+         |
+         |object A:
+         |  extension [T, U](a: A[T, U])
+         |     def ++(other: => A[T, U]): Int = a.dummy + other.dummy + a.compute
+         |
+         |object Main:
+         |  val a/*: A<<(1:11)>>[Int<<scala/Int#>>, String<<scala/Predef.String#>>]*/ = A[Int, String](/*dummy = */0, /*name = */"foo")
+         |  val res/*: Int<<scala/Int#>>*/ = a ++/*[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ a
+         |""".stripMargin
+    )
+
+  @Test def `by-name-method-infix-extension-2` =
+    check(
+      """|case class A[T, U](dummy: Int, name: U):
+         |  def compute: Int = 1
+         |
+         |extension [T, U](a: A[T, U])
+         |  def ++(other: => A[T, U]): Int = a.dummy + other.dummy + a.compute
+         |
+         |object Main:
+         |  val a = A[Int, String](0, "foo")
+         |  val res = a ++ a
+         |""".stripMargin,
+      """|case class A[T, U](dummy: Int, name: U):
+         |  def compute: Int = 1
+         |
+         |extension [T, U](a: A[T, U])
+         |  def ++(other: => A[T, U]): Int = a.dummy + other.dummy + a.compute
+         |
+         |object Main:
+         |  val a/*: A<<(1:11)>>[Int<<scala/Int#>>, String<<scala/Predef.String#>>]*/ = A[Int, String](/*dummy = */0, /*name = */"foo")
+         |  val res/*: Int<<scala/Int#>>*/ = a ++/*[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ a
+         |""".stripMargin
+    )
+
+  @Test def `named-parameter` =
+    check(
+      """|object Main{
+         |  def hello[T](arg: T) = arg
+         |  val x = hello(arg = List(1))
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  def hello[T](arg: T)/*: T<<(2:12)>>*/ = arg
+         |  val x/*: List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]*/ = hello/*[List<<scala/collection/immutable/List#>>[Int<<scala/Int#>>]]*/(arg = List/*[Int<<scala/Int#>>]*/(/*elems = */1))
+         |}
+         |""".stripMargin
+    )
 }

From 8aaafef8dde826973ffda6c376c3c55a6e6b3710 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 30 Jun 2025 17:08:09 +0200
Subject: [PATCH 389/505] Port Inlay hints for name parameters

[Cherry-picked dc14b8159a134b8225ec049d942e0979755926a9][modified]

From 05c5050656671a178954db7e7d63653e7ae30ecd Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 21 May 2025 10:51:18 +0000
Subject: [PATCH 390/505] Make hashcode of enum items stable

Co-authored-by: anna herlihy <herlihyap@gmail.com>
Co-authored-by: Miguel Trigueira <12471808+mtrigueira@users.noreply.github.com>

[Cherry-picked 8ea12613f8750bfddafc8b8f2142f191a66d69ef]
---
 .../tools/dotc/transform/SyntheticMembers.scala | 17 +++++++++--------
 .../run/i19177-stable-enum-item-hashcode.check  |  1 +
 .../run/i19177-stable-enum-item-hashcode.scala  |  5 +++++
 3 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 tests/run/i19177-stable-enum-item-hashcode.check
 create mode 100644 tests/run/i19177-stable-enum-item-hashcode.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
index 28399ceb727c..f66cbbcf58b0 100644
--- a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
@@ -68,7 +68,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
       myCaseSymbols = defn.caseClassSynthesized
       myCaseModuleSymbols = myCaseSymbols.filter(_ ne defn.Any_equals)
       myEnumValueSymbols = List(defn.Product_productPrefix)
-      myNonJavaEnumValueSymbols = myEnumValueSymbols :+ defn.Any_toString :+ defn.Enum_ordinal
+      myNonJavaEnumValueSymbols = myEnumValueSymbols :+ defn.Any_toString :+ defn.Enum_ordinal :+ defn.Any_hashCode
     }
 
   def valueSymbols(using Context): List[Symbol] = { initSymbols; myValueSymbols }
@@ -110,6 +110,12 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
     def syntheticDefIfMissing(sym: Symbol): List[Tree] =
       if (existingDef(sym, clazz).exists) Nil else syntheticDef(sym) :: Nil
 
+    def identifierRef: Tree =
+      if isSimpleEnumValue then // owner is `def $new(_$ordinal: Int, $name: String) = new MyEnum { ... }`
+        ref(clazz.owner.paramSymss.head.find(_.name == nme.nameDollar).get)
+      else // assume owner is `val Foo = new MyEnum { def ordinal = 0 }`
+        Literal(Constant(clazz.owner.name.toString))
+
     def syntheticDef(sym: Symbol): Tree = {
       val synthetic = sym.copy(
         owner = clazz,
@@ -129,12 +135,6 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
         else
           identifierRef
 
-      def identifierRef: Tree =
-        if isSimpleEnumValue then // owner is `def $new(_$ordinal: Int, $name: String) = new MyEnum { ... }`
-          ref(clazz.owner.paramSymss.head.find(_.name == nme.nameDollar).get)
-        else // assume owner is `val Foo = new MyEnum { def ordinal = 0 }`
-          Literal(Constant(clazz.owner.name.toString))
-
       def ordinalRef: Tree =
         if isSimpleEnumValue then // owner is `def $new(_$ordinal: Int, $name: String) = new MyEnum { ... }`
           ref(clazz.owner.paramSymss.head.find(_.name == nme.ordinalDollar_).get)
@@ -322,7 +322,8 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
      * For case classes with primitive paramters, see [[caseHashCodeBody]].
      */
     def chooseHashcode(using Context) =
-      if (accessors.isEmpty) Literal(Constant(ownName.hashCode))
+      if (isNonJavaEnumValue) identifierRef.select(nme.hashCode_).appliedToTermArgs(Nil)
+      else if (accessors.isEmpty) Literal(Constant(ownName.hashCode))
       else if (accessors.exists(_.info.finalResultType.classSymbol.isPrimitiveValueClass))
         caseHashCodeBody
       else
diff --git a/tests/run/i19177-stable-enum-item-hashcode.check b/tests/run/i19177-stable-enum-item-hashcode.check
new file mode 100644
index 000000000000..1479e19b5fdf
--- /dev/null
+++ b/tests/run/i19177-stable-enum-item-hashcode.check
@@ -0,0 +1 @@
+65
diff --git a/tests/run/i19177-stable-enum-item-hashcode.scala b/tests/run/i19177-stable-enum-item-hashcode.scala
new file mode 100644
index 000000000000..d643b4be4217
--- /dev/null
+++ b/tests/run/i19177-stable-enum-item-hashcode.scala
@@ -0,0 +1,5 @@
+enum E:
+  case A
+
+@main def Test =
+  println(E.A.hashCode)

From 6184594cabaa6bdc06931d47bb2d1c5a4dbf77b2 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Thu, 22 May 2025 15:32:28 +0000
Subject: [PATCH 391/505] Add more enum hashcode tests

[Cherry-picked 5c2e39e35d9a884d2669e5e1b22f23b20eee77b0]
---
 .../i19177-stable-enum-item-hashcode.check    |  1 -
 .../i19177-stable-enum-item-hashcode.scala    |  5 ----
 tests/run/stable-enum-hashcodes.check         | 12 ++++++++++
 tests/run/stable-enum-hashcodes.scala         | 23 +++++++++++++++++++
 4 files changed, 35 insertions(+), 6 deletions(-)
 delete mode 100644 tests/run/i19177-stable-enum-item-hashcode.check
 delete mode 100644 tests/run/i19177-stable-enum-item-hashcode.scala
 create mode 100644 tests/run/stable-enum-hashcodes.check
 create mode 100644 tests/run/stable-enum-hashcodes.scala

diff --git a/tests/run/i19177-stable-enum-item-hashcode.check b/tests/run/i19177-stable-enum-item-hashcode.check
deleted file mode 100644
index 1479e19b5fdf..000000000000
--- a/tests/run/i19177-stable-enum-item-hashcode.check
+++ /dev/null
@@ -1 +0,0 @@
-65
diff --git a/tests/run/i19177-stable-enum-item-hashcode.scala b/tests/run/i19177-stable-enum-item-hashcode.scala
deleted file mode 100644
index d643b4be4217..000000000000
--- a/tests/run/i19177-stable-enum-item-hashcode.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-enum E:
-  case A
-
-@main def Test =
-  println(E.A.hashCode)
diff --git a/tests/run/stable-enum-hashcodes.check b/tests/run/stable-enum-hashcodes.check
new file mode 100644
index 000000000000..2a3cb493c4c9
--- /dev/null
+++ b/tests/run/stable-enum-hashcodes.check
@@ -0,0 +1,12 @@
+65
+65
+66
+66
+67
+67
+68
+68
+-1449359058
+-1449359058
+194551161
+194551161
diff --git a/tests/run/stable-enum-hashcodes.scala b/tests/run/stable-enum-hashcodes.scala
new file mode 100644
index 000000000000..60b5af11e437
--- /dev/null
+++ b/tests/run/stable-enum-hashcodes.scala
@@ -0,0 +1,23 @@
+enum Enum:
+  case A
+  case B
+  case C()
+  case D()
+  case E(x: Int)
+
+@main def Test =
+  // Enum values (were not stable from run to run before #23218)
+  println(Enum.A.hashCode)
+  println(Enum.A.hashCode)
+  println(Enum.B.hashCode)
+  println(Enum.B.hashCode)
+
+  // Other enum cases (were already stable from run to run)
+  println(Enum.C().hashCode)
+  println(Enum.C().hashCode)
+  println(Enum.D().hashCode)
+  println(Enum.D().hashCode)
+  println(Enum.E(1).hashCode)
+  println(Enum.E(1).hashCode)
+  println(Enum.E(2).hashCode)
+  println(Enum.E(2).hashCode)

From f45857967e563f2d0decc883b99ac64a1ac20f92 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 30 Jun 2025 17:14:31 +0200
Subject: [PATCH 392/505] Backport new ErrorMessageID and messages

---
 .../src/dotty/tools/dotc/reporting/ErrorMessageID.scala     | 1 +
 compiler/src/dotty/tools/dotc/reporting/messages.scala      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index 896e00a46053..5ab4c7eb0b28 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -228,6 +228,7 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case OnlyFullyDependentAppliedConstructorTypeID // errorNumber: 212
   case PointlessAppliedConstructorTypeID // errorNumber: 213
   case IllegalContextBoundsID // errorNumber: 214
+  case NamedPatternNotApplicableID // errorNumber: 215
 
   def errorNumber = ordinal - 1
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index d83558475741..8732d2333620 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3262,4 +3262,8 @@ final class IllegalContextBounds(using Context) extends SyntaxMsg(IllegalContext
 
   override protected def explain(using Context): String = ""
 
-end IllegalContextBounds
+final class NamedPatternNotApplicable(selectorType: Type)(using Context) extends PatternMatchMsg(NamedPatternNotApplicableID):
+  override protected def msg(using Context): String =
+    i"Named patterns cannot be used with $selectorType, because it is not a named tuple or case class"
+
+  override protected def explain(using Context): String = ""
\ No newline at end of file

From 17a89d4fe1a538e8ef575f40649db33677638c84 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 30 Jun 2025 17:15:35 +0200
Subject: [PATCH 393/505] Improve error message when trying to use named
 extraction, when not matching case class or named tuple.

Co-authored-by: nmcb <nmcb@xs4all.nl>
Co-authored-by: jan-pieter <jpieter@gmail.com>
Co-authored-by: wwbakker <wwbakker@gmail.com>
Co-authored-by: thijsnissen <thijsnissen@gmail.com>
Co-authored-by: RoccoMathijn <rm.andela@gmail.com>

[Cherry-picked 6aaff88cbb748fe67efe0aa89f0eba6ab8e07335][modified]

From 3d955be09b672cbdf2c14eefe1ec4ff5aa583b26 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 26 Jun 2025 18:38:36 -0700
Subject: [PATCH 394/505] Avoid forcing extension on check of local select

[Cherry-picked 898884867e616c2e1d0a136b49a4721a7b5cb75c]
---
 .../src/dotty/tools/dotc/typer/Typer.scala    | 42 +++++++++++--------
 tests/pos/i18450.scala                        | 15 +++++++
 2 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 tests/pos/i18450.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index b89dea1276be..bf44ff659f22 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -639,25 +639,33 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
       checkLegalValue(tree2, pt)
       tree2
 
-    def isLocalExtensionMethodRef: Boolean = rawType match
-      case rawType: TermRef =>
-        rawType.denot.hasAltWith(_.symbol.is(ExtensionMethod))
-        && !pt.isExtensionApplyProto
-        && {
+    // extensionParam
+    def leadParamOf(m: SymDenotation): Symbol =
+      def leadParam(paramss: List[List[Symbol]]): Symbol = paramss match
+        case (param :: _) :: paramss if param.isType => leadParam(paramss)
+        case _ :: (param :: Nil) :: _ if m.name.isRightAssocOperatorName => param
+        case (param :: Nil) :: _ => param
+        case _ => NoSymbol
+      leadParam(m.rawParamss)
+
+    val localExtensionSelection: untpd.Tree =
+      var select: untpd.Tree = EmptyTree
+      if ctx.mode.is(Mode.InExtensionMethod) then
+        rawType match
+        case rawType: TermRef
+        if rawType.denot.hasAltWith(_.symbol.is(ExtensionMethod)) && !pt.isExtensionApplyProto =>
           val xmethod = ctx.owner.enclosingExtensionMethod
-          rawType.denot.hasAltWith { alt =>
-            alt.symbol.is(ExtensionMethod)
-            && alt.symbol.extensionParam.span == xmethod.extensionParam.span
-          }
-        }
-      case _ =>
-        false
+          val xparam  = leadParamOf(xmethod)
+          if rawType.denot.hasAltWith: alt =>
+               alt.symbol.is(ExtensionMethod)
+            && alt.symbol.extensionParam.span == xparam.span // forces alt.symbol (which might be xmethod)
+          then
+            select = untpd.cpy.Select(tree)(untpd.ref(xparam), name)
+        case _ =>
+      select
 
-    if ctx.mode.is(Mode.InExtensionMethod) && isLocalExtensionMethodRef then
-      val xmethod = ctx.owner.enclosingExtensionMethod
-      val qualifier = untpd.ref(xmethod.extensionParam.termRef)
-      val selection = untpd.cpy.Select(tree)(qualifier, name)
-      typed(selection, pt)
+    if !localExtensionSelection.isEmpty then
+      typed(localExtensionSelection, pt)
     else if rawType.exists then
       val ref = setType(ensureAccessible(rawType, superAccess = false, tree.srcPos))
       if ref.symbol.name != name then
diff --git a/tests/pos/i18450.scala b/tests/pos/i18450.scala
new file mode 100644
index 000000000000..42c4830a85e7
--- /dev/null
+++ b/tests/pos/i18450.scala
@@ -0,0 +1,15 @@
+//> using options -explain-cyclic -Ydebug-cyclic
+
+class C:
+  extension (s: String)
+    def f = "hello, world"
+    def g = f
+
+    //def k = k // Overloaded or recursive method k needs return type
+    // if k is not forced, it fails with:
+    // value k is not a member of String.
+    // Extension methods were tried, ...
+
+    def e =
+      import this.{f as hw}
+      hw // this.f

From c6ffa06e3fe575994c793a8572a547b0636a3b39 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Thu, 26 Jun 2025 17:36:21 +0200
Subject: [PATCH 395/505] Fix regressions in asSeenFrom introduced in 3.7

The body of isLegalPrefix used to read:

    pre.isStable || !ctx.phase.isTyper

but was changed to drop the second condition in #21954 (originally included in
3.6.4-RC1, reverted from 3.6.4 final but back in 3.7). This has led to a
number of regressions, the last ones discussed in #23423.

To make the testcases added in #21594 pass, this PR proposes a less drastic
change: relax isLegalPrefix as before, unless we're doing an implicit search.
This should dramatically reduce the possibility for regressions.

Fixes #23423.
Fixes #22676.
---
 compiler/src/dotty/tools/dotc/core/TypeOps.scala |  4 +++-
 tests/neg-custom-args/captures/lazylist.check    | 10 +++++-----
 tests/pos-macros/i23423/A_1.scala                | 16 ++++++++++++++++
 tests/pos-macros/i23423/B_2.scala                |  6 ++++++
 tests/pos/i22676.scala                           | 11 +++++++++++
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 tests/pos-macros/i23423/A_1.scala
 create mode 100644 tests/pos-macros/i23423/B_2.scala
 create mode 100644 tests/pos/i22676.scala

diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
index c985ed23274b..8b2f34608193 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
@@ -123,7 +123,9 @@ object TypeOps:
   }
 
   def isLegalPrefix(pre: Type)(using Context): Boolean =
-    pre.isStable || !ctx.phase.isTyper
+    // isLegalPrefix is relaxed after typer unless we're doing an implicit
+    // search (this matters when doing summonInline in an inline def like in tests/pos/i17222.8.scala).
+    pre.isStable || !ctx.phase.isTyper && ctx.mode.is(Mode.ImplicitsEnabled)
 
   /** Implementation of Types#simplified */
   def simplify(tp: Type, theMap: SimplifyMap | Null)(using Context): Type = {
diff --git a/tests/neg-custom-args/captures/lazylist.check b/tests/neg-custom-args/captures/lazylist.check
index 4b7611fc3fb7..59e2ee251b86 100644
--- a/tests/neg-custom-args/captures/lazylist.check
+++ b/tests/neg-custom-args/captures/lazylist.check
@@ -26,11 +26,11 @@
    |                                    Required: lazylists.LazyList[Int]^{cap2}
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg-custom-args/captures/lazylist.scala:41:48 -------------------------------------
-41 |  val ref4c: LazyList[Int]^{cap1, ref3, cap3} = ref4 // error
-   |                                                ^^^^
-   |                                             Found:    (ref4 : lazylists.LazyList[Int]^{cap3, cap2, ref1, cap1})
-   |                                             Required: lazylists.LazyList[Int]^{cap1, ref3, cap3}
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/lazylist.scala:41:42 -------------------------------------
+41 |  val ref4c: LazyList[Int]^{cap1, ref3} = ref4 // error
+   |                                          ^^^^
+   |                                          Found:    (ref4 : lazylists.LazyList[Int]^{cap3, cap1, cap2})
+   |                                          Required: lazylists.LazyList[Int]^{cap1, ref3}
    |
    | longer explanation available when compiling with `-explain`
 -- [E164] Declaration Error: tests/neg-custom-args/captures/lazylist.scala:22:6 ----------------------------------------
diff --git a/tests/pos-macros/i23423/A_1.scala b/tests/pos-macros/i23423/A_1.scala
new file mode 100644
index 000000000000..62455c74eed0
--- /dev/null
+++ b/tests/pos-macros/i23423/A_1.scala
@@ -0,0 +1,16 @@
+package pkg
+
+import scala.quoted.*
+
+trait HasElem {
+  type Elem
+  type Alias = Elem
+}
+
+object Macro:
+  inline def foo: Unit = ${fooImpl}
+  def fooImpl(using Quotes): Expr[Unit] =
+    '{
+      val lll: (he: HasElem) => he.Alias =
+        (hx: HasElem) => ???
+    }
diff --git a/tests/pos-macros/i23423/B_2.scala b/tests/pos-macros/i23423/B_2.scala
new file mode 100644
index 000000000000..144eaf4ce1da
--- /dev/null
+++ b/tests/pos-macros/i23423/B_2.scala
@@ -0,0 +1,6 @@
+object Test:
+  def test: Unit = pkg.Macro.foo
+  // used to be error:
+  // Found:    (hx: pkg.HasElem) => hx.Elem
+  // Required: (he: pkg.HasElem) => he.Elem
+
diff --git a/tests/pos/i22676.scala b/tests/pos/i22676.scala
new file mode 100644
index 000000000000..5654559b133f
--- /dev/null
+++ b/tests/pos/i22676.scala
@@ -0,0 +1,11 @@
+package example
+
+trait Example {
+  class Input
+
+  type Output[A] = A match {
+    case Input => Int
+  }
+}
+
+class Ref(ref: Example#Input)

From a24216f5ef89f0b60922a929d7d7d3ed0c931b78 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 30 Jun 2025 17:17:33 +0200
Subject: [PATCH 396/505] Fix regressions in asSeenFrom introduced in 3.7

The body of isLegalPrefix used to read:

    pre.isStable || !ctx.phase.isTyper

but was changed to drop the second condition in #21954 (originally included in
3.6.4-RC1, reverted from 3.6.4 final but back in 3.7). This has led to a
number of regressions, the last ones discussed in #23423.

To make the testcases added in #21594 pass, this PR proposes a less drastic
change: relax isLegalPrefix as before, unless we're doing an implicit search.
This should dramatically reduce the possibility for regressions.

Fixes #23423.
Fixes #22676.

[Cherry-picked 2e4bc0abb8a374d78fe1aac383f3208b5efb5eb1][modified]

From 2b55f0e660735f69a90bef9e843cc3415491c330 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Thu, 26 Jun 2025 13:02:58 +0200
Subject: [PATCH 397/505] Fix Symbol.info remapping in TreeTypeMap

Previously, the map would first copy and remap the outermost symbols,
then inner declarations, then ddeclarations of those declarations etc.,
so if an outer symbol referred to a more nested one, that reference was
not remapped, causing issues later.

[Cherry-picked e57d743430f583336fa4ce6e9159717f4843b55f]
---
 .../dotty/tools/dotc/ast/TreeTypeMap.scala    |  5 ++++
 tests/run/i23279.scala                        | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 tests/run/i23279.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala b/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala
index 5ddbdd990182..0298c306d24d 100644
--- a/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala
+++ b/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala
@@ -224,6 +224,11 @@ class TreeTypeMap(
         val tmap1 = tmap.withMappedSyms(
           origCls(cls).typeParams ::: origDcls,
           cls.typeParams ::: mappedDcls)
+        mapped.foreach { sym =>
+          // outer Symbols can reference nested ones in info,
+          // so we remap that once again with the updated TreeTypeMap
+          sym.info = tmap1.mapType(sym.info)
+        }
         origDcls.lazyZip(mappedDcls).foreach(cls.asClass.replace)
         tmap1
       }
diff --git a/tests/run/i23279.scala b/tests/run/i23279.scala
new file mode 100644
index 000000000000..8774e5afcd79
--- /dev/null
+++ b/tests/run/i23279.scala
@@ -0,0 +1,28 @@
+inline def simpleInlineWrap(f: => Any): Unit = f
+
+@main def Test(): Unit = {
+  simpleInlineWrap {
+    object lifecycle {
+      object Lifecycle {
+        trait FromZIO
+      }
+    }
+    object defn {
+      val Lifecycle: lifecycle.Lifecycle.type = lifecycle.Lifecycle
+    }
+    val xa: defn.Lifecycle.type = defn.Lifecycle
+  }
+
+  // more nested case
+  simpleInlineWrap {
+    object lifecycle {
+      object Lifecycle {
+        object FromZIO
+      }
+    }
+    object defn {
+      val Lifecycle: lifecycle.Lifecycle.type = lifecycle.Lifecycle
+    }
+    val xa: defn.Lifecycle.FromZIO.type = defn.Lifecycle.FromZIO
+  }
+}

From 04c71878a688103ec838fed85a5c27a912bd4692 Mon Sep 17 00:00:00 2001
From: Katarzyna Marek <kasia@marek.net>
Date: Fri, 27 Jun 2025 15:26:34 +0200
Subject: [PATCH 398/505] fix: simplify infer type for apply

[Cherry-picked 44366a0e3083e02aa7db2b9643db121233a1fe60]
---
 .../dotty/tools/pc/InferExpectedType.scala    | 38 +---------
 .../tools/pc/completions/Completions.scala    |  2 +-
 .../pc/tests/InferExpectedTypeSuite.scala     | 75 +++++++++++++++++++
 .../SingletonCompletionsSuite.scala           | 26 +++++++
 4 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
index 33e918d98e52..721b9c6375ab 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala
@@ -50,12 +50,12 @@ class InferExpectedType(
         val indexedCtx = IndexedContext(pos)(using locatedCtx)
         val printer =
           ShortenedTypePrinter(search, IncludeDefaultParam.ResolveLater)(using indexedCtx)
-        InterCompletionType.inferType(path)(using newctx).map{
+        InferCompletionType.inferType(path)(using newctx).map{
           tpe => printer.tpe(tpe)
         }
       case None => None
 
-object InterCompletionType:
+object InferCompletionType:
   def inferType(path: List[Tree])(using Context): Option[Type] =
     path match
       case (lit: Literal) :: Select(Literal(_), _) :: Apply(Select(Literal(_), _), List(s: Select)) :: rest if s.symbol == defn.Predef_undefined => inferType(rest, lit.span)
@@ -94,37 +94,7 @@ object InterCompletionType:
         else unapplyArgs(fun.tpe.finalResultType, fun, pats, NoSourcePosition).lift(ind)
       // f(@@)
       case ApplyExtractor(app) =>
-        val argsAndParams = ApplyArgsExtractor.getArgsAndParams(None, app, span).headOption
-        argsAndParams.flatMap:
-          case (args, params) =>
-            val idx = args.indexWhere(_.span.contains(span))
-            val param =
-              if idx >= 0 && params.length > idx then Some(params(idx).info)
-              else None
-            param match
-              // def f[T](a: T): T = ???
-              // f[Int](@@)
-              // val _: Int = f(@@)
-              case Some(t : TypeRef) if t.symbol.is(Flags.TypeParam) =>
-                for
-                  (typeParams, args) <-
-                    app match
-                      case Apply(TypeApply(fun, args), _) =>
-                        val typeParams = fun.symbol.paramSymss.headOption.filter(_.forall(_.isTypeParam))
-                        typeParams.map((_, args.map(_.tpe)))
-                      // val f: (j: "a") => Int
-                      // f(@@)
-                      case Apply(Select(v, StdNames.nme.apply), _) =>
-                          v.symbol.info match
-                            case AppliedType(des, args) =>
-                              Some((des.typeSymbol.typeParams, args))
-                            case _ => None
-                      case _ => None
-                  ind = typeParams.indexOf(t.symbol)
-                  tpe <- args.get(ind)
-                  if !tpe.isErroneous
-                yield tpe
-              case Some(tpe) => Some(tpe)
-              case _ => None
+        val idx = app.args.indexWhere(_.span.contains(span))
+        app.fun.tpe.widenTermRefExpr.paramInfoss.flatten.get(idx)
       case _ => None
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
index 0389d3fa2fab..6b42af504a6e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
@@ -522,7 +522,7 @@ class Completions(
           config.isCompletionSnippetsEnabled()
         )
         (args, false)
-    val singletonCompletions = InterCompletionType.inferType(path).map(
+    val singletonCompletions = InferCompletionType.inferType(path).map(
       SingletonCompletions.contribute(path, _, completionPos)
     ).getOrElse(Nil)
     (singletonCompletions ++ advanced, exclusive)
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala
index ba96488471b6..b796f44f12ca 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala
@@ -47,6 +47,24 @@ class InferExpectedTypeSuite extends BasePCSuite:
          |""".stripMargin
     )
 
+  @Test def `basic-params` =
+    check(
+      """|def paint(c: Int, f: String, d: List[String]) = ???
+         |val _ = paint(1, "aa", @@)
+         |""".stripMargin,
+      """|List[String]
+         |""".stripMargin
+    )
+
+  @Test def `basic-type-param` =
+    check(
+      """|def paint[T](c: T) = ???
+         |val _ = paint[Int](@@)
+         |""".stripMargin,
+      """|Int
+         |""".stripMargin
+    )
+
   @Test def `type-ascription` =
     check(
       """|def doo = (@@ : Double)
@@ -335,3 +353,60 @@ class InferExpectedTypeSuite extends BasePCSuite:
       """|String
          |""".stripMargin
     )
+
+  @Test def using =
+    check(
+      """|def go(using Ordering[Int])(x: Int, y: Int): Int =
+         |  Ordering[Int].compare(x, y)
+         |
+         |def test =
+         |  go(???, @@)
+         |""".stripMargin,
+      """|Int
+         |""".stripMargin
+    )
+
+  @Test def `apply-dynamic` =
+    check(
+      """|object TypedHoleApplyDynamic {
+         |  val obj: reflect.Selectable {
+         |    def method(x: Int): Unit
+         |  } = new reflect.Selectable {
+         |    def method(x: Int): Unit = ()
+         |  }
+         |
+         |  obj.method(@@)
+         |}
+         |""".stripMargin,
+      "Int"
+    )
+
+  @Test def `apply-dynamic-2` =
+    check(
+      """|object TypedHoleApplyDynamic {
+         |  val obj: reflect.Selectable {
+         |    def method[T](x: Int, y: T): Unit
+         |  } = new reflect.Selectable {
+         |    def method[T](x: Int, y: T): Unit = ()
+         |  }
+         |
+         |  obj.method[String](1, @@)
+         |}
+         |""".stripMargin,
+      "String"
+    )
+
+  @Test def `apply-dynamic-3` =
+    check(
+      """|object TypedHoleApplyDynamic {
+         |  val obj: reflect.Selectable {
+         |    def method[T](a: Int)(x: Int, y: T): Unit
+         |  } = new reflect.Selectable {
+         |    def method[T](a: Int)(x: Int, y: T): Unit = ()
+         |  }
+         |
+         |  obj.method[String](1)(1, @@)
+         |}
+         |""".stripMargin,
+      "String"
+    )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/SingletonCompletionsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/SingletonCompletionsSuite.scala
index 25d1418900fd..17e4ad2ad9f3 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/SingletonCompletionsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/SingletonCompletionsSuite.scala
@@ -297,4 +297,30 @@ class SingletonCompletionsSuite extends BaseCompletionSuite {
       """|"foo": "foo"
          |""".stripMargin
     )
+
+  @Test def `type-apply` =
+    check(
+      """|class Consumer[A]:
+         |  def eat(a: A) = ()
+         |
+         |def test =
+         |  Consumer[7].eat(@@)
+         |""".stripMargin,
+      "7: 7",
+      topLines = Some(1)
+    )
+
+  @Test def `type-apply-2` =
+    check(
+      """|class Consumer[A]:
+         |  def eat(a: A) = ()
+         |
+         |object Consumer7 extends Consumer[7]
+         |
+         |def test =
+         |  Consumer7.eat(@@)
+         |""".stripMargin,
+        "7: 7",
+        topLines = Some(1)
+      )
 }

From 0387c5bda42e559121c8be75075f4abc84469ade Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 1 Jul 2025 13:40:15 +0200
Subject: [PATCH 399/505] bugfix: Fix captures test after recent changes

---
 tests/neg-custom-args/captures/lazylist.check | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/neg-custom-args/captures/lazylist.check b/tests/neg-custom-args/captures/lazylist.check
index 59e2ee251b86..4b7611fc3fb7 100644
--- a/tests/neg-custom-args/captures/lazylist.check
+++ b/tests/neg-custom-args/captures/lazylist.check
@@ -26,11 +26,11 @@
    |                                    Required: lazylists.LazyList[Int]^{cap2}
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg-custom-args/captures/lazylist.scala:41:42 -------------------------------------
-41 |  val ref4c: LazyList[Int]^{cap1, ref3} = ref4 // error
-   |                                          ^^^^
-   |                                          Found:    (ref4 : lazylists.LazyList[Int]^{cap3, cap1, cap2})
-   |                                          Required: lazylists.LazyList[Int]^{cap1, ref3}
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/lazylist.scala:41:48 -------------------------------------
+41 |  val ref4c: LazyList[Int]^{cap1, ref3, cap3} = ref4 // error
+   |                                                ^^^^
+   |                                             Found:    (ref4 : lazylists.LazyList[Int]^{cap3, cap2, ref1, cap1})
+   |                                             Required: lazylists.LazyList[Int]^{cap1, ref3, cap3}
    |
    | longer explanation available when compiling with `-explain`
 -- [E164] Declaration Error: tests/neg-custom-args/captures/lazylist.scala:22:6 ----------------------------------------

From 1762fc259e809cb0321bd236fe168bfc0afac773 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 3 Jul 2025 15:37:20 +0200
Subject: [PATCH 400/505] bugfix: Revert the change in
 https://github.com/scala/scala3/pull/23438 and leave only the test

---
 compiler/src/dotty/tools/dotc/core/TypeOps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
index 8b2f34608193..c608afeaca79 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
@@ -125,7 +125,7 @@ object TypeOps:
   def isLegalPrefix(pre: Type)(using Context): Boolean =
     // isLegalPrefix is relaxed after typer unless we're doing an implicit
     // search (this matters when doing summonInline in an inline def like in tests/pos/i17222.8.scala).
-    pre.isStable || !ctx.phase.isTyper && ctx.mode.is(Mode.ImplicitsEnabled)
+    pre.isStable || !ctx.phase.isTyper
 
   /** Implementation of Types#simplified */
   def simplify(tp: Type, theMap: SimplifyMap | Null)(using Context): Type = {

From 67c5fac6c84e6ec79bcd28d626b4b2408073b4cb Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 24 Jun 2025 19:50:47 +0200
Subject: [PATCH 401/505] chore: Improve completions when a lot of exports are
 present

It seems .sourceSymbol would end up traversing a lot of trees in that case, which is highly inefficient

I also added a try for cases such as https://github.com/scalameta/metals/issues/7573

[Cherry-picked b148260003ab78b1e60cc040b947d4a8f989e36c]
---
 .../src/dotty/tools/dotc/interactive/Completion.scala    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index 820dcd774530..9d1bb002cabd 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -321,15 +321,15 @@ object Completion:
    *   8. symbol is not a constructor proxy module when in type completion mode
    *   9. have same term/type kind as name prefix given so far
    */
-  def isValidCompletionSymbol(sym: Symbol, completionMode: Mode, isNew: Boolean)(using Context): Boolean =
-
+  def isValidCompletionSymbol(sym: Symbol, completionMode: Mode, isNew: Boolean)(using Context): Boolean = try
     lazy val isEnum = sym.is(Enum) ||
       (sym.companionClass.exists && sym.companionClass.is(Enum))
 
     sym.exists &&
     !sym.isAbsent(canForce = false) &&
     !sym.isPrimaryConstructor &&
-    sym.sourceSymbol.exists &&
+      // running sourceSymbol on ExportedTerm will force a lot of computation from collectSubTrees
+    (sym.is(ExportedTerm) || sym.sourceSymbol.exists) &&
     (!sym.is(Package) || sym.is(ModuleClass)) &&
     !sym.isAllOf(Mutable | Accessor) &&
     !sym.isPackageObject &&
@@ -340,6 +340,9 @@ object Completion:
          (completionMode.is(Mode.Term) && (sym.isTerm || sym.is(ModuleClass))
       || (completionMode.is(Mode.Type) && (sym.isType || sym.isStableMember)))
     )
+  catch
+    case NonFatal(ex) =>
+      false
   end isValidCompletionSymbol
 
   given ScopeOrdering(using Context): Ordering[Seq[SingleDenotation]] with

From dde4a39a3d4e40e609dccf8adef944ac6a299625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Sajn=C3=B3g?=
 <118359987+przemekiterators@users.noreply.github.com>
Date: Tue, 1 Jul 2025 00:12:09 +0200
Subject: [PATCH 402/505] bugfix: Fix adjust type when already exists (#23455)

Fixes: https://github.com/scalameta/metals/issues/6018
[Cherry-picked 3435ddbe39137ef9affe39638305bea0f98ebd2d]
---
 .../dotty/tools/pc/InferredTypeProvider.scala |  6 +-
 .../tests/edit/InsertInferredTypeSuite.scala  | 64 +++++++++++++++++++
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
index 5cb85177927b..0ab1d264828e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala
@@ -183,8 +183,7 @@ final class InferredTypeProvider(
           typeNameEdit ::: imports
 
         rhs match
-          case t: Tree[?]
-              if t.typeOpt.isErroneous && retryType && !tpt.sourcePos.span.isZeroExtent =>
+          case t: Tree[?] if !tpt.sourcePos.span.isZeroExtent =>
             inferredTypeEdits(
               Some(
                 AdjustTypeOpts(
@@ -224,8 +223,7 @@ final class InferredTypeProvider(
           while i >= 0 && sourceText(i) != ':' do i -= 1
           i
         rhs match
-          case t: Tree[?]
-              if t.typeOpt.isErroneous && retryType && !tpt.sourcePos.span.isZeroExtent =>
+          case t: Tree[?] if !tpt.sourcePos.span.isZeroExtent =>
             inferredTypeEdits(
               Some(
                 AdjustTypeOpts(
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
index a5d940612d66..e9ae9df9893c 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala
@@ -1035,6 +1035,70 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite:
          |""".stripMargin
     )
 
+  @Test def `Adjust type for val` =
+    checkEdit(
+      """|object A{
+         |  val <<alpha>>:String = 123
+         |}""".stripMargin,
+
+      """|object A{
+         |  val alpha: Int = 123
+         |}""".stripMargin,
+    )
+
+  @Test def `Adjust type for val2` =
+    checkEdit(
+      """|object A{
+         |  val <<alpha>>:Int = 123
+         |}""".stripMargin,
+      """|object A{
+         |  val alpha: Int = 123
+         |}""".stripMargin,
+    )
+
+  @Test def `Adjust type for val3` =
+    checkEdit(
+      """|object A{
+         |  val <<alpha>>: Int = 123
+         |}""".stripMargin,
+      """|object A{
+         |  val alpha: Int = 123
+         |}""".stripMargin,
+    )
+
+  @Test def `Adjust type for def` =
+    checkEdit(
+      """|object A{
+         |  def <<alpha>>:String = 123
+         |}""".stripMargin,
+
+      """|object A{
+         |  def alpha: Int = 123
+         |}""".stripMargin,
+    )
+
+  @Test def `Adjust type for def2` =
+    checkEdit(
+      """|object A{
+         |  def <<alpha>>:Int = 123
+         |}""".stripMargin,
+      """|object A{
+         |  def alpha: Int = 123
+         |}""".stripMargin,
+    )
+
+
+  @Test def `Adjust type for def3` =
+    checkEdit(
+      """|object A{
+         |  def <<alpha>>: Int = 123
+         |}""".stripMargin,
+      """|object A{
+         |  def alpha: Int = 123
+         |}""".stripMargin,
+    )
+
+
   def checkEdit(
       original: String,
       expected: String

From ad3745283076462865ea00b2e5d0e34a0559412c Mon Sep 17 00:00:00 2001
From: Jan <Jannyboy11@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:05:28 +0200
Subject: [PATCH 403/505] Improve error message for conflicting definitions
 (#23453)

Now includes the signature in the message also when emitted from the
typer.

Co-authored-by: Matthieu Bovel <matthieu@bovel.net>
---
 .../dotty/tools/dotc/reporting/messages.scala | 10 +++--
 tests/neg/doubleDefinition.check              | 44 +++++++++----------
 tests/neg/exports.check                       | 14 +++---
 tests/neg/i14966a.check                       |  2 +-
 tests/neg/i23402.check                        | 10 +++++
 tests/neg/i23402.scala                        |  5 +++
 tests/neg/i23402b.check                       | 10 +++++
 tests/neg/i23402b.scala                       |  5 +++
 tests/neg/i23402c.check                       | 10 +++++
 tests/neg/i23402c.scala                       |  5 +++
 tests/neg/i7359-f.check                       |  2 +-
 tests/neg/mixin-forwarder-clash1.check        |  2 +-
 tests/neg/mixin-forwarder-clash2.check        |  2 +-
 tests/neg/override-erasure-clash.check        |  2 +-
 tests/neg/type-params.check                   |  4 +-
 15 files changed, 87 insertions(+), 40 deletions(-)
 create mode 100644 tests/neg/i23402.check
 create mode 100644 tests/neg/i23402.scala
 create mode 100644 tests/neg/i23402b.check
 create mode 100644 tests/neg/i23402b.scala
 create mode 100644 tests/neg/i23402c.check
 create mode 100644 tests/neg/i23402c.scala

diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 8732d2333620..456b3e948108 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -2303,7 +2303,9 @@ class DoubleDefinition(decl: Symbol, previousDecl: Symbol, base: Symbol)(using C
 extends NamingMsg(DoubleDefinitionID) {
   def msg(using Context) = {
     def nameAnd = if (decl.name != previousDecl.name) " name and" else ""
-    def erasedType = if ctx.erasedTypes then i" ${decl.info}" else ""
+    def erasedType: Type =
+      if ctx.erasedTypes then decl.info
+      else TypeErasure.transformInfo(decl, decl.info)
     def details(using Context): String =
       if (decl.isRealMethod && previousDecl.isRealMethod) {
         import Signature.MatchDegree.*
@@ -2331,7 +2333,7 @@ extends NamingMsg(DoubleDefinitionID) {
                     |Consider adding a @targetName annotation to one of the conflicting definitions
                     |for disambiguation."""
               else ""
-            i"have the same$nameAnd type$erasedType after erasure.$hint"
+            i"have the same$nameAnd type $erasedType after erasure.$hint"
         }
       }
       else ""
@@ -2344,7 +2346,7 @@ extends NamingMsg(DoubleDefinitionID) {
     }
     val clashDescription =
       if (decl.owner eq previousDecl.owner)
-        "Double definition"
+        "Conflicting definitions"
       else if ((decl.owner eq base) || (previousDecl eq base))
         "Name clash between defined and inherited member"
       else
@@ -3266,4 +3268,4 @@ final class NamedPatternNotApplicable(selectorType: Type)(using Context) extends
   override protected def msg(using Context): String =
     i"Named patterns cannot be used with $selectorType, because it is not a named tuple or case class"
 
-  override protected def explain(using Context): String = ""
\ No newline at end of file
+  override protected def explain(using Context): String = ""
diff --git a/tests/neg/doubleDefinition.check b/tests/neg/doubleDefinition.check
index 953a0ba8c128..db98effbabdd 100644
--- a/tests/neg/doubleDefinition.check
+++ b/tests/neg/doubleDefinition.check
@@ -1,130 +1,130 @@
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:14:5 ----------------------------------------------------------
 14 |	def foo(x: List[B]): Function1[B, B] = ??? // error: same jvm signature
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo(x: List[A]): A => A in class Test2 at line 13 and
    |	    def foo(x: List[B]): B => B in class Test2 at line 14
-   |	    have the same type after erasure.
+   |	    have the same type (x: List): Function1 after erasure.
    |
    |	    Consider adding a @targetName annotation to one of the conflicting definitions
    |	    for disambiguation.
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:21:5 ----------------------------------------------------------
 21 |	def foo(x: List[A]): Function2[B, B, B] = ??? // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo(x: List[A]): A => A in class Test3 at line 20 and
    |	    def foo(x: List[A]): (B, B) => B in class Test3 at line 21
    |	    have matching parameter types.
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:26:5 ----------------------------------------------------------
 26 |	def foo = 2 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    val foo: Int in class Test4 at line 25 and
    |	    def foo: Int in class Test4 at line 26
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:31:5 ----------------------------------------------------------
 31 |	val foo = 1 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo: Int in class Test4b at line 30 and
    |	    val foo: Int in class Test4b at line 31
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:36:5 ----------------------------------------------------------
 36 |	var foo = 1 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo: Int in class Test4c at line 35 and
    |	    var foo: Int in class Test4c at line 36
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:41:5 ----------------------------------------------------------
 41 |	def foo = 2 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    var foo: Int in class Test4d at line 40 and
    |	    def foo: Int in class Test4d at line 41
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:55:5 ----------------------------------------------------------
 55 |	def foo(x: List[B]): Function1[B, B] = ??? // error: same jvm signature
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo(x: List[A]): A => A in trait Test6 at line 54 and
    |	    def foo(x: List[B]): B => B in trait Test6 at line 55
-   |	    have the same type after erasure.
+   |	    have the same type (x: List): Function1 after erasure.
    |
    |	    Consider adding a @targetName annotation to one of the conflicting definitions
    |	    for disambiguation.
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:62:5 ----------------------------------------------------------
 62 |	def foo(x: List[A]): Function2[B, B, B] = ??? // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo(x: List[A]): A => A in trait Test7 at line 61 and
    |	    def foo(x: List[A]): (B, B) => B in trait Test7 at line 62
    |	    have matching parameter types.
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:67:5 ----------------------------------------------------------
 67 |	def foo = 2 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    val foo: Int in class Test8 at line 66 and
    |	    def foo: Int in class Test8 at line 67
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:72:5 ----------------------------------------------------------
 72 |	val foo = 1 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo: Int in class Test8b at line 71 and
    |	    val foo: Int in class Test8b at line 72
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:77:5 ----------------------------------------------------------
 77 |	var foo = 1 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    def foo: Int in class Test8c at line 76 and
    |	    var foo: Int in class Test8c at line 77
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:82:5 ----------------------------------------------------------
 82 |	def foo = 2 // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    var foo: Int in class Test8d at line 81 and
    |	    def foo: Int in class Test8d at line 82
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:88:5 ----------------------------------------------------------
 88 |	def foo: String // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    val foo: Int in class Test9 at line 87 and
    |	    def foo: String in class Test9 at line 88
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:92:5 ----------------------------------------------------------
 92 |	def foo: Int // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    val foo: Int in class Test10 at line 91 and
    |	    def foo: Int in class Test10 at line 92
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:96:5 ----------------------------------------------------------
 96 |	def foo: String // error
    |	    ^
-   |	    Double definition:
+   |	    Conflicting definitions:
    |	    val foo: Int in class Test11 at line 95 and
    |	    def foo: String in class Test11 at line 96
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:100:5 ---------------------------------------------------------
 100 |	def foo: Int // error
     |	    ^
-    |	    Double definition:
+    |	    Conflicting definitions:
     |	    val foo: Int in class Test12 at line 99 and
     |	    def foo: Int in class Test12 at line 100
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:104:5 ---------------------------------------------------------
 104 |	def foo: String // error
     |	    ^
-    |	    Double definition:
+    |	    Conflicting definitions:
     |	    var foo: Int in class Test13 at line 103 and
     |	    def foo: String in class Test13 at line 104
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:108:5 ---------------------------------------------------------
 108 |	def foo: Int // error
     |	    ^
-    |	    Double definition:
+    |	    Conflicting definitions:
     |	    var foo: Int in class Test14 at line 107 and
     |	    def foo: Int in class Test14 at line 108
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:112:5 ---------------------------------------------------------
 112 |	def foo: String // error
     |	    ^
-    |	    Double definition:
+    |	    Conflicting definitions:
     |	    var foo: Int in class Test15 at line 111 and
     |	    def foo: String in class Test15 at line 112
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:116:5 ---------------------------------------------------------
 116 |	def foo: Int // error
     |	    ^
-    |	    Double definition:
+    |	    Conflicting definitions:
     |	    var foo: Int in class Test16 at line 115 and
     |	    def foo: Int in class Test16 at line 116
diff --git a/tests/neg/exports.check b/tests/neg/exports.check
index 79951cebfc39..4016d8729043 100644
--- a/tests/neg/exports.check
+++ b/tests/neg/exports.check
@@ -15,30 +15,30 @@
 -- [E120] Naming Error: tests/neg/exports.scala:23:33 ------------------------------------------------------------------
 23 |    export printUnit.{stat => _, _} // error: double definition
    |                                 ^
-   |                                 Double definition:
+   |                                 Conflicting definitions:
    |                                 def status: List[String] in class Copier at line 28 and
    |                                 final def status: List[String] in class Copier at line 23
-   |                                 have the same type after erasure.
+   |                                 have the same type (): List after erasure.
    |
    |                                 Consider adding a @targetName annotation to one of the conflicting definitions
    |                                 for disambiguation.
 -- [E120] Naming Error: tests/neg/exports.scala:24:20 ------------------------------------------------------------------
 24 |    export scanUnit._               // error: double definition
    |                    ^
-   |                    Double definition:
+   |                    Conflicting definitions:
    |                    final def status: List[String] in class Copier at line 23 and
    |                    final def status: List[String] in class Copier at line 24
-   |                    have the same type after erasure.
+   |                    have the same type (): List after erasure.
    |
    |                    Consider adding a @targetName annotation to one of the conflicting definitions
    |                    for disambiguation.
 -- [E120] Naming Error: tests/neg/exports.scala:26:21 ------------------------------------------------------------------
 26 |    export printUnit.status         // error: double definition
    |                     ^
-   |                     Double definition:
+   |                     Conflicting definitions:
    |                     final def status: List[String] in class Copier at line 24 and
    |                     final def status: List[String] in class Copier at line 26
-   |                     have the same type after erasure.
+   |                     have the same type (): List after erasure.
    |
    |                     Consider adding a @targetName annotation to one of the conflicting definitions
    |                     for disambiguation.
@@ -55,7 +55,7 @@
 -- [E120] Naming Error: tests/neg/exports.scala:46:15 ------------------------------------------------------------------
 46 |    export bar._  // error: double definition
    |               ^
-   |               Double definition:
+   |               Conflicting definitions:
    |               val bar: Bar in class Baz at line 45 and
    |               final def bar: (Baz.this.bar.bar : => (Baz.this.bar.baz.bar : Bar)) in class Baz at line 46
 -- [E083] Type Error: tests/neg/exports.scala:57:11 --------------------------------------------------------------------
diff --git a/tests/neg/i14966a.check b/tests/neg/i14966a.check
index 777d1ec74955..933d16e593aa 100644
--- a/tests/neg/i14966a.check
+++ b/tests/neg/i14966a.check
@@ -1,7 +1,7 @@
 -- [E120] Naming Error: tests/neg/i14966a.scala:3:6 --------------------------------------------------------------------
 3 |  def f(x: List[Int]): String = ??? // error
   |      ^
-  |      Double definition:
+  |      Conflicting definitions:
   |      def f[X <: String](x: List[X]): String in class Test at line 2 and
   |      def f(x: List[Int]): String in class Test at line 3
   |      have the same type (x: scala.collection.immutable.List): String after erasure.
diff --git a/tests/neg/i23402.check b/tests/neg/i23402.check
new file mode 100644
index 000000000000..7310c7738b38
--- /dev/null
+++ b/tests/neg/i23402.check
@@ -0,0 +1,10 @@
+-- [E120] Naming Error: tests/neg/i23402.scala:4:5 ---------------------------------------------------------------------
+4 | def apply(p1: String)(p2: Int): A = A(p1, p2) // error
+  |     ^
+  |     Conflicting definitions:
+  |     def apply(p1: String, p2: Int): A in object A at line 3 and
+  |     def apply(p1: String)(p2: Int): A in object A at line 4
+  |     have the same type (p1: String, p2: Int): A after erasure.
+  |
+  |     Consider adding a @targetName annotation to one of the conflicting definitions
+  |     for disambiguation.
diff --git a/tests/neg/i23402.scala b/tests/neg/i23402.scala
new file mode 100644
index 000000000000..8849db2646dd
--- /dev/null
+++ b/tests/neg/i23402.scala
@@ -0,0 +1,5 @@
+class A(p1: String, p2: Int)
+object A {
+ def apply(p1: String, p2: Int): A = A(p1, p2)
+ def apply(p1: String)(p2: Int): A = A(p1, p2) // error
+}
diff --git a/tests/neg/i23402b.check b/tests/neg/i23402b.check
new file mode 100644
index 000000000000..1fce53d00d26
--- /dev/null
+++ b/tests/neg/i23402b.check
@@ -0,0 +1,10 @@
+-- [E120] Naming Error: tests/neg/i23402b.scala:4:5 --------------------------------------------------------------------
+4 | def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
+  |     ^
+  |     Conflicting definitions:
+  |     def apply[T](p1: String, p2: Int): A in object A at line 3 and
+  |     def apply[T](p1: String)(p2: Int): A in object A at line 4
+  |     have the same type (p1: String, p2: Int): A after erasure.
+  |
+  |     Consider adding a @targetName annotation to one of the conflicting definitions
+  |     for disambiguation.
diff --git a/tests/neg/i23402b.scala b/tests/neg/i23402b.scala
new file mode 100644
index 000000000000..1b486f21b583
--- /dev/null
+++ b/tests/neg/i23402b.scala
@@ -0,0 +1,5 @@
+class A(p1: String, p2: Int)
+object A {
+ def apply[T](p1: String, p2: Int): A = A(p1, p2)
+ def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
+}
diff --git a/tests/neg/i23402c.check b/tests/neg/i23402c.check
new file mode 100644
index 000000000000..5a87250ffb9e
--- /dev/null
+++ b/tests/neg/i23402c.check
@@ -0,0 +1,10 @@
+-- [E120] Naming Error: tests/neg/i23402c.scala:4:5 --------------------------------------------------------------------
+4 | def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
+  |     ^
+  |     Conflicting definitions:
+  |     def apply(p1: String, p2: Int): A in object A at line 3 and
+  |     def apply[T](p1: String)(p2: Int): A in object A at line 4
+  |     have the same type (p1: String, p2: Int): A after erasure.
+  |
+  |     Consider adding a @targetName annotation to one of the conflicting definitions
+  |     for disambiguation.
diff --git a/tests/neg/i23402c.scala b/tests/neg/i23402c.scala
new file mode 100644
index 000000000000..c28c0c512459
--- /dev/null
+++ b/tests/neg/i23402c.scala
@@ -0,0 +1,5 @@
+class A(p1: String, p2: Int)
+object A {
+ def apply(p1: String, p2: Int): A = A(p1, p2)
+ def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
+}
diff --git a/tests/neg/i7359-f.check b/tests/neg/i7359-f.check
index 5eabb4e1dd8c..9dca40aebb35 100644
--- a/tests/neg/i7359-f.check
+++ b/tests/neg/i7359-f.check
@@ -4,7 +4,7 @@
   |      Name clash between inherited members:
   |      def equals[T >: Boolean <: Boolean](obj: Any): T in trait SAMTrait at line 3 and
   |      def equals(x$0: Any): Boolean in class Any
-  |      have the same type after erasure.
+  |      have the same type (x$0: Object): Boolean after erasure.
   |
   |      Consider adding a @targetName annotation to one of the conflicting definitions
   |      for disambiguation.
diff --git a/tests/neg/mixin-forwarder-clash1.check b/tests/neg/mixin-forwarder-clash1.check
index 8c1e2a7911ef..328786f9b551 100644
--- a/tests/neg/mixin-forwarder-clash1.check
+++ b/tests/neg/mixin-forwarder-clash1.check
@@ -4,7 +4,7 @@
    |      Name clash between inherited members:
    |      def concat(suffix: Int): X in trait One at line 4 and
    |      def concat[Dummy](suffix: Int): Y in trait Two at line 8
-   |      have the same type after erasure.
+   |      have the same type (suffix: Int): Object after erasure.
    |
    |      Consider adding a @targetName annotation to one of the conflicting definitions
    |      for disambiguation.
diff --git a/tests/neg/mixin-forwarder-clash2.check b/tests/neg/mixin-forwarder-clash2.check
index 8956d96e2071..13993192993d 100644
--- a/tests/neg/mixin-forwarder-clash2.check
+++ b/tests/neg/mixin-forwarder-clash2.check
@@ -5,7 +5,7 @@
   |      Name clash between inherited members:
   |      def concat(suffix: Int): X in trait One at line 4 and
   |      def concat[Dummy](suffix: Int): Y in trait Two at line 8
-  |      have the same type after erasure.
+  |      have the same type (suffix: Int): Object after erasure.
   |
   |      Consider adding a @targetName annotation to one of the conflicting definitions
   |      for disambiguation.
diff --git a/tests/neg/override-erasure-clash.check b/tests/neg/override-erasure-clash.check
index e936a8de2397..2295eed3f125 100644
--- a/tests/neg/override-erasure-clash.check
+++ b/tests/neg/override-erasure-clash.check
@@ -4,4 +4,4 @@
   |      Name clash between defined and inherited member:
   |      def f(): Int in class A at line 3 and
   |      def g(): Int in class B at line 5
-  |      have the same name and type after erasure.
+  |      have the same name and type (): Int after erasure.
diff --git a/tests/neg/type-params.check b/tests/neg/type-params.check
index 3b052f3556e0..8ab41a36b7c0 100644
--- a/tests/neg/type-params.check
+++ b/tests/neg/type-params.check
@@ -56,10 +56,10 @@
 -- [E120] Naming Error: tests/neg/type-params.scala:44:6 ---------------------------------------------------------------
 44 |  def a = (p: A) => () // error
    |      ^
-   |      Double definition:
+   |      Conflicting definitions:
    |      def a: () => Unit in trait t278 at line 43 and
    |      def a: t278.this.A => Unit in trait t278 at line 44
-   |      have the same type after erasure.
+   |      have the same type (): Function1 after erasure.
    |
    |      Consider adding a @targetName annotation to one of the conflicting definitions
    |      for disambiguation.

From ee58684ed3a63779744e8a9e3d4400bf8cb9daa0 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 8 Jul 2025 14:53:32 +0200
Subject: [PATCH 404/505] Improve error message for conflicting definitions
 (#23453)

Now includes the signature in the message also when emitted from the
typer.

Co-authored-by: Matthieu Bovel <matthieu@bovel.net>
[Cherry-picked a57711625be3686c16e558e93c82c60e99a45882][modified]

From 495c4c80b2a771ab796ea509c39988d9102cbc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zieli=C5=84ski=20Patryk?=
 <75637004+zielinsky@users.noreply.github.com>
Date: Wed, 2 Jul 2025 13:18:01 +0200
Subject: [PATCH 405/505] fix: Inconsistent annotation tooltips (#23454)

Fix: https://github.com/scalameta/metals/issues/7531
[Cherry-picked d109a39e02ea2eb09097c91e19f1936524df296b]
---
 .../dotty/tools/dotc/ast/NavigateAST.scala    |  4 +-
 .../tools/pc/tests/hover/HoverDefnSuite.scala | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
index e77642a8e2b9..90bd9b7923ae 100644
--- a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
+++ b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
@@ -141,7 +141,9 @@ object NavigateAST {
           case _ =>
         val iterator = p match
           case defdef: DefTree[?] =>
-            p.productIterator ++ defdef.mods.productIterator
+            val mods = defdef.mods
+            val annotations = defdef.symbol.annotations.filter(_.tree.span.contains(span)).map(_.tree)
+            p.productIterator ++ annotations ++ mods.productIterator
           case _ =>
             p.productIterator
         childPath(iterator, p :: path)
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala
index 6a544fb3a6bc..466eb379ff48 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverDefnSuite.scala
@@ -255,3 +255,51 @@ class HoverDefnSuite extends BaseHoverSuite:
          |```
          |""".stripMargin
     )
+
+  @Test def `annotation` =
+    check(
+      """|
+         |@ma@@in
+         |def example() = 
+         |    println("test")
+         |""".stripMargin,
+      """|```scala
+         |def this(): main
+         |```""".stripMargin.hover
+    )
+
+  @Test def `annotation-2` =
+      check(
+        """|
+          |@ma@@in
+          |def example() = 
+          |    List("test")
+          |""".stripMargin,
+        """|```scala
+          |def this(): main
+          |```""".stripMargin.hover
+      )
+
+  @Test def `annotation-3` =
+      check(
+        """|
+          |@ma@@in
+          |def example() = 
+          |    Array("test")
+          |""".stripMargin,
+        """|```scala
+          |def this(): main
+          |```""".stripMargin.hover
+      )
+
+  @Test def `annotation-4` =
+      check(
+        """|
+          |@ma@@in
+          |def example() = 
+          |    Array(1, 2)
+          |""".stripMargin,
+        """|```scala
+          |def this(): main
+          |```""".stripMargin.hover
+      )

From bc0e95e2c3c5fbb18a3251d8276eeb0ec1847a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zieli=C5=84ski=20Patryk?=
 <75637004+zielinsky@users.noreply.github.com>
Date: Thu, 3 Jul 2025 11:41:10 +0200
Subject: [PATCH 406/505] Exclude named parameters inlay hints for java defined
 (#23462)

We don't want to show named parameters inlay hints for java defined
`(x$0, x$1 ...)`.
[Cherry-picked 638feaf0cdbf538d3480ff47ee0d75c5119e3446]
---
 .../dotty/tools/pc/PcInlayHintsProvider.scala    |  2 +-
 .../pc/tests/inlayHints/InlayHintsSuite.scala    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 0ef7871f7dae..3be5927a7aa0 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -434,7 +434,7 @@ object Parameters:
   def unapply(tree: Tree)(using params: InlayHintsParams, ctx: Context): Option[(Boolean, List[(Name, SourcePosition, Boolean)])] = 
     def shouldSkipFun(fun: Tree)(using Context): Boolean = 
       fun match
-        case sel: Select => isForComprehensionMethod(sel) || sel.symbol.name == nme.unapply
+        case sel: Select => isForComprehensionMethod(sel) || sel.symbol.name == nme.unapply || sel.symbol.is(Flags.JavaDefined)
         case _ => false
 
     def isInfixFun(fun: Tree, args: List[Tree])(using Context): Boolean = 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
index f7243ca54d91..bc4443ee5d28 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
@@ -1227,4 +1227,20 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |}
          |""".stripMargin
     )
+
+   @Test def `java-method-call` =
+    check(
+     """|object Main {
+        |  val str = "hello"
+        |  val sub = str.substring(1, 3)
+        |  val replaced = str.replace('l', 'x')
+        |}
+        |""".stripMargin,
+     """|object Main {
+        |  val str/*: String<<java/lang/String#>>*/ = "hello"
+        |  val sub/*: String<<java/lang/String#>>*/ = str.substring(1, 3)
+        |  val replaced/*: String<<java/lang/String#>>*/ = str.replace('l', 'x')
+        |}
+        |""".stripMargin
+    )
 }

From b699e980a32661b4c225ce64afbf448cdbb35942 Mon Sep 17 00:00:00 2001
From: Jentsch <d@jentsch.berlin>
Date: Wed, 11 Jun 2025 09:44:08 +0200
Subject: [PATCH 407/505] Drop invalid assumption from TastyUnpickler

Closes #22265

[Cherry-picked 5ca5a3e96bb30430d62b9c91c482f6a35578a952]
---
 .../dotty/tools/dotc/core/tasty/TreeUnpickler.scala |  1 -
 scaladoc-testcases/src/tests/22265/macro.scala      | 13 +++++++++++++
 scaladoc-testcases/src/tests/22265/test.scala       |  4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 scaladoc-testcases/src/tests/22265/macro.scala
 create mode 100644 scaladoc-testcases/src/tests/22265/test.scala

diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
index ee202330f172..6cc1d3c33c17 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -1106,7 +1106,6 @@ class TreeUnpickler(reader: TastyReader,
     inline def readImportOrExport(inline mkTree:
         (Tree, List[untpd.ImportSelector]) => Tree)()(using Context): Tree = {
       val start = currentAddr
-      assert(sourcePathAt(start).isEmpty)
       readByte()
       readEnd()
       val expr = readTree()
diff --git a/scaladoc-testcases/src/tests/22265/macro.scala b/scaladoc-testcases/src/tests/22265/macro.scala
new file mode 100644
index 000000000000..a2b9f118ceb5
--- /dev/null
+++ b/scaladoc-testcases/src/tests/22265/macro.scala
@@ -0,0 +1,13 @@
+import scala.quoted._
+
+object TestBuilder:
+  // transparent is needed
+  transparent inline def apply(inline expr: Unit): Any =
+    ${ TestBuilder.processTests('expr) }
+
+  def processTests(using Quotes)(body: Expr[Unit]): Expr[Any] =
+    import quotes.reflect._
+    body.asTerm match {
+      case Inlined(_, _, bindings) =>
+        '{ ${bindings.asExpr}; () } // can also be List(${bindings})
+    }
diff --git a/scaladoc-testcases/src/tests/22265/test.scala b/scaladoc-testcases/src/tests/22265/test.scala
new file mode 100644
index 000000000000..7642047a175b
--- /dev/null
+++ b/scaladoc-testcases/src/tests/22265/test.scala
@@ -0,0 +1,4 @@
+object breaks {
+  TestBuilder:
+    import List.empty
+}

From 029c8e75892f52cbcb70e8d21ff9b8d5adc5dd75 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Thu, 3 Jul 2025 12:33:03 +0000
Subject: [PATCH 408/505] Add an explainer to the DoubleDefinition error

---
 .../dotty/tools/dotc/reporting/messages.scala | 48 +++++++++++++++++--
 tests/neg/doubleDefinition.check              | 36 ++++++++++++++
 tests/neg/exports.check                       |  8 ++++
 tests/neg/i14966a.check                       |  2 +
 tests/neg/i23402.check                        | 44 +++++++++++++++--
 tests/neg/i23402.scala                        |  2 +
 tests/neg/i23402b.check                       |  2 +
 tests/neg/i23402c.check                       |  2 +
 tests/neg/i23402d.check                       | 12 +++++
 tests/neg/i23402d.scala                       |  5 ++
 tests/neg/override-erasure-clash.check        |  2 +
 tests/neg/type-params.check                   |  2 +
 12 files changed, 156 insertions(+), 9 deletions(-)
 create mode 100644 tests/neg/i23402d.check
 create mode 100644 tests/neg/i23402d.scala

diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 456b3e948108..83ccb45780d4 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -2301,14 +2301,16 @@ class JavaSymbolIsNotAValue(symbol: Symbol)(using Context) extends TypeMsg(JavaS
 
 class DoubleDefinition(decl: Symbol, previousDecl: Symbol, base: Symbol)(using Context)
 extends NamingMsg(DoubleDefinitionID) {
+  import Signature.MatchDegree.*
+
+  private def erasedType: Type =
+    if ctx.erasedTypes then decl.info
+    else TypeErasure.transformInfo(decl, decl.info)
+
   def msg(using Context) = {
     def nameAnd = if (decl.name != previousDecl.name) " name and" else ""
-    def erasedType: Type =
-      if ctx.erasedTypes then decl.info
-      else TypeErasure.transformInfo(decl, decl.info)
     def details(using Context): String =
       if (decl.isRealMethod && previousDecl.isRealMethod) {
-        import Signature.MatchDegree.*
 
         // compare the signatures when both symbols represent methods
         decl.signature.matchDegree(previousDecl.signature) match {
@@ -2359,7 +2361,43 @@ extends NamingMsg(DoubleDefinitionID) {
           |"""
     } + details
   }
-  def explain(using Context) = ""
+  def explain(using Context) =
+    decl.signature.matchDegree(previousDecl.signature) match
+      case FullMatch =>
+       i"""
+        |As part of the Scala compilation pipeline every type is reduced to its erased
+        |(runtime) form. In this phase, among other transformations, generic parameters
+        |disappear and separate parameter-list boundaries are flattened.
+        |
+        |For example, both `f[T](x: T)(y: String): Unit` and `f(x: Any, z: String): Unit`
+        |erase to the same runtime signature `f(x: Object, y: String): Unit`. Note that
+        |parameter names are irrelevant.
+        |
+        |In your code the two declarations
+        |
+        |  ${previousDecl.showDcl}
+        |  ${decl.showDcl}
+        |
+        |erase to the identical signature
+        |
+        |  ${erasedType}
+        |
+        |so the compiler cannot keep both: the generated bytecode symbols would collide.
+        |
+        |To fix this error, you need to disambiguate the two definitions. You can either:
+        |
+        |1. Rename one of the definitions, or
+        |2. Keep the same names in source but give one definition a distinct
+        |   bytecode-level name via `@targetName` for example:
+        |
+        |      @targetName("${decl.name.show}_2")
+        |      ${decl.showDcl}
+        |
+        |Choose the `@targetName` argument carefully: it is the name that will be used
+        |when calling the method externally, so it should be unique and descriptive.
+        """
+      case _ => ""
+
 }
 
 class ImportRenamedTwice(ident: untpd.Ident)(using Context) extends SyntaxMsg(ImportRenamedTwiceID) {
diff --git a/tests/neg/doubleDefinition.check b/tests/neg/doubleDefinition.check
index db98effbabdd..3c164fcf878b 100644
--- a/tests/neg/doubleDefinition.check
+++ b/tests/neg/doubleDefinition.check
@@ -8,6 +8,8 @@
    |
    |	    Consider adding a @targetName annotation to one of the conflicting definitions
    |	    for disambiguation.
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:21:5 ----------------------------------------------------------
 21 |	def foo(x: List[A]): Function2[B, B, B] = ??? // error
    |	    ^
@@ -21,24 +23,32 @@
    |	    Conflicting definitions:
    |	    val foo: Int in class Test4 at line 25 and
    |	    def foo: Int in class Test4 at line 26
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:31:5 ----------------------------------------------------------
 31 |	val foo = 1 // error
    |	    ^
    |	    Conflicting definitions:
    |	    def foo: Int in class Test4b at line 30 and
    |	    val foo: Int in class Test4b at line 31
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:36:5 ----------------------------------------------------------
 36 |	var foo = 1 // error
    |	    ^
    |	    Conflicting definitions:
    |	    def foo: Int in class Test4c at line 35 and
    |	    var foo: Int in class Test4c at line 36
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:41:5 ----------------------------------------------------------
 41 |	def foo = 2 // error
    |	    ^
    |	    Conflicting definitions:
    |	    var foo: Int in class Test4d at line 40 and
    |	    def foo: Int in class Test4d at line 41
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:55:5 ----------------------------------------------------------
 55 |	def foo(x: List[B]): Function1[B, B] = ??? // error: same jvm signature
    |	    ^
@@ -49,6 +59,8 @@
    |
    |	    Consider adding a @targetName annotation to one of the conflicting definitions
    |	    for disambiguation.
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:62:5 ----------------------------------------------------------
 62 |	def foo(x: List[A]): Function2[B, B, B] = ??? // error
    |	    ^
@@ -62,69 +74,93 @@
    |	    Conflicting definitions:
    |	    val foo: Int in class Test8 at line 66 and
    |	    def foo: Int in class Test8 at line 67
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:72:5 ----------------------------------------------------------
 72 |	val foo = 1 // error
    |	    ^
    |	    Conflicting definitions:
    |	    def foo: Int in class Test8b at line 71 and
    |	    val foo: Int in class Test8b at line 72
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:77:5 ----------------------------------------------------------
 77 |	var foo = 1 // error
    |	    ^
    |	    Conflicting definitions:
    |	    def foo: Int in class Test8c at line 76 and
    |	    var foo: Int in class Test8c at line 77
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:82:5 ----------------------------------------------------------
 82 |	def foo = 2 // error
    |	    ^
    |	    Conflicting definitions:
    |	    var foo: Int in class Test8d at line 81 and
    |	    def foo: Int in class Test8d at line 82
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:88:5 ----------------------------------------------------------
 88 |	def foo: String // error
    |	    ^
    |	    Conflicting definitions:
    |	    val foo: Int in class Test9 at line 87 and
    |	    def foo: String in class Test9 at line 88
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:92:5 ----------------------------------------------------------
 92 |	def foo: Int // error
    |	    ^
    |	    Conflicting definitions:
    |	    val foo: Int in class Test10 at line 91 and
    |	    def foo: Int in class Test10 at line 92
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:96:5 ----------------------------------------------------------
 96 |	def foo: String // error
    |	    ^
    |	    Conflicting definitions:
    |	    val foo: Int in class Test11 at line 95 and
    |	    def foo: String in class Test11 at line 96
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:100:5 ---------------------------------------------------------
 100 |	def foo: Int // error
     |	    ^
     |	    Conflicting definitions:
     |	    val foo: Int in class Test12 at line 99 and
     |	    def foo: Int in class Test12 at line 100
+    |
+    | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:104:5 ---------------------------------------------------------
 104 |	def foo: String // error
     |	    ^
     |	    Conflicting definitions:
     |	    var foo: Int in class Test13 at line 103 and
     |	    def foo: String in class Test13 at line 104
+    |
+    | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:108:5 ---------------------------------------------------------
 108 |	def foo: Int // error
     |	    ^
     |	    Conflicting definitions:
     |	    var foo: Int in class Test14 at line 107 and
     |	    def foo: Int in class Test14 at line 108
+    |
+    | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:112:5 ---------------------------------------------------------
 112 |	def foo: String // error
     |	    ^
     |	    Conflicting definitions:
     |	    var foo: Int in class Test15 at line 111 and
     |	    def foo: String in class Test15 at line 112
+    |
+    | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:116:5 ---------------------------------------------------------
 116 |	def foo: Int // error
     |	    ^
     |	    Conflicting definitions:
     |	    var foo: Int in class Test16 at line 115 and
     |	    def foo: Int in class Test16 at line 116
+    |
+    | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/exports.check b/tests/neg/exports.check
index 4016d8729043..bb4d7ab59421 100644
--- a/tests/neg/exports.check
+++ b/tests/neg/exports.check
@@ -22,6 +22,8 @@
    |
    |                                 Consider adding a @targetName annotation to one of the conflicting definitions
    |                                 for disambiguation.
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/exports.scala:24:20 ------------------------------------------------------------------
 24 |    export scanUnit._               // error: double definition
    |                    ^
@@ -32,6 +34,8 @@
    |
    |                    Consider adding a @targetName annotation to one of the conflicting definitions
    |                    for disambiguation.
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E120] Naming Error: tests/neg/exports.scala:26:21 ------------------------------------------------------------------
 26 |    export printUnit.status         // error: double definition
    |                     ^
@@ -42,6 +46,8 @@
    |
    |                     Consider adding a @targetName annotation to one of the conflicting definitions
    |                     for disambiguation.
+   |
+   | longer explanation available when compiling with `-explain`
 -- Error: tests/neg/exports.scala:35:24 --------------------------------------------------------------------------------
 35 |    export this.{concat => ++}   // error: no eligible member
    |                 ^^^^^^^^^^^^
@@ -58,6 +64,8 @@
    |               Conflicting definitions:
    |               val bar: Bar in class Baz at line 45 and
    |               final def bar: (Baz.this.bar.bar : => (Baz.this.bar.baz.bar : Bar)) in class Baz at line 46
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E083] Type Error: tests/neg/exports.scala:57:11 --------------------------------------------------------------------
 57 |    export printer.*  // error: not stable
    |           ^^^^^^^
diff --git a/tests/neg/i14966a.check b/tests/neg/i14966a.check
index 933d16e593aa..fd941509807a 100644
--- a/tests/neg/i14966a.check
+++ b/tests/neg/i14966a.check
@@ -8,3 +8,5 @@
   |
   |      Consider adding a @targetName annotation to one of the conflicting definitions
   |      for disambiguation.
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i23402.check b/tests/neg/i23402.check
index 7310c7738b38..4a98af863348 100644
--- a/tests/neg/i23402.check
+++ b/tests/neg/i23402.check
@@ -1,10 +1,46 @@
--- [E120] Naming Error: tests/neg/i23402.scala:4:5 ---------------------------------------------------------------------
-4 | def apply(p1: String)(p2: Int): A = A(p1, p2) // error
+-- [E120] Naming Error: tests/neg/i23402.scala:6:5 ---------------------------------------------------------------------
+6 | def apply(p1: String)(p2: Int): A = A(p1, p2) // error
   |     ^
   |     Conflicting definitions:
-  |     def apply(p1: String, p2: Int): A in object A at line 3 and
-  |     def apply(p1: String)(p2: Int): A in object A at line 4
+  |     def apply(p1: String, p2: Int): A in object A at line 5 and
+  |     def apply(p1: String)(p2: Int): A in object A at line 6
   |     have the same type (p1: String, p2: Int): A after erasure.
   |
   |     Consider adding a @targetName annotation to one of the conflicting definitions
   |     for disambiguation.
+  |---------------------------------------------------------------------------------------------------------------------
+  | Explanation (enabled by `-explain`)
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |
+  | As part of the Scala compilation pipeline every type is reduced to its erased
+  | (runtime) form. In this phase, among other transformations, generic parameters
+  | disappear and separate parameter-list boundaries are flattened.
+  |
+  | For example, both `f[T](x: T)(y: String): Unit` and `f(x: Any, z: String): Unit`
+  | erase to the same runtime signature `f(x: Object, y: String): Unit`. Note that
+  | parameter names are irrelevant.
+  |
+  | In your code the two declarations
+  |
+  |   def apply(p1: String, p2: Int): A
+  |   def apply(p1: String)(p2: Int): A
+  |
+  | erase to the identical signature
+  |
+  |   (p1: String, p2: Int): A
+  |
+  | so the compiler cannot keep both: the generated bytecode symbols would collide.
+  |
+  | To fix this error, you need to disambiguate the two definitions. You can either:
+  |
+  | 1. Rename one of the definitions, or
+  | 2. Keep the same names in source but give one definition a distinct
+  |    bytecode-level name via `@targetName` for example:
+  |
+  |       @targetName("apply_2")
+  |       def apply(p1: String)(p2: Int): A
+  |
+  | Choose the `@targetName` argument carefully: it is the name that will be used
+  | when calling the method externally, so it should be unique and descriptive.
+  |         
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i23402.scala b/tests/neg/i23402.scala
index 8849db2646dd..9f6fcdf032aa 100644
--- a/tests/neg/i23402.scala
+++ b/tests/neg/i23402.scala
@@ -1,3 +1,5 @@
+//> using options -explain
+
 class A(p1: String, p2: Int)
 object A {
  def apply(p1: String, p2: Int): A = A(p1, p2)
diff --git a/tests/neg/i23402b.check b/tests/neg/i23402b.check
index 1fce53d00d26..5036cf20097f 100644
--- a/tests/neg/i23402b.check
+++ b/tests/neg/i23402b.check
@@ -8,3 +8,5 @@
   |
   |     Consider adding a @targetName annotation to one of the conflicting definitions
   |     for disambiguation.
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i23402c.check b/tests/neg/i23402c.check
index 5a87250ffb9e..be73dd9c361d 100644
--- a/tests/neg/i23402c.check
+++ b/tests/neg/i23402c.check
@@ -8,3 +8,5 @@
   |
   |     Consider adding a @targetName annotation to one of the conflicting definitions
   |     for disambiguation.
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i23402d.check b/tests/neg/i23402d.check
new file mode 100644
index 000000000000..38806f9f122e
--- /dev/null
+++ b/tests/neg/i23402d.check
@@ -0,0 +1,12 @@
+-- [E120] Naming Error: tests/neg/i23402d.scala:5:4 --------------------------------------------------------------------
+5 |def f(x: Any): Unit = ??? // error
+  |    ^
+  |    Conflicting definitions:
+  |    def f[T](x: T): Unit in the top-level definitions in package <empty> at line 4 and
+  |    def f(x: Any): Unit in the top-level definitions in package <empty> at line 5
+  |    have the same type (x: Object): Unit after erasure.
+  |
+  |    Consider adding a @targetName annotation to one of the conflicting definitions
+  |    for disambiguation.
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i23402d.scala b/tests/neg/i23402d.scala
new file mode 100644
index 000000000000..674515fefd14
--- /dev/null
+++ b/tests/neg/i23402d.scala
@@ -0,0 +1,5 @@
+// This test checks that the example given in the `-explain` of the
+// `DoubleDefinition` message is correct.
+
+def f[T](x: T): Unit = ???
+def f(x: Any): Unit = ??? // error
diff --git a/tests/neg/override-erasure-clash.check b/tests/neg/override-erasure-clash.check
index 2295eed3f125..136eb0b4885f 100644
--- a/tests/neg/override-erasure-clash.check
+++ b/tests/neg/override-erasure-clash.check
@@ -5,3 +5,5 @@
   |      def f(): Int in class A at line 3 and
   |      def g(): Int in class B at line 5
   |      have the same name and type (): Int after erasure.
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/type-params.check b/tests/neg/type-params.check
index 8ab41a36b7c0..eb24e1c4bd73 100644
--- a/tests/neg/type-params.check
+++ b/tests/neg/type-params.check
@@ -63,6 +63,8 @@
    |
    |      Consider adding a @targetName annotation to one of the conflicting definitions
    |      for disambiguation.
+   |
+   | longer explanation available when compiling with `-explain`
 -- Error: tests/neg/type-params.scala:4:7 ------------------------------------------------------------------------------
 4 |  "".==[Int] // error
   |  ^^^^^^^^^^

From 8b9a34d1c755c32f8909924868a892385b5460b3 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 8 Jul 2025 14:54:30 +0200
Subject: [PATCH 409/505] Add an explainer to the DoubleDefinition error

[Cherry-picked 1ad34d5b4da00040553c5f5ab25474d87c8c44ed][modified]

From c657425c70560a507ad598424829f93fdf7b56b3 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Thu, 3 Jul 2025 12:39:33 +0000
Subject: [PATCH 410/505] Add regression test for #23350

[Cherry-picked 3c892d3948f961b733230b2fcef1e456c4988917]
---
 tests/neg/i23350.check | 46 ++++++++++++++++++++++++++++++++++++++++++
 tests/neg/i23350.scala | 10 +++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 tests/neg/i23350.check
 create mode 100644 tests/neg/i23350.scala

diff --git a/tests/neg/i23350.check b/tests/neg/i23350.check
new file mode 100644
index 000000000000..d9ae6a99cdca
--- /dev/null
+++ b/tests/neg/i23350.check
@@ -0,0 +1,46 @@
+-- [E120] Naming Error: tests/neg/i23350.scala:8:7 ---------------------------------------------------------------------
+8 |object D extends A: // error
+  |       ^
+  |       Name clash between defined and inherited member:
+  |       def apply(p: A.this.Props): Unit in class A at line 5 and
+  |       def apply(a: UndefOr2[String]): Unit in object D at line 10
+  |       have the same type (a: Object): Unit after erasure.
+  |
+  |       Consider adding a @targetName annotation to one of the conflicting definitions
+  |       for disambiguation.
+  |---------------------------------------------------------------------------------------------------------------------
+  | Explanation (enabled by `-explain`)
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |
+  | As part of the Scala compilation pipeline every type is reduced to its erased
+  | (runtime) form. In this phase, among other transformations, generic parameters
+  | disappear and separate parameter-list boundaries are flattened.
+  |
+  | For example, both `f[T](x: T)(y: String): Unit` and `f(x: Any, z: String): Unit`
+  | erase to the same runtime signature `f(x: Object, y: String): Unit`. Note that
+  | parameter names are irrelevant.
+  |
+  | In your code the two declarations
+  |
+  |   def apply(p: A.this.Props): Unit
+  |   def apply(a: UndefOr2[String]): Unit
+  |
+  | erase to the identical signature
+  |
+  |   (a: Object): Unit
+  |
+  | so the compiler cannot keep both: the generated bytecode symbols would collide.
+  |
+  | To fix this error, you need to disambiguate the two definitions. You can either:
+  |
+  | 1. Rename one of the definitions, or
+  | 2. Keep the same names in source but give one definition a distinct
+  |    bytecode-level name via `@targetName` for example:
+  |
+  |       @targetName("apply_2")
+  |       def apply(a: UndefOr2[String]): Unit
+  |
+  | Choose the `@targetName` argument carefully: it is the name that will be used
+  | when calling the method externally, so it should be unique and descriptive.
+  |         
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i23350.scala b/tests/neg/i23350.scala
new file mode 100644
index 000000000000..fa85805f8ae3
--- /dev/null
+++ b/tests/neg/i23350.scala
@@ -0,0 +1,10 @@
+//> using options -explain
+
+abstract class A:
+  type Props
+  def apply(p: Props) = ()
+
+type UndefOr2[A] = A | Unit
+object D extends A: // error
+  case class Props()
+  def apply(a: UndefOr2[String]) = ()

From 074202604a2f65c9ba1ce81680afc9d5f8d38f40 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 2 Jul 2025 15:14:39 +0000
Subject: [PATCH 411/505] Normalize tuple types when making seq literals for
 var args

---
 compiler/src/dotty/tools/dotc/core/TypeUtils.scala     | 10 ++++++++++
 compiler/src/dotty/tools/dotc/typer/Applications.scala |  2 +-
 compiler/src/dotty/tools/dotc/typer/Typer.scala        |  7 ++++---
 tests/run/i22345.scala                                 |  2 ++
 tests/run/i22345b.scala                                |  2 ++
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 tests/run/i22345.scala
 create mode 100644 tests/run/i22345b.scala

diff --git a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
index e31cd19b1135..8f462569e39b 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeUtils.scala
@@ -115,6 +115,16 @@ class TypeUtils:
         case Some(types) => TypeOps.nestedPairs(types)
         case None => throw new AssertionError("not a tuple")
 
+    /** If this is a generic tuple type with arity <= MaxTupleArity, return the
+     *  corresponding TupleN type, otherwise return this.
+     */
+    def normalizedTupleType(using Context): Type =
+      if self.isGenericTuple then
+        self.tupleElementTypes match
+          case Some(elems) if elems.size <= Definitions.MaxTupleArity => defn.tupleType(elems)
+          case _ => self
+      else
+        self
     def refinedWith(name: Name, info: Type)(using Context) = RefinedType(self, name, info)
 
     /** Is this type a methodic type that takes at least one parameter? */
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 4d39e3243fc0..d2fd7a928eb0 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -841,7 +841,7 @@ trait Applications extends Compatibility {
     def makeVarArg(n: Int, elemFormal: Type): Unit = {
       val args = typedArgBuf.takeRight(n).toList
       typedArgBuf.dropRightInPlace(n)
-      val elemtpt = TypeTree(elemFormal)
+      val elemtpt = TypeTree(elemFormal.normalizedTupleType)
       typedArgBuf += seqToRepeated(SeqLiteral(args, elemtpt))
     }
 
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index bf44ff659f22..cedc4a082744 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -738,10 +738,11 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
     // Otherwise, map combinations of A *: B *: .... EmptyTuple with nesting levels <= 22
     // to the Tuple class of the right arity and select from that one
     def trySmallGenericTuple(qual: Tree, withCast: Boolean) =
-      if qual.tpe.isSmallGenericTuple then
+      val tp = qual.tpe.widenTermRefExpr
+      val tpNormalized = tp.normalizedTupleType
+      if tp ne tpNormalized then
         if withCast then
-          val elems = qual.tpe.widenTermRefExpr.tupleElementTypes.getOrElse(Nil)
-          typedSelectWithAdapt(tree, pt, qual.cast(defn.tupleType(elems)))
+          typedSelectWithAdapt(tree, pt, qual.cast(tpNormalized))
         else
           typedSelectWithAdapt(tree, pt, qual)
       else EmptyTree
diff --git a/tests/run/i22345.scala b/tests/run/i22345.scala
new file mode 100644
index 000000000000..86cc3a01930e
--- /dev/null
+++ b/tests/run/i22345.scala
@@ -0,0 +1,2 @@
+@main def Test: Unit =
+  val a: Array[(Int, String)] = Array[Int *: String *: EmptyTuple]()
diff --git a/tests/run/i22345b.scala b/tests/run/i22345b.scala
new file mode 100644
index 000000000000..a331a66ea80a
--- /dev/null
+++ b/tests/run/i22345b.scala
@@ -0,0 +1,2 @@
+@main def Test: Unit =
+  val a: Array[(Int, String)] = Array[Int *: String *: EmptyTuple]((1, "hello"))

From 8b91ea87af84e272ca52e7cb2262023b616ebd96 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 8 Jul 2025 15:01:18 +0200
Subject: [PATCH 412/505] Normalize tuple types when making seq literals for
 var args

[Cherry-picked 979c546c3d19dac3d22708c380a603a4c49a8cdd][modified]

From ba5021a2ee8c0eb5203408db344c4453a6968f9f Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 2 Jul 2025 15:28:05 +0000
Subject: [PATCH 413/505] Normalize tuple types in synthetized classOf
 instances

[Cherry-picked a324d12dd9ecb4b322c25e7f834f52e360c981de]
---
 compiler/src/dotty/tools/dotc/typer/Synthesizer.scala | 2 +-
 tests/run/i22345c.scala                               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 tests/run/i22345c.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
index 2c85294a3a94..6a8acc01f257 100644
--- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
@@ -51,7 +51,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
             if defn.SpecialClassTagClasses.contains(sym) then
               classTagModul.select(sym.name.toTermName).withSpan(span)
             else
-              val ctype = escapeJavaArray(erasure(tp))
+              val ctype = escapeJavaArray(erasure(tp.normalizedTupleType))
               if ctype.exists then
                 classTagModul.select(nme.apply)
                   .appliedToType(tp)
diff --git a/tests/run/i22345c.scala b/tests/run/i22345c.scala
new file mode 100644
index 000000000000..25bafae0c390
--- /dev/null
+++ b/tests/run/i22345c.scala
@@ -0,0 +1,4 @@
+def makeSeq[T](args: T*): Seq[T] = args
+
+@main def Test: Unit =
+  val a: Array[(Int, String)] = makeSeq[Int *: String *: EmptyTuple]().toArray

From cf6142f6467b7abab1867ce2fb5f6cb078170513 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Fri, 4 Jul 2025 18:48:09 +0200
Subject: [PATCH 414/505] Fix missing members reporting for var setters

Suppress reporting a missing setter only if the corresponding getter was
also reported as missing.

Fixes #23474

[Cherry-picked 1f0da4e18bf919c8011fbc5f31cf1d9c4da0f0be]
---
 .../dotty/tools/dotc/typer/RefChecks.scala    |  8 +++++-
 tests/neg/i23474.check                        | 25 +++++++++++++++++++
 tests/neg/i23474.scala                        | 19 ++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tests/neg/i23474.check
 create mode 100644 tests/neg/i23474.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
index bcf92eb2721f..7114f609a41e 100644
--- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
@@ -630,10 +630,16 @@ object RefChecks {
         // to consolidate getters and setters.
         val grouped = missing.groupBy(_.underlyingSymbol.name)
 
+        def isDuplicateSetter(sym: Symbol): Boolean =
+          sym.isSetter && {
+            val field = sym.accessedFieldOrGetter
+            grouped.getOrElse(field.name, Nil).contains(field)
+          }
+
         val missingMethods = grouped.toList flatMap {
           case (name, syms) =>
             lastOverrides(syms)
-              .filterConserve(!_.isSetter)
+              .filterConserve(!isDuplicateSetter(_)) // Avoid reporting override error for both `x` and setter `x_=`
               .distinctBy(_.signature) // Avoid duplication for similar definitions (#19731)
         }
 
diff --git a/tests/neg/i23474.check b/tests/neg/i23474.check
new file mode 100644
index 000000000000..441978be6809
--- /dev/null
+++ b/tests/neg/i23474.check
@@ -0,0 +1,25 @@
+-- Error: tests/neg/i23474.scala:5:11 ----------------------------------------------------------------------------------
+5 |case class Y(val comment: String) extends Comment // error
+  |           ^
+  |           class Y needs to be abstract, since var comment_=(x$1: String): Unit in trait Comment is not defined 
+  |           (Note that an abstract var requires a setter in addition to the getter)
+-- Error: tests/neg/i23474.scala:7:6 -----------------------------------------------------------------------------------
+7 |class Z extends Comment: // error
+  |      ^
+  |      class Z needs to be abstract, since var comment_=(x$1: String): Unit in trait Comment is not defined 
+  |      (Note that an abstract var requires a setter in addition to the getter)
+-- [E164] Declaration Error: tests/neg/i23474.scala:11:15 --------------------------------------------------------------
+11 |  override def comment: String = "" // error
+   |               ^
+   |               error overriding variable comment in trait Comment of type String;
+   |                 method comment of type => String cannot override a mutable variable
+-- Error: tests/neg/i23474.scala:10:6 ----------------------------------------------------------------------------------
+10 |class X extends Comment: // error
+   |      ^
+   |      class X needs to be abstract, since var comment_=(x$1: String): Unit in trait Comment is not defined 
+   |      (Note that an abstract var requires a setter in addition to the getter)
+-- Error: tests/neg/i23474.scala:13:6 ----------------------------------------------------------------------------------
+13 |class W extends Comment // error
+   |      ^
+   |      class W needs to be abstract, since var comment: String in trait Comment is not defined 
+   |      (Note that variables need to be initialized to be defined)
diff --git a/tests/neg/i23474.scala b/tests/neg/i23474.scala
new file mode 100644
index 000000000000..3e34c2f457c0
--- /dev/null
+++ b/tests/neg/i23474.scala
@@ -0,0 +1,19 @@
+trait Comment {
+  var comment: String
+}
+
+case class Y(val comment: String) extends Comment // error
+
+class Z extends Comment: // error
+  val comment: String = ""
+
+class X extends Comment: // error
+  override def comment: String = "" // error
+
+class W extends Comment // error
+
+
+class OK:
+  val comment: String = ""
+  def comment_=(x: String): Unit = ()
+

From c29fa28aa14f0c4aca1d1611f03ec6121e3989ff Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Wed, 2 Jul 2025 16:38:18 +0200
Subject: [PATCH 415/505] Fix stale top level synthetic package object being
 used in later runs

[Cherry-picked c3e14438fdf7e9675a8a433cf004c0884f2e9dca]
---
 .../src/dotty/tools/dotc/core/SymDenotations.scala |  2 +-
 tests/pos-macros/i13821-a/Macro.scala              |  6 ++++++
 tests/pos-macros/i13821-a/Test.scala               | 12 ++++++++++++
 tests/pos-macros/i13821-b/Macro.scala              |  7 +++++++
 tests/pos-macros/i13821-b/Test.scala               | 14 ++++++++++++++
 5 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos-macros/i13821-a/Macro.scala
 create mode 100644 tests/pos-macros/i13821-a/Test.scala
 create mode 100644 tests/pos-macros/i13821-b/Macro.scala
 create mode 100644 tests/pos-macros/i13821-b/Test.scala

diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
index 889e3d12a98c..62444c175e1e 100644
--- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -2682,7 +2682,7 @@ object SymDenotations {
       || owner.isRefinementClass
       || owner.is(Scala2x)
       || owner.unforcedDecls.contains(denot.name, denot.symbol)
-      || (denot.is(Synthetic) && denot.is(ModuleClass) && stillValidInOwner(denot.companionClass))
+      || (denot.is(Synthetic) && denot.is(ModuleClass) && denot.companionClass.exists && stillValidInOwner(denot.companionClass))
       || denot.isSelfSym
       || denot.isLocalDummy)
   catch case ex: StaleSymbol => false
diff --git a/tests/pos-macros/i13821-a/Macro.scala b/tests/pos-macros/i13821-a/Macro.scala
new file mode 100644
index 000000000000..3583a44ffddc
--- /dev/null
+++ b/tests/pos-macros/i13821-a/Macro.scala
@@ -0,0 +1,6 @@
+trait Conversions:
+  given conv(using DFBits.Candidate): Conversion[Int, DFVal] = ???
+
+import scala.quoted.*
+transparent inline def f: Short = ${ getWidthMacro }
+private def getWidthMacro(using Quotes): Expr[Short] = '{ ??? }
diff --git a/tests/pos-macros/i13821-a/Test.scala b/tests/pos-macros/i13821-a/Test.scala
new file mode 100644
index 000000000000..86f5a6289a80
--- /dev/null
+++ b/tests/pos-macros/i13821-a/Test.scala
@@ -0,0 +1,12 @@
+type DFBits = Long
+object DFBits:
+  def a: Unit = f // forces suspension of this compilation unit in typer
+  def b: DFVal = 2 // uses implicit conversion `DFVal.conv`
+
+  trait Candidate
+  object Candidate:
+    given candidate: Candidate = ??? // completed in run 3 but created in run 2
+end DFBits
+
+trait DFVal
+object DFVal extends Conversions
diff --git a/tests/pos-macros/i13821-b/Macro.scala b/tests/pos-macros/i13821-b/Macro.scala
new file mode 100644
index 000000000000..c1c9c5e17851
--- /dev/null
+++ b/tests/pos-macros/i13821-b/Macro.scala
@@ -0,0 +1,7 @@
+import outer._
+trait Conversions:
+  given conv(using DFBits.Candidate): Conversion[Int, DFVal] = ???
+
+import scala.quoted.*
+transparent inline def f: Short = ${ getWidthMacro }
+private def getWidthMacro(using Quotes): Expr[Short] = '{ ??? }
diff --git a/tests/pos-macros/i13821-b/Test.scala b/tests/pos-macros/i13821-b/Test.scala
new file mode 100644
index 000000000000..5c9b8755a33c
--- /dev/null
+++ b/tests/pos-macros/i13821-b/Test.scala
@@ -0,0 +1,14 @@
+type outer = Int
+object outer:
+  type DFBits = Long
+  object DFBits:
+    def a: Unit = f // forces suspension of this compilation unit in typer
+    def b: DFVal = 2 // uses implicit conversion `DFVal.conv`
+
+    trait Candidate
+    object Candidate:
+      given candidate: Candidate = ??? // completed in run 3 but created in run 2
+  end DFBits
+
+  trait DFVal
+  object DFVal extends Conversions

From 5917e1275a50ab29b6f100107aad1cee9fdfd917 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Thu, 3 Jul 2025 13:33:20 +0200
Subject: [PATCH 416/505] Move previously-failing-now-compiling tests to pos
 tests

They were previously fixed from crashing to erroring state, now
compiling.
The cause of the previous crashes looks the same as the one fixes in
this PR, where the stale synthetic top level package object would be
brought forward, causing other stale symbols to be used.

[Cherry-picked 08b8340073a8286a82fb48543512d672c78aefc3]
---
 tests/neg/i19351.check                        | 4 ----
 tests/neg/i19351/A.scala                      | 5 -----
 tests/neg/i19351a.check                       | 4 ----
 tests/pos-macros/i19351/A.scala               | 6 ++++++
 tests/{neg => pos-macros}/i19351/B.scala      | 2 +-
 tests/{neg => pos-macros}/i19351a/Macro.scala | 0
 tests/{neg => pos-macros}/i19351a/Test.scala  | 2 +-
 7 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 tests/neg/i19351.check
 delete mode 100644 tests/neg/i19351/A.scala
 delete mode 100644 tests/neg/i19351a.check
 create mode 100644 tests/pos-macros/i19351/A.scala
 rename tests/{neg => pos-macros}/i19351/B.scala (84%)
 rename tests/{neg => pos-macros}/i19351a/Macro.scala (100%)
 rename tests/{neg => pos-macros}/i19351a/Test.scala (87%)

diff --git a/tests/neg/i19351.check b/tests/neg/i19351.check
deleted file mode 100644
index a9ee10510b32..000000000000
--- a/tests/neg/i19351.check
+++ /dev/null
@@ -1,4 +0,0 @@
--- Error: tests/neg/i19351/A.scala:3:35 --------------------------------------------------------------------------------
-3 |  inline def myMacro(): x.type = ${myMacroExpr}  // error
-  |                                   ^
-  |Cyclic macro dependency; macro refers to a toplevel symbol in tests/neg/i19351/A.scala from which the macro is called
diff --git a/tests/neg/i19351/A.scala b/tests/neg/i19351/A.scala
deleted file mode 100644
index f2258631a15a..000000000000
--- a/tests/neg/i19351/A.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-//object A:
-  val x: Int = 1
-  inline def myMacro(): x.type = ${myMacroExpr}  // error
-  def test = myMacro()
-
diff --git a/tests/neg/i19351a.check b/tests/neg/i19351a.check
deleted file mode 100644
index 10789c2db5aa..000000000000
--- a/tests/neg/i19351a.check
+++ /dev/null
@@ -1,4 +0,0 @@
--- Error: tests/neg/i19351a/Test.scala:8:34 ----------------------------------------------------------------------------
-8 |inline def not(b: Bool): Bool = ${notMacro('b)} // error
-  |                                  ^
-  |Cyclic macro dependency; macro refers to a toplevel symbol in tests/neg/i19351a/Test.scala from which the macro is called
diff --git a/tests/pos-macros/i19351/A.scala b/tests/pos-macros/i19351/A.scala
new file mode 100644
index 000000000000..0b2c7acc3797
--- /dev/null
+++ b/tests/pos-macros/i19351/A.scala
@@ -0,0 +1,6 @@
+// object A:
+  val x: Int = 1
+  inline def myMacro(): x.type = ${myMacroExpr}
+  def test = myMacro()
+
+@main def main() = ()
\ No newline at end of file
diff --git a/tests/neg/i19351/B.scala b/tests/pos-macros/i19351/B.scala
similarity index 84%
rename from tests/neg/i19351/B.scala
rename to tests/pos-macros/i19351/B.scala
index 8c8c071f3607..a22b4d5c51b6 100644
--- a/tests/neg/i19351/B.scala
+++ b/tests/pos-macros/i19351/B.scala
@@ -1,3 +1,3 @@
 import scala.quoted.*
-//import A.*
+// import A.*
 def myMacroExpr(using Quotes): Expr[x.type] = '{???}
\ No newline at end of file
diff --git a/tests/neg/i19351a/Macro.scala b/tests/pos-macros/i19351a/Macro.scala
similarity index 100%
rename from tests/neg/i19351a/Macro.scala
rename to tests/pos-macros/i19351a/Macro.scala
diff --git a/tests/neg/i19351a/Test.scala b/tests/pos-macros/i19351a/Test.scala
similarity index 87%
rename from tests/neg/i19351a/Test.scala
rename to tests/pos-macros/i19351a/Test.scala
index 84fb6ca4ae78..7f9e6dbc9786 100644
--- a/tests/neg/i19351a/Test.scala
+++ b/tests/pos-macros/i19351a/Test.scala
@@ -5,7 +5,7 @@ type Bool = [R] => (R, R) => R
 val True: Bool = [R] => (t: R, _: R) => t
 val False: Bool = [R] => (_: R, f: R) => f
 
-inline def not(b: Bool): Bool = ${notMacro('b)} // error
+inline def not(b: Bool): Bool = ${notMacro('b)}
 inline def show(b: Bool): String = ${showMacro('b)}
 //inline def not(b: Bool): Bool = ${foldMacro('b, 'False, 'True)}
 //inline def show(b: Bool): String = ${foldMacro('b, '{"TRUE"}, '{"FALSE"})}

From 07d3eba53e450d4d89d7d1d51ed9881ca77a2aa5 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 10 Jun 2025 12:14:04 -0700
Subject: [PATCH 417/505] Add accessible check for import usage

[Cherry-picked c76b42fcb87f7fe07363840335d100eebc91f19e]
---
 .../tools/dotc/transform/CheckUnused.scala    |  6 +++--
 tests/warn/i23347.scala                       | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tests/warn/i23347.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index edfb8f9efa41..e22b2442de48 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -283,8 +283,10 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
     def matchingSelector(info: ImportInfo): ImportSelector | Null =
       val qtpe = info.site
       def hasAltMember(nm: Name) = qtpe.member(nm).hasAltWith: alt =>
-           alt.symbol == sym
-        || nm.isTypeName && alt.symbol.isAliasType && alt.info.dealias.typeSymbol == sym
+        val sameSym =
+             alt.symbol == sym
+          || nm.isTypeName && alt.symbol.isAliasType && alt.info.dealias.typeSymbol == sym
+        sameSym && alt.symbol.isAccessibleFrom(qtpe)
       def loop(sels: List[ImportSelector]): ImportSelector | Null = sels match
         case sel :: sels =>
           val matches =
diff --git a/tests/warn/i23347.scala b/tests/warn/i23347.scala
new file mode 100644
index 000000000000..82e362070f03
--- /dev/null
+++ b/tests/warn/i23347.scala
@@ -0,0 +1,22 @@
+//> using options -Wunused:all
+
+object USED {
+  case class A(value: Int)
+}
+
+object UNUSED {
+  // In reality UNUSED would contain several other necessary members!
+  private type A = USED.A // warn private
+  class B
+}
+
+object Test {
+  import USED.*
+  import UNUSED.*
+
+  def foo(a: A): Int = a.value
+
+  def g(b: B) = ()
+
+}
+

From 79491f184b291718b9f16b0239e6ebf93e070b2c Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 7 Apr 2025 15:41:52 +0200
Subject: [PATCH 418/505] Fail not inlined inline methods calls early

All of them would be achieved with implicit resolution, during which
the global state (ctx.base) would have stopInlining set to true, but
the corresponding error might not have been shown as part of
the implicit resolution - now we reset that value after failing the
implicit, if it was not set before typing the implicit.
---
 .../dotty/tools/dotc/typer/Implicits.scala    |   4 +
 tests/neg/i13044.check                        | 134 ++----------------
 tests/neg/i13044.scala                        |   2 +-
 tests/neg/i22423.check                        |  24 ++++
 tests/neg/i22423.scala                        |  35 +++++
 5 files changed, 72 insertions(+), 127 deletions(-)
 create mode 100644 tests/neg/i22423.check
 create mode 100644 tests/neg/i22423.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
index a1a01823e2f3..063513f1c295 100644
--- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
@@ -1250,11 +1250,15 @@ trait Implicits:
         val history = ctx.searchHistory.nest(cand, pt)
         val typingCtx =
           nestedContext().setNewTyperState().setFreshGADTBounds.setSearchHistory(history)
+        val alreadyStoppedInlining = ctx.base.stopInlining
         val result = typedImplicit(cand, pt, argument, span)(using typingCtx)
         result match
           case res: SearchSuccess =>
             ctx.searchHistory.defineBynameImplicit(wideProto, res)
           case _ =>
+            if !alreadyStoppedInlining && ctx.base.stopInlining then
+              // a call overflowed as part of the expansion when typing the implicit
+              ctx.base.stopInlining = false
             // Since the search failed, the local typerstate will be discarded
             // without being committed, but type variables local to that state
             // might still appear in an error message, so we run `gc()` here to
diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check
index 69c61b06c353..6d6b2a349eb7 100644
--- a/tests/neg/i13044.check
+++ b/tests/neg/i13044.check
@@ -1,63 +1,18 @@
--- Error: tests/neg/i13044.scala:46:40 ---------------------------------------------------------------------------------
-46 |   implicit def typeSchema: Schema[A] = Schema.gen // error // error
+-- [E172] Type Error: tests/neg/i13044.scala:46:40 ---------------------------------------------------------------------
+61 |   implicit def typeSchema: Schema[A] = Schema.gen // error
    |                                        ^^^^^^^^^^
-   |                                        given instance gen is declared as `inline`, but was not inlined
+   |                                 No given instance of type Schema[B] was found.
+   |                                 I found:
    |
-   |                                        Try increasing `-Xmax-inlines` above 32
+   |                                     Schema.gen[B]
+   |
+   |                                 But given instance gen in trait SchemaDerivation does not match type Schema[B].
    |--------------------------------------------------------------------------------------------------------------------
    |Inline stack trace
    |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    |This location contains code that was inlined from i13044.scala:17
 17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:17
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^
    |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    |This location contains code that was inlined from i13044.scala:17
 18 |        builder :: recurse[ts]
@@ -71,76 +26,3 @@
 33 |  inline given gen[A]: Schema[A] = derived
    |                                   ^^^^^^^
     --------------------------------------------------------------------------------------------------------------------
--- Error: tests/neg/i13044.scala:46:40 ---------------------------------------------------------------------------------
-46 |   implicit def typeSchema: Schema[A] = Schema.gen // error // error
-   |                                        ^^^^^^^^^^
-   |                                        method recurse is declared as `inline`, but was not inlined
-   |
-   |                                        Try increasing `-Xmax-inlines` above 32
-   |--------------------------------------------------------------------------------------------------------------------
-   |Inline stack trace
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-18 |        builder :: recurse[ts]
-   |                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
-   |                                   ^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-18 |        builder :: recurse[ts]
-   |                   ^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-29 |        lazy val fields = recurse[m.MirroredElemTypes]
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   |This location contains code that was inlined from i13044.scala:18
-33 |  inline given gen[A]: Schema[A] = derived
-   |                                   ^^^^^^^
-    --------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i13044.scala b/tests/neg/i13044.scala
index ad7687bbf2b8..525a52376abf 100644
--- a/tests/neg/i13044.scala
+++ b/tests/neg/i13044.scala
@@ -43,5 +43,5 @@ case class B(c: C)
 case class A(a: A, b: B)
 
 object TestApp {
-   implicit def typeSchema: Schema[A] = Schema.gen // error // error
+   implicit def typeSchema: Schema[A] = Schema.gen // error
 }
diff --git a/tests/neg/i22423.check b/tests/neg/i22423.check
new file mode 100644
index 000000000000..ec189d99524a
--- /dev/null
+++ b/tests/neg/i22423.check
@@ -0,0 +1,24 @@
+-- Error: tests/neg/i22423.scala:35:14 ---------------------------------------------------------------------------------
+35 |  exportReader[Settings] // error
+   |  ^^^^^^^^^^^^^^^^^^^^^^
+   |  cannot reduce summonFrom with
+   |   patterns :  case given reader @ _:ConfigReader[List[String]]
+   |--------------------------------------------------------------------------------------------------------------------
+   |Inline stack trace
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i22423.scala:12
+12 |    summonFrom { case reader: ConfigReader[A] => reader }
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i22423.scala:12
+15 |    summonConfigReader[List[String]]
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i22423.scala:12
+ 8 |    readCaseClass()
+   |    ^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i22423.scala:12
+30 |inline given exportReader[A]: Exported[ConfigReader[A]] = Exported(HintsAwareConfigReaderDerivation.deriveReader[A])
+   |                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    --------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i22423.scala b/tests/neg/i22423.scala
new file mode 100644
index 000000000000..4204f8f93216
--- /dev/null
+++ b/tests/neg/i22423.scala
@@ -0,0 +1,35 @@
+//> using options -Xmax-inlines:7
+import scala.deriving.Mirror
+import scala.compiletime._
+import scala.compiletime.ops.int._
+
+object HintsAwareConfigReaderDerivation {
+  inline def deriveReader[A]: ConfigReader[A] =
+    readCaseClass()
+    ???
+
+  private inline def summonConfigReader[A]: ConfigReader[A] =
+    summonFrom { case reader: ConfigReader[A] => reader }
+
+  private inline def readCaseClass(): Unit =
+    summonConfigReader[List[String]]
+    val a1: Int = ???
+    val a2: EmptyTuple = ???
+    a1 *: a2
+    ???
+}
+
+trait ConfigReader[A]
+object ConfigReader {
+  implicit def traversableReader[A, F[A] <: TraversableOnce[A]](implicit configConvert: ConfigReader[A]): ConfigReader[F[A]] = ???
+  implicit def exportedReader[A](implicit exported: Exported[ConfigReader[A]]): ConfigReader[A] = exported.instance
+  case class Exported[A](instance: A)
+}
+
+import ConfigReader._
+inline given exportReader[A]: Exported[ConfigReader[A]] = Exported(HintsAwareConfigReaderDerivation.deriveReader[A])
+
+case class Settings(rules: List[String])
+
+val settings =
+  exportReader[Settings] // error

From 563653c5bf2ff80395c98fc25e8e43667d468814 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 8 Jul 2025 15:06:51 +0200
Subject: [PATCH 419/505] Fail not inlined inline methods calls early

All of them would be achieved with implicit resolution, during which
the global state (ctx.base) would have stopInlining set to true, but
the corresponding error might not have been shown as part of
the implicit resolution - now we reset that value after failing the
implicit, if it was not set before typing the implicit.

[Cherry-picked 0396584f18bf6adb12d0bf5ecbe1b1f6901c32b9][modified]

From 4e8c35c743c3c1d84806211c8c601f5e65228096 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 7 Jul 2025 12:31:00 +0200
Subject: [PATCH 420/505] Add regression test

[Cherry-picked 8598403dbc01185d136e9b918c41fdf9ce650a28]
---
 tests/pos-macros/i22585/Macro.scala | 22 ++++++++++++++++++++++
 tests/pos-macros/i22585/Main.scala  |  5 +++++
 2 files changed, 27 insertions(+)
 create mode 100644 tests/pos-macros/i22585/Macro.scala
 create mode 100644 tests/pos-macros/i22585/Main.scala

diff --git a/tests/pos-macros/i22585/Macro.scala b/tests/pos-macros/i22585/Macro.scala
new file mode 100644
index 000000000000..0daf304ab3a7
--- /dev/null
+++ b/tests/pos-macros/i22585/Macro.scala
@@ -0,0 +1,22 @@
+import scala.quoted.*
+
+trait Hammer[I, O] {
+  def hammer(input: I): O
+}
+
+object Hammer {
+  inline def makeProductHammerMacro[I, O](): Hammer[I, O] =
+    ${ makeProductHammerMacroImpl[I, O] }
+
+  def makeProductHammerMacroImpl[I: Type, O: Type](using Quotes): Expr[Hammer[I, O]] =
+    '{ makeHammer[I, O]() }
+
+  inline def makeHammer[S, O](): Hammer[S, O] =
+    new Hammer[S, O] {
+      lazy val (hammer: Hammer[?, Int], idx: Int) = ???
+
+      override def hammer(input: S): O = {
+        hammer.hammer(???.asInstanceOf).asInstanceOf[O]
+      }
+    }
+}
\ No newline at end of file
diff --git a/tests/pos-macros/i22585/Main.scala b/tests/pos-macros/i22585/Main.scala
new file mode 100644
index 000000000000..6b09d1fb719c
--- /dev/null
+++ b/tests/pos-macros/i22585/Main.scala
@@ -0,0 +1,5 @@
+object HammerSpec {
+  case class A(x: Int)
+  case class B(x: Int)
+  Hammer.makeProductHammerMacro[A, B]()
+}
\ No newline at end of file

From a290a4111337f58b31956eb8d7b98c4c3658e398 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 8 Jul 2025 12:11:55 +0200
Subject: [PATCH 421/505] -Yprofile-trace properly report macro splicing source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously when we had some code like:

def userCode: Unit =
  ...
  val x = myExpensiveMacro()
  ...

The profiler reported the time spent executing the macro as `«method userCode»`
which is misleading. This commit changes it to be reported as `«method
myExpensiveMacro»`. This is particularly useful in bottom-up profiling to find
which macros we spend the most amount of time in.

[Cherry-picked 7f81cc5c9c4b40a5ae98cbd8201769602eea0199]
---
 compiler/src/dotty/tools/dotc/inlines/Inliner.scala   | 7 ++++---
 compiler/src/dotty/tools/dotc/transform/Splicer.scala | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 99121f8187ee..5410866c1dd4 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -1098,9 +1098,10 @@ class Inliner(val call: tpd.Tree)(using Context):
       if suspendable then
         ctx.compilationUnit.suspend() // this throws a SuspendException
 
-    val evaluatedSplice = inContext(quoted.MacroExpansion.context(inlinedFrom)) {
-      Splicer.splice(body, splicePos, inlinedFrom.srcPos, MacroClassLoader.fromContext)
-    }
+    val evaluatedSplice =
+      inContext(quoted.MacroExpansion.context(inlinedFrom)):
+        ctx.profiler.onMacroSplice(inlinedFrom.symbol):
+          Splicer.splice(body, splicePos, inlinedFrom.srcPos, MacroClassLoader.fromContext)
     val inlinedNormalizer = new TreeMap {
       override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
         case tree @ Inlined(_, Nil, expr) if tree.inlinedFromOuterScope && enclosingInlineds.isEmpty => transform(expr)
diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
index 7a1992b0ba18..a52b78682ac1 100644
--- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
@@ -54,7 +54,7 @@ object Splicer {
         inContext(sliceContext) {
           val oldContextClassLoader = Thread.currentThread().getContextClassLoader
           Thread.currentThread().setContextClassLoader(classLoader)
-          try ctx.profiler.onMacroSplice(owner){
+          try {
             val interpreter = new SpliceInterpreter(splicePos, classLoader)
 
             // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree

From 6230788f54a9585ce67367c45b82036e4a2fba61 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 8 Jul 2025 16:45:55 +0200
Subject: [PATCH 422/505] bugfix: Fix diverging tests

---
 tests/neg/i13044.check |  2 +-
 tests/neg/i13044.scala | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check
index 6d6b2a349eb7..71fef532ec43 100644
--- a/tests/neg/i13044.check
+++ b/tests/neg/i13044.check
@@ -1,4 +1,4 @@
--- [E172] Type Error: tests/neg/i13044.scala:46:40 ---------------------------------------------------------------------
+-- [E172] Type Error: tests/neg/i13044.scala:61:40 ---------------------------------------------------------------------
 61 |   implicit def typeSchema: Schema[A] = Schema.gen // error
    |                                        ^^^^^^^^^^
    |                                 No given instance of type Schema[B] was found.
diff --git a/tests/neg/i13044.scala b/tests/neg/i13044.scala
index 525a52376abf..2f9cae2f9039 100644
--- a/tests/neg/i13044.scala
+++ b/tests/neg/i13044.scala
@@ -33,7 +33,22 @@ trait SchemaDerivation {
   inline given gen[A]: Schema[A] = derived
 }
 
-case class H(i: Int)
+case class X15(i: Int)
+case class X14(i: X15)
+case class X13(i: X14)
+case class X12(i: X13)
+case class X11(i: X12)
+case class X10(i: X11)
+case class X9(i: X10)
+case class X8(i: X9)
+case class X7(i: X8)
+case class X6(i: X7)
+case class X5(i: X6)
+case class X4(i: X5)
+case class X3(i: X4)
+case class X2(i: X3)
+case class X1(i: X2)
+case class H(i: X1)
 case class G(h: H)
 case class F(g: G)
 case class E(f: Option[F])

From 3ee5a4d405e9b0a489230719708ac995601b0e4e Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 8 Jul 2025 22:08:40 +0200
Subject: [PATCH 423/505] -Yprofile-trace profiles all inline calls (#23490)

Previously we only profiled macro expansion, but even non-macro inline
calls can have a significant impact on performance (e.g. if we're doing
typeclass derivation) and are worth tracking. This does not seem to
significantly impact the size of traces in practice.
[Cherry-picked 8a14de3ce985cba4b864f1a3623c6bb82dfe5a6d]
---
 .../src/dotty/tools/dotc/inlines/Inliner.scala   |  3 +--
 .../src/dotty/tools/dotc/inlines/Inlines.scala   |  2 +-
 .../src/dotty/tools/dotc/profile/Profiler.scala  | 16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
index 5410866c1dd4..d5b10f853784 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -1100,8 +1100,7 @@ class Inliner(val call: tpd.Tree)(using Context):
 
     val evaluatedSplice =
       inContext(quoted.MacroExpansion.context(inlinedFrom)):
-        ctx.profiler.onMacroSplice(inlinedFrom.symbol):
-          Splicer.splice(body, splicePos, inlinedFrom.srcPos, MacroClassLoader.fromContext)
+        Splicer.splice(body, splicePos, inlinedFrom.srcPos, MacroClassLoader.fromContext)
     val inlinedNormalizer = new TreeMap {
       override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
         case tree @ Inlined(_, Nil, expr) if tree.inlinedFromOuterScope && enclosingInlineds.isEmpty => transform(expr)
diff --git a/compiler/src/dotty/tools/dotc/inlines/Inlines.scala b/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
index e84fe174a6d0..f535a7925451 100644
--- a/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
+++ b/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
@@ -101,7 +101,7 @@ object Inlines:
    *  @return   An `Inlined` node that refers to the original call and the inlined bindings
    *            and body that replace it.
    */
-  def inlineCall(tree: Tree)(using Context): Tree =
+  def inlineCall(tree: Tree)(using Context): Tree = ctx.profiler.onInlineCall(tree.symbol):
     if tree.symbol.denot != SymDenotations.NoDenotation
       && tree.symbol.effectiveOwner == defn.CompiletimeTestingPackage.moduleClass
     then
diff --git a/compiler/src/dotty/tools/dotc/profile/Profiler.scala b/compiler/src/dotty/tools/dotc/profile/Profiler.scala
index ab3e73468385..8b1192871cff 100644
--- a/compiler/src/dotty/tools/dotc/profile/Profiler.scala
+++ b/compiler/src/dotty/tools/dotc/profile/Profiler.scala
@@ -117,12 +117,12 @@ sealed trait Profiler {
   protected def beforeImplicitSearch(pt: Type): TracedEventId  = TracedEventId.Empty
   protected def afterImplicitSearch(event: TracedEventId): Unit = ()
 
-  inline def onMacroSplice[T](macroSym: Symbol)(inline body: T): T =
-    val event = beforeMacroSplice(macroSym)
+  inline def onInlineCall[T](inlineSym: Symbol)(inline body: T): T =
+    val event = beforeInlineCall(inlineSym)
     try body
-    finally afterMacroSplice(event)
-  protected def beforeMacroSplice(macroSym: Symbol): TracedEventId = TracedEventId.Empty
-  protected def afterMacroSplice(event: TracedEventId): Unit = ()
+    finally afterInlineCall(event)
+  protected def beforeInlineCall(inlineSym: Symbol): TracedEventId = TracedEventId.Empty
+  protected def afterInlineCall(event: TracedEventId): Unit = ()
 
   inline def onCompletion[T](root: Symbol, associatedFile: => AbstractFile)(inline body: T): T =
     val (event, completionName) = beforeCompletion(root, associatedFile)
@@ -178,7 +178,7 @@ private [profile] class RealProfiler(reporter : ProfileReporter)(using Context)
 
   enum Category:
     def name: String = this.toString().toLowerCase()
-    case Run, Phase, File, TypeCheck, Implicit, Macro, Completion
+    case Run, Phase, File, TypeCheck, Implicit, Inline, Completion
   private [profile] val chromeTrace =
     if ctx.settings.YprofileTrace.isDefault
     then null
@@ -317,8 +317,8 @@ private [profile] class RealProfiler(reporter : ProfileReporter)(using Context)
   override def beforeImplicitSearch(pt: Type): TracedEventId = traceDurationStart(Category.Implicit, s"?[${symbolName(pt.typeSymbol)}]", colour = "yellow")
   override def afterImplicitSearch(event: TracedEventId): Unit = traceDurationEnd(Category.Implicit, event, colour = "yellow")
 
-  override def beforeMacroSplice(macroSym: Symbol): TracedEventId = traceDurationStart(Category.Macro, s"«${symbolName(macroSym)}»", colour = "olive")
-  override def afterMacroSplice(event: TracedEventId): Unit = traceDurationEnd(Category.Macro, event, colour = "olive")
+  override def beforeInlineCall(inlineSym: Symbol): TracedEventId = traceDurationStart(Category.Inline, s"«${symbolName(inlineSym)}»", colour = "olive")
+  override def afterInlineCall(event: TracedEventId): Unit = traceDurationEnd(Category.Inline, event, colour = "olive")
 
   override def beforeCompletion(root: Symbol, associatedFile: => AbstractFile): (TracedEventId, String) =
     if chromeTrace == null

From 0a6b88053cad5e699b3e297c99193cc44ddfea26 Mon Sep 17 00:00:00 2001
From: Marc GRIS <62659262+m-gris@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:03:57 +0200
Subject: [PATCH 424/505] fix: StringIndexOutOfBoundsException in presentation
 compiler's hasColon method (#23498)

This PR fixes a `StringIndexOutOfBoundsException` that could occur in
the presentation compiler when checking for colons in override
completions.

## Problem
The `dotty.tools.pc.completions.OverrideCompletions.hasColon` method was
accessing characters at specific indices without first verifying that
the indices were within the text bounds. This could cause crashes when
the span end positions were at or beyond the text length.

## Solution
Added bounds checking before accessing characters:
- For `TypeDef` cases: verify `td.rhs.span.end < text.length` before
`text.charAt(td.rhs.span.end)`
- For `Template` parent cases: filter to ensure `text.length > idx`
before `text.charAt(idx)`

## Testing
The existing test suite passes, and a new test case `no-new-line` was
added to cover the edge case.

[resolves
scalameta/metals#7575](https://github.com/scalameta/metals/issues/7575)
[Cherry-picked 01447dfcb45ffdeaf1f7790a247ddfe43bb1b385]
---
 .../pc/completions/OverrideCompletions.scala  |  4 +-
 .../AutoImplementAbstractMembersSuite.scala   | 72 ++++++++++++-------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
index 807f959a2406..f01a1e9b8cd8 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala
@@ -511,10 +511,10 @@ object OverrideCompletions:
       Context
   ): Option[Int] =
     defn match
-      case td: TypeDef if text.charAt(td.rhs.span.end) == ':' =>
+      case td: TypeDef if (td.rhs.span.end < text.length) && text.charAt(td.rhs.span.end) == ':' =>
         Some(td.rhs.span.end)
       case TypeDef(_, temp : Template) =>
-        temp.parentsOrDerived.lastOption.map(_.span.end).filter(text.charAt(_) == ':')
+        temp.parentsOrDerived.lastOption.map(_.span.end).filter(idx => text.length > idx && text.charAt(idx) == ':')
       case _ => None
 
   private def fallbackFromParent(parent: Tree, name: String)(using Context) =
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImplementAbstractMembersSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImplementAbstractMembersSuite.scala
index ffe4e293ba30..38e78e4e545b 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImplementAbstractMembersSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImplementAbstractMembersSuite.scala
@@ -75,39 +75,59 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite:
          |""".stripMargin
     )
 
-  @Test def `empty-lines-between-members` =
+  @Test def `no-new-line` =
     checkEdit(
       """|package a
-         |
-         |object A {
-         |  trait Base {
-         |    def foo(x: Int): Int
-         |    def bar(x: String): String
-         |  }
-         |  class <<Concrete>> extends Base {
-         |
-         |    def bar(x: String): String = ???
-         |
-         |  }
-         |}
-         |""".stripMargin,
+          |
+          |trait X:
+          |  def foo: Unit
+          |
+          |class <<Y>> extends X""".stripMargin,
       """|package a
          |
-         |object A {
-         |  trait Base {
-         |    def foo(x: Int): Int
-         |    def bar(x: String): String
-         |  }
-         |  class Concrete extends Base {
-         |
+         |trait X:
+         |  def foo: Unit
          |
-         |    override def foo(x: Int): Int = ???
+         |class Y extends X {
          |
-         |    def bar(x: String): String = ???
+         |  override def foo: Unit = ???
          |
-         |  }
-         |}
-         |""".stripMargin
+         |}""".stripMargin,
+    )
+
+  @Test def `empty-lines-between-members` =
+    checkEdit(
+      """|package a
+        |
+        |object A {
+        |  trait Base {
+        |    def foo(x: Int): Int
+        |    def bar(x: String): String
+        |  }
+        |  class <<Concrete>> extends Base {
+        |
+        |    def bar(x: String): String = ???
+        |
+        |  }
+        |}
+        |""".stripMargin,
+      """|package a
+        |
+        |object A {
+        |  trait Base {
+        |    def foo(x: Int): Int
+        |    def bar(x: String): String
+        |  }
+        |  class Concrete extends Base {
+        |
+        |
+        |    override def foo(x: Int): Int = ???
+        |
+        |    def bar(x: String): String = ???
+        |
+        |  }
+        |}
+        |""".stripMargin
     )
 
   @Test def `objectdef` =

From 49d2843ce6d8247c98d7352fc58d28afb895e4c0 Mon Sep 17 00:00:00 2001
From: bingchen-li <bingli@microsoft.com>
Date: Fri, 11 Jul 2025 20:26:17 +0800
Subject: [PATCH 425/505] Update indentation.md to fix a typo (#23505)

Closes #23492
[Cherry-picked 26d17941780339a5e92f5a63f86c977775879aa9]
---
 docs/_docs/reference/other-new-features/indentation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/reference/other-new-features/indentation.md b/docs/_docs/reference/other-new-features/indentation.md
index 9963d1ee7577..103de5d6797a 100644
--- a/docs/_docs/reference/other-new-features/indentation.md
+++ b/docs/_docs/reference/other-new-features/indentation.md
@@ -189,7 +189,7 @@ Define for an arbitrary sequence of tokens or non-terminals `TS`:
 
 ```ebnf
 :<<< TS >>>   ::=   ‘{’ TS ‘}’
-                |   <colon> <indent" TS <outdent>
+                |   <colon> <indent> TS <outdent>
 ```
 Then the grammar changes as follows:
 ```ebnf

From 66f1e5f15a031a98476214edb177dbf65c84f7f1 Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Thu, 10 Jul 2025 16:52:44 +0200
Subject: [PATCH 426/505] Add TypeParamRef handling in isSingletonBounded

---
 .../src/dotty/tools/dotc/core/Types.scala     | 18 ++++++
 tests/pos/i22922.scala                        | 57 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 tests/pos/i22922.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 28995d4ddf13..61a725fc4b54 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -338,6 +338,24 @@ object Types extends TypeUtils {
       case AndType(tpL, tpR) => tpL.isEffectivelySingleton || tpR.isEffectivelySingleton
       case _ => false
 
+    /** Is this upper-bounded by a (possibly aliased) singleton type?
+     *  Overridden in TypeVar
+     */
+    def isSingletonBounded(frozen: Boolean)(using Context): Boolean = this.dealias.normalized match
+      case tp: SingletonType => tp.isStable
+      case tp: TypeParamRef =>
+        ctx.typerState.constraint.bounds(tp).hi.isSingletonBounded(frozen)
+      case tp: TypeRef =>
+        tp.name == tpnme.Singleton && tp.symbol == defn.SingletonClass
+        || tp.superType.isSingletonBounded(frozen)
+      case tp: TypeVar if !tp.isInstantiated =>
+        if frozen then tp frozen_<:< defn.SingletonType else tp <:< defn.SingletonType
+      case tp: HKTypeLambda => false
+      case tp: TypeProxy => tp.superType.isSingletonBounded(frozen)
+      case tp: AndType => tp.tp1.isSingletonBounded(frozen) || tp.tp2.isSingletonBounded(frozen)
+      case tp: OrType => tp.tp1.isSingletonBounded(frozen) && tp.tp2.isSingletonBounded(frozen)
+      case _ => false
+
     /** Is this type of kind `AnyKind`? */
     def hasAnyKind(using Context): Boolean = {
       @tailrec def loop(tp: Type): Boolean = tp match {
diff --git a/tests/pos/i22922.scala b/tests/pos/i22922.scala
new file mode 100644
index 000000000000..a65c99d6bd46
--- /dev/null
+++ b/tests/pos/i22922.scala
@@ -0,0 +1,57 @@
+abstract class Computation[+A, -U]
+type !![+A, -U] = Computation[A, U]
+type Const[C] = [_] =>> C
+
+final class EffectImpl[Fx]:
+  sealed trait ThisInterpreter extends Interpreter.Unsealed:
+    final override type Elim = Fx
+  abstract class Stateless[F[+_], G[+_], Fx]
+      extends Interpreter.Stateless[F, G, Fx]
+      with ThisInterpreter
+
+trait Effect:
+  val impl: EffectImpl[this.type] = ???
+
+trait SourceEffect[O] extends Effect:
+  abstract class Stateless[U] extends StatelessReturn[Unit, U]
+  abstract class StatelessReturn[R, U] extends impl.Stateless[Const[Unit], Const[R], U]
+
+sealed trait Handler[From[+_], To[+_], Elim, Intro]:
+  final def handle[V] = new HandleSyntax[V]
+  final class HandleSyntax[V]:
+    def apply[A, W](comp: From[A] !! W)(using CanPartiallyHandle[V, W, Elim]): To[A] !! (V & Intro) = ???
+
+sealed trait CanPartiallyHandle[U, V, W] // missing in StreamImpl.map
+object CanPartiallyHandle:
+  given [U, V, W](using (W & U) <:< V): CanPartiallyHandle[U, V, W] = ???
+
+sealed trait Interpreter:
+  type From[+A]
+  type To[+A]
+  type Elim
+  type Intro
+
+  final def toHandler: Handler[From, To, Elim, Intro] = ???
+object Interpreter:
+  trait Unsealed extends Interpreter
+  abstract class Stateless[F[+_], G[+_], Fx] extends Interpreter:
+    final override type From[+A] = F[A]
+    final override type To[+A] = G[A]
+    final override type Intro = Fx
+
+object Syntax:
+  extension [U](comp: Unit !! U)
+    def asStream[A, V](fx: SourceEffect[A])(using (fx.type & V) =:= U): Stream[A, V] = ???
+
+sealed abstract class Stream[+A, -U]:
+  def map[B](f: A => B): Stream[B, U]
+
+import Syntax.*
+final case class StreamImpl[A, U](Fx: SourceEffect[A])(val compute: Unit !! (U & Fx.type))
+    extends Stream[A, U]:
+  type Fx = Fx.type
+  override def map[B](f: A => B): Stream[B, U] =
+    case object Fx2 extends SourceEffect[B]
+    new Fx.Stateless[Fx2.type] {}.toHandler
+      .handle(compute)
+      .asStream(Fx2) // error

From a060e8a6b435564852a92d13a10da9698b35c77e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 24 Jul 2025 14:45:04 +0200
Subject: [PATCH 427/505] Add TypeParamRef handling in isSingletonBounded

[Cherry-picked 71c9ad65528c52f721dd83fdc1d71a9907e3f336][modified]

From 075cddd9f1f52c20c8cc46c8bd942244e022ee4e Mon Sep 17 00:00:00 2001
From: noti0na1 <noti0na1@users.noreply.github.com>
Date: Fri, 11 Jul 2025 13:11:41 +0200
Subject: [PATCH 428/505] Fix logic in isSingletonBounded for OrType case

[Cherry-picked f14fa1050d1a4a87b394609af5e474d71e348e62]
---
 compiler/src/dotty/tools/dotc/core/Types.scala | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 61a725fc4b54..2e0b227bba7c 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -353,7 +353,6 @@ object Types extends TypeUtils {
       case tp: HKTypeLambda => false
       case tp: TypeProxy => tp.superType.isSingletonBounded(frozen)
       case tp: AndType => tp.tp1.isSingletonBounded(frozen) || tp.tp2.isSingletonBounded(frozen)
-      case tp: OrType => tp.tp1.isSingletonBounded(frozen) && tp.tp2.isSingletonBounded(frozen)
       case _ => false
 
     /** Is this type of kind `AnyKind`? */

From 16b756c98e718e4d0db69a8376bceadba5da83fd Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Sun, 13 Jul 2025 12:03:00 +0200
Subject: [PATCH 429/505] Fix this references everywhere in dependent function
 types

We did fix them in parameters of dependent function types, but not in the
result type. This led to a this reference being seen incorrectly as
referring to the dependent function type itself.

Fixes #23111

[Cherry-picked 068d9bbd954c3511b18706c4291b736b2211a0dc]
---
 .../src/dotty/tools/dotc/typer/Typer.scala    | 46 +++++++++----------
 tests/neg/i23111.check                        | 12 +++++
 tests/neg/i23111.scala                        |  3 ++
 3 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 tests/neg/i23111.check
 create mode 100644 tests/neg/i23111.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index cedc4a082744..65049c698738 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -1451,11 +1451,11 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
     else typedFunctionValue(tree, pt)
 
   def typedFunctionType(tree: untpd.Function, pt: Type)(using Context): Tree = {
-    val untpd.Function(args, body) = tree
-    body match
-      case untpd.CapturesAndResult(refs, result) =>
+    val untpd.Function(args, result) = tree
+    result match
+      case untpd.CapturesAndResult(refs, result1) =>
         return typedUnadapted(untpd.makeRetaining(
-          cpy.Function(tree)(args, result), refs, tpnme.retains), pt)
+          cpy.Function(tree)(args, result1), refs, tpnme.retains), pt)
       case _ =>
     var (funFlags, erasedParams) = tree match {
       case tree: untpd.FunctionWithMods => (tree.mods.flags, tree.erasedParams)
@@ -1467,22 +1467,13 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
     val isImpure = funFlags.is(Impure)
 
     /** Typechecks dependent function type with given parameters `params` */
-    def typedDependent(params: List[untpd.ValDef])(using Context): Tree =
-      val fixThis = new untpd.UntypedTreeMap:
-        // pretype all references of this in outer context,
-        // so that they do not refer to the refined type being constructed
-        override def transform(tree: untpd.Tree)(using Context): untpd.Tree = tree match
-          case This(id) => untpd.TypedSplice(typedExpr(tree)(using ctx.outer))
-          case _ => super.transform(tree)
-
+    def typedDependent(params: List[untpd.ValDef], result: untpd.Tree)(using Context): Tree =
       val params1 =
         if funFlags.is(Given) then params.map(_.withAddedFlags(Given))
         else params
-      val params2 = params1.map(fixThis.transformSub)
-      val params3 = params2.zipWithConserve(erasedParams) { (arg, isErased) =>
+      val params2 = params1.zipWithConserve(erasedParams): (arg, isErased) =>
         if isErased then arg.withAddedFlags(Erased) else arg
-      }
-      val appDef0 = untpd.DefDef(nme.apply, List(params3), body, EmptyTree).withSpan(tree.span)
+      val appDef0 = untpd.DefDef(nme.apply, List(params2), result, EmptyTree).withSpan(tree.span)
       index(appDef0 :: Nil)
       val appDef = typed(appDef0).asInstanceOf[DefDef]
       val mt = appDef.symbol.info.asInstanceOf[MethodType]
@@ -1490,14 +1481,14 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
         report.error(em"$mt is an illegal function type because it has inter-parameter dependencies", tree.srcPos)
       // Restart typechecking if there are erased classes that we want to mark erased
       if mt.erasedParams.zip(mt.paramInfos.map(_.isErasedClass)).exists((paramErased, classErased) => classErased && !paramErased) then
-        val newParams = params3.zipWithConserve(mt.paramInfos.map(_.isErasedClass)) { (arg, isErasedClass) =>
+        val newParams = params2.zipWithConserve(mt.paramInfos.map(_.isErasedClass)) { (arg, isErasedClass) =>
           if isErasedClass then arg.withAddedFlags(Erased) else arg
         }
-        return typedDependent(newParams)
+        return typedDependent(newParams, result)
       val core =
         if mt.hasErasedParams then TypeTree(defn.ErasedFunctionClass.typeRef)
         else
-          val resTpt = TypeTree(mt.nonDependentResultApprox).withSpan(body.span)
+          val resTpt = TypeTree(mt.nonDependentResultApprox).withSpan(result.span)
           val paramTpts = appDef.termParamss.head.map(p => TypeTree(p.tpt.tpe).withSpan(p.tpt.span))
           val funSym = defn.FunctionSymbol(numArgs, isContextual, isImpure)
           val tycon = TypeTree(funSym.typeRef)
@@ -1507,19 +1498,28 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
     args match {
       case ValDef(_, _, _) :: _ =>
-        typedDependent(args.asInstanceOf[List[untpd.ValDef]])(
+        val fixThis = new untpd.UntypedTreeMap:
+          // pretype all references of this so that they do not refer to the
+          // refined type being constructed
+          override def transform(tree: untpd.Tree)(using Context): untpd.Tree = tree match
+            case This(id) => untpd.TypedSplice(typedExpr(tree))
+            case _ => super.transform(tree)
+
+        val untpd.Function(fixedArgs: List[untpd.ValDef] @unchecked, fixedResult) =
+          fixThis.transform(tree): @unchecked
+        typedDependent(fixedArgs, fixedResult)(
           using ctx.fresh.setOwner(newRefinedClassSymbol(tree.span)).setNewScope)
       case _ =>
         if erasedParams.contains(true) then
           typedFunctionType(desugar.makeFunctionWithValDefs(tree, pt), pt)
         else
           val funSym = defn.FunctionSymbol(numArgs, isContextual, isImpure)
-          val result = typed(cpy.AppliedTypeTree(tree)(untpd.TypeTree(funSym.typeRef), args :+ body), pt)
+          val funTpt = typed(cpy.AppliedTypeTree(tree)(untpd.TypeTree(funSym.typeRef), args :+ result), pt)
           // if there are any erased classes, we need to re-do the typecheck.
-          result match
+          funTpt match
             case r: AppliedTypeTree if r.args.exists(_.tpe.isErasedClass) =>
               typedFunctionType(desugar.makeFunctionWithValDefs(tree, pt), pt)
-            case _ => result
+            case _ => funTpt
     }
   }
 
diff --git a/tests/neg/i23111.check b/tests/neg/i23111.check
new file mode 100644
index 000000000000..017657eac15c
--- /dev/null
+++ b/tests/neg/i23111.check
@@ -0,0 +1,12 @@
+-- [E086] Syntax Error: tests/neg/i23111.scala:2:47 --------------------------------------------------------------------
+2 |  def bar: (a: Int, b: Int) => A.this.type = x => ??? // error
+  |                                             ^^^^^^^^
+  |                                             Wrong number of parameters, expected: 2
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E086] Syntax Error: tests/neg/i23111.scala:3:45 --------------------------------------------------------------------
+3 |  def baz: (a: Int, b: Int) => this.type = x => ???   // error
+  |                                           ^^^^^^^^
+  |                                           Wrong number of parameters, expected: 2
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i23111.scala b/tests/neg/i23111.scala
new file mode 100644
index 000000000000..99dd3927e0ac
--- /dev/null
+++ b/tests/neg/i23111.scala
@@ -0,0 +1,3 @@
+trait A:
+  def bar: (a: Int, b: Int) => A.this.type = x => ??? // error
+  def baz: (a: Int, b: Int) => this.type = x => ???   // error

From 718f2deb47113529802553115780b54876cf3128 Mon Sep 17 00:00:00 2001
From: kijuky <40358+kijuky@users.noreply.github.com>
Date: Mon, 26 May 2025 00:18:13 +0900
Subject: [PATCH 430/505] fix: #23261 Distinguish 0.0 and -0.0 in ConstantType
 match types

- Ensure match types distinguish between 0.0 and -0.0 in pattern matching.
- This enables accurate reduction in match types involving Double constants.

Close #23261

[Cherry-picked 4ab5ca67639f2829e61a52802bdccf416e85e470]
---
 .../dotty/tools/dotc/core/TypeComparer.scala  |  2 +-
 tests/neg/i23261.scala                        |  7 +++
 tests/pos/i23261.scala                        | 46 +++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 tests/neg/i23261.scala
 create mode 100644 tests/pos/i23261.scala

diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
index 48274e0561ef..f9f8a4d6618f 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -390,7 +390,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
         compareErasedValueType
       case ConstantType(v2) =>
         tp1 match {
-          case ConstantType(v1) => v1.value == v2.value && recur(v1.tpe, v2.tpe)
+          case ConstantType(v1) => v1 == v2 && recur(v1.tpe, v2.tpe)
           case _ => secondTry
         }
       case tp2: AnyConstantType =>
diff --git a/tests/neg/i23261.scala b/tests/neg/i23261.scala
new file mode 100644
index 000000000000..7186ebd9e615
--- /dev/null
+++ b/tests/neg/i23261.scala
@@ -0,0 +1,7 @@
+@main def main(): Unit =
+  summon[0.0 =:= -0.0]   // error: Cannot prove that (0.0: Double) =:= (-0.0: Double).
+  val d: 0.0 = -0.0      // error: Cannot prove that (0.0: Double) =:= (-0.0: Double).
+  val d2: -0.0 = 0.0     // error: Cannot prove that (-0.0: Double) =:= (0.0: Double).
+  summon[0.0f =:= -0.0f] // error: Cannot prove that (0.0f: Float) =:= (-0.0f: Float).
+  val f: 0.0f = -0.0f    // error: Cannot prove that (0.0f: Float) =:= (-0.0f: Float).
+  val f2: -0.0f = 0.0f   // error: Cannot prove that (-0.0f: Float) =:= (0.0f: Float).
diff --git a/tests/pos/i23261.scala b/tests/pos/i23261.scala
new file mode 100644
index 000000000000..04b0e3a2f93c
--- /dev/null
+++ b/tests/pos/i23261.scala
@@ -0,0 +1,46 @@
+type DoubleToString[D <: Double] <: String = D match
+  case 0.0 => "0.0"
+  case -0.0 => "-0.0"
+  case _ => "_"
+
+type DoubleToString2[D <: Double] <: String = D match
+  case 0.0 => "0.0"
+  case _ => "_"
+
+type DoubleToString3[D <: Double] <: String = D match
+  case -0.0 => "-0.0"
+  case _ => "_"
+
+type FloatToString[F <: Float] <: String = F match
+  case 0.0f => "0.0f"
+  case -0.0f => "-0.0f"
+  case _ => "_"
+
+type FloatToString2[F <: Float] <: String = F match
+  case 0.0f => "0.0f"
+  case _ => "_"
+
+type FloatToString3[F <: Float] <: String = F match
+  case -0.0f => "-0.0f"
+  case _ => "_"
+
+@main def main(): Unit = {
+  summon[0.0 =:= 0.0]
+  summon[-0.0 =:= -0.0]
+  summon[DoubleToString[0.0] =:= "0.0"]
+  summon[DoubleToString[-0.0] =:= "-0.0"]
+  summon[DoubleToString[3.14] =:= "_"]
+  summon[DoubleToString2[0.0] =:= "0.0"]
+  summon[DoubleToString2[-0.0] =:= "_"]
+  summon[DoubleToString3[-0.0] =:= "-0.0"]
+  summon[DoubleToString3[0.0] =:= "_"]
+  summon[0.0f =:= 0.0f]
+  summon[-0.0f =:= -0.0f]
+  summon[FloatToString[0.0f] =:= "0.0f"]
+  summon[FloatToString[-0.0f] =:= "-0.0f"]
+  summon[FloatToString[3.14f] =:= "_"]
+  summon[FloatToString2[0.0f] =:= "0.0f"]
+  summon[FloatToString2[-0.0f] =:= "_"]
+  summon[FloatToString3[-0.0f] =:= "-0.0f"]
+  summon[FloatToString3[0.0f] =:= "_"]
+}

From 7424073819e1c91f839a0dfdfa77092feb9c0bcf Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Sun, 13 Jul 2025 13:55:35 +0200
Subject: [PATCH 431/505] Support cleanup actions in class completers

Needed to break the loop between completion of class and companion object.
If we try to complete the class first, and completion needs the companion
object (for instance for processing an import) then the companion object
completion would consult the companion class info for constructor that
need a constructor proxy in the object. This can lead to a cyclic reference.

We now break the cycle by delaying adding constructor proxies in this case
to be the last completion action of the companion class.
---
 .../src/dotty/tools/dotc/core/NamerOps.scala  | 27 ++++++++++++++++++-
 .../tools/dotc/core/tasty/TreeUnpickler.scala |  5 +++-
 .../src/dotty/tools/dotc/typer/Namer.scala    |  4 ++-
 tests/pos/i22436/atest.scala                  |  3 +++
 tests/pos/i22436/defs.scala                   |  7 +++++
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 tests/pos/i22436/atest.scala
 create mode 100644 tests/pos/i22436/defs.scala

diff --git a/compiler/src/dotty/tools/dotc/core/NamerOps.scala b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
index 82ebb03b9662..91a5dfde1c47 100644
--- a/compiler/src/dotty/tools/dotc/core/NamerOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
@@ -9,6 +9,25 @@ import TypeApplications.EtaExpansion
 /** Operations that are shared between Namer and TreeUnpickler */
 object NamerOps:
 
+  /** A completer supporting cleanup actions.
+   *  Needed to break the loop between completion of class and companion object.
+   *  If we try to complete the class first, and completion needs the companion
+   *  object (for instance for processing an import) then the companion object
+   *  completion would consult the companion class info for constructor that
+   *  need a constructor proxy in the object. This can lead to a cyclic reference.
+   *  We break the cycle by delaying adding constructor proxies to be a cleanuo
+   *  action instead.
+   */
+  trait CompleterWithCleanup extends LazyType:
+    private var cleanupActions: List[() => Unit] = Nil
+    def addCleanupAction(op: () => Unit): Unit =
+      cleanupActions = op :: cleanupActions
+    def cleanup(): Unit =
+      if cleanupActions.nonEmpty then
+        cleanupActions.reverse.foreach(_())
+        cleanupActions = Nil
+  end CompleterWithCleanup
+
   /** The type of the constructed instance is returned
    *
    *  @param ctor the constructor
@@ -118,8 +137,14 @@ object NamerOps:
         ApplyProxyCompleter(constr),
         cls.privateWithin,
         constr.coord)
-    for dcl <- cls.info.decls do
+    def doAdd() = for dcl <- cls.info.decls do
       if dcl.isConstructor then scope.enter(proxy(dcl))
+    cls.infoOrCompleter match
+      case completer: CompleterWithCleanup if cls.is(Touched) =>
+        // Taking the info would lead to a cyclic reference here - delay instead until cleanup of `cls`
+        completer.addCleanupAction(doAdd)
+      case _ =>
+        doAdd()
     scope
   end addConstructorApplies
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
index 6cc1d3c33c17..4edbb278504e 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -127,7 +127,8 @@ class TreeUnpickler(reader: TastyReader,
     }
   }
 
-  class Completer(reader: TastyReader)(using @constructorOnly _ctx: Context) extends LazyType {
+  class Completer(reader: TastyReader)(using @constructorOnly _ctx: Context)
+  extends LazyType, CompleterWithCleanup {
     import reader.*
     val owner = ctx.owner
     val mode = ctx.mode
@@ -147,6 +148,8 @@ class TreeUnpickler(reader: TastyReader,
             case ex: CyclicReference => throw ex
             case ex: AssertionError => fail(ex)
             case ex: Exception => fail(ex)
+          finally
+            cleanup()
   }
 
   class TreeReader(val reader: TastyReader) {
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index 75f738abd00e..2269a07ec77c 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1089,7 +1089,8 @@ class Namer { typer: Typer =>
     end typeSig
   }
 
-  class ClassCompleter(cls: ClassSymbol, original: TypeDef)(ictx: Context) extends Completer(original)(ictx) {
+  class ClassCompleter(cls: ClassSymbol, original: TypeDef)(ictx: Context)
+  extends Completer(original)(ictx), CompleterWithCleanup {
     withDecls(newScope(using ictx))
 
     protected implicit val completerCtx: Context = localContext(cls)
@@ -1691,6 +1692,7 @@ class Namer { typer: Typer =>
       processExports(using localCtx)
       defn.patchStdLibClass(cls)
       addConstructorProxies(cls)
+      cleanup()
     }
   }
 
diff --git a/tests/pos/i22436/atest.scala b/tests/pos/i22436/atest.scala
new file mode 100644
index 000000000000..7f77a5562385
--- /dev/null
+++ b/tests/pos/i22436/atest.scala
@@ -0,0 +1,3 @@
+object Case1 {
+  def myProps(transport: ProtocolTransport): Unit = ???
+}
diff --git a/tests/pos/i22436/defs.scala b/tests/pos/i22436/defs.scala
new file mode 100644
index 000000000000..c4bc3d74df25
--- /dev/null
+++ b/tests/pos/i22436/defs.scala
@@ -0,0 +1,7 @@
+object ProtocolTransport
+
+import ProtocolTransport.*
+
+@annotation.nowarn()
+class ProtocolTransport()
+

From d796579b620493be1a693e4808925a24a0f1f4fc Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 24 Jul 2025 14:46:18 +0200
Subject: [PATCH 432/505] Support cleanup actions in class completers

Needed to break the loop between completion of class and companion object.
If we try to complete the class first, and completion needs the companion
object (for instance for processing an import) then the companion object
completion would consult the companion class info for constructor that
need a constructor proxy in the object. This can lead to a cyclic reference.

We now break the cycle by delaying adding constructor proxies in this case
to be the last completion action of the companion class.

[Cherry-picked 9704b0ca6ed6a585f9011a2680b78256c39a47de][modified]

From 0906a0a8dd090619127e60a92448e30c986f22d4 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Fri, 11 Jul 2025 13:45:26 +0200
Subject: [PATCH 433/505] Guard against invalid prefixes in argForParam

Fixes #23504
---
 compiler/src/dotty/tools/dotc/core/Types.scala | 7 +++++--
 tests/neg/i23504.scala                         | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 tests/neg/i23504.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 2e0b227bba7c..c6ddb2a781ca 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -2682,8 +2682,11 @@ object Types extends TypeUtils {
           while (tparams.nonEmpty && args.nonEmpty) {
             if (tparams.head.eq(tparam))
               return args.head match {
-                case _: TypeBounds if !widenAbstract => TypeRef(pre, tparam)
-                case arg => arg.boxedUnlessFun(tycon)
+                case _: TypeBounds if !widenAbstract =>
+                  if !NamedType.validPrefix(pre) then
+                    throw TypeError(em"invalid prefix $pre cannot replace parameter $tparam in result of selection")
+                  TypeRef(pre, tparam)
+                case arg => arg
               }
             tparams = tparams.tail
             args = args.tail
diff --git a/tests/neg/i23504.scala b/tests/neg/i23504.scala
new file mode 100644
index 000000000000..9d79b074a4da
--- /dev/null
+++ b/tests/neg/i23504.scala
@@ -0,0 +1,2 @@
+def test =
+  Seq.empty[[T] =>> () => ?].head() // error
\ No newline at end of file

From 268526df859901977af7ea25926ded106bf17e0c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 24 Jul 2025 14:47:49 +0200
Subject: [PATCH 434/505] Guard against invalid prefixes in argForParam

Fixes #23504

[Cherry-picked 982f21a0cec8bce40ed4443ee4c8a98c6d258bec][modified]

From 0e57f90d7797fff022be22f1c95debaaa908233a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 24 Jul 2025 14:48:02 +0200
Subject: [PATCH 435/505] Add failing test to exclude list

We should come back to this and allow this test by catching the TypeError
and reporting it.

[Cherry-picked 40e076d228fb37c8d7fea23a7fb832e7586affc7][modified]

From 1a3d5ce5e32206b43fc5304b32b7be5eadee3de3 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Sat, 12 Jul 2025 13:05:54 +0200
Subject: [PATCH 436/505] More systematic handling of invalid prefixes

It looks like there are many situations where an illegal higher-kinded type in an argument for
a value type parameter causes illegal TermRefs and TypeRefs to be constructed, leading to an
assertion error. We now turn the assertion error into a specialized exception which eventually
leads to a TypeError being thrown.

The problem is we cannot detect illegal kinds in arguments early enough to prevent these
situations. We do detect them later, but the damage can already be done before that.

[Cherry-picked 4a959b1181f4a17d9722fbe0fda010da435e9cf4]
---
 compiler/src/dotty/tools/dotc/core/Types.scala   |  9 ++++-----
 compiler/src/dotty/tools/dotc/core/Uniques.scala | 15 +++++++++++++--
 tests/neg/i23504.scala                           |  3 ++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index c6ddb2a781ca..c4efb291da00 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -2261,7 +2261,7 @@ object Types extends TypeUtils {
     def _1: Type
     def _2: Designator
 
-    assert(NamedType.validPrefix(prefix), s"invalid prefix $prefix")
+    if !NamedType.validPrefix(prefix) then throw InvalidPrefix()
 
     private var myName: Name | Null = null
     private var lastDenotation: Denotation | Null = null
@@ -2682,10 +2682,7 @@ object Types extends TypeUtils {
           while (tparams.nonEmpty && args.nonEmpty) {
             if (tparams.head.eq(tparam))
               return args.head match {
-                case _: TypeBounds if !widenAbstract =>
-                  if !NamedType.validPrefix(pre) then
-                    throw TypeError(em"invalid prefix $pre cannot replace parameter $tparam in result of selection")
-                  TypeRef(pre, tparam)
+                case _: TypeBounds if !widenAbstract => TypeRef(pre, tparam)
                 case arg => arg
               }
             tparams = tparams.tail
@@ -3041,6 +3038,8 @@ object Types extends TypeUtils {
       apply(prefix, designatorFor(prefix, name, denot)).withDenot(denot)
   }
 
+  class InvalidPrefix extends Exception
+
   // --- Other SingletonTypes: ThisType/SuperType/ConstantType ---------------------------
 
   /** The type cls.this
diff --git a/compiler/src/dotty/tools/dotc/core/Uniques.scala b/compiler/src/dotty/tools/dotc/core/Uniques.scala
index da6b0aba88bd..b50905c22c98 100644
--- a/compiler/src/dotty/tools/dotc/core/Uniques.scala
+++ b/compiler/src/dotty/tools/dotc/core/Uniques.scala
@@ -3,6 +3,7 @@ package core
 
 import Types.*, Contexts.*, util.Stats.*, Hashable.*, Names.*
 import config.Config
+import Symbols.Symbol
 import Decorators.*
 import util.{WeakHashSet, Stats}
 import WeakHashSet.Entry
@@ -41,8 +42,10 @@ object Uniques:
       val h = doHash(null, designator, prefix)
       if monitored then recordCaching(h, classOf[NamedType])
       def newType =
-        if (isTerm) new CachedTermRef(prefix, designator, h)
-        else new CachedTypeRef(prefix, designator, h)
+        try
+          if isTerm then new CachedTermRef(prefix, designator, h)
+          else new CachedTypeRef(prefix, designator, h)
+        catch case ex: InvalidPrefix => badPrefix(prefix, designator)
       if h == NotCached then newType
       else
         // Inlined from WeakHashSet#put
@@ -61,6 +64,14 @@ object Uniques:
 
         linkedListLoop(oldHead)
       end if
+    end enterIfNew
+
+    private def badPrefix(prefix: Type, desig: Designator)(using Context): Nothing =
+      def name = desig match
+        case desig: Name => desig
+        case desig: Symbol => desig.name
+      throw TypeError(em"invalid prefix $prefix when trying to form $prefix . $name")
+
   end NamedTypeUniques
 
   final class AppliedUniques extends WeakHashSet[AppliedType](Config.initialUniquesCapacity * 2) with Hashable:
diff --git a/tests/neg/i23504.scala b/tests/neg/i23504.scala
index 9d79b074a4da..e53337eaa105 100644
--- a/tests/neg/i23504.scala
+++ b/tests/neg/i23504.scala
@@ -1,2 +1,3 @@
 def test =
-  Seq.empty[[T] =>> () => ?].head() // error
\ No newline at end of file
+  Seq.empty[[T] =>> () => ?].head() // error
+  Seq.empty[[T] =>> Int => Int].head(1) // error
\ No newline at end of file

From 4d235ad2bd2a2741290ba6aa57de17409ffd3383 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Mon, 14 Jul 2025 14:49:04 -0700
Subject: [PATCH 437/505] Check path of module prefix for tailrec (#23491)

Fixes #23444
[Cherry-picked 9396bbe267b844a8cf4262ad375e1e4e96d0cf38]
---
 .../dotty/tools/dotc/transform/TailRec.scala  |  5 ++++-
 tests/run/i23444.scala                        | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 tests/run/i23444.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
index e1bd3136f895..a9cfd40967e2 100644
--- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
@@ -344,7 +344,10 @@ class TailRec extends MiniPhase {
               case prefix: This if prefix.symbol == enclosingClass =>
                 // Avoid assigning `this = this`
                 assignParamPairs
-              case prefix if prefix.symbol.is(Module) && prefix.symbol.moduleClass == enclosingClass =>
+              case prefix
+              if prefix.symbol.is(Module)
+              && prefix.symbol.moduleClass == enclosingClass
+              && isPurePath(prefix) =>
                 // Avoid assigning `this = MyObject`
                 assignParamPairs
               case _ =>
diff --git a/tests/run/i23444.scala b/tests/run/i23444.scala
new file mode 100644
index 000000000000..ada7545e077f
--- /dev/null
+++ b/tests/run/i23444.scala
@@ -0,0 +1,22 @@
+
+import annotation.*
+
+class Path(action: () => Unit, parent: Option[Path]):
+  object O:
+    @tailrec
+    def apply(): Unit =
+      action()
+
+      parent match
+        case Some(p) =>
+          p.O.apply()
+        case None =>
+
+@main def Test: Unit =
+  var counter = 0
+  val fun = () => {
+    counter += 1
+    if counter > 2 then throw AssertionError("bad loop")
+  }
+  val path = Path(fun, Some(Path(fun, None)))
+  path.O()

From 61be637b255a2c9f4dcaf43282481110059449ab Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Mon, 14 Jul 2025 14:50:50 -0700
Subject: [PATCH 438/505] Use result of lambda type of implicit in CheckUnused
 (#23497)

Fixes #23494

When inspecting unused implicit parameters, the check skips parameters
which are "marker traits". It tests for any members of the type (or its
upper bound) which are not "universal members". This commit uses the
`resultType` to avoid an error
```
invalid new prefix
```
while computing members where the type is a `LambdaType`.

A future improvement would be not to request `allMembers`, since the
check only needs to find one that is not universal.

The necessitating change was
https://github.com/scala/scala3/commit/2e4bc0abb8a374d78fe1aac383f3208b5efb5eb1.
---
 .../dotty/tools/dotc/transform/CheckUnused.scala  |  2 +-
 tests/warn/i15503f.scala                          |  7 ++++++-
 tests/warn/i23494.scala                           | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/warn/i23494.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index e22b2442de48..43774a209ebb 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -964,7 +964,7 @@ object CheckUnused:
     def isCanEqual: Boolean =
       sym.isOneOf(GivenOrImplicit) && sym.info.finalResultType.baseClasses.exists(_.derivesFrom(defn.CanEqualClass))
     def isMarkerTrait: Boolean =
-      sym.info.hiBound.allMembers.forall: d =>
+      sym.info.hiBound.resultType.allMembers.forall: d =>
         val m = d.symbol
         !m.isTerm || m.isSelfSym || m.is(Method) && (m.owner == defn.AnyClass || m.owner == defn.ObjectClass)
     def isEffectivelyPrivate: Boolean =
diff --git a/tests/warn/i15503f.scala b/tests/warn/i15503f.scala
index 7c3483411f86..684bee3313e8 100644
--- a/tests/warn/i15503f.scala
+++ b/tests/warn/i15503f.scala
@@ -1,4 +1,4 @@
-//> using options  -Wunused:implicits
+//> using options -Wunused:implicits
 
 /* This goes around the "trivial method" detection */
 val default_int = 1
@@ -58,6 +58,8 @@ package givens:
   trait Y:
     def doY: String
 
+  trait Z
+
   given X with
     def doX = 7
 
@@ -75,6 +77,9 @@ package givens:
 
   given namely (using x: X): Y with // warn protected param to given class
     def doY = "8"
+
+  def f(using => X) = println() // warn
+  def g(using => Z) = println() // nowarn marker trait
 end givens
 
 object i22895:
diff --git a/tests/warn/i23494.scala b/tests/warn/i23494.scala
new file mode 100644
index 000000000000..c3c0c5a2e0bc
--- /dev/null
+++ b/tests/warn/i23494.scala
@@ -0,0 +1,15 @@
+//> using options -Wunused:implicits
+
+import scala.deriving.Mirror
+
+abstract class EnumerationValues[A]:
+  type Out
+
+object EnumerationValues:
+  type Aux[A, B] = EnumerationValues[A] { type Out = B }
+
+  def apply[A, B](): EnumerationValues.Aux[A, B] = new EnumerationValues[A]:
+    override type Out = B
+
+  given sum[A, B <: Tuple](using mirror: Mirror.SumOf[A] { type MirroredElemTypes = B }): EnumerationValues.Aux[A, A] =
+    EnumerationValues[A, A]()

From 40111e83fda66613705378e3740d306521d24a50 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 24 Jul 2025 14:49:10 +0200
Subject: [PATCH 439/505] Use result of lambda type of implicit in CheckUnused
 (#23497)

Fixes #23494

When inspecting unused implicit parameters, the check skips parameters
which are "marker traits". It tests for any members of the type (or its
upper bound) which are not "universal members". This commit uses the
`resultType` to avoid an error
```
invalid new prefix
```
while computing members where the type is a `LambdaType`.

A future improvement would be not to request `allMembers`, since the
check only needs to find one that is not universal.

The necessitating change was
https://github.com/scala/scala3/commit/2e4bc0abb8a374d78fe1aac383f3208b5efb5eb1.
[Cherry-picked a5e15ab7d7b271272c9e1ac1d2837425ec592214][modified]

From b5a2d3a13b02a864ac9816154b92b70cd173ff5b Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Fri, 9 May 2025 01:09:11 +0200
Subject: [PATCH 440/505] Wrap type of accessors pointing to a module class
 into a TermRef

[Cherry-picked 2c896f121ba2e2abb3be8db39ada404c89ae3151]
---
 .../tools/dotc/transform/AccessProxies.scala     |  7 ++++++-
 tests/pos/i22593.scala                           | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos/i22593.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala
index 237db90b315f..ee4055bdafb1 100644
--- a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala
+++ b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala
@@ -136,8 +136,13 @@ abstract class AccessProxies {
         if accessorClass.is(Package) then
           accessorClass = ctx.owner.topLevelClass
         val accessorName = accessorNameOf(accessed.name, accessorClass)
+        val mappedInfo = accessed.info match
+          // TypeRef pointing to module class seems to not be stable, so we remap that to a TermRef
+          // see test i22593.scala (and issue #i22593)
+          case tref @ TypeRef(prefix, _) if tref.symbol.is(Module) => TermRef(prefix, tref.symbol.companionModule)
+          case other => other
         val accessorInfo =
-          accessed.info.ensureMethodic.asSeenFrom(accessorClass.thisType, accessed.owner)
+          mappedInfo.ensureMethodic.asSeenFrom(accessorClass.thisType, accessed.owner)
         val accessor = accessorSymbol(accessorClass, accessorName, accessorInfo, accessed)
         rewire(reference, accessor)
       }
diff --git a/tests/pos/i22593.scala b/tests/pos/i22593.scala
new file mode 100644
index 000000000000..a1cf650193c0
--- /dev/null
+++ b/tests/pos/i22593.scala
@@ -0,0 +1,16 @@
+import scala.quoted.*
+
+package jam {
+  trait JamCoreDsl {
+    implicit inline def defaultJamConfig: this.JamConfig =
+      new JamConfig(brewRecRegex = ".*")
+    class JamConfig(val brewRecRegex: String)
+    inline def brew(implicit inline config: JamConfig): Unit = ???
+  }
+  private object internal extends JamCoreDsl
+  export internal._
+}
+
+object test {
+  jam.brew
+}

From 7215d64a9fd568cf9a7dccadf7d9a2ded84967f3 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 7 Jul 2025 13:51:14 +0200
Subject: [PATCH 441/505] Add a test that is still broken after #23438

[Cherry-picked f7918377152bf65d84cfcb5899fab25403070130]
---
 tests/pos/{i22593.scala => i22593a.scala} |  0
 tests/pos/i22593b/Main.scala              | 27 +++++++++++++++++++++++
 tests/pos/i22593b/Test.scala              |  3 +++
 3 files changed, 30 insertions(+)
 rename tests/pos/{i22593.scala => i22593a.scala} (100%)
 create mode 100644 tests/pos/i22593b/Main.scala
 create mode 100644 tests/pos/i22593b/Test.scala

diff --git a/tests/pos/i22593.scala b/tests/pos/i22593a.scala
similarity index 100%
rename from tests/pos/i22593.scala
rename to tests/pos/i22593a.scala
diff --git a/tests/pos/i22593b/Main.scala b/tests/pos/i22593b/Main.scala
new file mode 100644
index 000000000000..dcc28e6a767c
--- /dev/null
+++ b/tests/pos/i22593b/Main.scala
@@ -0,0 +1,27 @@
+import scala.quoted.*
+
+package jam {
+    trait JamCoreDsl {
+        implicit inline def defaultJamConfig: this.JamConfig =
+            new JamConfig(brewRecRegex = ".*")
+        class JamConfig(val brewRecRegex: String)
+        inline def brew(implicit inline config: JamConfig): Unit = ${ brewImpl() }
+    }
+    private object internal extends JamCoreDsl
+    export internal._
+
+    def brewImpl(using q: Quotes)(): Expr[Unit] = {
+        findSelf
+        '{()}
+    }
+
+    private def findSelf(using q: Quotes): Unit = {
+        import q.reflect.*
+        def rec(s: Symbol): Option[Symbol] = s.maybeOwner match {
+            case o if o.isNoSymbol => None
+            case o if o.isClassDef => Option(o)
+            case o => rec(o)
+        }
+        rec(Symbol.spliceOwner)
+    }
+}
\ No newline at end of file
diff --git a/tests/pos/i22593b/Test.scala b/tests/pos/i22593b/Test.scala
new file mode 100644
index 000000000000..73c2f9ad7cb3
--- /dev/null
+++ b/tests/pos/i22593b/Test.scala
@@ -0,0 +1,3 @@
+object CoreSpec  {
+  jam.brew
+}
\ No newline at end of file

From 3b54482383450a6fdebc726ce723cfee854be844 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 24 Jul 2025 14:50:45 +0200
Subject: [PATCH 442/505] chore: Revert bad merge change

---
 compiler/src/dotty/tools/dotc/core/Types.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index c4efb291da00..4ed809e74778 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -2683,7 +2683,7 @@ object Types extends TypeUtils {
             if (tparams.head.eq(tparam))
               return args.head match {
                 case _: TypeBounds if !widenAbstract => TypeRef(pre, tparam)
-                case arg => arg
+                case arg => arg.boxedUnlessFun(tycon)
               }
             tparams = tparams.tail
             args = args.tail

From 445bafffe92f76cde9bcab4f1b148e6fe91678a7 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Tue, 15 Jul 2025 17:44:03 +0200
Subject: [PATCH 443/505] Don't use FullyDefinedType when synthesizing
 ClassTags

It's not necessary to instantiate all type variables, deeply, since
we are only interested in the outermost shape. Also, that way we do
not instantiate to Nothing, which is something difficult to recover from.

[Cherry-picked e6bf7b82b6377943ec1098393a3e49a83eca7ecb]
---
 compiler/src/dotty/tools/dotc/typer/Inferencing.scala |  4 +++-
 compiler/src/dotty/tools/dotc/typer/Synthesizer.scala | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
index ffef8e0638cd..2da75a0748b5 100644
--- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
@@ -377,7 +377,9 @@ object Inferencing {
   }
 
   /** The instantiation decision for given poly param computed from the constraint. */
-  enum Decision { case Min; case Max; case ToMax; case Skip; case Fail }
+  enum Decision:
+    case Min, Max, ToMax, Skip, Fail
+
   private def instDecision(tvar: TypeVar, v: Int, minimizeSelected: Boolean, ifBottom: IfBottom)(using Context): Decision =
     import Decision.*
     val direction = instDirection(tvar.origin)
diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
index 6a8acc01f257..633b62070645 100644
--- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
@@ -27,7 +27,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
   private type SpecialHandlers = List[(ClassSymbol, SpecialHandler)]
 
   val synthesizedClassTag: SpecialHandler = (formal, span) =>
-    def instArg(tp: Type): Type = tp.stripTypeVar match
+    def instArg(tp: Type): Type = tp.dealias match
       // Special case to avoid instantiating `Int & S` to `Int & Nothing` in
       // i16328.scala. The intersection comes from an earlier instantiation
       // to an upper bound.
@@ -35,9 +35,13 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
       // bounds are usually widened during instantiation.
       case tp: AndOrType if tp.tp1 =:= tp.tp2 =>
         instArg(tp.tp1)
+      case tvar: TypeVar if ctx.typerState.constraint.contains(tvar) =>
+        instArg(
+            if tvar.hasLowerBound then tvar.instantiate(fromBelow = true)
+            else if tvar.hasUpperBound then tvar.instantiate(fromBelow = false)
+            else NoType)
       case _ =>
-        if isFullyDefined(tp, ForceDegree.all) then tp
-        else NoType // this happens in tests/neg/i15372.scala
+        tp
 
     val tag = formal.argInfos match
       case arg :: Nil =>

From a1813d117632f1850f3a180c10f7170ce3081206 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Tue, 15 Jul 2025 19:24:08 +0200
Subject: [PATCH 444/505] Constrain by deepening results in more implicit
 searches

We used to look at deep expected type when the result of an implicit was ambiguous.
This could add more constraints which could resolve the ambiguity.

We now do the same also if the search type has uninstantiated type variables. In that
case, consulting more context might further constrain type variables, which might in
turn enlarge the implicit scope so that a solution can be found.

Fixes #23526

[Cherry-picked 45f7ef6e5d1f9a3b45b77b933470de43760b0c72]
---
 .../dotty/tools/dotc/typer/Synthesizer.scala    | 10 +++++-----
 compiler/src/dotty/tools/dotc/typer/Typer.scala | 17 ++++++++++++++---
 tests/neg/i9568.check                           |  7 ++-----
 tests/pos/i23526.scala                          | 14 ++++++++++++++
 4 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 tests/pos/i23526.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
index 633b62070645..43035c0fd3dc 100644
--- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
@@ -28,12 +28,12 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
 
   val synthesizedClassTag: SpecialHandler = (formal, span) =>
     def instArg(tp: Type): Type = tp.dealias match
-      // Special case to avoid instantiating `Int & S` to `Int & Nothing` in
-      // i16328.scala. The intersection comes from an earlier instantiation
-      // to an upper bound.
-      // The dual situation with unions is harder to trigger because lower
-      // bounds are usually widened during instantiation.
       case tp: AndOrType if tp.tp1 =:= tp.tp2 =>
+        // Special case to avoid instantiating `Int & S` to `Int & Nothing` in
+        // i16328.scala. The intersection comes from an earlier instantiation
+        // to an upper bound.
+        // The dual situation with unions is harder to trigger because lower
+        // bounds are usually widened during instantiation.
         instArg(tp.tp1)
       case tvar: TypeVar if ctx.typerState.constraint.contains(tvar) =>
         instArg(
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index 65049c698738..c574b9ff7889 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3850,12 +3850,23 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
               implicitArgs(formals2, argIndex + 1, pt)
 
             val arg = inferImplicitArg(formal, tree.span.endPos)
+
+            def canProfitFromMoreConstraints =
+              arg.tpe.isInstanceOf[AmbiguousImplicits]
+                    // ambiguity could be decided by more constraints
+              || !isFullyDefined(formal, ForceDegree.none)
+                    // more context might constrain type variables which could make implicit scope larger
+
             arg.tpe match
-              case failed: AmbiguousImplicits =>
+              case failed: SearchFailureType if canProfitFromMoreConstraints =>
                 val pt1 = pt.deepenProtoTrans
                 if (pt1 `ne` pt) && (pt1 ne sharpenedPt) && constrainResult(tree.symbol, wtp, pt1)
-                then implicitArgs(formals, argIndex, pt1)
-                else arg :: implicitArgs(formals1, argIndex + 1, pt1)
+                then return implicitArgs(formals, argIndex, pt1)
+              case _ =>
+
+            arg.tpe match
+              case failed: AmbiguousImplicits =>
+                arg :: implicitArgs(formals1, argIndex + 1, pt)
               case failed: SearchFailureType =>
                 lazy val defaultArg =
                   def appPart(t: Tree): Tree = t match
diff --git a/tests/neg/i9568.check b/tests/neg/i9568.check
index 3f318d0b0111..744023714a69 100644
--- a/tests/neg/i9568.check
+++ b/tests/neg/i9568.check
@@ -4,13 +4,10 @@
    |          No given instance of type => Monad[F] was found for parameter ev of method blaMonad in object Test.
    |          I found:
    |
-   |              Test.blaMonad[F², S](Test.blaMonad[F³, S²])
+   |              Test.blaMonad[F², S]
    |
-   |          But method blaMonad in object Test does not match type => Monad[F²]
+   |          But method blaMonad in object Test does not match type => Monad[F]
    |
    |          where:    F  is a type variable with constraint <: [_] =>> Any
    |                    F² is a type variable with constraint <: [_] =>> Any
-   |                    F³ is a type variable with constraint <: [_] =>> Any
-   |                    S  is a type variable
-   |                    S² is a type variable
    |          .
diff --git a/tests/pos/i23526.scala b/tests/pos/i23526.scala
new file mode 100644
index 000000000000..e530608435c7
--- /dev/null
+++ b/tests/pos/i23526.scala
@@ -0,0 +1,14 @@
+trait B[-A, +To] {
+  def addOne(e: A): this.type = this
+  def res(): To
+}
+
+class Col[A]
+
+object Factory {
+  def newB[A](using reflect.ClassTag[A]) = new B[A, Col[A]] { def res(): Col[A] = new Col[A] }
+}
+
+def test =
+  val a = Factory.newB.addOne(1).res()
+  val b = collection.immutable.ArraySeq.newBuilder.addOne(1).result()

From 74a3b337cc42156104640050ea6795e6bb5f3137 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Mon, 21 Jul 2025 05:17:44 -0700
Subject: [PATCH 445/505] Improve use of boolean defaults (#23564)

A couple of cases where recursing with default booleans was especially
confusing.

Spellcheck would like to change booleans to beanpoles.

I know the project hates so-called style PRs.

But if I see something morally wrong, I cannot but act upon it.

I must confirm that inlined helper such as `jsig1` allows `tailrec`.
Maybe it's enough to annotate jsig? Edit: I see goto 0 only. With
tailrec, it complains about the RHS of the helper `inline def jsig1`,
which is spurious.
---
 .../dotc/transform/GenericSignatures.scala    | 29 ++++++++++---------
 .../tools/dotc/transform/patmat/Space.scala   |  4 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
index e60561fb04e2..493302961461 100644
--- a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
+++ b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
@@ -233,6 +233,7 @@ object GenericSignatures {
 
     @noinline
     def jsig(tp0: Type, toplevel: Boolean = false, unboxedVCs: Boolean = true): Unit = {
+      inline def jsig1(tp0: Type): Unit = jsig(tp0, toplevel = false, unboxedVCs = true)
 
       val tp = tp0.dealias
       tp match {
@@ -241,41 +242,41 @@ object GenericSignatures {
           val erasedUnderlying = fullErasure(ref.underlying.bounds.hi)
           // don't emit type param name if the param is upper-bounded by a primitive type (including via a value class)
           if erasedUnderlying.isPrimitiveValueType then
-            jsig(erasedUnderlying, toplevel, unboxedVCs)
+            jsig(erasedUnderlying, toplevel = toplevel, unboxedVCs = unboxedVCs)
           else typeParamSig(ref.paramName.lastPart)
 
         case defn.ArrayOf(elemtp) =>
           if (isGenericArrayElement(elemtp, isScala2 = false))
-            jsig(defn.ObjectType)
+            jsig1(defn.ObjectType)
           else
             builder.append(ClassfileConstants.ARRAY_TAG)
             elemtp match
-              case TypeBounds(lo, hi) => jsig(hi.widenDealias)
-              case _ => jsig(elemtp)
+              case TypeBounds(lo, hi) => jsig1(hi.widenDealias)
+              case _ => jsig1(elemtp)
 
         case RefOrAppliedType(sym, pre, args) =>
           if (sym == defn.PairClass && tupleArity(tp) > Definitions.MaxTupleArity)
-            jsig(defn.TupleXXLClass.typeRef)
+            jsig1(defn.TupleXXLClass.typeRef)
           else if (isTypeParameterInSig(sym, sym0)) {
             assert(!sym.isAliasType, "Unexpected alias type: " + sym)
             typeParamSig(sym.name.lastPart)
           }
           else if (defn.specialErasure.contains(sym))
-            jsig(defn.specialErasure(sym).nn.typeRef)
+            jsig1(defn.specialErasure(sym).nn.typeRef)
           else if (sym == defn.UnitClass || sym == defn.BoxedUnitModule)
-            jsig(defn.BoxedUnitClass.typeRef)
+            jsig1(defn.BoxedUnitClass.typeRef)
           else if (sym == defn.NothingClass)
             builder.append("Lscala/runtime/Nothing$;")
           else if (sym == defn.NullClass)
             builder.append("Lscala/runtime/Null$;")
           else if (sym.isPrimitiveValueClass)
-            if (!unboxedVCs) jsig(defn.ObjectType)
-            else if (sym == defn.UnitClass) jsig(defn.BoxedUnitClass.typeRef)
+            if (!unboxedVCs) jsig1(defn.ObjectType)
+            else if (sym == defn.UnitClass) jsig1(defn.BoxedUnitClass.typeRef)
             else builder.append(defn.typeTag(sym.info))
           else if (sym.isDerivedValueClass) {
             if (unboxedVCs) {
               val erasedUnderlying = fullErasure(tp)
-              jsig(erasedUnderlying, toplevel)
+              jsig(erasedUnderlying, toplevel = toplevel, unboxedVCs = true)
             } else classSig(sym, pre, args)
           }
           else if (defn.isSyntheticFunctionClass(sym)) {
@@ -285,14 +286,14 @@ object GenericSignatures {
           else if sym.isClass then
             classSig(sym, pre, args)
           else
-            jsig(erasure(tp), toplevel, unboxedVCs)
+            jsig(erasure(tp), toplevel = toplevel, unboxedVCs = unboxedVCs)
 
         case ExprType(restpe) if toplevel =>
           builder.append("()")
           methodResultSig(restpe)
 
         case ExprType(restpe) =>
-          jsig(defn.FunctionType(0).appliedTo(restpe))
+          jsig1(defn.FunctionType(0).appliedTo(restpe))
 
         case PolyType(tparams, mtpe: MethodType) =>
           assert(tparams.nonEmpty)
@@ -320,7 +321,7 @@ object GenericSignatures {
           builder.append('(')
           // TODO: Update once we support varargs
           params.foreach { tp =>
-            jsig(tp)
+            jsig1(tp)
           }
           builder.append(')')
           methodResultSig(restpe)
@@ -338,7 +339,7 @@ object GenericSignatures {
           val (reprParents, _) = splitIntersection(parents)
           val repr =
             reprParents.find(_.typeSymbol.is(TypeParam)).getOrElse(reprParents.head)
-          jsig(repr, unboxedVCs = unboxedVCs)
+          jsig(repr, toplevel = false, unboxedVCs = unboxedVCs)
 
         case ci: ClassInfo =>
           val tParams = tp.typeParams
diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index 20b6a2e5b272..bc7f8631492b 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -460,8 +460,8 @@ object SpaceEngine {
         val inArray = tycon.isRef(defn.ArrayClass) || tp.translucentSuperType.isRef(defn.ArrayClass)
         val args2 =
           if isTyped && !inArray then args.map(_ => WildcardType)
-          else args.map(arg => erase(arg, inArray = inArray, isValue = false))
-        tp.derivedAppliedType(erase(tycon, inArray, isValue = false), args2)
+          else args.map(arg => erase(arg, inArray = inArray, isValue = false, isTyped = false))
+        tp.derivedAppliedType(erase(tycon, inArray = inArray, isValue = false, isTyped = false), args2)
 
       case tp @ OrType(tp1, tp2) =>
         OrType(erase(tp1, inArray, isValue), erase(tp2, inArray, isValue), tp.isSoft)

From 9fdf42edd8addf09eaf7d5cf53d451dcf00ba032 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Jul 2025 16:49:05 +0200
Subject: [PATCH 446/505] Improve use of boolean defaults (#23564)

A couple of cases where recursing with default booleans was especially
confusing.

Spellcheck would like to change booleans to beanpoles.

I know the project hates so-called style PRs.

But if I see something morally wrong, I cannot but act upon it.

I must confirm that inlined helper such as `jsig1` allows `tailrec`.
Maybe it's enough to annotate jsig? Edit: I see goto 0 only. With
tailrec, it complains about the RHS of the helper `inline def jsig1`,
which is spurious.
[Cherry-picked 3770ee888ff07a725fd356bfd8c23ea33cb93eb0][modified]

From 2bbd278f54dfc7ee236babcad57533ab735627de Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Mon, 21 Jul 2025 08:01:39 -0700
Subject: [PATCH 447/505] Consider setter of effectively private var (#23211)

Anonymous classes get a setter for a var member:
as usual, don't warn about the setter but only about the var getter.

Additionally, check whether the setter is referenced before claiming
that the var is unset.

Fixes #23200
---
 .../tools/dotc/transform/CheckUnused.scala    | 15 +++++--
 tests/warn/i23200.check                       |  8 ++++
 tests/warn/i23200.scala                       | 41 +++++++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 tests/warn/i23200.check
 create mode 100644 tests/warn/i23200.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
index 43774a209ebb..efc5e829a6c3 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
@@ -7,7 +7,7 @@ import dotty.tools.dotc.config.ScalaSettings
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.{Name, SimpleName, DerivedName, TermName, termName}
-import dotty.tools.dotc.core.NameOps.{isAnonymousFunctionName, isReplWrapperName, isContextFunction}
+import dotty.tools.dotc.core.NameOps.{isAnonymousFunctionName, isReplWrapperName, isContextFunction, setterName}
 import dotty.tools.dotc.core.NameKinds.{
   BodyRetainerName, ContextBoundParamName, ContextFunctionParamName, DefaultGetterName, WildcardParamName}
 import dotty.tools.dotc.core.StdNames.nme
@@ -543,7 +543,13 @@ object CheckUnused:
       if sym.isLocalToBlock then
         if ctx.settings.WunusedHas.locals && sym.is(Mutable) && !infos.asss(sym) then
           warnAt(pos)(UnusedSymbol.unsetLocals)
-      else if ctx.settings.WunusedHas.privates && sym.isAllOf(Private | Mutable) && !infos.asss(sym) then
+      else if ctx.settings.WunusedHas.privates
+        && sym.is(Mutable)
+        && (sym.is(Private) || sym.isEffectivelyPrivate)
+        && !sym.isSetter // tracks sym.underlyingSymbol sibling getter, check setter below
+        && !infos.asss(sym)
+        && !infos.refs(sym.owner.info.member(sym.name.asTermName.setterName).symbol)
+      then
         warnAt(pos)(UnusedSymbol.unsetPrivates)
 
     def checkPrivate(sym: Symbol, pos: SrcPos) =
@@ -552,7 +558,10 @@ object CheckUnused:
         && !sym.isOneOf(SelfName | Synthetic | CaseAccessor)
         && !sym.name.is(BodyRetainerName)
         && !sym.isSerializationSupport
-        && !(sym.is(Mutable) && sym.isSetter && sym.owner.is(Trait)) // tracks sym.underlyingSymbol sibling getter
+        && !( sym.is(Mutable)
+           && sym.isSetter // tracks sym.underlyingSymbol sibling getter
+           && (sym.owner.is(Trait) || sym.owner.isAnonymousClass)
+        )
         && !infos.nowarn(sym)
       then
         warnAt(pos)(UnusedSymbol.privateMembers)
diff --git a/tests/warn/i23200.check b/tests/warn/i23200.check
new file mode 100644
index 000000000000..75d663f0f338
--- /dev/null
+++ b/tests/warn/i23200.check
@@ -0,0 +1,8 @@
+-- [E198] Unused Symbol Warning: tests/warn/i23200.scala:8:8 -----------------------------------------------------------
+8 |    var x: Int = 42 // warn
+  |        ^
+  |        unset private variable, consider using an immutable val instead
+-- [E198] Unused Symbol Warning: tests/warn/i23200.scala:40:6 ----------------------------------------------------------
+40 |  var x: Int = 42 // warn local var
+   |      ^
+   |      unset local variable, consider using an immutable val instead
diff --git a/tests/warn/i23200.scala b/tests/warn/i23200.scala
new file mode 100644
index 000000000000..613e8df32262
--- /dev/null
+++ b/tests/warn/i23200.scala
@@ -0,0 +1,41 @@
+//> using options -Wunused:all
+
+trait Foo
+trait Bar
+
+def `anon not updated` =
+  new Foo {
+    var x: Int = 42 // warn
+    val _ = new Bar:
+      println(x)
+    //x = 27
+    //x_=(27)
+  }
+def `anon yes updated` =
+  new Foo {
+    var x: Int = 42 // nowarn
+    val _ = new Bar:
+      println(x)
+    x = 27
+    //x_=(27)
+  }
+def `anon yes updated from nested context` =
+  new Foo {
+    var x: Int = 42 // nowarn
+    val _ = new Bar:
+      println(x)
+      x = 27
+    //x_=(27)
+  }
+def `anon yes updated in daring use of setter` =
+  new Foo {
+    var x: Int = 42 // nowarn
+    val _ = new Bar:
+      println(x)
+    //x = 27
+    x_=(27)
+  }
+
+def f: Unit =
+  var x: Int = 42 // warn local var
+  println(x)

From 705b7aa2a89660354a979b6c610a1ecb84d47e02 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Jul 2025 16:49:57 +0200
Subject: [PATCH 448/505] Consider setter of effectively private var (#23211)

Anonymous classes get a setter for a var member:
as usual, don't warn about the setter but only about the var getter.

Additionally, check whether the setter is referenced before claiming
that the var is unset.

Fixes #23200
[Cherry-picked 48e173acade41a5fcf2d7b25bae1a93f8dc38693][modified]

From 493f654983a1b9e0aa2ac7308d7a5a80b86b2da3 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 15 Jul 2025 16:24:19 +0200
Subject: [PATCH 449/505] Don't approximate a type using `Nothing` as prefix

Approximate range(Nothing, hi) to Nothing & hi instead of Nothing. This avoids
creating TypeRefs with a Nothing prefix which manifest themselves down the line
with an error like:

    Cannot resolve reference to type path.type.AbsMember.
    The classfile defining the type might be missing from the classpath.
         val z1 = transition(di).ext(1) // error
                            ^
Due to a MissingType thrown from TypeErasure#sigName.

This change required tweaking Type#findMember to handle WildcardTypes instead of
returning NoDenotation. This was only required for two
tests (tests/pos/i7414.scala and tests/pos/i13842.scala) where `wildApprox` ends
up creating a TermRef whose underlying type is a WildcardType, because of a type
parameter being substituted by a wildcard, which seems legitimate when we're using
`wildApprox`.

The presentation compiler also had a special case for Nothing appearing in
completion which had to be adapted.

Fixes #23530

[Cherry-picked 9f4179a6d261784502deca5febff89548f612f56]
---
 .../src/dotty/tools/dotc/core/Types.scala     | 23 ++++++++++++++++---
 .../pc/printer/ShortenedTypePrinter.scala     |  8 +++----
 tests/pos/i23530.scala                        | 18 +++++++++++++++
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 tests/pos/i23530.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 4ed809e74778..2406c0105aed 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -792,6 +792,8 @@ object Types extends TypeUtils {
           goOr(tp)
         case tp: JavaArrayType =>
           defn.ObjectType.findMember(name, pre, required, excluded)
+        case tp: WildcardType =>
+          go(tp.bounds)
         case err: ErrorType =>
           newErrorSymbol(pre.classSymbol.orElse(defn.RootClass), name, err.msg)
         case _ =>
@@ -6052,9 +6054,24 @@ object Types extends TypeUtils {
   abstract class ApproximatingTypeMap(using Context) extends TypeMap { thisMap =>
 
     protected def range(lo: Type, hi: Type): Type =
-      if (variance > 0) hi
-      else if (variance < 0) lo
-      else if (lo `eq` hi) lo
+      if variance > 0 then hi
+      else if variance < 0 then
+        if (lo eq defn.NothingType) && hi.hasSimpleKind then
+          // Approximate by Nothing & hi instead of just Nothing, in case the
+          // approximated type is used as the prefix of another type (this would
+          // lead to a type with a `NoDenotation` denot and a possible
+          // MissingType in `TypeErasure#sigName`).
+          //
+          // Note that we cannot simply check for a `Nothing` prefix in
+          // `derivedSelect`, because the substitution might be done lazily (for
+          // example if Nothing is the type of a parameter being depended on in
+          // a MethodType)
+          //
+          // Test case in tests/pos/i23530.scala
+          AndType(lo, hi)
+        else
+          lo
+      else if lo `eq` hi then lo
       else Range(lower(lo), upper(hi))
 
     protected def emptyRange = range(defn.NothingType, defn.AnyType)
diff --git a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
index 3d8882f5eb19..94146acd05f9 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
@@ -17,8 +17,7 @@ import dotty.tools.dotc.core.Names
 import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.Names.NameOrdering
 import dotty.tools.dotc.core.StdNames
-import dotty.tools.dotc.core.Symbols.NoSymbol
-import dotty.tools.dotc.core.Symbols.Symbol
+import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.core.Types.Type
 import dotty.tools.dotc.printing.RefinedPrinter
@@ -254,7 +253,6 @@ class ShortenedTypePrinter(
   end hoverSymbol
 
   def isImportedByDefault(sym: Symbol): Boolean =
-    import dotty.tools.dotc.core.Symbols.defn
     lazy val effectiveOwner = sym.effectiveOwner
     sym.isType && (effectiveOwner == defn.ScalaPackageClass || effectiveOwner == defn.ScalaPredefModuleClass)
 
@@ -496,9 +494,9 @@ class ShortenedTypePrinter(
     val info = nameToInfo
       .get(param.name)
       .flatMap { info =>
-        // In some cases, paramInfo becomes Nothing (e.g. CompletionOverrideSuite#cake)
+        // In some cases, paramInfo becomes `... & Nothing` (e.g. CompletionOverrideSuite#cake)
         // which is meaningless, in that case, fallback to param.info
-        if info.isNothingType then None
+        if info <:< defn.NothingType then None
         else Some(info)
       }
       .getOrElse(param.info)
diff --git a/tests/pos/i23530.scala b/tests/pos/i23530.scala
new file mode 100644
index 000000000000..822526f7562d
--- /dev/null
+++ b/tests/pos/i23530.scala
@@ -0,0 +1,18 @@
+trait TestContainer:
+  trait TestPath:
+    type AbsMember
+
+  extension (path: TestPath)
+    infix def ext(color: path.AbsMember): Unit = ???
+    infix def ext(other: Int): Unit = ???
+
+object Repro:
+  val dc2: TestContainer = ???
+  import dc2.TestPath
+
+  def transition(path: TestPath)(using DummyImplicit): TestPath = ???
+
+  def test: Unit =
+    val di: TestPath = ???
+    // error
+    val z1 = transition(di).ext(1)

From f544475fe1b7d29f9ee363d1db1057574758809d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Fornal?=
 <24961583+Florian3k@users.noreply.github.com>
Date: Tue, 22 Jul 2025 12:55:45 +0200
Subject: [PATCH 450/505] Compare span points in pathTo to determine best span
 (#23581)

Closes #22207
[Cherry-picked 98c594f39d38a859719f09f39124d56dbb1ed755]
---
 .../dotty/tools/dotc/ast/NavigateAST.scala    | 20 ++++++++---
 .../tools/pc/tests/hover/HoverTermSuite.scala | 36 +++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
index 90bd9b7923ae..861db55b1903 100644
--- a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
+++ b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
@@ -94,7 +94,8 @@ object NavigateAST {
       * When choosing better fit we compare spans. If candidate span has starting or ending point inside (exclusive)
       * current best fit it is selected as new best fit. This means that same spans are failing the first predicate.
       *
-      * In case when spans start and end at same offsets we prefer non synthethic one.
+      * In case when spans start and end at same offsets we prefer non synthethic one,
+      * and then one with better point (see isBetterPoint below).
       */
     def isBetterFit(currentBest: List[Positioned], candidate: List[Positioned]): Boolean =
       if currentBest.isEmpty && candidate.nonEmpty then true
@@ -102,9 +103,20 @@ object NavigateAST {
         val bestSpan = currentBest.head.span
         val candidateSpan = candidate.head.span
 
-        bestSpan != candidateSpan &&
-          envelops(bestSpan, candidateSpan) ||
-          bestSpan.contains(candidateSpan) && bestSpan.isSynthetic && !candidateSpan.isSynthetic
+        def isBetterPoint =
+          // Given two spans with same end points,
+          // we compare their points in relation to the point we are looking for (span.point)
+          // The candidate (candidateSpan.point) is better than what we have so far (bestSpan.point), when:
+          // 1) candidate is closer to target from the right
+          span.point <= candidateSpan.point && candidateSpan.point < bestSpan.point
+          // 2) candidate is closer to target from the left
+          || bestSpan.point < candidateSpan.point && candidateSpan.point <= span.point
+          // 3) candidate is to on the left side of target, and best so far is on the right
+          || candidateSpan.point <= span.point && span.point < bestSpan.point
+
+        bestSpan != candidateSpan && envelops(bestSpan, candidateSpan)
+        || bestSpan.contains(candidateSpan) && bestSpan.isSynthetic && !candidateSpan.isSynthetic
+        || candidateSpan.start == bestSpan.start && candidateSpan.end == bestSpan.end && isBetterPoint
       else false
 
     def isRecoveryTree(sel: untpd.Select): Boolean =
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
index e0501d4c9496..3e3019e80ff7 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -747,3 +747,39 @@ class HoverTermSuite extends BaseHoverSuite:
          |""".stripMargin,
          "def substring(x$0: Int, x$1: Int): String".hover
     )
+
+  @Test def `multiple-valdefs-1` =
+    check(
+      """|object O {
+         |  val x@@x, yy, zz = 1
+         |}
+         |""".stripMargin,
+      "val xx: Int".hover
+    )
+
+  @Test def `multiple-valdefs-2` =
+    check(
+      """|object O {
+         |  val xx, y@@y, zz = 1
+         |}
+         |""".stripMargin,
+      "val yy: Int".hover
+    )
+
+  @Test def `multiple-valdefs-3` =
+    check(
+      """|object O {
+         |  val xx, yy, z@@z = 1
+         |}
+         |""".stripMargin,
+      "val zz: Int".hover
+    )
+
+  @Test def `multiple-valdefs-4` =
+    check(
+      """|object O {
+         |  val xx, thisIsAVeryLongNa@@me, zz = 1
+         |}
+         |""".stripMargin,
+      "val thisIsAVeryLongName: Int".hover
+    )

From 82c855e0c94832b15886a6f3b5f2bc59b9a2b33f Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Tue, 22 Jul 2025 07:30:41 -0700
Subject: [PATCH 451/505] Make check look intentional per review

---
 .../dotc/transform/localopt/FormatChecker.scala | 16 ++++++++++++++--
 .../localopt/StringInterpolatorOpt.scala        | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
index b0ce1d6614fd..f152ac9a6876 100644
--- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
@@ -228,8 +228,20 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
       case _ => true
 
     def lintToString(arg: Type): Unit =
-      if ctx.settings.Whas.toStringInterpolated && kind == StringXn && !(arg.widen =:= defn.StringType) && !arg.isPrimitiveValueType
-      then warningAt(CC)("interpolation uses toString")
+      def checkIsStringify(tp: Type): Boolean = tp.widen match
+        case OrType(tp1, tp2) =>
+          checkIsStringify(tp1) || checkIsStringify(tp2)
+        case tp =>
+          !(tp =:= defn.StringType)
+          && {
+              tp =:= defn.UnitType
+              && { warningAt(CC)("interpolated Unit value"); true }
+            ||
+              !tp.isPrimitiveValueType
+              && { warningAt(CC)("interpolation uses toString"); true }
+          }
+      if ctx.settings.Whas.toStringInterpolated && kind == StringXn then
+        checkIsStringify(arg): Unit
 
     // what arg type if any does the conversion accept
     def acceptableVariants: List[Type] =
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
index 1afcfbac6206..0bb1df9a21e1 100644
--- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
@@ -109,9 +109,20 @@ class StringInterpolatorOpt extends MiniPhase:
       result
     end mkConcat
     def lintToString(t: Tree): Unit =
-      val arg: Type = t.tpe
-      if ctx.settings.Whas.toStringInterpolated && !(arg.widen =:= defn.StringType) && !arg.isPrimitiveValueType
-      then report.warning("interpolation uses toString", t.srcPos)
+      def checkIsStringify(tp: Type): Boolean = tp.widen match
+        case OrType(tp1, tp2) =>
+          checkIsStringify(tp1) || checkIsStringify(tp2)
+        case tp =>
+          !(tp =:= defn.StringType)
+          && {
+              tp =:= defn.UnitType
+              && { report.warning("interpolated Unit value", t.srcPos); true }
+            ||
+              !tp.isPrimitiveValueType
+              && { report.warning("interpolation uses toString", t.srcPos); true }
+          }
+      if ctx.settings.Whas.toStringInterpolated then
+        checkIsStringify(t.tpe): Unit
     val sym = tree.symbol
     // Test names first to avoid loading scala.StringContext if not used, and common names first
     val isInterpolatedMethod =

From 0d64b0a9bcf6507050f5afc82b3fdf1cc77dbfec Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Jul 2025 16:51:33 +0200
Subject: [PATCH 452/505] Make check look intentional per review

[Cherry-picked 2887c0a98f6ec67b55703a6b63d86f28109102eb][modified]

From e84a4e4960f3dbe3a11ced7643ef949e2c4eea8f Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 26 Jun 2025 07:33:39 -0700
Subject: [PATCH 453/505] Encode path of class

---
 .../src/dotty/tools/dotc/core/Denotations.scala   |  6 +++---
 compiler/src/dotty/tools/dotc/core/Phases.scala   |  9 ++++-----
 .../tools/dotc/fromtasty/TastyFileUtil.scala      | 15 ++++++---------
 scaladoc-testcases/src/tests/encoded.name.scala   |  2 ++
 .../scala/tasty/inspector/TastyInspector.scala    |  4 ++--
 5 files changed, 17 insertions(+), 19 deletions(-)
 create mode 100644 scaladoc-testcases/src/tests/encoded.name.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Denotations.scala b/compiler/src/dotty/tools/dotc/core/Denotations.scala
index 84ef94687b13..fdf6bf265096 100644
--- a/compiler/src/dotty/tools/dotc/core/Denotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/Denotations.scala
@@ -1299,9 +1299,9 @@ object Denotations {
   }
 
   /** The current denotation of the static reference given by path,
-    *  or a MissingRef or NoQualifyingRef instance, if it does not exist.
-    *  if generateStubs is set, generates stubs for missing top-level symbols
-    */
+   *  or a MissingRef or NoQualifyingRef instance, if it does not exist.
+   *  if generateStubs is set, generates stubs for missing top-level symbols
+   */
   def staticRef(path: Name, generateStubs: Boolean = true, isPackage: Boolean = false)(using Context): Denotation = {
     def select(prefix: Denotation, selector: Name): Denotation = {
       val owner = prefix.disambiguate(_.info.isParameterless)
diff --git a/compiler/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala
index 603328d18d44..dba638ca13d6 100644
--- a/compiler/src/dotty/tools/dotc/core/Phases.scala
+++ b/compiler/src/dotty/tools/dotc/core/Phases.scala
@@ -462,15 +462,14 @@ object Phases {
       * Enrich crash messages.
       */
     final def monitor(doing: String)(body: Context ?=> Unit)(using Context): Boolean =
-      val unit = ctx.compilationUnit
-      if ctx.run.enterUnit(unit) then
+      ctx.run.enterUnit(ctx.compilationUnit)
+      && {
         try {body; true}
         catch case NonFatal(ex) if !ctx.run.enrichedErrorMessage =>
-          report.echo(ctx.run.enrichErrorMessage(s"exception occurred while $doing $unit"))
+          report.echo(ctx.run.enrichErrorMessage(s"exception occurred while $doing ${ctx.compilationUnit}"))
           throw ex
         finally ctx.run.advanceUnit()
-      else
-        false
+      }
 
     inline def runSubPhase[T](id: Run.SubPhase)(inline body: (Run.SubPhase, Context) ?=> T)(using Context): T =
       given Run.SubPhase = id
diff --git a/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala b/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala
index bc04cc648a65..9bd3016de1f5 100644
--- a/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala
+++ b/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala
@@ -15,7 +15,7 @@ object TastyFileUtil {
    *    package foo
    *    class Foo
    *  ```
-   *  then `getClassName("./out/foo/Foo.tasty") returns `Some("./out")`
+   *  then `getClassPath("./out/foo/Foo.tasty") returns `Some("./out")`
    */
   def getClassPath(file: AbstractFile): Option[String] =
     getClassName(file).map { className =>
@@ -37,14 +37,11 @@ object TastyFileUtil {
     assert(file.extension == "tasty")
     val bytes = file.toByteArray
     val names = new TastyClassName(bytes).readName()
-    names.map { case (packageName, className) =>
-      val fullName = packageName match {
-        case EMPTY_PACKAGE => s"${className.lastPart}"
-        case _ => s"$packageName.${className.lastPart}"
-      }
-      fullName
-    }
-  }
+    names.map: (packageName, className) =>
+      if packageName == EMPTY_PACKAGE then
+        s"${className.lastPart.encode}"
+      else
+        s"${packageName.encode}.${className.lastPart.encode}"
 }
 
 
diff --git a/scaladoc-testcases/src/tests/encoded.name.scala b/scaladoc-testcases/src/tests/encoded.name.scala
new file mode 100644
index 000000000000..d47bf83bfe15
--- /dev/null
+++ b/scaladoc-testcases/src/tests/encoded.name.scala
@@ -0,0 +1,2 @@
+
+def exampleMember = "hello, world"
diff --git a/scaladoc/src/scala/tasty/inspector/TastyInspector.scala b/scaladoc/src/scala/tasty/inspector/TastyInspector.scala
index 14e5f019b433..47501521d612 100644
--- a/scaladoc/src/scala/tasty/inspector/TastyInspector.scala
+++ b/scaladoc/src/scala/tasty/inspector/TastyInspector.scala
@@ -9,7 +9,7 @@ import scala.quoted.runtime.impl.QuotesImpl
 import dotty.tools.dotc.Compiler
 import dotty.tools.dotc.Driver
 import dotty.tools.dotc.Run
-import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Contexts.{Context, ctx}
 import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.fromtasty._
@@ -69,7 +69,7 @@ object TastyInspector:
       override def phaseName: String = "tastyInspector"
 
       override def runOn(units: List[CompilationUnit])(using ctx0: Context): List[CompilationUnit] =
-        // NOTE: although this is a phase, do not expect this to be ran with an xsbti.CompileProgress
+        // NOTE: although this is a phase, do not expect this to be run with an xsbti.CompileProgress
         val ctx = QuotesCache.init(ctx0.fresh)
         runOnImpl(units)(using ctx)
 

From 800ab5a16e1e866d6e9a58eab783c559ea0b2f12 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Jul 2025 16:53:39 +0200
Subject: [PATCH 454/505] Encode path of class

[Cherry-picked 7b42ed8853d127dbfed870d82829cfb422024331][modified]

From bb6e368cf6b6e0daed799e4a1f9d657504793a38 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Jul 2025 16:54:10 +0200
Subject: [PATCH 455/505] Best effort failure excluded

[Cherry-picked e7db08ad692c9a4ccafeaad8b19367b0feaca78a][modified]

From 211d70b9380517f1e139915fe3193466661c1067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zieli=C5=84ski=20Patryk?=
 <75637004+zielinsky@users.noreply.github.com>
Date: Thu, 24 Jul 2025 19:37:53 +0200
Subject: [PATCH 456/505] Add InferredMethodProvider for automatic method
 signature generation (#23563)

Porting https://github.com/scalameta/metals/pull/6877

Related discussion and feature request:
https://github.com/scalameta/metals-feature-requests/issues/298
[Cherry-picked 405e2bd57f8dc3821790e42dfee1d57d63fa7561]
---
 .../tools/pc/InferredMethodProvider.scala     | 362 ++++++++++++
 .../tools/pc/ScalaPresentationCompiler.scala  |  16 +
 .../edit/InsertInferredMethodSuite.scala      | 519 ++++++++++++++++++
 3 files changed, 897 insertions(+)
 create mode 100644 presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala
 create mode 100644 presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredMethodSuite.scala

diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala
new file mode 100644
index 000000000000..e6f27781bc64
--- /dev/null
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala
@@ -0,0 +1,362 @@
+package dotty.tools.pc
+
+import java.nio.file.Paths
+
+import scala.annotation.tailrec
+
+import scala.meta.pc.OffsetParams
+import scala.meta.pc.PresentationCompilerConfig
+import scala.meta.pc.SymbolSearch
+import scala.meta.pc.reports.ReportContext
+
+import dotty.tools.dotc.ast.tpd.*
+import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Names.Name
+import dotty.tools.dotc.core.Symbols.*
+import dotty.tools.dotc.core.Symbols.defn
+import dotty.tools.dotc.core.Types.*
+import dotty.tools.dotc.interactive.Interactive
+import dotty.tools.dotc.interactive.InteractiveDriver
+import dotty.tools.dotc.util.SourceFile
+import dotty.tools.dotc.util.SourcePosition
+import dotty.tools.pc.printer.ShortenedTypePrinter
+import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
+import dotty.tools.pc.utils.InteractiveEnrichments.*
+
+import org.eclipse.lsp4j.TextEdit
+import org.eclipse.lsp4j as l
+
+/**
+ * Tries to calculate edits needed to create a method that will fix missing symbol
+ * in all the places that it is possible such as:
+ * - apply inside method invocation `method(.., nonExistent(param), ...)` and `method(.., nonExistent, ...)`
+ * - method in val definition `val value: DefinedType = nonExistent(param)` and `val value: DefinedType = nonExistent`
+ * - simple method call `nonExistent(param)` and `nonExistent`
+ * - method call inside a container `container.nonExistent(param)` and `container.nonExistent`
+ *
+ * @param params position and actual source
+ * @param driver Scala 3 interactive compiler driver
+ * @param config presentation compiler configuration
+ * @param symbolSearch symbol search
+ */
+final class InferredMethodProvider(
+    params: OffsetParams,
+    driver: InteractiveDriver,
+    config: PresentationCompilerConfig,
+    symbolSearch: SymbolSearch
+)(using ReportContext):
+
+  case class AdjustTypeOpts(
+      text: String,
+      adjustedEndPos: l.Position
+  )
+
+  def inferredMethodEdits(
+      adjustOpt: Option[AdjustTypeOpts] = None
+  ): List[TextEdit] =
+    val uri = params.uri().nn
+    val filePath = Paths.get(uri).nn
+
+    val sourceText = adjustOpt.map(_.text).getOrElse(params.text().nn)
+    val source =
+      SourceFile.virtual(filePath.toString(), sourceText)
+    driver.run(uri, source)
+    val unit = driver.currentCtx.run.nn.units.head
+    val pos = driver.sourcePosition(params)
+    val path =
+      Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)
+
+    given locatedCtx: Context = driver.localContext(params)
+    val indexedCtx = IndexedContext(pos)(using locatedCtx)
+
+    val autoImportsGen = AutoImports.generator(
+      pos,
+      sourceText,
+      unit.tpdTree,
+      unit.comments,
+      indexedCtx,
+      config
+    )
+
+    val printer = ShortenedTypePrinter(
+      symbolSearch,
+      includeDefaultParam = IncludeDefaultParam.ResolveLater,
+      isTextEdit = true
+    )(using indexedCtx)
+
+    def imports: List[TextEdit] =
+      printer.imports(autoImportsGen)
+
+    def printType(tpe: Type): String =
+      printer.tpe(tpe)
+
+    def printName(name: Name): String =
+      printer.nameString(name)
+
+    def printParams(params: List[Type], startIndex: Int = 0): String =
+      params.zipWithIndex
+        .map { case (p, index) =>
+          s"arg${index + startIndex}: ${printType(p)}"
+        }
+        .mkString(", ")
+
+    def printSignature(
+        methodName: Name, 
+        params: List[List[Type]], 
+        retTypeOpt: Option[Type]
+    ): String =
+      val retTypeString = retTypeOpt match
+        case Some(retType) =>
+          val printRetType = printType(retType)
+          if retType.isAny then ""
+          else s": $printRetType"
+        case _ => ""
+
+      val (paramsString, _) = params.foldLeft(("", 0)){
+        case ((acc, startIdx), paramList) =>
+          val printed = s"(${printParams(paramList, startIdx)})"
+          (acc + printed, startIdx + paramList.size)
+      }
+
+      s"def ${printName(methodName)}$paramsString$retTypeString = ???"
+
+    @tailrec
+    def countIndent(text: String, index: Int, acc: Int): Int =
+      if index > 0 && text(index) != '\n' then countIndent(text, index - 1, acc + 1)
+      else acc
+
+    def indentation(text: String, pos: Int): String =
+      if pos > 0 then
+        val isSpace = text(pos) == ' '
+        val isTab = text(pos) == '\t'
+        val indent = countIndent(params.text(), pos, 0)
+
+        if isSpace then " " * indent else if isTab then "\t" * indent else ""
+      else ""
+
+    def insertPosition() =
+      val blockOrTemplateIndex =
+        path.tail.indexWhere {
+          case _: Block | _: Template => true
+          case _ => false
+        }
+      path(blockOrTemplateIndex).sourcePos
+
+    /**
+     * Returns the position to insert the method signature for a container.
+     * If the container has an empty body, the position is the end of the container.
+     * If the container has a non-empty body, the position is the end of the last element in the body. 
+     * 
+     * @param container the container to insert the method signature for
+     * @return the position to insert the method signature for the container and a boolean indicating if the container has an empty body
+     */
+    def insertPositionFor(container: Tree): Option[(SourcePosition, Boolean)] =
+      val typeSymbol = container.tpe.widenDealias.typeSymbol
+      if typeSymbol.exists then
+        val trees = driver.openedTrees(params.uri().nn)
+        val include = Interactive.Include.definitions | Interactive.Include.local
+        Interactive.findTreesMatching(trees, include, typeSymbol).headOption match
+          case Some(srcTree) =>
+            srcTree.tree match
+              case classDef: TypeDef if classDef.rhs.isInstanceOf[Template] =>
+                val template = classDef.rhs.asInstanceOf[Template]
+                val (pos, hasEmptyBody) = template.body.lastOption match
+                  case Some(last) => (last.sourcePos, false)
+                  case None => (classDef.sourcePos, true)
+                Some((pos, hasEmptyBody))
+              case _ => None
+          case None => None
+      else None
+
+      /**
+      * Extracts type information for a specific parameter in a method signature.
+      * If the parameter is a function type, extracts both the function's argument types 
+      * and return type. Otherwise, extracts just the parameter type.
+      * 
+      * @param methodType the method type to analyze
+      * @param argIndex the index of the parameter to extract information for
+      * @return a tuple of (argument types, return type) where:
+      *         - argument types: Some(List[Type]) if parameter is a function, None otherwise
+      *         - return type: Some(Type) representing either the function's return type or the parameter type itself
+      */
+    def extractParameterTypeInfo(methodType: Type, argIndex: Int): (Option[List[Type]], Option[Type]) =
+      methodType match
+        case m @ MethodType(param) =>
+          val expectedFunctionType = m.paramInfos(argIndex)
+          if defn.isFunctionType(expectedFunctionType) then
+            expectedFunctionType match
+              case defn.FunctionOf(argTypes, retType, _) =>
+                (Some(argTypes), Some(retType))
+              case _ =>
+                (None, Some(expectedFunctionType))
+          else
+            (None, Some(m.paramInfos(argIndex)))
+        case _ => (None, None)
+    
+    def signatureEdits(signature: String): List[TextEdit] =
+      val pos = insertPosition()
+      val indent = indentation(params.text(), pos.start - 1)
+      val lspPos = pos.toLsp
+      lspPos.setEnd(lspPos.getStart())
+
+      List(
+        TextEdit(
+          lspPos,
+          s"$signature\n$indent",
+        )
+      ) ::: imports
+
+    def signatureEditsForContainer(signature: String, container: Tree): List[TextEdit] =
+      insertPositionFor(container) match
+        case Some((pos, hasEmptyBody)) =>
+          val lspPos = pos.toLsp
+          lspPos.setStart(lspPos.getEnd())
+          val indent = indentation(params.text(), pos.start - 1)
+
+          if hasEmptyBody then
+            List(
+              TextEdit(
+                lspPos,
+                s":\n  $indent$signature",
+              )
+            ) ::: imports
+          else
+            List(
+              TextEdit(
+                lspPos,
+                s"\n$indent$signature",
+              )
+            ) ::: imports
+        case None => Nil
+
+    path match
+      /**
+       *                 outerArgs
+       *        ---------------------------
+       * method(..., errorMethod(args), ...)
+       * 
+       */
+      case (id @ Ident(errorMethod)) :: 
+           (apply @ Apply(func, args)) :: 
+            Apply(method, outerArgs) :: 
+            _ if id.symbol == NoSymbol && func == id && method != apply =>
+        
+        val argTypes = args.map(_.typeOpt.widenDealias)
+
+        val argIndex = outerArgs.indexOf(apply)
+        val (allArgTypes, retTypeOpt) = 
+          extractParameterTypeInfo(method.tpe.widenDealias, argIndex) match
+            case (Some(argTypes2), retTypeOpt) => (List(argTypes, argTypes2), retTypeOpt)
+            case (None, retTypeOpt) => (List(argTypes), retTypeOpt)
+
+        val signature = printSignature(errorMethod, allArgTypes, retTypeOpt)
+
+        signatureEdits(signature)
+
+      /**
+       *              outerArgs
+       *        ---------------------
+       * method(..., errorMethod, ...)
+       * 
+       */
+      case (id @ Ident(errorMethod)) :: 
+           Apply(method, outerArgs) :: 
+           _ if id.symbol == NoSymbol && method != id =>
+        
+        val argIndex = outerArgs.indexOf(id)
+
+        val (argTypes, retTypeOpt) = extractParameterTypeInfo(method.tpe.widenDealias, argIndex)
+
+        val allArgTypes = argTypes match
+          case Some(argTypes) => List(argTypes)
+          case None => Nil
+
+        val signature = printSignature(errorMethod, allArgTypes, retTypeOpt)
+        
+        signatureEdits(signature)
+
+      /**
+       *                tpt             body
+       *            -----------   ----------------
+       * val value: DefinedType = errorMethod(args)
+       * 
+       */
+      case (id @ Ident(errorMethod)) :: 
+           (apply @ Apply(func, args)) :: 
+           ValDef(_, tpt, body) :: 
+            _ if id.symbol == NoSymbol && func == id && apply == body =>
+            
+        val retType = tpt.tpe.widenDealias
+        val argTypes = args.map(_.typeOpt.widenDealias)
+
+        val signature = printSignature(errorMethod, List(argTypes), Some(retType))
+        signatureEdits(signature)
+
+      /**
+       *                tpt          body
+       *            -----------   -----------
+       * val value: DefinedType = errorMethod
+       * 
+       */
+      case (id @ Ident(errorMethod)) :: 
+            ValDef(_, tpt, body) :: 
+            _ if id.symbol == NoSymbol && id == body =>
+            
+        val retType = tpt.tpe.widenDealias
+
+        val signature = printSignature(errorMethod, Nil, Some(retType))
+        signatureEdits(signature)
+
+      /**
+       * 
+       * errorMethod(args)
+       * 
+       */
+      case (id @ Ident(errorMethod)) :: 
+           (apply @ Apply(func, args)) :: 
+            _ if id.symbol == NoSymbol && func == id =>
+
+        val argTypes = args.map(_.typeOpt.widenDealias)
+
+        val signature = printSignature(errorMethod, List(argTypes), None)
+        signatureEdits(signature)
+
+      /**
+       * 
+       * errorMethod
+       * 
+       */
+      case (id @ Ident(errorMethod)) :: 
+           _ if id.symbol == NoSymbol =>
+
+        val signature = printSignature(errorMethod, Nil, None)
+        signatureEdits(signature)
+
+      /**
+       * 
+       * container.errorMethod(args)
+       * 
+       */
+      case (select @ Select(container, errorMethod)) :: 
+           (apply @ Apply(func, args)) :: 
+            _  if select.symbol == NoSymbol && func == select =>
+        
+        val argTypes = args.map(_.typeOpt.widenDealias)
+        val signature = printSignature(errorMethod, List(argTypes), None)
+        signatureEditsForContainer(signature, container)
+
+      /**
+       * 
+       * container.errorMethod
+       * 
+       */
+      case (select @ Select(container, errorMethod)) :: 
+            _  if select.symbol == NoSymbol =>
+        
+        val signature = printSignature(errorMethod, Nil, None)
+        signatureEditsForContainer(signature, container)
+
+      case _ => Nil
+
+  end inferredMethodEdits
+end InferredMethodProvider
diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
index 2f218687296f..18311d1b7853 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala
@@ -64,6 +64,7 @@ case class ScalaPresentationCompiler(
      CodeActionId.ExtractMethod,
      CodeActionId.InlineValue,
      CodeActionId.InsertInferredType,
+     CodeActionId.InsertInferredMethod,
      PcConvertToNamedLambdaParameters.codeActionId
    ).asJava
 
@@ -92,6 +93,8 @@ case class ScalaPresentationCompiler(
           implementAbstractMembers(params)
         case (CodeActionId.InsertInferredType, _) =>
           insertInferredType(params)
+        case (CodeActionId.InsertInferredMethod, _) =>
+          insertInferredMethod(params)
         case (CodeActionId.InlineValue, _) =>
           inlineValue(params)
         case (CodeActionId.ExtractMethod, Some(extractionPos: OffsetParams)) =>
@@ -352,6 +355,19 @@ case class ScalaPresentationCompiler(
         .asJava
     }(params.toQueryContext)
 
+  def insertInferredMethod(
+      params: OffsetParams
+  ): CompletableFuture[ju.List[l.TextEdit]] =
+    val empty: ju.List[l.TextEdit] = new ju.ArrayList[l.TextEdit]()
+    compilerAccess.withNonInterruptableCompiler(
+      empty,
+      params.token()
+    ) { pc =>
+      new InferredMethodProvider(params, pc.compiler(), config, search)
+        .inferredMethodEdits()
+        .asJava
+    }(params.toQueryContext)
+
   override def inlineValue(
       params: OffsetParams
   ): CompletableFuture[ju.List[l.TextEdit]] =
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredMethodSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredMethodSuite.scala
new file mode 100644
index 000000000000..2b8e2ef32ef5
--- /dev/null
+++ b/presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredMethodSuite.scala
@@ -0,0 +1,519 @@
+package dotty.tools.pc.tests.edit
+
+import java.net.URI
+import java.util.Optional
+
+import scala.meta.internal.jdk.CollectionConverters.*
+import scala.meta.internal.metals.CompilerOffsetParams
+import scala.meta.pc.CodeActionId
+import scala.language.unsafeNulls
+
+import dotty.tools.pc.base.BaseCodeActionSuite
+import dotty.tools.pc.utils.TextEdits
+
+import org.eclipse.lsp4j as l
+import org.junit.Test
+
+class InsertInferredMethodSuite extends BaseCodeActionSuite:
+
+  @Test def `simple` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  method1(<<otherMethod>>(1))
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  def otherMethod(arg0: Int): String = ???
+        |  method1(otherMethod(1))
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `simple-2` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  <<otherMethod>>(1)
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  def otherMethod(arg0: Int) = ???
+        |  otherMethod(1)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `simple-3` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  <<otherMethod>>((1 + 123).toDouble)
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  def otherMethod(arg0: Double) = ???
+        |  otherMethod((1 + 123).toDouble)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `simple-4` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  method1(<<otherMethod>>())
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def method1(s : String) = 123
+        |
+        |  def otherMethod(): String = ???
+        |  method1(otherMethod())
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `backtick-method-name` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  <<`met ? hod`>>(10)
+        |}
+        |""".stripMargin,
+      """|trait Main {
+        |  def `met ? hod`(arg0: Int) = ???
+        |  `met ? hod`(10)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `custom-type` =
+    checkEdit(
+    """|
+       |trait Main {
+       |  def method1(b: Double, s : String) = 123
+       |
+       |  case class User(i : Int)
+       |  val user = User(1)
+       |
+       |  method1(0.0, <<otherMethod>>(user, 1))
+       |}
+       |""".stripMargin,
+    """|
+       |trait Main {
+       |  def method1(b: Double, s : String) = 123
+       |
+       |  case class User(i : Int)
+       |  val user = User(1)
+       |
+       |  def otherMethod(arg0: User, arg1: Int): String = ???
+       |  method1(0.0, otherMethod(user, 1))
+       |}
+       |""".stripMargin
+    )
+
+  @Test def `custom-type-2` =
+    checkEdit(
+    """|
+       |trait Main {
+       |  def method1(b: Double, s : String) = 123
+       |
+       |  case class User(i : Int)
+       |  val user = User(1)
+       |  <<otherMethod>>(user, 1)
+       |}
+       |""".stripMargin,
+    """|
+       |trait Main {
+       |  def method1(b: Double, s : String) = 123
+       |
+       |  case class User(i : Int)
+       |  val user = User(1)
+       |  def otherMethod(arg0: User, arg1: Int) = ???
+       |  otherMethod(user, 1)
+       |}
+       |""".stripMargin
+    )
+
+  @Test def `custom-type-advanced` =
+    checkEdit(
+    """|
+       |trait Main {
+       |    def method1(b: Double, s : String) = 123
+       |
+       |    case class User(i : Int)
+       |
+       |    <<otherMethod>>(User(1), 1)
+       |}
+       |
+       |""".stripMargin,
+    """|trait Main {
+       |    def method1(b: Double, s : String) = 123
+       |
+       |    case class User(i : Int)
+       |
+       |    def otherMethod(arg0: User, arg1: Int) = ???
+       |    otherMethod(User(1), 1)
+       |}
+       |""".stripMargin
+    )
+
+  @Test def `custom-type-advanced-2` =
+    checkEdit(
+    """|
+       |trait Main {
+       |    def method1(b: Double, s : String) = 123
+       |
+       |    case class User(i : Int)
+       |
+       |    <<otherMethod>>(List(Set(User(1))), Map("1" -> 1))
+       |}
+       |
+       |""".stripMargin,
+    """|trait Main {
+       |    def method1(b: Double, s : String) = 123
+       |
+       |    case class User(i : Int)
+       |
+       |    def otherMethod(arg0: List[Set[User]], arg1: Map[String, Int]) = ???
+       |    otherMethod(List(Set(User(1))), Map("1" -> 1))
+       |}
+       |""".stripMargin
+    )
+
+  @Test def `with-imports` =
+    checkEdit(
+    """|import java.nio.file.Files
+       |
+       |trait Main {
+       |  def main() = {
+       |    def method1(s : String) = 123
+       |      val path = Files.createTempDirectory("")
+       |      method1(<<otherMethod>>(path))
+       |    }
+       |}
+       |
+       |""".stripMargin,
+    """|import java.nio.file.Files
+       |import java.nio.file.Path
+       |
+       |trait Main {
+       |  def main() = {
+       |    def method1(s : String) = 123
+       |      val path = Files.createTempDirectory("")
+       |      def otherMethod(arg0: Path): String = ???
+       |      method1(otherMethod(path))
+       |    }
+       |}
+       |""".stripMargin
+    )
+
+  @Test def `val-definition` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  val result: String = <<nonExistent>>(42, "hello")
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def nonExistent(arg0: Int, arg1: String): String = ???
+        |  val result: String = nonExistent(42, "hello")
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `val-definition-no-args` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  val result: Int = <<getValue>>
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def getValue: Int = ???
+        |  val result: Int = getValue
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `lambda-expression` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  val list = List(1, 2, 3)
+        |  list.map(<<transform>>)
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  val list = List(1, 2, 3)
+        |  def transform(arg0: Int) = ???
+        |  list.map(transform)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `lambda-expression-2` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  val list = List(1, 2, 3)
+        |  list.map(<<transform>>(10, "test"))
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  val list = List(1, 2, 3)
+        |  def transform(arg0: Int, arg1: String)(arg2: Int) = ???
+        |  list.map(transform(10, "test"))
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `lambda-expression-3` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  val list = List("a", "b", "c")
+        |  list.map(<<process>>)
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  val list = List("a", "b", "c")
+        |  def process(arg0: String) = ???
+        |  list.map(process)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `lambda-expression-4` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  List((1, 2, 3)).filter(_ => true).map(<<otherMethod>>)
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def otherMethod(arg0: (Int, Int, Int)) = ???
+        |  List((1, 2, 3)).filter(_ => true).map(otherMethod)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `lambda-expression-5` =
+    checkEdit(
+      """|
+        |trait Main {
+        | val list = List(1, 2, 3)
+        | list.filter(<<otherMethod>>)
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        | val list = List(1, 2, 3)
+        | def otherMethod(arg0: Int): Boolean = ???
+        | list.filter(otherMethod)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `simple-method-no-args` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  <<missingMethod>>
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def missingMethod = ???
+        |  missingMethod
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `simple-method-no-args-2` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  def method1(s : String) = 123
+        |  method1(<<missingMethod>>)
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def method1(s : String) = 123
+        |  def missingMethod: String = ???
+        |  method1(missingMethod)
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `nested-val-definition` =
+    checkEdit(
+      """|
+        |trait Main {
+        |  def someMethod(): Unit = {
+        |    val data: List[String] = <<generateData>>(10)
+        |  }
+        |}
+        |
+        |""".stripMargin,
+      """|trait Main {
+        |  def someMethod(): Unit = {
+        |    def generateData(arg0: Int): List[String] = ???
+        |    val data: List[String] = generateData(10)
+        |  }
+        |}
+        |""".stripMargin
+    )
+
+  @Test def `simple-class-definition` =
+    checkEdit(
+      """|
+        |class User:
+        |  val name: String = "John"
+        |
+        |object Main:
+        |  val user = User()
+        |  user.<<otherMethod>>
+        |
+        |""".stripMargin,
+      """|
+         |class User:
+         |  val name: String = "John"
+         |  def otherMethod = ???
+         |
+         |object Main:
+         |  val user = User()
+         |  user.otherMethod
+         |""".stripMargin,
+    )
+
+  @Test def `simple-class-definition-2` =
+    checkEdit(
+      """|
+        |class User:
+        |  val name: String = "John"
+        |
+        |object Main:
+        |  val user = User()
+        |  user.<<otherMethod>>(10)
+        |
+        |""".stripMargin,
+      """|
+         |class User:
+         |  val name: String = "John"
+         |  def otherMethod(arg0: Int) = ???
+         |
+         |object Main:
+         |  val user = User()
+         |  user.otherMethod(10)
+         |""".stripMargin,
+    )
+
+  @Test def `simple-object-definition` =
+    checkEdit(
+      """|
+        |object User:
+        |  val name: String = "John"
+        |
+        |object Main:
+        |  User.<<otherMethod>>
+        |
+        |""".stripMargin,
+      """|
+         |object User:
+         |  val name: String = "John"
+         |  def otherMethod = ???
+         |
+         |object Main:
+         |  User.otherMethod
+         |""".stripMargin,
+    )
+
+  @Test def `simple-object-definition-2` =
+    checkEdit(
+      """|
+        |object User:
+        |  val name: String = "John"
+        |
+        |object Main:
+        |  User.<<otherMethod>>(10)
+        |
+        |""".stripMargin,
+      """|
+         |object User:
+         |  val name: String = "John"
+         |  def otherMethod(arg0: Int) = ???
+         |
+         |object Main:
+         |  User.otherMethod(10)
+         |""".stripMargin,
+    )
+
+  @Test def `class-definition-without-body` =
+    checkEdit(
+      """|
+        |class User
+        |
+        |object Main:
+        |  val user = User()
+        |  user.<<otherMethod>>
+        |
+        |""".stripMargin,
+      """|
+         |class User:
+         |  def otherMethod = ???
+         |
+         |object Main:
+         |  val user = User()
+         |  user.otherMethod
+         |""".stripMargin,
+    )
+
+  def checkEdit(
+      original: String,
+      expected: String
+  ): Unit =
+    val edits = getAutoImplement(original)
+    val (code, _, _) = params(original)
+    val obtained = TextEdits.applyEdits(code, edits)
+    assertNoDiff(expected, obtained)
+
+  def getAutoImplement(
+      original: String,
+      filename: String = "file:/A.scala"
+  ): List[l.TextEdit] =
+    val (code, _, offset) = params(original)
+    val result = presentationCompiler
+      .codeAction(
+        CompilerOffsetParams(URI.create(filename), code, offset, cancelToken),
+        CodeActionId.InsertInferredMethod,
+        Optional.empty()
+      )
+      .get()
+    result.asScala.toList

From 5a05c0ac83f8c8b6db6ea3392e5d65f43463e408 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Fri, 25 Jul 2025 09:11:02 +0200
Subject: [PATCH 457/505] bugfix: Also save infos in semanticdb (#23587)

Previously, when user changed a warning to info, we would not save it
and miss information if that warning was about unused. Now, we also save
infos.

https://github.com/scalacenter/scalafix/issues/2269
[Cherry-picked 00d19dfd0906d2b4a8c076ded8af15cc3a6f2dc9]
---
 .../dotty/tools/dotc/reporting/Reporter.scala | 10 ++-
 .../dotc/semanticdb/ExtractSemanticDB.scala   | 10 +--
 .../semanticdb/expect/InfoMacro.expect.scala  | 14 ++++
 tests/semanticdb/expect/InfoMacro.scala       | 14 ++++
 .../expect/InfoMacroTest.expect.scala         |  7 ++
 tests/semanticdb/expect/InfoMacroTest.scala   |  7 ++
 tests/semanticdb/metac.expect                 | 83 +++++++++++++++++++
 7 files changed, 139 insertions(+), 6 deletions(-)
 create mode 100644 tests/semanticdb/expect/InfoMacro.expect.scala
 create mode 100644 tests/semanticdb/expect/InfoMacro.scala
 create mode 100644 tests/semanticdb/expect/InfoMacroTest.expect.scala
 create mode 100644 tests/semanticdb/expect/InfoMacroTest.scala

diff --git a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala
index eb9756028c27..a0f454f1818c 100644
--- a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala
@@ -95,6 +95,7 @@ abstract class Reporter extends interfaces.ReporterResult {
 
   private var _errorCount = 0
   private var _warningCount = 0
+  private var _infoCount = 0
 
   /** The number of errors reported by this reporter (ignoring outer reporters) */
   def errorCount: Int = _errorCount
@@ -112,12 +113,17 @@ abstract class Reporter extends interfaces.ReporterResult {
 
   private var warnings: List[Warning] = Nil
 
+  private var infos: List[Info] = Nil
+
   /** All errors reported by this reporter (ignoring outer reporters) */
   def allErrors: List[Error] = errors
 
   /** All warnings reported by this reporter (ignoring outer reporters) */
   def allWarnings: List[Warning] = warnings
 
+  /** All infos reported by this reporter (ignoring outer reporters) */
+  def allInfos: List[Info] = infos
+
   /** Were sticky errors reported? Overridden in StoreReporter. */
   def hasStickyErrors: Boolean = false
 
@@ -171,7 +177,9 @@ abstract class Reporter extends interfaces.ReporterResult {
             _errorCount += 1
             if ctx.typerState.isGlobalCommittable then
               ctx.base.errorsToBeReported = true
-          case _: Info    => // nothing to do here
+          case i: Info    =>
+            infos = i :: infos
+            _infoCount += 1
           // match error if d is something else
         }
         markReported(dia)
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
index 076a7deda4b1..d39d3d095bb7 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
@@ -63,7 +63,7 @@ class ExtractSemanticDB private (phaseMode: ExtractSemanticDB.PhaseMode) extends
 
   private def computeDiagnostics(
       sourceRoot: String,
-      warnings: Map[SourceFile, List[Warning]],
+      warnings: Map[SourceFile, List[dotty.tools.dotc.reporting.Diagnostic]],
       append: ((Path, List[Diagnostic])) => Unit)(using Context): Boolean = monitor(phaseName) {
     val unit = ctx.compilationUnit
     warnings.get(unit.source).foreach { ws =>
@@ -104,14 +104,14 @@ class ExtractSemanticDB private (phaseMode: ExtractSemanticDB.PhaseMode) extends
     val appendDiagnostics = phaseMode == ExtractSemanticDB.PhaseMode.AppendDiagnostics
     val unitContexts = units.map(ctx.fresh.setCompilationUnit(_).withRootImports)
     if (appendDiagnostics)
-      val warnings = ctx.reporter.allWarnings.groupBy(w => w.pos.source)
+      val warningsAndInfos = (ctx.reporter.allWarnings ++ ctx.reporter.allInfos).groupBy(w => w.pos.source)
       val buf = mutable.ListBuffer.empty[(Path, Seq[Diagnostic])]
       val units0 =
-        for unitCtx <- unitContexts if computeDiagnostics(sourceRoot, warnings, buf += _)(using unitCtx)
+        for unitCtx <- unitContexts if computeDiagnostics(sourceRoot, warningsAndInfos, buf += _)(using unitCtx)
         yield unitCtx.compilationUnit
       cancellable {
-        buf.toList.asJava.parallelStream().forEach { case (out, warnings) =>
-          ExtractSemanticDB.appendDiagnostics(warnings, out)
+        buf.toList.asJava.parallelStream().forEach { case (out, diagnostics) =>
+          ExtractSemanticDB.appendDiagnostics(diagnostics, out)
         }
       }
       units0
diff --git a/tests/semanticdb/expect/InfoMacro.expect.scala b/tests/semanticdb/expect/InfoMacro.expect.scala
new file mode 100644
index 000000000000..67122d6cbf37
--- /dev/null
+++ b/tests/semanticdb/expect/InfoMacro.expect.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+object InfoMacro/*<-_empty_::InfoMacro.*/ {
+  inline def reportInfo/*<-_empty_::InfoMacro.reportInfo().*/(msg/*<-_empty_::InfoMacro.reportInfo().(msg)*/: String/*->scala::Predef.String#*/): Unit/*->scala::Unit#*/ = ${ reportInfoMacro/*->_empty_::InfoMacro.reportInfoMacro().*/('msg) }
+
+  def reportInfoMacro/*<-_empty_::InfoMacro.reportInfoMacro().*/(msg/*<-_empty_::InfoMacro.reportInfoMacro().(msg)*/: Expr/*->scala::quoted::Expr#*/[String/*->scala::Predef.String#*/])(using Quotes/*->scala::quoted::Quotes#*/): Expr/*->scala::quoted::Expr#*/[Unit/*->scala::Unit#*/] = {
+    import quotes/*->scala::quoted::Quotes$package.quotes().*/.reflect/*->scala::quoted::Quotes#reflect.*/.report/*->scala::quoted::Quotes#reflectModule#report.*/
+
+    // Report an info diagnostic
+    report/*->scala::quoted::Quotes#reflectModule#report.*/.info/*->scala::quoted::Quotes#reflectModule#reportModule#info().*/(s/*->scala::StringContext#s().*/"Info from macro: ${msg/*->_empty_::InfoMacro.reportInfoMacro().(msg)*/.valueOrAbort/*->scala::quoted::Quotes#valueOrAbort().*/}")
+
+    '{ () }
+  }
+}
diff --git a/tests/semanticdb/expect/InfoMacro.scala b/tests/semanticdb/expect/InfoMacro.scala
new file mode 100644
index 000000000000..9248d51dd03a
--- /dev/null
+++ b/tests/semanticdb/expect/InfoMacro.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+object InfoMacro {
+  inline def reportInfo(msg: String): Unit = ${ reportInfoMacro('msg) }
+
+  def reportInfoMacro(msg: Expr[String])(using Quotes): Expr[Unit] = {
+    import quotes.reflect.report
+
+    // Report an info diagnostic
+    report.info(s"Info from macro: ${msg.valueOrAbort}")
+
+    '{ () }
+  }
+}
diff --git a/tests/semanticdb/expect/InfoMacroTest.expect.scala b/tests/semanticdb/expect/InfoMacroTest.expect.scala
new file mode 100644
index 000000000000..19977da0c79f
--- /dev/null
+++ b/tests/semanticdb/expect/InfoMacroTest.expect.scala
@@ -0,0 +1,7 @@
+
+object InfoMacroTest/*<-_empty_::InfoMacroTest.*/ {
+  def main/*<-_empty_::InfoMacroTest.main().*/(): Unit/*->scala::Unit#*/ = {
+    InfoMacro/*->_empty_::InfoMacro.*/.reportInfo/*->_empty_::InfoMacro.reportInfo().*/("This is a test info message")
+    InfoMacro/*->_empty_::InfoMacro.*/.reportInfo/*->_empty_::InfoMacro.reportInfo().*/("Another info message")
+  }
+}
diff --git a/tests/semanticdb/expect/InfoMacroTest.scala b/tests/semanticdb/expect/InfoMacroTest.scala
new file mode 100644
index 000000000000..e53a840efc8a
--- /dev/null
+++ b/tests/semanticdb/expect/InfoMacroTest.scala
@@ -0,0 +1,7 @@
+
+object InfoMacroTest {
+  def main(): Unit = {
+    InfoMacro.reportInfo("This is a test info message")
+    InfoMacro.reportInfo("Another info message")
+  }
+}
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 80cfc754c057..592bf586fcd9 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -1980,6 +1980,89 @@ Occurrences:
 Diagnostics:
 [0:26..0:34): [warning] unused import
 
+expect/InfoMacro.scala
+----------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => InfoMacro.scala
+Text => empty
+Language => Scala
+Symbols => 7 entries
+Occurrences => 23 entries
+Synthetics => 6 entries
+
+Symbols:
+_empty_/InfoMacro. => final object InfoMacro extends Object { self: InfoMacro.type => +3 decls }
+_empty_/InfoMacro.reportInfo(). => inline macro reportInfo (param msg: String): Unit
+_empty_/InfoMacro.reportInfo().(msg) => param msg: String
+_empty_/InfoMacro.reportInfoMacro(). => method reportInfoMacro (param msg: Expr[String])(implicit given param x$2: Quotes): Expr[Unit]
+_empty_/InfoMacro.reportInfoMacro().(msg) => param msg: Expr[String]
+_empty_/InfoMacro.reportInfoMacro().(x$2) => implicit given param x$2: Quotes
+local0 => implicit given param contextual$1: Quotes
+
+Occurrences:
+[0:7..0:12): scala -> scala/
+[0:13..0:19): quoted -> scala/quoted/
+[2:7..2:16): InfoMacro <- _empty_/InfoMacro.
+[3:13..3:23): reportInfo <- _empty_/InfoMacro.reportInfo().
+[3:24..3:27): msg <- _empty_/InfoMacro.reportInfo().(msg)
+[3:29..3:35): String -> scala/Predef.String#
+[3:38..3:42): Unit -> scala/Unit#
+[3:48..3:63): reportInfoMacro -> _empty_/InfoMacro.reportInfoMacro().
+[5:6..5:21): reportInfoMacro <- _empty_/InfoMacro.reportInfoMacro().
+[5:22..5:25): msg <- _empty_/InfoMacro.reportInfoMacro().(msg)
+[5:27..5:31): Expr -> scala/quoted/Expr#
+[5:32..5:38): String -> scala/Predef.String#
+[5:47..5:53): Quotes -> scala/quoted/Quotes#
+[5:56..5:60): Expr -> scala/quoted/Expr#
+[5:61..5:65): Unit -> scala/Unit#
+[6:11..6:17): quotes -> scala/quoted/Quotes$package.quotes().
+[6:18..6:25): reflect -> scala/quoted/Quotes#reflect.
+[6:26..6:32): report -> scala/quoted/Quotes#reflectModule#report.
+[9:4..9:10): report -> scala/quoted/Quotes#reflectModule#report.
+[9:11..9:15): info -> scala/quoted/Quotes#reflectModule#reportModule#info().
+[9:16..9:17): s -> scala/StringContext#s().
+[9:37..9:40): msg -> _empty_/InfoMacro.reportInfoMacro().(msg)
+[9:41..9:53): valueOrAbort -> scala/quoted/Quotes#valueOrAbort().
+
+Synthetics:
+[3:48..3:69):reportInfoMacro('msg) => *(contextual$1)
+[3:64..3:68):'msg => orig()(contextual$1)
+[6:11..6:17):quotes => *(x$2)
+[9:37..9:53):msg.valueOrAbort => *(StringFromExpr[String])
+[9:41..9:53):valueOrAbort => *[String]
+[11:4..11:11):'{ () } => orig(())(x$2)
+
+expect/InfoMacroTest.scala
+--------------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => InfoMacroTest.scala
+Text => empty
+Language => Scala
+Symbols => 2 entries
+Occurrences => 7 entries
+Diagnostics => 2 entries
+
+Symbols:
+_empty_/InfoMacroTest. => final object InfoMacroTest extends Object { self: InfoMacroTest.type => +2 decls }
+_empty_/InfoMacroTest.main(). => method main (): Unit
+
+Occurrences:
+[1:7..1:20): InfoMacroTest <- _empty_/InfoMacroTest.
+[2:6..2:10): main <- _empty_/InfoMacroTest.main().
+[2:14..2:18): Unit -> scala/Unit#
+[3:4..3:13): InfoMacro -> _empty_/InfoMacro.
+[3:14..3:24): reportInfo -> _empty_/InfoMacro.reportInfo().
+[4:4..4:13): InfoMacro -> _empty_/InfoMacro.
+[4:14..4:24): reportInfo -> _empty_/InfoMacro.reportInfo().
+
+Diagnostics:
+[3:4..3:55): [info] Info from macro: This is a test info message
+[4:4..4:48): [info] Info from macro: Another info message
+
 expect/InstrumentTyper.scala
 ----------------------------
 

From c0929ded030e754a806398222a9d6d7cda73b47a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Mon, 28 Jul 2025 16:58:05 +0200
Subject: [PATCH 458/505] bugfix: Fix tests after backporting changes

---
 .../tools/dotc/fromtasty/TastyFileUtil.scala  |  1 +
 .../tools/pc/InferredMethodProvider.scala     | 92 +++++++++----------
 tests/semanticdb/metac.expect                 |  6 +-
 tests/warn/tostring-interpolated.scala        |  2 +-
 4 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala b/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala
index 9bd3016de1f5..e6baafe9bdb7 100644
--- a/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala
+++ b/compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala
@@ -42,6 +42,7 @@ object TastyFileUtil {
         s"${className.lastPart.encode}"
       else
         s"${packageName.encode}.${className.lastPart.encode}"
+  }
 }
 
 
diff --git a/presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala
index e6f27781bc64..d4299f6b1f95 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/InferredMethodProvider.scala
@@ -101,8 +101,8 @@ final class InferredMethodProvider(
         .mkString(", ")
 
     def printSignature(
-        methodName: Name, 
-        params: List[List[Type]], 
+        methodName: Name,
+        params: List[List[Type]],
         retTypeOpt: Option[Type]
     ): String =
       val retTypeString = retTypeOpt match
@@ -129,7 +129,7 @@ final class InferredMethodProvider(
       if pos > 0 then
         val isSpace = text(pos) == ' '
         val isTab = text(pos) == '\t'
-        val indent = countIndent(params.text(), pos, 0)
+        val indent = countIndent(params.text().nn, pos, 0)
 
         if isSpace then " " * indent else if isTab then "\t" * indent else ""
       else ""
@@ -145,8 +145,8 @@ final class InferredMethodProvider(
     /**
      * Returns the position to insert the method signature for a container.
      * If the container has an empty body, the position is the end of the container.
-     * If the container has a non-empty body, the position is the end of the last element in the body. 
-     * 
+     * If the container has a non-empty body, the position is the end of the last element in the body.
+     *
      * @param container the container to insert the method signature for
      * @return the position to insert the method signature for the container and a boolean indicating if the container has an empty body
      */
@@ -170,9 +170,9 @@ final class InferredMethodProvider(
 
       /**
       * Extracts type information for a specific parameter in a method signature.
-      * If the parameter is a function type, extracts both the function's argument types 
+      * If the parameter is a function type, extracts both the function's argument types
       * and return type. Otherwise, extracts just the parameter type.
-      * 
+      *
       * @param methodType the method type to analyze
       * @param argIndex the index of the parameter to extract information for
       * @return a tuple of (argument types, return type) where:
@@ -192,10 +192,10 @@ final class InferredMethodProvider(
           else
             (None, Some(m.paramInfos(argIndex)))
         case _ => (None, None)
-    
+
     def signatureEdits(signature: String): List[TextEdit] =
       val pos = insertPosition()
-      val indent = indentation(params.text(), pos.start - 1)
+      val indent = indentation(params.text().nn, pos.start - 1)
       val lspPos = pos.toLsp
       lspPos.setEnd(lspPos.getStart())
 
@@ -211,7 +211,7 @@ final class InferredMethodProvider(
         case Some((pos, hasEmptyBody)) =>
           val lspPos = pos.toLsp
           lspPos.setStart(lspPos.getEnd())
-          val indent = indentation(params.text(), pos.start - 1)
+          val indent = indentation(params.text().nn, pos.start - 1)
 
           if hasEmptyBody then
             List(
@@ -234,17 +234,17 @@ final class InferredMethodProvider(
        *                 outerArgs
        *        ---------------------------
        * method(..., errorMethod(args), ...)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
-            Apply(method, outerArgs) :: 
+      case (id @ Ident(errorMethod)) ::
+           (apply @ Apply(func, args)) ::
+            Apply(method, outerArgs) ::
             _ if id.symbol == NoSymbol && func == id && method != apply =>
-        
+
         val argTypes = args.map(_.typeOpt.widenDealias)
 
         val argIndex = outerArgs.indexOf(apply)
-        val (allArgTypes, retTypeOpt) = 
+        val (allArgTypes, retTypeOpt) =
           extractParameterTypeInfo(method.tpe.widenDealias, argIndex) match
             case (Some(argTypes2), retTypeOpt) => (List(argTypes, argTypes2), retTypeOpt)
             case (None, retTypeOpt) => (List(argTypes), retTypeOpt)
@@ -257,12 +257,12 @@ final class InferredMethodProvider(
        *              outerArgs
        *        ---------------------
        * method(..., errorMethod, ...)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           Apply(method, outerArgs) :: 
+      case (id @ Ident(errorMethod)) ::
+           Apply(method, outerArgs) ::
            _ if id.symbol == NoSymbol && method != id =>
-        
+
         val argIndex = outerArgs.indexOf(id)
 
         val (argTypes, retTypeOpt) = extractParameterTypeInfo(method.tpe.widenDealias, argIndex)
@@ -272,20 +272,20 @@ final class InferredMethodProvider(
           case None => Nil
 
         val signature = printSignature(errorMethod, allArgTypes, retTypeOpt)
-        
+
         signatureEdits(signature)
 
       /**
        *                tpt             body
        *            -----------   ----------------
        * val value: DefinedType = errorMethod(args)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
-           ValDef(_, tpt, body) :: 
+      case (id @ Ident(errorMethod)) ::
+           (apply @ Apply(func, args)) ::
+           ValDef(_, tpt, body) ::
             _ if id.symbol == NoSymbol && func == id && apply == body =>
-            
+
         val retType = tpt.tpe.widenDealias
         val argTypes = args.map(_.typeOpt.widenDealias)
 
@@ -296,24 +296,24 @@ final class InferredMethodProvider(
        *                tpt          body
        *            -----------   -----------
        * val value: DefinedType = errorMethod
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-            ValDef(_, tpt, body) :: 
+      case (id @ Ident(errorMethod)) ::
+            ValDef(_, tpt, body) ::
             _ if id.symbol == NoSymbol && id == body =>
-            
+
         val retType = tpt.tpe.widenDealias
 
         val signature = printSignature(errorMethod, Nil, Some(retType))
         signatureEdits(signature)
 
       /**
-       * 
+       *
        * errorMethod(args)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
+      case (id @ Ident(errorMethod)) ::
+           (apply @ Apply(func, args)) ::
             _ if id.symbol == NoSymbol && func == id =>
 
         val argTypes = args.map(_.typeOpt.widenDealias)
@@ -322,37 +322,37 @@ final class InferredMethodProvider(
         signatureEdits(signature)
 
       /**
-       * 
+       *
        * errorMethod
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
+      case (id @ Ident(errorMethod)) ::
            _ if id.symbol == NoSymbol =>
 
         val signature = printSignature(errorMethod, Nil, None)
         signatureEdits(signature)
 
       /**
-       * 
+       *
        * container.errorMethod(args)
-       * 
+       *
        */
-      case (select @ Select(container, errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
+      case (select @ Select(container, errorMethod)) ::
+           (apply @ Apply(func, args)) ::
             _  if select.symbol == NoSymbol && func == select =>
-        
+
         val argTypes = args.map(_.typeOpt.widenDealias)
         val signature = printSignature(errorMethod, List(argTypes), None)
         signatureEditsForContainer(signature, container)
 
       /**
-       * 
+       *
        * container.errorMethod
-       * 
+       *
        */
-      case (select @ Select(container, errorMethod)) :: 
+      case (select @ Select(container, errorMethod)) ::
             _  if select.symbol == NoSymbol =>
-        
+
         val signature = printSignature(errorMethod, Nil, None)
         signatureEditsForContainer(signature, container)
 
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 592bf586fcd9..712f6ef99b3c 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -1999,7 +1999,7 @@ _empty_/InfoMacro.reportInfo().(msg) => param msg: String
 _empty_/InfoMacro.reportInfoMacro(). => method reportInfoMacro (param msg: Expr[String])(implicit given param x$2: Quotes): Expr[Unit]
 _empty_/InfoMacro.reportInfoMacro().(msg) => param msg: Expr[String]
 _empty_/InfoMacro.reportInfoMacro().(x$2) => implicit given param x$2: Quotes
-local0 => implicit given param contextual$1: Quotes
+local0 => implicit given param evidence$1: Quotes
 
 Occurrences:
 [0:7..0:12): scala -> scala/
@@ -2027,8 +2027,8 @@ Occurrences:
 [9:41..9:53): valueOrAbort -> scala/quoted/Quotes#valueOrAbort().
 
 Synthetics:
-[3:48..3:69):reportInfoMacro('msg) => *(contextual$1)
-[3:64..3:68):'msg => orig()(contextual$1)
+[3:48..3:69):reportInfoMacro('msg) => *(evidence$1)
+[3:64..3:68):'msg => orig()(evidence$1)
 [6:11..6:17):quotes => *(x$2)
 [9:37..9:53):msg.valueOrAbort => *(StringFromExpr[String])
 [9:41..9:53):valueOrAbort => *[String]
diff --git a/tests/warn/tostring-interpolated.scala b/tests/warn/tostring-interpolated.scala
index 165bc374b5ef..a7e9129b162d 100644
--- a/tests/warn/tostring-interpolated.scala
+++ b/tests/warn/tostring-interpolated.scala
@@ -29,7 +29,7 @@ class Mitigations {
 
   def ok = s"$s is ok"
   def jersey = s"number $i"
-  def unitized = s"unfortunately $shown" // maybe tell them about unintended ()?
+  def unitized = s"unfortunately $shown" // warn
 
   def nopct = f"$s is ok"
   def nofmt = f"number $i"

From 2f5ac7bbd2622e389b6e2a9a2f24aef83c3d338f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Bra=C4=8Devac?= <bracevac@users.noreply.github.com>
Date: Wed, 23 Jul 2025 15:05:35 +0200
Subject: [PATCH 459/505] Suppress warnings in comprehensions with 22+ binds

Fixes #23164

At that point, we emit a TupleXXL pattern case bundling
all the variable bindings so far. The type tests in these
patterns cannot be checked at runtime due to erasure.
But we know these are safe, so we mark them as `@unchecked`.

[Cherry-picked abc8192fac301ad371c9a9a1102d6c043e886fad]
---
 .../src/dotty/tools/dotc/ast/Desugar.scala    | 14 +++-
 tests/warn/i23164.scala                       | 72 +++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 tests/warn/i23164.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
index 5d3df980e7db..197d0d081f7f 100644
--- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -1629,7 +1629,19 @@ object desugar {
           val matchCheckMode =
             if (gen.checkMode == GenCheckMode.Check || gen.checkMode == GenCheckMode.CheckAndFilter) MatchCheck.IrrefutableGenFrom
             else MatchCheck.None
-          makeCaseLambda(CaseDef(gen.pat, EmptyTree, body) :: Nil, matchCheckMode)
+          val pat = gen.pat.match
+            case Tuple(pats) if pats.length > Definitions.MaxImplementedFunctionArity =>
+              /* The pattern case is a tupleXXL, because we have bound > 21 variables in the comprehension.
+               * In this case, we need to mark all the typed patterns as @unchecked, or get loads of warnings.
+               * Cf. warn test i23164.scala */
+              Tuple:
+                pats.map:
+                  case t @ Bind(name, tp @ Typed(id, tpt)) =>
+                    val annotated = Annotated(tpt, New(ref(defn.UncheckedAnnot.typeRef)))
+                    cpy.Bind(t)(name, cpy.Typed(tp)(id, annotated)).withMods(t.mods)
+                  case t => t
+            case _ => gen.pat
+          makeCaseLambda(CaseDef(pat, EmptyTree, body) :: Nil, matchCheckMode)
       }
 
       /** If `pat` is not an Identifier, a Typed(Ident, _), or a Bind, wrap
diff --git a/tests/warn/i23164.scala b/tests/warn/i23164.scala
new file mode 100644
index 000000000000..ac068555a5b3
--- /dev/null
+++ b/tests/warn/i23164.scala
@@ -0,0 +1,72 @@
+class T1[F[_]]
+class T2[F[_]]
+class T3[F[_]]
+class T4[F[_]]
+class T5[F[_]]
+class T6[F[_]]
+class T7[F[_]]
+class T8[F[_]]
+class T9[F[_]]
+class T10[F[_]]
+class T11[F[_]]
+class T12[F[_]]
+class T13[F[_]]
+class T14[F[_]]
+class T15[F[_]]
+class T16[F[_]]
+class T17[F[_]]
+class T18[F[_]]
+class T19[F[_]]
+class T20[F[_]]
+class T21[F[_]]
+class T22[F[_]]
+
+class Result[F[_]: {T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22}]
+
+val r = for
+  t1 <- Option(new T1[Option])
+  t2 <- Option(new T2[Option])
+  t3 <- Option(new T3[Option])
+  t4 <- Option(new T4[Option])
+  t5 <- Option(new T5[Option])
+  t6 <- Option(new T6[Option])
+  t7 <- Option(new T7[Option])
+  t8 <- Option(new T8[Option])
+  t9 <- Option(new T9[Option])
+  t10 <- Option(new T10[Option])
+  t11 <- Option(new T11[Option])
+  t12 <- Option(new T12[Option])
+  t13 <- Option(new T13[Option])
+  t14 <- Option(new T14[Option])
+  t15 <- Option(new T15[Option])
+  t16 <- Option(new T16[Option])
+  t17 <- Option(new T17[Option])
+  t18 <- Option(new T18[Option])
+  t19 <- Option(new T19[Option])
+  t20 <- Option(new T20[Option])
+  t21 <- Option(new T21[Option])
+  t22 <- Option(new T22[Option])
+  given T1[Option] = t1
+  given T2[Option] = t2
+  given T3[Option] = t3
+  given T4[Option] = t4
+  given T5[Option] = t5
+  given T6[Option] = t6
+  given T7[Option] = t7
+  given T8[Option] = t8
+  given T9[Option] = t9
+  given T10[Option] = t10
+  given T11[Option] = t11
+  given T12[Option] = t12
+  given T13[Option] = t13
+  given T14[Option] = t14
+  given T15[Option] = t15
+  given T16[Option] = t16
+  given T17[Option] = t17
+  given T18[Option] = t18
+  given T19[Option] = t19
+  given T20[Option] = t20
+  given T21[Option] = t21
+  given T22[Option] = t22
+  result <- Option(new Result[Option])
+yield result
\ No newline at end of file

From d491de02ff7543c0a655baf2637de30c7dddd2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Rochala?=
 <48657087+rochala@users.noreply.github.com>
Date: Tue, 29 Jul 2025 09:01:05 +0200
Subject: [PATCH 460/505] Fix completions for Quotes (#23619)

Some denotation were not collected because they were
`UniqueRefDenotation` and we matched for `SymDenotation`
[Cherry-picked 74f78a1d3bae514662ecdafd88f5f3da26397cdf]
---
 .../dotty/tools/dotc/interactive/Completion.scala   |  5 +++--
 .../tools/pc/tests/completion/CompletionSuite.scala | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index 9d1bb002cabd..c54a81372afa 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -587,8 +587,9 @@ object Completion:
 
       // 1. The extension method is visible under a simple name, by being defined or inherited or imported in a scope enclosing the reference.
       val extMethodsInScope = scopeCompletions.names.toList.flatMap:
-        case (name, denots) => denots.collect:
-          case d: SymDenotation if d.isTerm && d.termRef.symbol.is(Extension) => (d.termRef, name.asTermName)
+        case (name, denots) =>
+          denots.collect:
+            case d if d.isTerm && d.symbol.is(Extension) => (d.symbol.termRef, name.asTermName)
 
       // 2. The extension method is a member of some given instance that is visible at the point of the reference.
       val givensInScope = ctx.implicits.eligible(defn.AnyType).map(_.implicitRef.underlyingRef)
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
index 84ee3129b0ea..13f373f068c4 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -2228,3 +2228,16 @@ class CompletionSuite extends BaseCompletionSuite:
         |""".stripMargin,
       "test: Int"
     )
+
+  @Test def `macros` =
+    check(
+      """
+        |object Macro:
+        |  import scala.quoted.*
+        |  def dbgImpl[A](a: Expr[A])(using Quotes): Expr[A] =
+        |    import quotes.reflect.*
+        |    a.asTer@@
+        |
+        |""".stripMargin,
+      "asTerm: Term"
+    )

From 887a6fc9a209f8cae671ac4f3d3114203b31571b Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Tue, 29 Jul 2025 14:21:47 +0200
Subject: [PATCH 461/505] Add regression test for #23616 (#23623)

[Cherry-picked e936805df167f83614ae1a90a2f996f285ace4f7]
---
 tests/pos/i23616.scala | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/pos/i23616.scala

diff --git a/tests/pos/i23616.scala b/tests/pos/i23616.scala
new file mode 100644
index 000000000000..48f91d8cd77f
--- /dev/null
+++ b/tests/pos/i23616.scala
@@ -0,0 +1,22 @@
+trait Apply[F[_]]:
+  extension [A](fa: F[A])
+    def map[B](f: A => B): F[B]
+    def map2[B, Z](fb: F[B])(f: (A, B) => Z): F[Z] = ???
+
+  private case class IsMap[T <: Tuple](value: Tuple.Map[T, F])
+  private inline def tupledGeneric[T <: Tuple](tuple: Tuple.Map[T, F]): F[T] =
+    inline IsMap(tuple) match
+      case t: IsMap[h *: EmptyTuple] => t.value.head.map(_ *: EmptyTuple)
+      case t: IsMap[h *: t] =>
+        val head = t.value.head
+        val tail = tupledGeneric(t.value.tail)
+        head.map2(tail)(_ *: _)
+
+trait Monad[F[_]] extends Apply[F]:
+  extension [A](fa: F[A]) def flatMap[B](f: A => F[B]): F[B]
+  extension [A](fa: F[A]) override def map[B](f: A => B): F[B] = ???
+
+opaque type Kleisli[F[_], A, B] = A => F[B]
+given [F[_], A](using F: Monad[F]): Monad[[B] =>> Kleisli[F, A, B]] with
+  extension [B](k: Kleisli[F, A, B])
+    def flatMap[C](f: B => Kleisli[F, A, C]) = ???
\ No newline at end of file

From 9178ff00d6dd2ab5f127da1790319766bab62f72 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Wed, 26 Mar 2025 16:38:07 +0100
Subject: [PATCH 462/505] Sort the typeMembers output list and filter out
 non-members

[Cherry-picked fe6cfc6ddbef97f1654d0aa9001ec30d6ee4345d]
---
 .../src/dotty/tools/dotc/core/Types.scala     | 17 ++++++++++
 .../quoted/runtime/impl/QuotesImpl.scala      | 28 +++++++++++++++-
 tests/run-macros/type-members.check           |  8 +++++
 tests/run-macros/type-members/Macro_1.scala   | 12 +++++++
 tests/run-macros/type-members/Test_2.scala    | 33 +++++++++++++++++++
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 tests/run-macros/type-members.check
 create mode 100644 tests/run-macros/type-members/Macro_1.scala
 create mode 100644 tests/run-macros/type-members/Test_2.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 2406c0105aed..f2e000c2db73 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -984,6 +984,23 @@ object Types extends TypeUtils {
       buf.toList
     }
 
+    /** For use in quotes reflect.
+     *  A bit slower than the usual approach due to the use of LinkedHashSet.
+     **/
+    def sortedParents(using Context): mutable.LinkedHashSet[Type] = this match
+      case tp: ClassInfo =>
+        mutable.LinkedHashSet(tp) | mutable.LinkedHashSet(tp.declaredParents.flatMap(_.sortedParents.toList)*)
+      case tp: RefinedType =>
+        tp.parent.sortedParents
+      case tp: TypeProxy =>
+        tp.superType.sortedParents
+      case tp: AndType =>
+        tp.tp1.sortedParents | tp.tp2.sortedParents
+      case tp: OrType =>
+        tp.tp1.sortedParents & tp.tp2.sortedParents
+      case _ =>
+        mutable.LinkedHashSet()
+
     /** The set of abstract term members of this type. */
     final def abstractTermMembers(using Context): Seq[SingleDenotation] = {
       record("abstractTermMembers")
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index 13f144d45122..87a865f81e1a 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -2757,7 +2757,33 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
         def memberTypes: List[Symbol] =
           self.typeRef.decls.filter(_.isType)
         def typeMembers: List[Symbol] =
-          lookupPrefix.typeMembers.map(_.symbol).toList
+          // lookupPrefix.typeMembers currently returns a Set wrapped into a unsorted Seq,
+          // so we try to sort that here (see discussion: https://github.com/scala/scala3/issues/22472),
+          // without adding too much of a performance hit.
+          // It first sorts by parents, then for type params by their positioning, then for members
+          // derived from declarations it sorts them by their name lexicographically
+          val parentsMap = lookupPrefix.sortedParents.map(_.typeSymbol).zipWithIndex.toList.toMap
+          val unsortedTypeMembers = lookupPrefix.typeMembers.map(_.symbol).filter(_.exists).toList
+          unsortedTypeMembers.sortWith {
+            case (typeA, typeB) =>
+              val msg = "Unknown type member found. Please consider reporting the issue to the compiler. "
+              assert(parentsMap.contains(typeA.owner), msg)
+              assert(parentsMap.contains(typeB.owner), msg)
+              val parentPlacementA = parentsMap(typeA.owner)
+              val parentPlacementB = parentsMap(typeB.owner)
+              if (parentPlacementA == parentPlacementB) then
+                if typeA.isTypeParam && typeB.isTypeParam then
+                  // put type params at the beginning (and sort them by declaration order)
+                  val pl = typeA.owner
+                  val typeParamPositionMap = pl.typeParams.map(_.asInstanceOf[Symbol]).zipWithIndex.toMap
+                  typeParamPositionMap(typeA) < typeParamPositionMap(typeB)
+                else if typeA.isTypeParam then true
+                else if typeB.isTypeParam then false
+                else
+                  // sort by name lexicographically
+                  typeA.name.toString().compareTo(typeB.name.toString()) < 0
+              else parentPlacementA < parentPlacementB
+          }.map(_.asInstanceOf[Symbol])
 
         def declarations: List[Symbol] =
           self.typeRef.info.decls.toList
diff --git a/tests/run-macros/type-members.check b/tests/run-macros/type-members.check
new file mode 100644
index 000000000000..6805e6158e8e
--- /dev/null
+++ b/tests/run-macros/type-members.check
@@ -0,0 +1,8 @@
+class FooSmall: List(type A, type B, type C, type D)
+class FooLarge: List(type A, type B, type C, type D, type E)
+type FooUnion: List()
+type FooAnd: List(type A, type B, type C, type D, type E)
+trait CLS1: List(type A, type B, type C, type B1, type B2, type A3, type B3, type B4)
+type SharedAnd1: List(type B, type Shared, type A, type C)
+type SharedAnd2: List(type C, type Shared, type A, type B)
+type SharedUnion: List(type A, type Shared)
diff --git a/tests/run-macros/type-members/Macro_1.scala b/tests/run-macros/type-members/Macro_1.scala
new file mode 100644
index 000000000000..1aff04803798
--- /dev/null
+++ b/tests/run-macros/type-members/Macro_1.scala
@@ -0,0 +1,12 @@
+package example
+
+import scala.quoted.*
+
+object Macro {
+  inline def typeMembers[T <: AnyKind]: String = ${ typeMembersImpl[T] }
+
+  def typeMembersImpl[T <: AnyKind: Type](using quotes: Quotes): Expr[String] = {
+    import quotes.reflect.*
+    Expr(s"${TypeRepr.of[T].typeSymbol}: ${TypeRepr.of[T].typeSymbol.typeMembers.toString}")
+  }
+}
diff --git a/tests/run-macros/type-members/Test_2.scala b/tests/run-macros/type-members/Test_2.scala
new file mode 100644
index 000000000000..506e67068492
--- /dev/null
+++ b/tests/run-macros/type-members/Test_2.scala
@@ -0,0 +1,33 @@
+import example.Macro
+
+class FooSmall[A, B] { type D; type C }
+class FooLarge[A, B, C] { type E; type D }
+
+type FooUnion[A, B] = FooSmall[A, B] | FooLarge[A, B, Int]
+type FooAnd[A, B] = FooSmall[A, B] & FooLarge[A, B, Int]
+
+trait CLS4[A] { type B4 }
+trait CLS3[A] extends CLS4[A] { type B3; type A3 }
+trait CLS2[A] { type B2 }
+trait CLS1[A, B, C] extends CLS2[A] with CLS3[B] { type B1 }
+
+trait SharedParent[A] { type Shared }
+trait SharedA[A] extends SharedParent[A] { type B }
+trait SharedB[A] extends SharedParent[A] { type C }
+type SharedAnd1[A] = SharedA[A] & SharedB[A]
+type SharedAnd2[A] = SharedB[A] & SharedA[A]
+type SharedUnion[A] = SharedA[A] | SharedB[A]
+
+@main def Test(): Unit = {
+  println(Macro.typeMembers[FooSmall])
+  println(Macro.typeMembers[FooLarge])
+
+  println(Macro.typeMembers[FooUnion])
+  println(Macro.typeMembers[FooAnd])
+
+  println(Macro.typeMembers[CLS1])
+
+  println(Macro.typeMembers[SharedAnd1])
+  println(Macro.typeMembers[SharedAnd2])
+  println(Macro.typeMembers[SharedUnion])
+}

From 12e1c9f980f15e2417ce113698f292c23d0a9677 Mon Sep 17 00:00:00 2001
From: Jan Chyb <jan.chyb.99@gmail.com>
Date: Mon, 31 Mar 2025 11:32:39 +0200
Subject: [PATCH 463/505] Change expected ordering of typeMembers in an older
 testcase

[Cherry-picked 36f781077608b3edf67ca5c6b5cabac785140816]
---
 tests/run-macros/i14902.check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-macros/i14902.check b/tests/run-macros/i14902.check
index 9b27fcb7e5dc..5e6373a9516c 100644
--- a/tests/run-macros/i14902.check
+++ b/tests/run-macros/i14902.check
@@ -1,4 +1,4 @@
 List(X)
-List(X, Y, Z)
+List(Y, Z, X)
 List(X)
 List(Y, Z)

From a53789db99339aaba488d814b7f42136e880e87c Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@users.noreply.github.com>
Date: Wed, 30 Jul 2025 11:53:21 +0200
Subject: [PATCH 464/505] bugfix: Include synthetic apply in semanticdb
 (#23629)

Fixes https://github.com/scalameta/metals/issues/7666

Some weird entries around string interpolation, but they actually make
sense.
---
 .../dotc/semanticdb/SyntheticsExtractor.scala |   4 +-
 tests/semanticdb/metac.expect                 | 184 ++++++++++++++++--
 2 files changed, 169 insertions(+), 19 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala
index af38315a857e..6bf3b0468ffc 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala
@@ -76,7 +76,9 @@ class SyntheticsExtractor:
             )
           ).toOpt
 
-        case tree: Apply if tree.fun.symbol.is(Implicit) =>
+        case tree: Apply
+            if tree.fun.symbol.is(Implicit) ||
+              (tree.fun.symbol.name == nme.apply && tree.fun.span.isSynthetic) =>
           val pos = range(tree.span, tree.source)
           s.Synthetic(
             pos,
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 712f6ef99b3c..3a38e8772c55 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -500,6 +500,7 @@ Text => empty
 Language => Scala
 Symbols => 22 entries
 Occurrences => 17 entries
+Synthetics => 2 entries
 
 Symbols:
 caseclass/CaseClass# => case class CaseClass extends Object with Product with Serializable { self: CaseClass => +8 decls }
@@ -544,6 +545,10 @@ Occurrences:
 [6:15..6:24): CaseClass -> caseclass/CaseClass#
 [6:27..6:36): CaseClass -> caseclass/CaseClass.
 
+Synthetics:
+[5:35..5:52):CaseClass(int, 0) => apply(*)
+[6:27..6:42):CaseClass(0, 0) => apply(*)
+
 expect/Classes.scala
 --------------------
 
@@ -555,7 +560,7 @@ Language => Scala
 Symbols => 108 entries
 Occurrences => 127 entries
 Diagnostics => 9 entries
-Synthetics => 2 entries
+Synthetics => 3 entries
 
 Symbols:
 classes/C1# => final class C1 extends AnyVal { self: C1 => +2 decls }
@@ -810,6 +815,7 @@ Diagnostics:
 Synthetics:
 [51:16..51:27):List(1).map => *[Int]
 [51:16..51:20):List => *.apply[Int]
+[51:16..51:23):List(1) => List.apply[Int](*)
 
 expect/Deprecated.scala
 -----------------------
@@ -899,6 +905,7 @@ Language => Scala
 Symbols => 30 entries
 Occurrences => 49 entries
 Diagnostics => 3 entries
+Synthetics => 2 entries
 
 Symbols:
 endmarkers/Container# => class Container extends Object { self: Container => +5 decls }
@@ -988,6 +995,10 @@ Diagnostics:
 [42:8..42:16): [warning] unused local definition
 [46:8..46:16): [warning] unused local definition
 
+Synthetics:
+[23:6..23:13):(1,2,3) => Tuple3.apply[Int, Int, Int](*)
+[27:6..27:13):(4,5,6) => Tuple3.apply[Int, Int, Int](*)
+
 expect/EndMarkers2.scala
 ------------------------
 
@@ -1070,7 +1081,7 @@ Language => Scala
 Symbols => 181 entries
 Occurrences => 159 entries
 Diagnostics => 1 entries
-Synthetics => 6 entries
+Synthetics => 9 entries
 
 Symbols:
 _empty_/Enums. => final object Enums extends Object { self: Enums.type => +30 decls }
@@ -1420,11 +1431,14 @@ Diagnostics:
 [30:12..30:17): [warning] unused explicit parameter
 
 Synthetics:
+[49:27..49:33):Refl() => Refl.apply[T](*)
 [52:9..52:13):Refl => *.unapply[Option[B]]
 [52:31..52:50):identity[Option[B]] => *[Function1[A, Option[B]]]
 [54:14..54:18):Some => *.apply[Some[Int]]
+[54:14..54:27):Some(Some(1)) => Some.apply[Some[Int]](*)
 [54:14..54:34):Some(Some(1)).unwrap => *(given_<:<_T_T[Option[Int]])
 [54:19..54:23):Some => *.apply[Int]
+[54:19..54:26):Some(1) => Some.apply[Int](*)
 [54:28..54:34):unwrap => *[Some[Int], Int]
 
 expect/EtaExpansion.scala
@@ -1437,7 +1451,7 @@ Text => empty
 Language => Scala
 Symbols => 3 entries
 Occurrences => 9 entries
-Synthetics => 5 entries
+Synthetics => 7 entries
 
 Symbols:
 example/EtaExpansion# => class EtaExpansion extends Object { self: EtaExpansion => +1 decls }
@@ -1458,9 +1472,11 @@ Occurrences:
 Synthetics:
 [3:2..3:13):Some(1).map => *[Int]
 [3:2..3:6):Some => *.apply[Int]
+[3:2..3:9):Some(1) => Some.apply[Int](*)
 [3:14..3:22):identity => *[Int]
 [4:2..4:18):List(1).foldLeft => *[String]
 [4:2..4:6):List => *.apply[Int]
+[4:2..4:9):List(1) => List.apply[Int](*)
 
 expect/Example.scala
 --------------------
@@ -1473,6 +1489,7 @@ Language => Scala
 Symbols => 5 entries
 Occurrences => 23 entries
 Diagnostics => 1 entries
+Synthetics => 1 entries
 
 Symbols:
 example/Example. => final object Example extends Object { self: Example.type => +3 decls }
@@ -1509,6 +1526,9 @@ Occurrences:
 Diagnostics:
 [2:24..2:30): [warning] unused import
 
+Synthetics:
+[9:37..9:37): => ClassTag.apply[Int](*)
+
 expect/Extension.scala
 ----------------------
 
@@ -1519,7 +1539,7 @@ Text => empty
 Language => Scala
 Symbols => 32 entries
 Occurrences => 66 entries
-Synthetics => 1 entries
+Synthetics => 2 entries
 
 Symbols:
 ext/DeckUsage. => final object DeckUsage extends Object { self: DeckUsage.type => +2 decls }
@@ -1624,6 +1644,7 @@ Occurrences:
 [26:7..26:14): fooSize -> ext/Extension$package.Deck.fooSize().
 
 Synthetics:
+[4:36..4:42):(s, i) => Tuple2.apply[String, Int](*)
 [14:46..14:61):summon[Read[T]] => *(x$2)
 
 expect/ForComprehension.scala
@@ -1636,7 +1657,7 @@ Text => empty
 Language => Scala
 Symbols => 13 entries
 Occurrences => 53 entries
-Synthetics => 6 entries
+Synthetics => 23 entries
 
 Symbols:
 example/ForComprehension# => class ForComprehension extends Object { self: ForComprehension => +1 decls }
@@ -1710,11 +1731,50 @@ Occurrences:
 
 Synthetics:
 [4:9..4:13):List => *.apply[Int]
+[4:9..4:16):List(1) => List.apply[Int](*)
+[5:4..7:5):b <- List(1)
+    if b > 1
+    c => Tuple2.apply[Int, Int](*)
 [5:9..5:13):List => *.apply[Int]
+[5:9..5:16):List(1) => List.apply[Int](*)
+[8:10..8:19):(a, b, c) => Tuple3.apply[Int, Int, Int](*)
 [10:9..10:13):List => *.apply[Int]
+[10:9..10:16):List(1) => List.apply[Int](*)
 [11:9..11:13):List => *.apply[Int]
+[11:9..11:16):List(a) => List.apply[Int](*)
+[12:7..15:5):(
+      a,
+      b
+    ) => Tuple2.apply[Int, Int](*)
+[15:9..15:15):(1, 2) => Tuple2.apply[Int, Int](*)
 [19:9..19:13):List => *.apply[Tuple2[Int, Int]]
+[19:9..19:21):List((a, b)) => List.apply[Tuple2[Int, Int]](*)
+[19:14..19:20):(a, b) => Tuple2.apply[Int, Int](*)
+[20:7..25:5):(
+      a,
+      b,
+      c,
+      d
+    ) => Tuple4.apply[Int, Int, Int, Int](*)
+[25:9..25:21):(1, 2, 3, 4) => Tuple4.apply[Int, Int, Int, Int](*)
+[26:4..26:5):e => Tuple2.apply[Tuple2[Int, Int], Tuple4[Int, Int, Int, Int]](*)
+[26:8..31:5):(
+      a,
+      b,
+      c,
+      d
+    ) => Tuple4.apply[Int, Int, Int, Int](*)
+[32:12..32:24):(1, 2, 3, 4) => Tuple4.apply[Int, Int, Int, Int](*)
 [33:9..33:13):List => *.apply[Tuple4[Int, Int, Int, Int]]
+[33:9..33:16):List(e) => List.apply[Tuple4[Int, Int, Int, Int]](*)
+[35:4..42:5):(
+      a,
+      b,
+      c,
+      d,
+      e,
+      f
+    ) => Tuple6.apply[Int, Int, Int, Int, Tuple4[Int, Int, Int, Int], Tuple4[Int, Int, Int, Int]](*)
 
 expect/Givens.scala
 -------------------
@@ -1726,7 +1786,7 @@ Text => empty
 Language => Scala
 Symbols => 33 entries
 Occurrences => 72 entries
-Synthetics => 3 entries
+Synthetics => 6 entries
 
 Symbols:
 a/b/Givens. => final object Givens extends Object { self: Givens.type => +13 decls }
@@ -1838,6 +1898,9 @@ Occurrences:
 [27:59..27:64): empty -> a/b/Givens.Monoid#empty().
 
 Synthetics:
+[6:21..6:37):Hello, I am $any => apply(*)
+[9:23..9:41):Goodbye, from $any => apply(*)
+[10:22..10:40):So Long, from $any => apply(*)
 [12:17..12:25):sayHello => *[Int]
 [13:19..13:29):sayGoodbye => *[Int]
 [14:18..14:27):saySoLong => *[Int]
@@ -1852,7 +1915,7 @@ Text => empty
 Language => Scala
 Symbols => 23 entries
 Occurrences => 52 entries
-Synthetics => 6 entries
+Synthetics => 9 entries
 
 Symbols:
 example/ImplicitConversion# => class ImplicitConversion extends Object { self: ImplicitConversion => +9 decls }
@@ -1934,12 +1997,17 @@ Occurrences:
 [34:58..34:63): other -> example/ImplicitConversion.newAny2stringadd#`+`().(other)
 
 Synthetics:
+[11:14..11:20):(1, 2) => Tuple2.apply[Int, Int](*)
 [15:2..15:9):message => augmentString(*)
 [17:2..17:7):tuple => newAny2stringadd[Tuple2[Int, Int]](*)
 [20:15..20:22):message => string2Number(*)
+[23:4..23:26):Hello $message $number => apply(*)
 [24:2..26:16):s"""Hello
      |$message
      |$number""" => augmentString(*)
+[24:6..26:13):Hello
+     |$message
+     |$number => apply(*)
 [28:15..28:19):char => char2int(*)
 [29:16..29:20):char => char2long(*)
 
@@ -1990,7 +2058,7 @@ Text => empty
 Language => Scala
 Symbols => 7 entries
 Occurrences => 23 entries
-Synthetics => 6 entries
+Synthetics => 7 entries
 
 Symbols:
 _empty_/InfoMacro. => final object InfoMacro extends Object { self: InfoMacro.type => +3 decls }
@@ -2030,6 +2098,7 @@ Synthetics:
 [3:48..3:69):reportInfoMacro('msg) => *(evidence$1)
 [3:64..3:68):'msg => orig()(evidence$1)
 [6:11..6:17):quotes => *(x$2)
+[9:18..9:54):Info from macro: ${msg.valueOrAbort} => apply(*)
 [9:37..9:53):msg.valueOrAbort => *(StringFromExpr[String])
 [9:41..9:53):valueOrAbort => *[String]
 [11:4..11:11):'{ () } => orig(())(x$2)
@@ -2073,7 +2142,7 @@ Text => empty
 Language => Scala
 Symbols => 8 entries
 Occurrences => 53 entries
-Synthetics => 2 entries
+Synthetics => 4 entries
 
 Symbols:
 example/InstrumentTyper# => class InstrumentTyper extends Object { self: AnyRef & InstrumentTyper => +5 decls }
@@ -2142,7 +2211,22 @@ Occurrences:
 
 Synthetics:
 [8:12..8:16):List => *.apply[Float | Double | List[Nothing] | Boolean | Unit | Char | String | LinkOption | Int | Long | Class[Option[Int]]]
+[8:12..21:3):List(
+    Literal.int,
+    Literal.long,
+    Literal.float,
+    Literal.double,
+    Literal.nil,
+    Literal.char,
+    Literal.string,
+    Literal.bool,
+    Literal.unit,
+    Literal.javaEnum,
+    Literal.clazzOf,
+    List()
+  ) => List.apply[Float | Double | List[Nothing] | Boolean | Unit | Char | String | LinkOption | Int | Long | Class[Option[Int]]](*)
 [20:4..20:8):List => *.apply[Nothing]
+[20:4..20:10):List() => List.apply[Nothing](*)
 
 expect/InventedNames.scala
 --------------------------
@@ -2290,7 +2374,7 @@ Text => empty
 Language => Scala
 Symbols => 7 entries
 Occurrences => 24 entries
-Synthetics => 3 entries
+Synthetics => 5 entries
 
 Symbols:
 example/Issue1749# => class Issue1749 extends Object { self: Issue1749 => +3 decls }
@@ -2329,8 +2413,10 @@ Occurrences:
 
 Synthetics:
 [8:2..8:10):(x1, x1) => orderingToOrdered[Tuple2[Int, Int]](*)
+[8:2..8:10):(x1, x1) => Tuple2.apply[Int, Int](*)
 [8:2..8:10):(x1, x1) => *(Tuple2(Int, Int))
 [8:10..8:10): => *(Int, Int)
+[9:13..9:21):(x2, x2) => Tuple2.apply[Int, Int](*)
 
 expect/JavaStaticVar.scala
 --------------------------
@@ -2405,7 +2491,7 @@ Text => empty
 Language => Scala
 Symbols => 3 entries
 Occurrences => 6 entries
-Synthetics => 1 entries
+Synthetics => 2 entries
 
 Symbols:
 local0 => val local x: Int
@@ -2422,6 +2508,7 @@ Occurrences:
 
 Synthetics:
 [5:4..5:8):List => *.apply[Int]
+[5:4..5:11):List(x) => List.apply[Int](*)
 
 expect/MatchType.scala
 ----------------------
@@ -2932,6 +3019,7 @@ Text => empty
 Language => Scala
 Symbols => 41 entries
 Occurrences => 41 entries
+Synthetics => 1 entries
 
 Symbols:
 example/NamedApplyBlockCaseClassConstruction. => final object NamedApplyBlockCaseClassConstruction extends Object { self: NamedApplyBlockCaseClassConstruction.type => +6 decls }
@@ -3019,6 +3107,9 @@ Occurrences:
 [12:16..12:24): bodyText -> example/NamedApplyBlockCaseClassConstruction.bodyText.
 [12:26..12:30): tail -> example/NamedApplyBlockCaseClassConstruction.Msg.apply().(tail)
 
+Synthetics:
+[12:12..12:40):Msg(bodyText, tail = "tail") => apply(*)
+
 expect/NamedArguments.scala
 ---------------------------
 
@@ -3029,6 +3120,7 @@ Text => empty
 Language => Scala
 Symbols => 16 entries
 Occurrences => 12 entries
+Synthetics => 1 entries
 
 Symbols:
 example/NamedArguments# => class NamedArguments extends Object { self: NamedArguments => +4 decls }
@@ -3062,6 +3154,9 @@ Occurrences:
 [5:7..5:12): apply -> example/NamedArguments#User.apply().
 [5:13..5:17): name -> example/NamedArguments#User.apply().(name)
 
+Synthetics:
+[4:2..4:21):User(name = "John") => apply(*)
+
 expect/NewModifiers.scala
 -------------------------
 
@@ -3253,7 +3348,7 @@ Text => empty
 Language => Scala
 Symbols => 68 entries
 Occurrences => 115 entries
-Synthetics => 3 entries
+Synthetics => 4 entries
 
 Symbols:
 example/C# => class C extends Object { self: C => +3 decls }
@@ -3445,6 +3540,7 @@ Occurrences:
 Synthetics:
 [15:23..15:34):elems.toMap => *[String, Any]
 [15:23..15:34):elems.toMap => *(refl[Tuple2[String, Any]])
+[16:41..16:53):fields(name) => apply(*)
 [32:47..32:56):s.pickOne => *[String]
 
 expect/RightAssociativeExtension.scala
@@ -3457,6 +3553,7 @@ Text => empty
 Language => Scala
 Symbols => 5 entries
 Occurrences => 12 entries
+Synthetics => 1 entries
 
 Symbols:
 ext/RightAssociativeExtension$package. => final package object ext extends Object { self: ext.type => +3 decls }
@@ -3479,6 +3576,9 @@ Occurrences:
 [5:4..5:5): b <- ext/RightAssociativeExtension$package.b.
 [5:14..5:17): :*: -> ext/RightAssociativeExtension$package.`:*:`().
 
+Synthetics:
+[3:36..3:42):(s, i) => Tuple2.apply[String, Int](*)
+
 expect/Selfs.scala
 ------------------
 
@@ -3540,7 +3640,7 @@ Language => Scala
 Symbols => 20 entries
 Occurrences => 31 entries
 Diagnostics => 14 entries
-Synthetics => 1 entries
+Synthetics => 2 entries
 
 Symbols:
 example/Shadow# => class Shadow extends Object { self: Shadow => +5 decls }
@@ -3615,6 +3715,7 @@ Diagnostics:
 
 Synthetics:
 [16:16..16:20):List => *.apply[Int]
+[16:16..16:27):List(1,2,3) => List.apply[Int](*)
 
 expect/StructuralTypes.scala
 ----------------------------
@@ -3694,7 +3795,7 @@ Language => Scala
 Symbols => 62 entries
 Occurrences => 164 entries
 Diagnostics => 3 entries
-Synthetics => 39 entries
+Synthetics => 48 entries
 
 Symbols:
 example/Synthetic# => class Synthetic extends Object { self: Synthetic => +23 decls }
@@ -3934,11 +4035,14 @@ Diagnostics:
 Synthetics:
 [5:2..5:13):List(1).map => *[Int]
 [5:2..5:6):List => *.apply[Int]
+[5:2..5:9):List(1) => List.apply[Int](*)
 [6:2..6:18):Array.empty[Int] => intArrayOps(*)
+[6:18..6:18): => ClassTag.apply[Int](*)
 [7:2..7:8):"fooo" => augmentString(*)
 [10:13..10:24):"name:(.*)" => augmentString(*)
 [11:8..11:11):#:: => *.unapply[Int]
 [11:17..11:25):LazyList => *.apply[Int]
+[11:17..11:31):LazyList(1, 2) => LazyList.apply[Int](*)
 [13:4..13:28):#:: 2 #:: LazyList.empty => *[Int]
 [13:8..13:28):2 #:: LazyList.empty => toDeferrer[Int](*)
 [13:10..13:28):#:: LazyList.empty => *[Int]
@@ -3947,6 +4051,7 @@ Synthetics:
 [15:9..15:12):#:: => *.unapply[Int]
 [15:16..15:19):#:: => *.unapply[Int]
 [15:25..15:33):LazyList => *.apply[Int]
+[15:25..15:39):LazyList(1, 2) => LazyList.apply[Int](*)
 [17:14..17:38):#:: 2 #:: LazyList.empty => *[Int]
 [17:18..17:38):2 #:: LazyList.empty => toDeferrer[Int](*)
 [17:20..17:38):#:: LazyList.empty => *[Int]
@@ -3958,8 +4063,13 @@ Synthetics:
 [19:46..19:47):x => ArrowAssoc[Int](*)
 [20:12..20:13):1 => intWrapper(*)
 [20:26..20:27):0 => intWrapper(*)
+[20:44..20:50):(i, j) => Tuple2.apply[Int, Int](*)
 [21:12..21:13):1 => intWrapper(*)
 [21:26..21:27):0 => intWrapper(*)
+[21:58..21:64):(i, j) => Tuple2.apply[Int, Int](*)
+[25:4..25:7):s() => apply(*)
+[28:4..28:9):Bar() => apply(*)
+[29:4..29:36):null.asInstanceOf[Int => Int](2) => apply(*)
 [32:35..32:49):Array.empty[T] => *(evidence$1)
 [36:22..36:27):new F => orderingToOrdered[F](*)
 [36:22..36:27):new F => *(ordering)
@@ -3982,7 +4092,7 @@ Text => empty
 Language => Scala
 Symbols => 2 entries
 Occurrences => 5 entries
-Synthetics => 2 entries
+Synthetics => 3 entries
 
 Symbols:
 example/Tabs$package. => final package object example extends Object { self: example.type => +2 decls }
@@ -3999,6 +4109,7 @@ Synthetics:
 [3:1..4:6):List(1,2,3)
 		.map => *[Int]
 [3:1..3:5):List => *.apply[Int]
+[3:1..3:12):List(1,2,3) => List.apply[Int](*)
 
 expect/TargetName.scala
 -----------------------
@@ -4093,7 +4204,7 @@ Language => Scala
 Symbols => 22 entries
 Occurrences => 45 entries
 Diagnostics => 3 entries
-Synthetics => 11 entries
+Synthetics => 21 entries
 
 Symbols:
 example/ValPattern# => class ValPattern extends Object { self: ValPattern => +14 decls }
@@ -4172,17 +4283,41 @@ Diagnostics:
 [31:15..31:25): [warning] unset local variable, consider using an immutable val instead
 
 Synthetics:
+[4:22..4:28):(1, 2) => Tuple2.apply[Int, Int](*)
 [5:6..5:10):Some => *.unapply[Int]
 [6:4..6:8):Some => *.apply[Int]
+[6:4..6:11):Some(1) => Some.apply[Int](*)
 [8:6..8:10):List => *.unapplySeq[Nothing]
 [8:11..8:15):Some => *.unapply[Nothing]
+[10:28..10:34):(1, 2) => Tuple2.apply[Int, Int](*)
 [11:6..11:10):Some => *.unapply[Int]
 [12:4..12:8):Some => *.apply[Int]
+[12:4..12:11):Some(1) => Some.apply[Int](*)
+[16:6..23:7):(
+        number1,
+        left,
+        right,
+        number1Var,
+        leftVar,
+        rightVar
+      ) => Tuple6.apply[Int, Int, Int, Int, Int, Int](*)
 [25:4..25:11):locally => *[Unit]
+[26:26..26:32):(1, 2) => Tuple2.apply[Int, Int](*)
 [27:10..27:14):Some => *.unapply[Int]
 [28:8..28:12):Some => *.apply[Int]
+[28:8..28:15):Some(1) => Some.apply[Int](*)
+[30:32..30:38):(1, 2) => Tuple2.apply[Int, Int](*)
 [31:10..31:14):Some => *.unapply[Int]
 [32:8..32:12):Some => *.apply[Int]
+[32:8..32:15):Some(1) => Some.apply[Int](*)
+[34:8..41:9):(
+          number1,
+          left,
+          right,
+          number1Var,
+          leftVar,
+          rightVar
+        ) => Tuple6.apply[Int, Int, Int, Int, Int, Int](*)
 
 expect/Vals.scala
 -----------------
@@ -4766,6 +4901,7 @@ Language => Scala
 Symbols => 24 entries
 Occurrences => 63 entries
 Diagnostics => 2 entries
+Synthetics => 1 entries
 
 Symbols:
 _empty_/Copy# => trait Copy [typeparam In  <: Txn[In], typeparam Out  <: Txn[Out]] extends Object { self: Copy[In, Out] => +5 decls }
@@ -4862,6 +4998,9 @@ Diagnostics:
 [13:12..13:17): [warning] unused pattern variable
 [13:28..13:34): [warning] unused pattern variable
 
+Synthetics:
+[12:4..12:13):(in, out) => Tuple2.apply[Repr[In], Repr[Out]](*)
+
 expect/inlineconsume.scala
 --------------------------
 
@@ -4956,7 +5095,7 @@ Text => empty
 Language => Scala
 Symbols => 17 entries
 Occurrences => 31 entries
-Synthetics => 1 entries
+Synthetics => 2 entries
 
 Symbols:
 _empty_/Concrete# => class Concrete extends NullaryTest[Int, List] { self: Concrete => +3 decls }
@@ -5012,6 +5151,7 @@ Occurrences:
 
 Synthetics:
 [13:17..13:21):List => *.apply[Int]
+[13:17..13:28):List(1,2,3) => List.apply[Int](*)
 
 expect/recursion.scala
 ----------------------
@@ -5023,6 +5163,7 @@ Text => empty
 Language => Scala
 Symbols => 36 entries
 Occurrences => 48 entries
+Synthetics => 2 entries
 
 Symbols:
 local0 => type N$1  <: Nat
@@ -5112,6 +5253,10 @@ Occurrences:
 [23:35..23:39): Zero -> recursion/Nats.Zero.
 [23:40..23:42): ++ -> recursion/Nats.Nat#`++`().
 
+Synthetics:
+[5:50..5:60):Succ(this) => Succ.apply[Nat.this.type](*)
+[5:50..5:60):Succ(this) => Succ.apply[Nat.this.type](*)
+
 expect/semanticdb-Definitions.scala
 -----------------------------------
 
@@ -5725,7 +5870,7 @@ Text => empty
 Language => Scala
 Symbols => 18 entries
 Occurrences => 21 entries
-Synthetics => 3 entries
+Synthetics => 6 entries
 
 Symbols:
 _empty_/AnObject. => final object AnObject extends Object { self: AnObject.type => +6 decls }
@@ -5772,8 +5917,11 @@ Occurrences:
 
 Synthetics:
 [11:2..11:6):List => *.apply[Int]
+[11:2..11:12):List(1, 2) => List.apply[Int](*)
 [12:2..12:12):List.apply => *[Nothing]
+[12:2..12:14):List.apply() => List.apply[Nothing](*)
 [13:2..13:14):List.`apply` => *[Nothing]
+[13:2..13:16):List.`apply`() => List.apply[Nothing](*)
 
 expect/toplevel.scala
 ---------------------

From 89f5e2f843a570f6ca87ec8e417911d2e8d786ee Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 6 Aug 2025 20:16:21 +0200
Subject: [PATCH 465/505] bugfix: Include synthetic apply in semanticdb
 (#23629)

Fixes https://github.com/scalameta/metals/issues/7666

Some weird entries around string interpolation, but they actually make
sense.
[Cherry-picked 74b9e85a0a65004dedcb321d6e496ff473da6793][modified]

From e92c0a6a074c769c63336afdf97b73967eb81a7b Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Mon, 28 Jul 2025 18:41:38 +0000
Subject: [PATCH 466/505] Update error message id to keep compatibility with
 Scala Next

---
 compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index 5ab4c7eb0b28..f8befc5a19df 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -229,6 +229,10 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case PointlessAppliedConstructorTypeID // errorNumber: 213
   case IllegalContextBoundsID // errorNumber: 214
   case NamedPatternNotApplicableID // errorNumber: 215
+  case UnnecessaryNN // errorNumber: 216
+  case ErasedNotPureID // errorNumber: 217
+  case IllegalErasedDefID // errorNumber: 218
+  case CannotInstantiateQuotedTypeVarID // errorNumber: 219
 
   def errorNumber = ordinal - 1
 

From e6c566b5748cff96f467a5951daef9bfd415299d Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 6 Aug 2025 20:22:43 +0200
Subject: [PATCH 467/505] Emit an error for quoted pattern type variable after
 `new`

[Cherry-picked 05b26be733282aef65c179d9c6aee8ad19c2933d][modified]

From df886a0fed8b0bf4f0f3d1a33004e8399c799734 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Mon, 28 Jul 2025 18:48:09 +0000
Subject: [PATCH 468/505] Add quoted pattern type variable expected type test

[Cherry-picked e9808a9a379b8bd406dc18af1a84949f7f6ef300]
---
 tests/neg-macros/i22616b.check | 13 +++++++++++++
 tests/neg-macros/i22616b.scala | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 tests/neg-macros/i22616b.check
 create mode 100644 tests/neg-macros/i22616b.scala

diff --git a/tests/neg-macros/i22616b.check b/tests/neg-macros/i22616b.check
new file mode 100644
index 000000000000..3c6007276cef
--- /dev/null
+++ b/tests/neg-macros/i22616b.check
@@ -0,0 +1,13 @@
+-- [E007] Type Mismatch Error: tests/neg-macros/i22616b.scala:17:18 ----------------------------------------------------
+17 |      case '{ Foo($y: t) } => // error
+   |                  ^^^^^
+   |                  Found:    t
+   |                  Required: String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E006] Not Found Error: tests/neg-macros/i22616b.scala:18:19 --------------------------------------------------------
+18 |        '{type S = t; ()} // error
+   |                   ^
+   |                   Not found: type t
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-macros/i22616b.scala b/tests/neg-macros/i22616b.scala
new file mode 100644
index 000000000000..45926f4e0d37
--- /dev/null
+++ b/tests/neg-macros/i22616b.scala
@@ -0,0 +1,22 @@
+// This test illustrates a current limitation of quoted pattern type variables,
+// which has been discussed in https://github.com/scala/scala3/issues/22616#issuecomment-3012534064:
+// These type variables do not have bound in general (see `typedQuotedTypeVar`),
+// so they might not conform to the expected type. Here, `t` does not conform
+// to `String`.
+
+import scala.quoted.{FromExpr, Expr, Quotes}
+
+case class Foo(x: String)
+
+object Macro:
+  inline def myMacro(): Unit =
+    ${ myMacroImpl('{Foo("hello")}) }
+
+  def myMacroImpl(x: Expr[Foo])(using Quotes): Expr[Unit] =
+    x match
+      case '{ Foo($y: t) } => // error
+        '{type S = t; ()} // error
+      case _ =>
+        println("not a foo")
+
+    '{()}

From 49a9b533ac19bb8a3d71b1d094d19af95137b11f Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Mon, 28 Jul 2025 18:48:51 +0000
Subject: [PATCH 469/505] Add workaround for #22616

[Cherry-picked c5b83bd21886a20303297505f6fe9ba747e9fdbe]
---
 tests/run-macros/i22616c.check                |  1 +
 tests/run-macros/i22616c/Macro_4.scala        | 11 +++++++
 tests/run-macros/i22616c/MyTypeRepr_3.scala   | 33 +++++++++++++++++++
 tests/run-macros/i22616c/SealedTrait3_2.scala |  8 +++++
 tests/run-macros/i22616c/Test_5.scala         |  2 ++
 tests/run-macros/i22616c/caseName_1.scala     | 14 ++++++++
 6 files changed, 69 insertions(+)
 create mode 100644 tests/run-macros/i22616c.check
 create mode 100644 tests/run-macros/i22616c/Macro_4.scala
 create mode 100644 tests/run-macros/i22616c/MyTypeRepr_3.scala
 create mode 100644 tests/run-macros/i22616c/SealedTrait3_2.scala
 create mode 100644 tests/run-macros/i22616c/Test_5.scala
 create mode 100644 tests/run-macros/i22616c/caseName_1.scala

diff --git a/tests/run-macros/i22616c.check b/tests/run-macros/i22616c.check
new file mode 100644
index 000000000000..d1918272a8f7
--- /dev/null
+++ b/tests/run-macros/i22616c.check
@@ -0,0 +1 @@
+_B_
diff --git a/tests/run-macros/i22616c/Macro_4.scala b/tests/run-macros/i22616c/Macro_4.scala
new file mode 100644
index 000000000000..02e677db3428
--- /dev/null
+++ b/tests/run-macros/i22616c/Macro_4.scala
@@ -0,0 +1,11 @@
+import scala.quoted.*
+
+object Macro:
+  inline def myMacro[T](): String =
+    ${ myMacroImpl[T]() }
+
+  def myMacroImpl[T: Type]()(using Quotes): Expr[String] =
+    import quotes.reflect.*
+    val myTypeRepr = MyTypeRepr(TypeRepr.of[T])
+    val `caseName`(name) = myTypeRepr.requiredAnnotationValue[caseName]
+    Expr(name)
diff --git a/tests/run-macros/i22616c/MyTypeRepr_3.scala b/tests/run-macros/i22616c/MyTypeRepr_3.scala
new file mode 100644
index 000000000000..1a35889d403d
--- /dev/null
+++ b/tests/run-macros/i22616c/MyTypeRepr_3.scala
@@ -0,0 +1,33 @@
+import scala.quoted.*
+
+final class MyTypeRepr(using val quotes: Quotes)(val unwrap: quotes.reflect.TypeRepr) {
+  import quotes.reflect.*
+
+  def getAnnotation(annotTpe: quotes.reflect.Symbol): Option[quotes.reflect.Term] =
+    unwrap.typeSymbol.getAnnotation(annotTpe)
+
+  def optionalAnnotation[Annot: Type]: Option[Expr[Annot]] = {
+    val annotTpe = TypeRepr.of[Annot]
+    val annotFlags = annotTpe.typeSymbol.flags
+
+    if (annotFlags.is(Flags.Abstract) || annotFlags.is(Flags.Trait))
+      report.errorAndAbort(s"Bad annotation type ${annotTpe.show} is abstract")
+
+    this.getAnnotation(annotTpe.typeSymbol) match
+      case Some(tree) if tree.tpe <:< annotTpe => Some(tree.asExprOf[Annot])
+      case _                                   => None
+  }
+
+  def requiredAnnotation[Annot: Type]: Expr[Annot] =
+    optionalAnnotation[Annot].getOrElse(report.errorAndAbort(s"Missing required annotation `${TypeRepr.of[Annot].show}` for `$this`"))
+
+  def optionalAnnotationValue[Annot: {Type, FromExpr}]: Option[Annot] =
+    optionalAnnotation[Annot].map { expr =>
+      expr.value.getOrElse(report.errorAndAbort(s"Found annotation `${TypeRepr.of[Annot].show}` for `$this`, but are unable to extract Expr.value\n${expr.show}"))
+    }
+
+  def requiredAnnotationValue[Annot: {Type, FromExpr}]: Annot = {
+    val expr = requiredAnnotation[Annot]
+    expr.value.getOrElse(report.errorAndAbort(s"Found annotation `${TypeRepr.of[Annot].show}` for `$this`, but are unable to extract Expr.value\n${expr.show}"))
+  }
+}
diff --git a/tests/run-macros/i22616c/SealedTrait3_2.scala b/tests/run-macros/i22616c/SealedTrait3_2.scala
new file mode 100644
index 000000000000..9141a9ebd08b
--- /dev/null
+++ b/tests/run-macros/i22616c/SealedTrait3_2.scala
@@ -0,0 +1,8 @@
+sealed trait SealedTrait3[+A, +B]
+object SealedTrait3 {
+  final case class AB1[+B, +A](a: B, b: A) extends SealedTrait3[B, A]
+  final case class AB2[+C, +D](a: C, b: D) extends SealedTrait3[D, C]
+  final case class A[+T](a: T) extends SealedTrait3[T, Nothing]
+  @caseName("_B_") final case class B[+T](b: T) extends SealedTrait3[Nothing, T]
+  case object Neither extends SealedTrait3[Nothing, Nothing]
+}
diff --git a/tests/run-macros/i22616c/Test_5.scala b/tests/run-macros/i22616c/Test_5.scala
new file mode 100644
index 000000000000..c8d177a5ae1b
--- /dev/null
+++ b/tests/run-macros/i22616c/Test_5.scala
@@ -0,0 +1,2 @@
+@main def Test =
+  println(Macro.myMacro[SealedTrait3.B[Any]]())
diff --git a/tests/run-macros/i22616c/caseName_1.scala b/tests/run-macros/i22616c/caseName_1.scala
new file mode 100644
index 000000000000..c8fee116e2e9
--- /dev/null
+++ b/tests/run-macros/i22616c/caseName_1.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+final case class caseName(name: String) extends scala.annotation.Annotation
+object caseName {
+  // This demonstrates a workaround for issue #22616.
+  given FromExpr[caseName] =
+    new FromExpr[caseName] {
+      override def unapply(x: Expr[caseName])(using Quotes): Option[caseName] =
+        x match {
+          case '{ new `caseName`(${ Expr(name) }) } => Some(caseName(name))
+          case _                                    => println(x.show); None
+        }
+    }
+}

From 20bc7454f544438801f913c10014f2b7142bebe1 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Thu, 31 Jul 2025 22:55:11 +0200
Subject: [PATCH 470/505] [build] Increment default thread stack size from to
 2MB (was 1MB) (#23638)

I suspect the StackOverflow errors started to get triggered recently as
our build got larger/more complicated - increae in the thread stack size
should mitigate the issue, otherwise, we'll need to investigate it
again.
---
 .jvmopts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.jvmopts b/.jvmopts
index a50abf36aa42..d8606eba733e 100644
--- a/.jvmopts
+++ b/.jvmopts
@@ -1,5 +1,5 @@
--Xss1m
--Xms512m
--Xmx4096m
+-Xss2m
+-Xms1024m
+-Xmx8192m
 -XX:MaxInlineLevel=35
 -XX:ReservedCodeCacheSize=512m

From 67047bf798467897d32982f2d0e640d7452ee220 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 6 Aug 2025 20:25:00 +0200
Subject: [PATCH 471/505] [build] Increment default thread stack size from to
 2MB (was 1MB) (#23638)

I suspect the StackOverflow errors started to get triggered recently as
our build got larger/more complicated - increae in the thread stack size
should mitigate the issue, otherwise, we'll need to investigate it
again.
[Cherry-picked fe6b7eb1d5a72993b1ebe4f4d02ce3b61f47514f][modified]

From 9ecd1c744b8d05f220eba8df033ca0d85350fc6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zieli=C5=84ski=20Patryk?=
 <75637004+zielinsky@users.noreply.github.com>
Date: Fri, 1 Aug 2025 13:48:43 +0200
Subject: [PATCH 472/505] Handle default arguments in named parameters for
 inlay hints (#23641)

Handle default arguments in named parameters for inlay hints
[Cherry-picked a115c8d0ea4c4a5ab1cb775b2a15be2ef1e1cbfc]
---
 .../dotty/tools/pc/PcInlayHintsProvider.scala | 13 ++++-
 .../pc/tests/inlayHints/InlayHintsSuite.scala | 57 +++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index 3be5927a7aa0..f4e3bc8c9c10 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -19,6 +19,7 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.NameOps.fieldName
 import dotty.tools.dotc.core.Names.Name
+import dotty.tools.dotc.core.NameKinds.DefaultGetterName
 import dotty.tools.dotc.core.StdNames.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
@@ -457,6 +458,13 @@ object Parameters:
         case TypeApply(fun, _) => getUnderlyingFun(fun)
         case t => t
 
+    @tailrec
+    def isDefaultArg(arg: Tree): Boolean = arg match
+      case Ident(name) => name.is(DefaultGetterName)
+      case Select(_, name) => name.is(DefaultGetterName)
+      case Apply(fun, _) => isDefaultArg(fun)
+      case _ => false
+
     if (params.namedParameters() || params.byNameParameters()) then
       tree match
         case Apply(fun, args) if isRealApply(fun) => 
@@ -467,15 +475,16 @@ object Parameters:
             val funTp = fun.typeOpt.widenTermRefExpr
             val paramNames = funTp.paramNamess.flatten
             val paramInfos = funTp.paramInfoss.flatten
+            
             Some(
-              // Check if the function is an infix function or the underlying function is an infix function
               isInfixFun(fun, args) || underlyingFun.isInfix,
               (
                 args
                 .zip(paramNames)
                 .zip(paramInfos)
                 .collect {
-                  case ((arg, paramName), paramInfo) if !arg.span.isZeroExtent => (paramName.fieldName, arg.sourcePos, paramInfo.isByName)
+                  case ((arg, paramName), paramInfo) if !arg.span.isZeroExtent && !isDefaultArg(arg) => 
+                    (paramName.fieldName, arg.sourcePos, paramInfo.isByName)
                 }
               )
             )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
index bc4443ee5d28..1152e2928ad6 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
@@ -1243,4 +1243,61 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
         |}
         |""".stripMargin
     )
+
+  @Test def `default-parameter` =
+    check(
+      """|object Main {
+         |  def foo(a: Int, b: Int = 2) = a + b
+         |  val x = foo(1)
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def foo(a: Int, b: Int = 2)/*: Int<<scala/Int#>>*/ = a + b
+         |  val x/*: Int<<scala/Int#>>*/ = foo(/*a = */1)
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `default-parameter-2` =
+    check(
+      """|object Main {
+         |  def foo(a: Int = 10, b: Int = 2) = a + b
+         |  val x = foo(b = 1)
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def foo(a: Int = 10, b: Int = 2)/*: Int<<scala/Int#>>*/ = a + b
+         |  val x/*: Int<<scala/Int#>>*/ = foo(b = 1)
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `default-parameter-3` =
+    check(
+      """|object Main {
+         |  def foo(a: Int, b: Int = 2, c: Int) = a + b + c
+         |  val x = foo(a = 1, c = 2)
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def foo(a: Int, b: Int = 2, c: Int)/*: Int<<scala/Int#>>*/ = a + b + c
+         |  val x/*: Int<<scala/Int#>>*/ = foo(a = 1, c = 2)
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `default-parameter-4` =
+    check(
+      """|object Main {
+         |  def foo(a: Int, b: Int = 2, c: Int) = a + b + c
+         |  val x = foo(1, 2, 3)
+         |}
+         |""".stripMargin,
+      """|object Main {
+         |  def foo(a: Int, b: Int = 2, c: Int)/*: Int<<scala/Int#>>*/ = a + b + c
+         |  val x/*: Int<<scala/Int#>>*/ = foo(/*a = */1, /*b = */2, /*c = */3)
+         |}
+         |""".stripMargin
+    )
+
 }

From 56300856b119f0ed40dbce2e514bd6a44e63325a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 7 Aug 2025 10:48:33 +0200
Subject: [PATCH 473/505] bugfix: Fix tests after backporting

---
 tests/neg-macros/i22616b.check                | 13 --------
 tests/neg-macros/i22616b.scala                | 22 -------------
 tests/run-macros/i22616c.check                |  1 -
 tests/run-macros/i22616c/Macro_4.scala        | 11 -------
 tests/run-macros/i22616c/MyTypeRepr_3.scala   | 33 -------------------
 tests/run-macros/i22616c/SealedTrait3_2.scala |  8 -----
 tests/run-macros/i22616c/Test_5.scala         |  2 --
 tests/run-macros/i22616c/caseName_1.scala     | 14 --------
 tests/warn/i23164.scala                       |  2 +-
 9 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 tests/neg-macros/i22616b.check
 delete mode 100644 tests/neg-macros/i22616b.scala
 delete mode 100644 tests/run-macros/i22616c.check
 delete mode 100644 tests/run-macros/i22616c/Macro_4.scala
 delete mode 100644 tests/run-macros/i22616c/MyTypeRepr_3.scala
 delete mode 100644 tests/run-macros/i22616c/SealedTrait3_2.scala
 delete mode 100644 tests/run-macros/i22616c/Test_5.scala
 delete mode 100644 tests/run-macros/i22616c/caseName_1.scala

diff --git a/tests/neg-macros/i22616b.check b/tests/neg-macros/i22616b.check
deleted file mode 100644
index 3c6007276cef..000000000000
--- a/tests/neg-macros/i22616b.check
+++ /dev/null
@@ -1,13 +0,0 @@
--- [E007] Type Mismatch Error: tests/neg-macros/i22616b.scala:17:18 ----------------------------------------------------
-17 |      case '{ Foo($y: t) } => // error
-   |                  ^^^^^
-   |                  Found:    t
-   |                  Required: String
-   |
-   | longer explanation available when compiling with `-explain`
--- [E006] Not Found Error: tests/neg-macros/i22616b.scala:18:19 --------------------------------------------------------
-18 |        '{type S = t; ()} // error
-   |                   ^
-   |                   Not found: type t
-   |
-   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-macros/i22616b.scala b/tests/neg-macros/i22616b.scala
deleted file mode 100644
index 45926f4e0d37..000000000000
--- a/tests/neg-macros/i22616b.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-// This test illustrates a current limitation of quoted pattern type variables,
-// which has been discussed in https://github.com/scala/scala3/issues/22616#issuecomment-3012534064:
-// These type variables do not have bound in general (see `typedQuotedTypeVar`),
-// so they might not conform to the expected type. Here, `t` does not conform
-// to `String`.
-
-import scala.quoted.{FromExpr, Expr, Quotes}
-
-case class Foo(x: String)
-
-object Macro:
-  inline def myMacro(): Unit =
-    ${ myMacroImpl('{Foo("hello")}) }
-
-  def myMacroImpl(x: Expr[Foo])(using Quotes): Expr[Unit] =
-    x match
-      case '{ Foo($y: t) } => // error
-        '{type S = t; ()} // error
-      case _ =>
-        println("not a foo")
-
-    '{()}
diff --git a/tests/run-macros/i22616c.check b/tests/run-macros/i22616c.check
deleted file mode 100644
index d1918272a8f7..000000000000
--- a/tests/run-macros/i22616c.check
+++ /dev/null
@@ -1 +0,0 @@
-_B_
diff --git a/tests/run-macros/i22616c/Macro_4.scala b/tests/run-macros/i22616c/Macro_4.scala
deleted file mode 100644
index 02e677db3428..000000000000
--- a/tests/run-macros/i22616c/Macro_4.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-import scala.quoted.*
-
-object Macro:
-  inline def myMacro[T](): String =
-    ${ myMacroImpl[T]() }
-
-  def myMacroImpl[T: Type]()(using Quotes): Expr[String] =
-    import quotes.reflect.*
-    val myTypeRepr = MyTypeRepr(TypeRepr.of[T])
-    val `caseName`(name) = myTypeRepr.requiredAnnotationValue[caseName]
-    Expr(name)
diff --git a/tests/run-macros/i22616c/MyTypeRepr_3.scala b/tests/run-macros/i22616c/MyTypeRepr_3.scala
deleted file mode 100644
index 1a35889d403d..000000000000
--- a/tests/run-macros/i22616c/MyTypeRepr_3.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-import scala.quoted.*
-
-final class MyTypeRepr(using val quotes: Quotes)(val unwrap: quotes.reflect.TypeRepr) {
-  import quotes.reflect.*
-
-  def getAnnotation(annotTpe: quotes.reflect.Symbol): Option[quotes.reflect.Term] =
-    unwrap.typeSymbol.getAnnotation(annotTpe)
-
-  def optionalAnnotation[Annot: Type]: Option[Expr[Annot]] = {
-    val annotTpe = TypeRepr.of[Annot]
-    val annotFlags = annotTpe.typeSymbol.flags
-
-    if (annotFlags.is(Flags.Abstract) || annotFlags.is(Flags.Trait))
-      report.errorAndAbort(s"Bad annotation type ${annotTpe.show} is abstract")
-
-    this.getAnnotation(annotTpe.typeSymbol) match
-      case Some(tree) if tree.tpe <:< annotTpe => Some(tree.asExprOf[Annot])
-      case _                                   => None
-  }
-
-  def requiredAnnotation[Annot: Type]: Expr[Annot] =
-    optionalAnnotation[Annot].getOrElse(report.errorAndAbort(s"Missing required annotation `${TypeRepr.of[Annot].show}` for `$this`"))
-
-  def optionalAnnotationValue[Annot: {Type, FromExpr}]: Option[Annot] =
-    optionalAnnotation[Annot].map { expr =>
-      expr.value.getOrElse(report.errorAndAbort(s"Found annotation `${TypeRepr.of[Annot].show}` for `$this`, but are unable to extract Expr.value\n${expr.show}"))
-    }
-
-  def requiredAnnotationValue[Annot: {Type, FromExpr}]: Annot = {
-    val expr = requiredAnnotation[Annot]
-    expr.value.getOrElse(report.errorAndAbort(s"Found annotation `${TypeRepr.of[Annot].show}` for `$this`, but are unable to extract Expr.value\n${expr.show}"))
-  }
-}
diff --git a/tests/run-macros/i22616c/SealedTrait3_2.scala b/tests/run-macros/i22616c/SealedTrait3_2.scala
deleted file mode 100644
index 9141a9ebd08b..000000000000
--- a/tests/run-macros/i22616c/SealedTrait3_2.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-sealed trait SealedTrait3[+A, +B]
-object SealedTrait3 {
-  final case class AB1[+B, +A](a: B, b: A) extends SealedTrait3[B, A]
-  final case class AB2[+C, +D](a: C, b: D) extends SealedTrait3[D, C]
-  final case class A[+T](a: T) extends SealedTrait3[T, Nothing]
-  @caseName("_B_") final case class B[+T](b: T) extends SealedTrait3[Nothing, T]
-  case object Neither extends SealedTrait3[Nothing, Nothing]
-}
diff --git a/tests/run-macros/i22616c/Test_5.scala b/tests/run-macros/i22616c/Test_5.scala
deleted file mode 100644
index c8d177a5ae1b..000000000000
--- a/tests/run-macros/i22616c/Test_5.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-@main def Test =
-  println(Macro.myMacro[SealedTrait3.B[Any]]())
diff --git a/tests/run-macros/i22616c/caseName_1.scala b/tests/run-macros/i22616c/caseName_1.scala
deleted file mode 100644
index c8fee116e2e9..000000000000
--- a/tests/run-macros/i22616c/caseName_1.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-import scala.quoted.*
-
-final case class caseName(name: String) extends scala.annotation.Annotation
-object caseName {
-  // This demonstrates a workaround for issue #22616.
-  given FromExpr[caseName] =
-    new FromExpr[caseName] {
-      override def unapply(x: Expr[caseName])(using Quotes): Option[caseName] =
-        x match {
-          case '{ new `caseName`(${ Expr(name) }) } => Some(caseName(name))
-          case _                                    => println(x.show); None
-        }
-    }
-}
diff --git a/tests/warn/i23164.scala b/tests/warn/i23164.scala
index ac068555a5b3..b82e21d8d7bb 100644
--- a/tests/warn/i23164.scala
+++ b/tests/warn/i23164.scala
@@ -21,7 +21,7 @@ class T20[F[_]]
 class T21[F[_]]
 class T22[F[_]]
 
-class Result[F[_]: {T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22}]
+class Result[F[_]: T1 :T2 :T3 :T4 :T5 :T6 :T7 :T8 :T9 :T10 :T11 :T12 :T13 :T14 :T15 :T16 :T17 :T18 :T19 :T20 :T21 :T22]
 
 val r = for
   t1 <- Option(new T1[Option])

From 864c1aec5a3017d4407f062191f650b97fe0bfb0 Mon Sep 17 00:00:00 2001
From: Alexander <azazf93@gmail.com>
Date: Sun, 22 Jun 2025 16:52:13 +0300
Subject: [PATCH 474/505] constructor not uninhabited, if field with bottom
 type is lazy

[Cherry-picked e8e52109f8982da1f42b70f28c116bcb85998176]
---
 .../tools/dotc/transform/patmat/Space.scala   | 44 +++++++------------
 .../patmat-lazy-nothing-not-exhaustive.check  |  1 +
 .../patmat-lazy-nothing-not-exhaustive.scala  | 12 +++++
 ...atmat-type-member-nothing-exhaustive.scala | 18 ++++++++
 4 files changed, 47 insertions(+), 28 deletions(-)
 create mode 100644 tests/warn/patmat-lazy-nothing-not-exhaustive.check
 create mode 100644 tests/warn/patmat-lazy-nothing-not-exhaustive.scala
 create mode 100644 tests/warn/patmat-type-member-nothing-exhaustive.scala

diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index bc7f8631492b..a68676f3d290 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -642,49 +642,37 @@ object SpaceEngine {
         // we get
         //    <== refineUsingParent(NatT, class Succ, []) = Succ[NatT]
         //    <== isSub(Succ[NatT] <:< Succ[Succ[<?>]]) = false
-        def getAppliedClass(tp: Type): (Type, List[Type]) = tp match
-          case tp @ AppliedType(_: HKTypeLambda, _)                        => (tp, Nil)
-          case tp @ AppliedType(tycon: TypeRef, _) if tycon.symbol.isClass => (tp, tp.args)
+        def getAppliedClass(tp: Type): Type = tp match
+          case tp @ AppliedType(_: HKTypeLambda, _)                        => tp
+          case tp @ AppliedType(tycon: TypeRef, _) if tycon.symbol.isClass => tp
           case tp @ AppliedType(tycon: TypeProxy, _)                       => getAppliedClass(tycon.superType.applyIfParameterized(tp.args))
-          case tp                                                          => (tp, Nil)
-        val (tp, typeArgs) = getAppliedClass(tpOriginal)
-        // This function is needed to get the arguments of the types that will be applied to the class.
-        // This is necessary because if the arguments of the types contain Nothing,
-        // then this can affect whether the class will be taken into account during the exhaustiveness check
-        def getTypeArgs(parent: Symbol, child: Symbol, typeArgs: List[Type]): List[Type] =
-          val superType = child.typeRef.superType
-          if typeArgs.exists(_.isBottomType) && superType.isInstanceOf[ClassInfo] then
-            val parentClass = superType.asInstanceOf[ClassInfo].declaredParents.find(_.classSymbol == parent).get
-            val paramTypeMap = Map.from(parentClass.argInfos.map(_.typeSymbol).zip(typeArgs))
-            val substArgs = child.typeRef.typeParamSymbols.map(param => paramTypeMap.getOrElse(param, WildcardType))
-            substArgs
-          else Nil
-        def getChildren(sym: Symbol, typeArgs: List[Type]): List[Symbol] =
+          case tp                                                          => tp
+        val tp = getAppliedClass(tpOriginal)
+        def getChildren(sym: Symbol): List[Symbol] =
           sym.children.flatMap { child =>
             if child eq sym then List(sym) // i3145: sealed trait Baz, val x = new Baz {}, Baz.children returns Baz...
             else if tp.classSymbol == defn.TupleClass || tp.classSymbol == defn.NonEmptyTupleClass then
               List(child) // TupleN and TupleXXL classes are used for Tuple, but they aren't Tuple's children
-            else if (child.is(Private) || child.is(Sealed)) && child.isOneOf(AbstractOrTrait) then
-              getChildren(child, getTypeArgs(sym, child, typeArgs))
-            else
-              val childSubstTypes = child.typeRef.applyIfParameterized(getTypeArgs(sym, child, typeArgs))
-              // if a class contains a field of type Nothing,
-              // then it can be ignored in pattern matching, because it is impossible to obtain an instance of it
-              val existFieldWithBottomType = childSubstTypes.fields.exists(_.info.isBottomType)
-              if existFieldWithBottomType then Nil else List(child)
+            else if (child.is(Private) || child.is(Sealed)) && child.isOneOf(AbstractOrTrait) then getChildren(child)
+            else List(child)
           }
-        val children = trace(i"getChildren($tp)")(getChildren(tp.classSymbol, typeArgs))
+        val children = trace(i"getChildren($tp)")(getChildren(tp.classSymbol))
 
         val parts = children.map { sym =>
           val sym1 = if (sym.is(ModuleClass)) sym.sourceModule else sym
           val refined = trace(i"refineUsingParent($tp, $sym1, $mixins)")(TypeOps.refineUsingParent(tp, sym1, mixins))
 
+          def containsUninhabitedField(tp: Type): Boolean =
+            tp.fields.exists { field =>
+              !field.symbol.flags.is(Lazy) && field.info.dealias.isBottomType
+            }
+
           def inhabited(tp: Type): Boolean = tp.dealias match
             case AndType(tp1, tp2) => !TypeComparer.provablyDisjoint(tp1, tp2)
             case OrType(tp1, tp2) => inhabited(tp1) || inhabited(tp2)
             case tp: RefinedType => inhabited(tp.parent)
-            case tp: TypeRef => inhabited(tp.prefix)
-            case _ => true
+            case tp: TypeRef => !containsUninhabitedField(tp) && inhabited(tp.prefix)
+            case _ => !containsUninhabitedField(tp)
 
           if inhabited(refined) then refined
           else NoType
diff --git a/tests/warn/patmat-lazy-nothing-not-exhaustive.check b/tests/warn/patmat-lazy-nothing-not-exhaustive.check
new file mode 100644
index 000000000000..a0a2400cf5ad
--- /dev/null
+++ b/tests/warn/patmat-lazy-nothing-not-exhaustive.check
@@ -0,0 +1 @@
+-- [E029] Pattern Match Exhaustivity Warning: tests\warn\patmat-lazy-nothing-not-exhaustive.scala:10:5 -----------------
10 |  id(x match { // warn
   |     ^
   |     match may not be exhaustive.
   |
   |     It would fail on pattern case: Bar()
   |
   | longer explanation available when compiling with `-explain`
\ No newline at end of file
diff --git a/tests/warn/patmat-lazy-nothing-not-exhaustive.scala b/tests/warn/patmat-lazy-nothing-not-exhaustive.scala
new file mode 100644
index 000000000000..79eef226ad9f
--- /dev/null
+++ b/tests/warn/patmat-lazy-nothing-not-exhaustive.scala
@@ -0,0 +1,12 @@
+sealed trait Adt
+case class Foo() extends Adt
+case class Bar() extends Adt {
+  lazy val x: Nothing = throw new Exception()
+}
+
+inline def id[A](a: A): A = a
+
+def shouldThrowAWarning(x: Adt) =
+  id(x match { // warn
+    case Foo() => "Bar"
+  })
diff --git a/tests/warn/patmat-type-member-nothing-exhaustive.scala b/tests/warn/patmat-type-member-nothing-exhaustive.scala
new file mode 100644
index 000000000000..c04270b78a3a
--- /dev/null
+++ b/tests/warn/patmat-type-member-nothing-exhaustive.scala
@@ -0,0 +1,18 @@
+trait Phase {
+  type FooTy
+  type BarTy
+  sealed trait Adt
+  case class Foo(x: FooTy) extends Adt
+  case class Bar(x: BarTy) extends Adt
+}
+
+object Basic extends Phase {
+  type FooTy = Unit
+  type BarTy = Nothing
+}
+
+
+def test(a: Basic.Adt) = {
+  a match
+    case Basic.Foo(x) =>
+}
\ No newline at end of file

From 952e9774946eb3da14ec63bbc91aa93320c051bf Mon Sep 17 00:00:00 2001
From: Alexander <azazf93@gmail.com>
Date: Sun, 22 Jun 2025 19:36:25 +0300
Subject: [PATCH 475/505] move test to patmat

[Cherry-picked 0696aeca8bfeeab62cd85cf99a93e6480b4c82bd]
---
 tests/patmat/patmat-lazy-nothing-not-exhaustive.check     | 1 +
 .../patmat-lazy-nothing-not-exhaustive.scala              | 8 +++-----
 tests/warn/patmat-lazy-nothing-not-exhaustive.check       | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 tests/patmat/patmat-lazy-nothing-not-exhaustive.check
 rename tests/{warn => patmat}/patmat-lazy-nothing-not-exhaustive.scala (65%)
 delete mode 100644 tests/warn/patmat-lazy-nothing-not-exhaustive.check

diff --git a/tests/patmat/patmat-lazy-nothing-not-exhaustive.check b/tests/patmat/patmat-lazy-nothing-not-exhaustive.check
new file mode 100644
index 000000000000..aef9e1aed027
--- /dev/null
+++ b/tests/patmat/patmat-lazy-nothing-not-exhaustive.check
@@ -0,0 +1 @@
+8: Pattern Match Exhaustivity: Bar()
\ No newline at end of file
diff --git a/tests/warn/patmat-lazy-nothing-not-exhaustive.scala b/tests/patmat/patmat-lazy-nothing-not-exhaustive.scala
similarity index 65%
rename from tests/warn/patmat-lazy-nothing-not-exhaustive.scala
rename to tests/patmat/patmat-lazy-nothing-not-exhaustive.scala
index 79eef226ad9f..b66eb63c110c 100644
--- a/tests/warn/patmat-lazy-nothing-not-exhaustive.scala
+++ b/tests/patmat/patmat-lazy-nothing-not-exhaustive.scala
@@ -4,9 +4,7 @@ case class Bar() extends Adt {
   lazy val x: Nothing = throw new Exception()
 }
 
-inline def id[A](a: A): A = a
-
 def shouldThrowAWarning(x: Adt) =
-  id(x match { // warn
-    case Foo() => "Bar"
-  })
+  x match { // warn
+    case Foo() => "Foo"
+  }
diff --git a/tests/warn/patmat-lazy-nothing-not-exhaustive.check b/tests/warn/patmat-lazy-nothing-not-exhaustive.check
deleted file mode 100644
index a0a2400cf5ad..000000000000
--- a/tests/warn/patmat-lazy-nothing-not-exhaustive.check
+++ /dev/null
@@ -1 +0,0 @@
--- [E029] Pattern Match Exhaustivity Warning: tests\warn\patmat-lazy-nothing-not-exhaustive.scala:10:5 -----------------
10 |  id(x match { // warn
   |     ^
   |     match may not be exhaustive.
   |
   |     It would fail on pattern case: Bar()
   |
   | longer explanation available when compiling with `-explain`
\ No newline at end of file

From f2c45a827b474d99476d699555b017441d1fc2e8 Mon Sep 17 00:00:00 2001
From: Alex1005a <azazf93@gmail.com>
Date: Fri, 1 Aug 2025 13:03:02 +0300
Subject: [PATCH 476/505] Don't module class for unhabitated fields (#23634)

Fix #23576
[Cherry-picked 17625b571f852462f1975af925e444a60f723e7e]
---
 compiler/src/dotty/tools/dotc/transform/patmat/Space.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index a68676f3d290..0dfa73035099 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -663,7 +663,7 @@ object SpaceEngine {
           val refined = trace(i"refineUsingParent($tp, $sym1, $mixins)")(TypeOps.refineUsingParent(tp, sym1, mixins))
 
           def containsUninhabitedField(tp: Type): Boolean =
-            tp.fields.exists { field =>
+            !tp.typeSymbol.is(ModuleClass) && tp.fields.exists { field =>
               !field.symbol.flags.is(Lazy) && field.info.dealias.isBottomType
             }
 

From b60dae396a126597b7a91f9fdf290ce976e5702a Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Wed, 6 Aug 2025 01:58:50 -0700
Subject: [PATCH 477/505] Add suppression if nowarn differs (#23652)

Fixes #23651

The [previous fix](https://github.com/scala/scala3/pull/22383) for the
same `@nowarn` attached to multiple elements should have compared the
`annotPos` to identify duplicates (instead of the target range).

This commit defers detecting "bad" or duplicate suppressions (which
originate with the same annotation) to report time, after the
suppression is "unused"; there are few nowarns per file and fewer that
are unused.

While checking for a suppression, mark matching unused suppressions as
"superseded", so that if they remain unused, the warning can add an
"audit" that the nowarn matched a diagnostic (but was superseded by some
other nowarn).

~This commit goes further and checks for duplicates (including whether
the filters look the same).~

~If it finds a duplicate where the `annotPos` differs, warn about the
user-written annotation.~

~Filters match each other if they are the same type and, if they have a
pattern, the string representations of the patterns are equal.~
---
 compiler/src/dotty/tools/dotc/Run.scala       |  38 +++---
 .../dotty/tools/dotc/reporting/WConf.scala    |  16 ++-
 tests/neg/nowarn.check                        | 110 ------------------
 tests/neg/nowarn.scala                        |  89 --------------
 tests/warn/i23651.scala                       |  27 +++++
 tests/warn/nowarn.check                       | 110 ++++++++++++++++++
 tests/warn/nowarn.scala                       |  83 +++++++++++++
 7 files changed, 257 insertions(+), 216 deletions(-)
 delete mode 100644 tests/neg/nowarn.check
 delete mode 100644 tests/neg/nowarn.scala
 create mode 100644 tests/warn/i23651.scala
 create mode 100644 tests/warn/nowarn.check
 create mode 100644 tests/warn/nowarn.scala

diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala
index 88a69d7d7cd4..8b2af2d06316 100644
--- a/compiler/src/dotty/tools/dotc/Run.scala
+++ b/compiler/src/dotty/tools/dotc/Run.scala
@@ -90,14 +90,21 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       mySuspendedMessages.getOrElseUpdate(warning.pos.source, mutable.LinkedHashSet.empty) += warning
 
     def nowarnAction(dia: Diagnostic): Action.Warning.type | Action.Verbose.type | Action.Silent.type =
-      mySuppressions.getOrElse(dia.pos.source, Nil).find(_.matches(dia)) match {
-        case Some(s) =>
+      mySuppressions.get(dia.pos.source) match
+      case Some(suppressions) =>
+        val matching = suppressions.iterator.filter(_.matches(dia))
+        if matching.hasNext then
+          val s = matching.next()
+          for other <- matching do
+            if !other.used then
+              other.markSuperseded() // superseded unless marked used later
           s.markUsed()
-          if (s.verbose) Action.Verbose
+          if s.verbose then Action.Verbose
           else Action.Silent
-        case _ =>
+        else
           Action.Warning
-      }
+      case none =>
+        Action.Warning
 
     def registerNowarn(annotPos: SourcePosition, range: Span)(conf: String, pos: SrcPos)(using Context): Unit =
       var verbose = false
@@ -116,12 +123,10 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
           .merge
       addSuppression:
         Suppression(annotPos, filters, range.start, range.end, verbose)
-          .tap: sup =>
-            if filters == List(MessageFilter.None) then sup.markUsed() // invalid suppressions, don't report as unused
 
     def addSuppression(sup: Suppression): Unit =
       val suppressions = mySuppressions.getOrElseUpdate(sup.annotPos.source, ListBuffer.empty)
-      if sup.start != sup.end && suppressions.forall(x => x.start != sup.start || x.end != sup.end) then
+      if sup.start != sup.end then
         suppressions += sup
 
     def reportSuspendedMessages(source: SourceFile)(using Context): Unit = {
@@ -132,7 +137,8 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       mySuspendedMessages.remove(source).foreach(_.foreach(ctx.reporter.issueIfNotSuppressed))
     }
 
-    def runFinished(hasErrors: Boolean): Unit =
+    def runFinished()(using Context): Unit =
+      val hasErrors = ctx.reporter.hasErrors
       // report suspended messages (in case the run finished before typer)
       mySuspendedMessages.keysIterator.toList.foreach(reportSuspendedMessages)
       // report unused nowarns only if all all phases are done
@@ -140,10 +146,16 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
         for
           source <- mySuppressions.keysIterator.toList
           sups   <- mySuppressions.remove(source)
-          sup    <- sups.reverse
-          if !sup.used
         do
-          report.warning("@nowarn annotation does not suppress any warnings", sup.annotPos)
+          val suppressions = sups.reverse.toList
+          for sup <- suppressions do
+            if !sup.used
+            && !suppressions.exists(s => s.ne(sup) && s.used && s.annotPos == sup.annotPos) // duplicate
+            && sup.filters != List(MessageFilter.None) // invalid suppression, don't report as unused
+            then
+              val more = if sup.superseded then " but matches a diagnostic" else ""
+              report.warning("@nowarn annotation does not suppress any warnings"+more, sup.annotPos)
+  end suppressions
 
   /** The compilation units currently being compiled, this may return different
    *  results over time.
@@ -372,7 +384,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
     runPhases(allPhases = fusedPhases)(using runCtx)
     if (!ctx.reporter.hasErrors)
       Rewrites.writeBack()
-    suppressions.runFinished(hasErrors = ctx.reporter.hasErrors)
+    suppressions.runFinished()
     while (finalizeActions.nonEmpty && canProgress()) {
       val action = finalizeActions.remove(0)
       action()
diff --git a/compiler/src/dotty/tools/dotc/reporting/WConf.scala b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
index 95e9652c796c..cff15aa6dc38 100644
--- a/compiler/src/dotty/tools/dotc/reporting/WConf.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
@@ -10,6 +10,7 @@ import dotty.tools.dotc.interfaces.SourceFile
 import dotty.tools.dotc.reporting.MessageFilter.SourcePattern
 
 import java.util.regex.PatternSyntaxException
+import scala.PartialFunction.cond
 import scala.annotation.internal.sharable
 import scala.util.matching.Regex
 
@@ -136,13 +137,20 @@ object WConf:
       if (parseErrorss.nonEmpty) Left(parseErrorss.flatten)
       else Right(WConf(configs))
 
-class Suppression(val annotPos: SourcePosition, filters: List[MessageFilter], val start: Int, val end: Int, val verbose: Boolean):
-  private[this] var _used = false
-  def used: Boolean = _used
+class Suppression(val annotPos: SourcePosition, val filters: List[MessageFilter], val start: Int, val end: Int, val verbose: Boolean):
+  inline def unusedState = 0
+  inline def usedState = 1
+  inline def supersededState = 2
+  private var _used = unusedState
+  def used: Boolean = _used == usedState
+  def superseded: Boolean = _used == supersededState
   def markUsed(): Unit =
-    _used = true
+    _used = usedState
+  def markSuperseded(): Unit =
+    _used = supersededState
   def matches(dia: Diagnostic): Boolean =
     val pos = dia.pos
     pos.exists && start <= pos.start && pos.end <= end && filters.forall(_.matches(dia))
 
   override def toString = s"Suppress in ${annotPos.source} $start..$end [${filters.mkString(", ")}]"
+end Suppression
diff --git a/tests/neg/nowarn.check b/tests/neg/nowarn.check
deleted file mode 100644
index ff01de1788bd..000000000000
--- a/tests/neg/nowarn.check
+++ /dev/null
@@ -1,110 +0,0 @@
--- [E002] Syntax Warning: tests/neg/nowarn.scala:11:10 -----------------------------------------------------------------
-11 |def t1a = try 1 // warning (parser)
-   |          ^^^^^
-   |          A try without catch or finally is equivalent to putting
-   |          its body in a block; no exceptions are handled.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E002] Syntax Warning: tests/neg/nowarn.scala:25:25 -----------------------------------------------------------------
-25 |@nowarn(o.inl) def t2d = try 1   // two warnings (`inl` is not a compile-time constant)
-   |                         ^^^^^
-   |                         A try without catch or finally is equivalent to putting
-   |                         its body in a block; no exceptions are handled.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E002] Syntax Warning: tests/neg/nowarn.scala:33:26 -----------------------------------------------------------------
-33 |@nowarn("id=1") def t4d = try 1 // error and warning (unused nowarn, wrong id)
-   |                          ^^^^^
-   |                          A try without catch or finally is equivalent to putting
-   |                          its body in a block; no exceptions are handled.
-   |
-   | longer explanation available when compiling with `-explain`
--- [E002] Syntax Warning: tests/neg/nowarn.scala:35:28 -----------------------------------------------------------------
-35 |@nowarn("verbose") def t5 = try 1 // warning with details
-   |                            ^^^^^
-   |                            A try without catch or finally is equivalent to putting
-   |                            its body in a block; no exceptions are handled.
-   |Matching filters for @nowarn or -Wconf:
-   |  - id=E2
-   |  - name=EmptyCatchAndFinallyBlock
-   |
-   | longer explanation available when compiling with `-explain`
--- [E129] Potential Issue Warning: tests/neg/nowarn.scala:15:11 --------------------------------------------------------
-15 |def t2 = { 1; 2 } // warning (the invalid nowarn doesn't silence anything)
-   |           ^
-   |           A pure expression does nothing in statement position
-   |
-   | longer explanation available when compiling with `-explain`
--- Warning: tests/neg/nowarn.scala:14:8 --------------------------------------------------------------------------------
-14 |@nowarn("wat?") // warning (typer, invalid filter)
-   |        ^^^^^^
-   |        Invalid message filter
-   |        unknown filter: wat?
--- [E129] Potential Issue Warning: tests/neg/nowarn.scala:18:12 --------------------------------------------------------
-18 |def t2a = { 1; 2 } // warning (invalid nowarn doesn't silence)
-   |            ^
-   |            A pure expression does nothing in statement position
-   |
-   | longer explanation available when compiling with `-explain`
--- Warning: tests/neg/nowarn.scala:17:8 --------------------------------------------------------------------------------
-17 |@nowarn(t1a.toString) // warning (typer, argument not a compile-time constant)
-   |        ^^^^^^^^^^^^
-   |        filter needs to be a compile-time constant string
--- Warning: tests/neg/nowarn.scala:25:10 -------------------------------------------------------------------------------
-25 |@nowarn(o.inl) def t2d = try 1   // two warnings (`inl` is not a compile-time constant)
-   |        ^^^^^
-   |        filter needs to be a compile-time constant string
--- Deprecation Warning: tests/neg/nowarn.scala:39:10 -------------------------------------------------------------------
-39 |def t6a = f // warning (refchecks, deprecation)
-   |          ^
-   |          method f is deprecated
--- Deprecation Warning: tests/neg/nowarn.scala:42:30 -------------------------------------------------------------------
-42 |@nowarn("msg=fish") def t6d = f // error (unused nowarn), warning (deprecation)
-   |                              ^
-   |                              method f is deprecated
--- Deprecation Warning: tests/neg/nowarn.scala:49:10 -------------------------------------------------------------------
-49 |def t7c = f             // warning (deprecation)
-   |          ^
-   |          method f is deprecated
--- [E092] Pattern Match Unchecked Warning: tests/neg/nowarn.scala:55:7 -------------------------------------------------
-55 |  case _: List[Int] => 0 // warning (patmat, unchecked)
-   |       ^
-   |the type test for List[Int] cannot be checked at runtime because its type arguments can't be determined from Any
-   |
-   | longer explanation available when compiling with `-explain`
--- Error: tests/neg/nowarn.scala:33:1 ----------------------------------------------------------------------------------
-33 |@nowarn("id=1") def t4d = try 1 // error and warning (unused nowarn, wrong id)
-   |^^^^^^^^^^^^^^^
-   |@nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:42:1 ----------------------------------------------------------------------------------
-42 |@nowarn("msg=fish") def t6d = f // error (unused nowarn), warning (deprecation)
-   |^^^^^^^^^^^^^^^^^^^
-   |@nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:50:5 ----------------------------------------------------------------------------------
-50 |  : @nowarn("msg=fish") // error (unused nowarn)
-   |    ^^^^^^^^^^^^^^^^^^^
-   |    @nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:62:0 ----------------------------------------------------------------------------------
-62 |@nowarn def t9a = { 1: @nowarn; 2 } // error (outer @nowarn is unused)
-   |^^^^^^^
-   |@nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:63:27 ---------------------------------------------------------------------------------
-63 |@nowarn def t9b = { 1: Int @nowarn; 2 } // error (inner @nowarn is unused, it covers the type, not the expression)
-   |                           ^^^^^^^
-   |                           @nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:68:0 ----------------------------------------------------------------------------------
-68 |@nowarn @ann(f) def t10b = 0  // error (unused nowarn)
-   |^^^^^^^
-   |@nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:69:8 ----------------------------------------------------------------------------------
-69 |@ann(f: @nowarn) def t10c = 0 // error (unused nowarn), should be silent
-   |        ^^^^^^^
-   |        @nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:72:0 ----------------------------------------------------------------------------------
-72 |@nowarn class I1a { // error (unused nowarn)
-   |^^^^^^^
-   |@nowarn annotation does not suppress any warnings
--- Error: tests/neg/nowarn.scala:77:0 ----------------------------------------------------------------------------------
-77 |@nowarn class I1b { // error (unused nowarn)
-   |^^^^^^^
-   |@nowarn annotation does not suppress any warnings
diff --git a/tests/neg/nowarn.scala b/tests/neg/nowarn.scala
deleted file mode 100644
index 5b18ab5ccc51..000000000000
--- a/tests/neg/nowarn.scala
+++ /dev/null
@@ -1,89 +0,0 @@
-//> using options -deprecation -Wunused:nowarn "-Wconf:msg=@nowarn annotation does not suppress any warnings:e"
-
-import scala.annotation.{ nowarn, Annotation }
-
-// This test doesn't run with `-Werror`, because once there's an error, later phases are skipped and we would not see
-// their warnings.
-// Instead, this test runs with `-Wunused:nowarn -Wconf:msg=@nowarn annotation does not suppress any warnings:e`.
-// Only "unused nowarn" warnings are reported as errors. Since these warnings are reported at the very end, all other
-// phases of the compiler run normally.
-
-def t1a = try 1 // warning (parser)
-@nowarn("msg=try without catch") def t1b = try 1
-
-@nowarn("wat?") // warning (typer, invalid filter)
-def t2 = { 1; 2 } // warning (the invalid nowarn doesn't silence anything)
-
-@nowarn(t1a.toString) // warning (typer, argument not a compile-time constant)
-def t2a = { 1; 2 } // warning (invalid nowarn doesn't silence)
-
-object o:
-  final val const = "msg=try"
-  inline def inl = "msg=try"
-
-@nowarn(o.const) def t2c = try 1 // no warning
-@nowarn(o.inl) def t2d = try 1   // two warnings (`inl` is not a compile-time constant)
-
-@nowarn("id=E129") def t3a = { 1; 2 }
-@nowarn("name=PureExpressionInStatementPosition") def t3b = { 1; 2 }
-
-@nowarn("id=E002") def t4a = try 1
-@nowarn("id=E2") def t4b = try 1
-@nowarn("id=2") def t4c = try 1
-@nowarn("id=1") def t4d = try 1 // error and warning (unused nowarn, wrong id)
-
-@nowarn("verbose") def t5 = try 1 // warning with details
-
-@deprecated def f = 0
-
-def t6a = f // warning (refchecks, deprecation)
-@nowarn("cat=deprecation") def t6b = f
-@nowarn("msg=deprecated") def t6c = f
-@nowarn("msg=fish") def t6d = f // error (unused nowarn), warning (deprecation)
-@nowarn("") def t6e = f
-@nowarn def t6f = f
-
-def t7a = f: @nowarn("cat=deprecation")
-def t7b = f
-  : @nowarn("msg=deprecated")
-def t7c = f             // warning (deprecation)
-  : @nowarn("msg=fish") // error (unused nowarn)
-def t7d = f: @nowarn("")
-def t7e = f: @nowarn
-
-def t8a(x: Any) = x match
-  case _: List[Int] => 0 // warning (patmat, unchecked)
-  case _ => 1
-
-@nowarn("cat=unchecked") def t8(x: Any) = x match
-  case _: List[Int] => 0
-  case _ => 1
-
-@nowarn def t9a = { 1: @nowarn; 2 } // error (outer @nowarn is unused)
-@nowarn def t9b = { 1: Int @nowarn; 2 } // error (inner @nowarn is unused, it covers the type, not the expression)
-
-class ann(a: Any) extends Annotation
-
-@ann(f) def t10a = 0          // should be a deprecation warning, but currently isn't
-@nowarn @ann(f) def t10b = 0  // error (unused nowarn)
-@ann(f: @nowarn) def t10c = 0 // error (unused nowarn), should be silent
-
-def forceCompletionOfI1a = (new I1a).m
-@nowarn class I1a { // error (unused nowarn)
-  @nowarn def m = { 1; 2 }
-}
-
-// completion during type checking
-@nowarn class I1b { // error (unused nowarn)
-  @nowarn def m = { 1; 2 }
-}
-
-@nowarn class I1c {
-  def m = { 1; 2 }
-}
-
-trait T {
-  @nowarn val t1 = { 0; 1 }
-}
-
-class K extends T
diff --git a/tests/warn/i23651.scala b/tests/warn/i23651.scala
new file mode 100644
index 000000000000..c81ddb4249f8
--- /dev/null
+++ b/tests/warn/i23651.scala
@@ -0,0 +1,27 @@
+//> using options -deprecation -Wunused:nowarn
+
+import scala.annotation.nowarn
+
+@deprecated
+class A
+
+@deprecated
+class B
+
+@nowarn("msg=trait C is deprecated") // warn
+  // @nowarn annotation does not suppress any warnings
+@nowarn("msg=class A is deprecated")
+@nowarn("cat=deprecation&msg=class A is deprecated") // warn
+  // @nowarn annotation does not suppress any warnings but matches a diagnostic
+@nowarn("cat=deprecation&msg=class B is deprecated")
+trait C1:
+  def a: A
+  def b: B
+
+@nowarn("cat=deprecation&msg=class B is deprecated")
+@nowarn("cat=deprecation&msg=class B is deprecated") // warn
+  // @nowarn annotation does not suppress any warnings but matches a diagnostic
+@nowarn("cat=deprecation&msg=class A is deprecated")
+trait C2:
+  def a: A
+  def b: B
diff --git a/tests/warn/nowarn.check b/tests/warn/nowarn.check
new file mode 100644
index 000000000000..89ff8d51161b
--- /dev/null
+++ b/tests/warn/nowarn.check
@@ -0,0 +1,110 @@
+-- [E002] Syntax Warning: tests/warn/nowarn.scala:5:10 -----------------------------------------------------------------
+5 |def t1a = try 1 // warn (parser)
+  |          ^^^^^
+  |          A try without catch or finally is equivalent to putting
+  |          its body in a block; no exceptions are handled.
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E002] Syntax Warning: tests/warn/nowarn.scala:19:25 ----------------------------------------------------------------
+19 |@nowarn(o.inl) def t2d = try 1   // warn // warn (`inl` is not a compile-time constant)
+   |                         ^^^^^
+   |                         A try without catch or finally is equivalent to putting
+   |                         its body in a block; no exceptions are handled.
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E002] Syntax Warning: tests/warn/nowarn.scala:27:26 ----------------------------------------------------------------
+27 |@nowarn("id=1") def t4d = try 1 // warn // warn (unused nowarn, wrong id)
+   |                          ^^^^^
+   |                          A try without catch or finally is equivalent to putting
+   |                          its body in a block; no exceptions are handled.
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E002] Syntax Warning: tests/warn/nowarn.scala:29:28 ----------------------------------------------------------------
+29 |@nowarn("verbose") def t5 = try 1 // warn with details
+   |                            ^^^^^
+   |                            A try without catch or finally is equivalent to putting
+   |                            its body in a block; no exceptions are handled.
+   |Matching filters for @nowarn or -Wconf:
+   |  - id=E2
+   |  - name=EmptyCatchAndFinallyBlock
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E129] Potential Issue Warning: tests/warn/nowarn.scala:9:11 --------------------------------------------------------
+9 |def t2 = { 1; 2 } // warn (the invalid nowarn doesn't silence anything)
+  |           ^
+  |           A pure expression does nothing in statement position
+  |
+  | longer explanation available when compiling with `-explain`
+-- Warning: tests/warn/nowarn.scala:8:8 --------------------------------------------------------------------------------
+8 |@nowarn("wat?") // warn (typer, invalid filter)
+  |        ^^^^^^
+  |        Invalid message filter
+  |        unknown filter: wat?
+-- [E129] Potential Issue Warning: tests/warn/nowarn.scala:12:12 -------------------------------------------------------
+12 |def t2a = { 1; 2 } // warn (invalid nowarn doesn't silence)
+   |            ^
+   |            A pure expression does nothing in statement position
+   |
+   | longer explanation available when compiling with `-explain`
+-- Warning: tests/warn/nowarn.scala:11:8 -------------------------------------------------------------------------------
+11 |@nowarn(t1a.toString) // warn (typer, argument not a compile-time constant)
+   |        ^^^^^^^^^^^^
+   |        filter needs to be a compile-time constant string
+-- Warning: tests/warn/nowarn.scala:19:10 ------------------------------------------------------------------------------
+19 |@nowarn(o.inl) def t2d = try 1   // warn // warn (`inl` is not a compile-time constant)
+   |        ^^^^^
+   |        filter needs to be a compile-time constant string
+-- Deprecation Warning: tests/warn/nowarn.scala:33:10 ------------------------------------------------------------------
+33 |def t6a = f // warn (refchecks, deprecation)
+   |          ^
+   |          method f is deprecated
+-- Deprecation Warning: tests/warn/nowarn.scala:36:30 ------------------------------------------------------------------
+36 |@nowarn("msg=fish") def t6d = f // warn (unused nowarn) // warn (deprecation)
+   |                              ^
+   |                              method f is deprecated
+-- Deprecation Warning: tests/warn/nowarn.scala:43:10 ------------------------------------------------------------------
+43 |def t7c = f             // warn (deprecation)
+   |          ^
+   |          method f is deprecated
+-- [E092] Pattern Match Unchecked Warning: tests/warn/nowarn.scala:49:7 ------------------------------------------------
+49 |  case _: List[Int] => 0 // warn (patmat, unchecked)
+   |       ^
+   |the type test for List[Int] cannot be checked at runtime because its type arguments can't be determined from Any
+   |
+   | longer explanation available when compiling with `-explain`
+-- Warning: tests/warn/nowarn.scala:27:1 -------------------------------------------------------------------------------
+27 |@nowarn("id=1") def t4d = try 1 // warn // warn (unused nowarn, wrong id)
+   |^^^^^^^^^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Warning: tests/warn/nowarn.scala:36:1 -------------------------------------------------------------------------------
+36 |@nowarn("msg=fish") def t6d = f // warn (unused nowarn) // warn (deprecation)
+   |^^^^^^^^^^^^^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Warning: tests/warn/nowarn.scala:44:5 -------------------------------------------------------------------------------
+44 |  : @nowarn("msg=fish") // warn (unused nowarn)
+   |    ^^^^^^^^^^^^^^^^^^^
+   |    @nowarn annotation does not suppress any warnings
+-- Warning: tests/warn/nowarn.scala:56:0 -------------------------------------------------------------------------------
+56 |@nowarn def t9a = { 1: @nowarn; 2 } // warn (outer @nowarn is unused)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings but matches a diagnostic
+-- Warning: tests/warn/nowarn.scala:57:27 ------------------------------------------------------------------------------
+57 |@nowarn def t9b = { 1: Int @nowarn; 2 } // warn (inner @nowarn is unused, it covers the type, not the expression)
+   |                           ^^^^^^^
+   |                           @nowarn annotation does not suppress any warnings
+-- Warning: tests/warn/nowarn.scala:62:0 -------------------------------------------------------------------------------
+62 |@nowarn @ann(f) def t10b = 0  // warn (unused nowarn)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Warning: tests/warn/nowarn.scala:63:8 -------------------------------------------------------------------------------
+63 |@ann(f: @nowarn) def t10c = 0 // warn (unused nowarn), should be silent
+   |        ^^^^^^^
+   |        @nowarn annotation does not suppress any warnings
+-- Warning: tests/warn/nowarn.scala:66:0 -------------------------------------------------------------------------------
+66 |@nowarn class I1a { // warn (unused nowarn)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings but matches a diagnostic
+-- Warning: tests/warn/nowarn.scala:71:0 -------------------------------------------------------------------------------
+71 |@nowarn class I1b { // warn (unused nowarn)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings but matches a diagnostic
diff --git a/tests/warn/nowarn.scala b/tests/warn/nowarn.scala
new file mode 100644
index 000000000000..f6cacdd677d0
--- /dev/null
+++ b/tests/warn/nowarn.scala
@@ -0,0 +1,83 @@
+//> using options -deprecation -Wunused:nowarn
+
+import scala.annotation.{nowarn, Annotation}
+
+def t1a = try 1 // warn (parser)
+@nowarn("msg=try without catch") def t1b = try 1
+
+@nowarn("wat?") // warn (typer, invalid filter)
+def t2 = { 1; 2 } // warn (the invalid nowarn doesn't silence anything)
+
+@nowarn(t1a.toString) // warn (typer, argument not a compile-time constant)
+def t2a = { 1; 2 } // warn (invalid nowarn doesn't silence)
+
+object o:
+  final val const = "msg=try"
+  inline def inl = "msg=try"
+
+@nowarn(o.const) def t2c = try 1 // no warn
+@nowarn(o.inl) def t2d = try 1   // warn // warn (`inl` is not a compile-time constant)
+
+@nowarn("id=E129") def t3a = { 1; 2 }
+@nowarn("name=PureExpressionInStatementPosition") def t3b = { 1; 2 }
+
+@nowarn("id=E002") def t4a = try 1
+@nowarn("id=E2") def t4b = try 1
+@nowarn("id=2") def t4c = try 1
+@nowarn("id=1") def t4d = try 1 // warn // warn (unused nowarn, wrong id)
+
+@nowarn("verbose") def t5 = try 1 // warn with details
+
+@deprecated def f = 0
+
+def t6a = f // warn (refchecks, deprecation)
+@nowarn("cat=deprecation") def t6b = f
+@nowarn("msg=deprecated") def t6c = f
+@nowarn("msg=fish") def t6d = f // warn (unused nowarn) // warn (deprecation)
+@nowarn("") def t6e = f
+@nowarn def t6f = f
+
+def t7a = f: @nowarn("cat=deprecation")
+def t7b = f
+  : @nowarn("msg=deprecated")
+def t7c = f             // warn (deprecation)
+  : @nowarn("msg=fish") // warn (unused nowarn)
+def t7d = f: @nowarn("")
+def t7e = f: @nowarn
+
+def t8a(x: Any) = x match
+  case _: List[Int] => 0 // warn (patmat, unchecked)
+  case _ => 1
+
+@nowarn("cat=unchecked") def t8(x: Any) = x match
+  case _: List[Int] => 0
+  case _ => 1
+
+@nowarn def t9a = { 1: @nowarn; 2 } // warn (outer @nowarn is unused)
+@nowarn def t9b = { 1: Int @nowarn; 2 } // warn (inner @nowarn is unused, it covers the type, not the expression)
+
+class ann(a: Any) extends Annotation
+
+@ann(f) def t10a = 0          // should be a deprecation warning, but currently isn't
+@nowarn @ann(f) def t10b = 0  // warn (unused nowarn)
+@ann(f: @nowarn) def t10c = 0 // warn (unused nowarn), should be silent
+
+def forceCompletionOfI1a = (new I1a).m
+@nowarn class I1a { // warn (unused nowarn)
+  @nowarn def m = { 1; 2 }
+}
+
+// completion during type checking
+@nowarn class I1b { // warn (unused nowarn)
+  @nowarn def m = { 1; 2 }
+}
+
+@nowarn class I1c {
+  def m = { 1; 2 }
+}
+
+trait T {
+  @nowarn val t1 = { 0; 1 }
+}
+
+class K extends T

From 4059d1c4cd3b47634ed4c5a442ed81c44ff4a69e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 8 Aug 2025 08:48:57 +0200
Subject: [PATCH 478/505] Add suppression if nowarn differs (#23652)

Fixes #23651

The [previous fix](https://github.com/scala/scala3/pull/22383) for the
same `@nowarn` attached to multiple elements should have compared the
`annotPos` to identify duplicates (instead of the target range).

This commit defers detecting "bad" or duplicate suppressions (which
originate with the same annotation) to report time, after the
suppression is "unused"; there are few nowarns per file and fewer that
are unused.

While checking for a suppression, mark matching unused suppressions as
"superseded", so that if they remain unused, the warning can add an
"audit" that the nowarn matched a diagnostic (but was superseded by some
other nowarn).

~This commit goes further and checks for duplicates (including whether
the filters look the same).~

~If it finds a duplicate where the `annotPos` differs, warn about the
user-written annotation.~

~Filters match each other if they are the same type and, if they have a
pattern, the string representations of the patterns are equal.~
[Cherry-picked 40843f748444886114bce7003ff2147d6f00500d][modified]

From 9de5e1f052379638979eb3c249bda97ca12a77df Mon Sep 17 00:00:00 2001
From: Kacper Korban <kacper.f.korban@gmail.com>
Date: Wed, 6 Aug 2025 10:17:02 +0100
Subject: [PATCH 479/505] fix: Fix extracting refinements from intersection
 types in dynamic select hovers (#23640)

closes #22919

---------

Co-authored-by: Bulby <26726264+thedrawingcoder-gamer@users.noreply.github.com>
[Cherry-picked b0627b3a9df3ba5e16f34b3b189c4df84fcf3647]
---
 .../main/dotty/tools/pc/HoverProvider.scala   | 22 ++++--
 .../tools/pc/tests/hover/HoverTermSuite.scala | 75 +++++++++++++++++++
 2 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
index 6e8e3209c9d7..4ac07587fce2 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -13,6 +13,7 @@ import scala.meta.pc.SymbolSearch
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Constants.*
 import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Decorators.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.StdNames.*
@@ -202,12 +203,21 @@ object HoverProvider:
             findRefinement(parent)
           case _ => None
 
-      val refTpe = sel.typeOpt.widen.deepDealiasAndSimplify match
-        case r: RefinedType => Some(r)
-        case t: (TermRef | TypeProxy) => Some(t.termSymbol.info.deepDealiasAndSimplify)
-        case _ => None
-
-      refTpe.flatMap(findRefinement).asJava
+      def extractRefinements(t: Type): List[Type] = t match
+        case r: RefinedType => List(r)
+        case t: (TypeRef | AppliedType) =>
+          // deepDealiasAndSimplify can succeed with no progress, so we have to avoid infinite loops
+          val t1 = t.deepDealiasAndSimplify
+          if t1 == t then Nil
+          else extractRefinements(t1)
+        case t: TermRef => extractRefinements(t.widen)
+        case t: TypeProxy => List(t.termSymbol.info.deepDealiasAndSimplify)
+        case AndType(l , r) => List(extractRefinements(l), extractRefinements(r)).flatten
+        case _ => Nil
+
+      val refTpe: List[Type] = extractRefinements(sel.typeOpt)
+
+      refTpe.flatMap(findRefinement).headOption.asJava
     case _ =>
       ju.Optional.empty().nn
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
index 3e3019e80ff7..6cefe387a950 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -783,3 +783,78 @@ class HoverTermSuite extends BaseHoverSuite:
          |""".stripMargin,
       "val thisIsAVeryLongName: Int".hover
     )
+
+  @Test def `intersection_of_selectable-1` =
+    check(
+      """|class Record extends Selectable:
+         |  def selectDynamic(name: String): Any = ???
+         |
+         |type A = Record { val aa: Int }
+         |type B = Record { val bb: String }
+         |type AB = A & B
+         |
+         |val ab: AB = Record().asInstanceOf[AB]
+         |val ab_a = ab.a@@a
+         |""".stripMargin,
+      "val aa: Int".hover
+    )
+
+  @Test def `intersection_of_selectable-2` =
+    check(
+      """|class Record extends Selectable:
+         |  def selectDynamic(name: String): Any = ???
+         |
+         |type A = Record { val aa: Int }
+         |type B = Record { val aa: String }
+         |type AB = A & B
+         |
+         |val ab: AB = Record().asInstanceOf[AB]
+         |val ab_a = ab.a@@a
+         |""".stripMargin,
+      "val aa: Int & String".hover
+    )
+
+  @Test def `intersection_of_selectable-3` =
+    check(
+      """|class Record extends Selectable:
+         |  def selectDynamic(name: String): Any = ???
+         |
+         |type A = Record { val aa: Int }
+         |type B = Record { val bb: String }
+         |type AB = A & B
+         |
+         |val ab: AB = Record().asInstanceOf[AB]
+         |val ab_a = ab.b@@b
+         |""".stripMargin,
+      "val bb: String".hover
+    )
+
+  @Test def `intersection_of_selectable-4` =
+    check(
+      """|class Record extends Selectable:
+         |  def selectDynamic(name: String): Any = ???
+         |
+         |type A = Record { val aa: Int }
+         |type B = Record { val bb: String }
+         |type C = Record { val cc: Float }
+         |type AB = A & B
+         |type ABC = AB & C
+         |
+         |val abc: ABC = Record().asInstanceOf[ABC]
+         |val abc_a = abc.a@@a
+         |""".stripMargin,
+      "val aa: Int".hover
+    )
+
+  @Test def `intersection_of_selectable-5` =
+    check(
+      """|class Record extends Selectable:
+         |  def selectDynamic(name: String): Any = ???
+         |
+         |type AL = List[Int] & Record { val aa: Int }
+         |
+         |val al: AL = ???.asInstanceOf[ABC]
+         |val al_a = al.a@@a
+         |""".stripMargin,
+      "val aa: Int".hover
+    )

From 1e1b9a4df9f9797b1a9d137a8ec93a017bee78dd Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 29 Jul 2025 19:43:52 +0200
Subject: [PATCH 480/505] Generalize "Don't approximate a type using Nothing as
 prefix"

This generalizes https://github.com/scala/scala3/pull/23531 which skipped
higher-kinded types, turns out approximating them to Nothing can lead to the
same issue.

Fixes #23627.

[Cherry-picked 1ea24d6a89cb88a9f51b76f9fd17ffd424e4f9e1]
---
 compiler/src/dotty/tools/dotc/core/Types.scala | 12 +++++++++---
 tests/pos/i23627.scala                         | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 tests/pos/i23627.scala

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index f2e000c2db73..f0ca272cce36 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -6073,7 +6073,7 @@ object Types extends TypeUtils {
     protected def range(lo: Type, hi: Type): Type =
       if variance > 0 then hi
       else if variance < 0 then
-        if (lo eq defn.NothingType) && hi.hasSimpleKind then
+        if (lo eq defn.NothingType) then
           // Approximate by Nothing & hi instead of just Nothing, in case the
           // approximated type is used as the prefix of another type (this would
           // lead to a type with a `NoDenotation` denot and a possible
@@ -6084,8 +6084,14 @@ object Types extends TypeUtils {
           // example if Nothing is the type of a parameter being depended on in
           // a MethodType)
           //
-          // Test case in tests/pos/i23530.scala
-          AndType(lo, hi)
+          // Test case in tests/pos/i23530.scala (and tests/pos/i23627.scala for
+          // the higher-kinded case which requires eta-expansion)
+          hi.etaExpand match
+            case expandedHi: HKTypeLambda =>
+              expandedHi.derivedLambdaType(resType = AndType(lo, expandedHi.resType))
+            case _ =>
+              // simple-kinded case
+              AndType(lo, hi)
         else
           lo
       else if lo `eq` hi then lo
diff --git a/tests/pos/i23627.scala b/tests/pos/i23627.scala
new file mode 100644
index 000000000000..1480a80c9c00
--- /dev/null
+++ b/tests/pos/i23627.scala
@@ -0,0 +1,18 @@
+trait TestContainer:
+  trait TestPath[T]:
+    type AbsMember
+
+  extension (path: TestPath[?])
+    infix def ext(color: path.AbsMember): Unit = ???
+    infix def ext(other: Int): Unit = ???
+
+object Repro:
+  val dc2: TestContainer = ???
+  import dc2.TestPath
+
+  def transition(path: TestPath[?])(using DummyImplicit): TestPath[?] = ???
+
+  def test: Unit =
+    val di: TestPath[?] = ???
+    // error
+    val z1 = transition(di).ext(1)

From d4c1a3bb651a43d9618762519f5b2ddddf2ef015 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Fri, 8 Aug 2025 09:07:49 +0200
Subject: [PATCH 481/505] bugfix: Add missing function

---
 .../tools/dotc/core/TypeApplications.scala    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala
index ab216bfd147d..64b9a1f082ba 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala
@@ -310,6 +310,34 @@ class TypeApplications(val self: Type) extends AnyVal {
   def ensureLambdaSub(using Context): Type =
     if (isLambdaSub) self else EtaExpansion(self)
 
+
+  /** Convert a type constructor `TC` which has type parameters `X1, ..., Xn`
+   *  to `[X1, ..., Xn] -> TC[X1, ..., Xn]`.
+   */
+  def etaExpand(using Context): Type =
+    val tparams = self.typeParams
+    val resType = self.appliedTo(tparams.map(_.paramRef))
+    self.dealias match
+      case self: TypeRef if tparams.nonEmpty && self.symbol.isClass =>
+        val owner = self.symbol.owner
+        // Calling asSeenFrom on the type parameter infos is important
+        // so that class type references within another prefix have
+        // their type parameters' info fixed.
+        // e.g. from pos/i18569:
+        //    trait M1:
+        //      trait A
+        //      trait F[T <: A]
+        //    object M2 extends M1
+        // Type parameter T in M1.F has an upper bound of M1#A
+        // But eta-expanding M2.F should have type parameters with an upper-bound of M2.A.
+        // So we take the prefix M2.type and the F symbol's owner, M1,
+        // to call asSeenFrom on T's info.
+        HKTypeLambda(tparams.map(_.paramName))(
+          tl => tparams.map(p => HKTypeLambda.toPInfo(tl.integrate(tparams, p.paramInfo.asSeenFrom(self.prefix, owner)))),
+          tl => tl.integrate(tparams, resType))
+      case _ =>
+        HKTypeLambda.fromParams(tparams, resType)
+
   /** Eta expand if `self` is a (non-lambda) class reference and `bound` is a higher-kinded type */
   def EtaExpandIfHK(bound: Type)(using Context): Type = {
     val hkParams = bound.hkTypeParams

From 84d69e33788b85138a2c525476c0e12d3aadcc36 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Wed, 6 Aug 2025 15:28:55 +0200
Subject: [PATCH 482/505] More careful ClassTag instantiation (#23659)

We now use a blend of the new scheme and a backwards compatible special
case if type variables as ClassTag arguments are constrained by further
type variables.

Fixes #23611
---
 .../dotty/tools/dotc/typer/Synthesizer.scala  | 29 ++++++++++++++++--
 tests/pos/i23611.scala                        | 26 ++++++++++++++++
 tests/pos/i23611a.scala                       | 30 +++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 tests/pos/i23611.scala
 create mode 100644 tests/pos/i23611a.scala

diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
index 43035c0fd3dc..0a653c5e8ef8 100644
--- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
@@ -18,6 +18,7 @@ import annotation.{tailrec, constructorOnly}
 import ast.tpd
 import ast.tpd.*
 import Synthesizer.*
+import TypeComparer.{fullLowerBound, fullUpperBound}
 
 /** Synthesize terms for special classes */
 class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
@@ -36,10 +37,32 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
         // bounds are usually widened during instantiation.
         instArg(tp.tp1)
       case tvar: TypeVar if ctx.typerState.constraint.contains(tvar) =>
+      	// If tvar has a lower or upper bound:
+      	//   1. If the bound is not another type variable, use this as approximation.
+      	//   2. Otherwise, if the type can be forced to be fully defined, use that type
+      	//      as approximation.
+      	//   3. Otherwise leave argument uninstantiated.
+      	// The reason for (2) is that we observed complicated constraints in i23611.scala
+      	// that get better types if a fully defined type is computed than if several type
+      	// variables are approximated incrementally. This is a minimization of some ZIO code.
+      	// So in order to keep backwards compatibility (where before we _only_ did 2) we
+      	// add that special case.
+        def isGroundConstr(tp: Type): Boolean = tp.dealias match
+          case tvar: TypeVar if ctx.typerState.constraint.contains(tvar) => false
+          case pref: TypeParamRef if ctx.typerState.constraint.contains(pref) => false
+          case tp: AndOrType => isGroundConstr(tp.tp1) && isGroundConstr(tp.tp2)
+          case _ => true
         instArg(
-            if tvar.hasLowerBound then tvar.instantiate(fromBelow = true)
-            else if tvar.hasUpperBound then tvar.instantiate(fromBelow = false)
-            else NoType)
+            if tvar.hasLowerBound then
+              if isGroundConstr(fullLowerBound(tvar.origin)) then tvar.instantiate(fromBelow = true)
+              else if isFullyDefined(tp, ForceDegree.all) then tp
+              else NoType
+            else if tvar.hasUpperBound then
+              if isGroundConstr(fullUpperBound(tvar.origin)) then tvar.instantiate(fromBelow = false)
+              else if isFullyDefined(tp, ForceDegree.all) then tp
+              else NoType
+            else
+              NoType)
       case _ =>
         tp
 
diff --git a/tests/pos/i23611.scala b/tests/pos/i23611.scala
new file mode 100644
index 000000000000..0fef178b9c32
--- /dev/null
+++ b/tests/pos/i23611.scala
@@ -0,0 +1,26 @@
+import java.io.{File, IOException}
+import java.net.URI
+import java.nio.file.{Path, Paths}
+import scala.reflect.ClassTag
+
+trait FileConnectors {
+  def listPath(path: => Path): ZStream[Any, IOException, Path]
+
+  final def listFile(file: => File): ZStream[Any, IOException, File] =
+    for {
+      path <- null.asInstanceOf[ZStream[Any, IOException, Path]]
+      r    <- listPath(path).mapZIO(a => ZIO.attempt(a.toFile).refineToOrDie)
+    } yield r
+}
+
+sealed trait ZIO[-R, +E, +A]
+extension [R, E <: Throwable, A](self: ZIO[R, E, A])
+  def refineToOrDie[E1 <: E: ClassTag]: ZIO[R, E1, A] = ???
+
+object ZIO:
+  def attempt[A](code: => A): ZIO[Any, Throwable, A] = ???
+
+sealed trait ZStream[-R, +E, +A]:
+  def map[B](f: A => B): ZStream[R, E, B] = ???
+  def flatMap[R1 <: R, E1 >: E, B](f: A => ZStream[R1, E1, B]): ZStream[R1, E1, B]
+  def mapZIO[R1 <: R, E1 >: E, A1](f: A => ZIO[R1, E1, A1]): ZStream[R1, E1, A1]
\ No newline at end of file
diff --git a/tests/pos/i23611a.scala b/tests/pos/i23611a.scala
new file mode 100644
index 000000000000..fbaf709e2f0e
--- /dev/null
+++ b/tests/pos/i23611a.scala
@@ -0,0 +1,30 @@
+import java.io.{File, IOException}
+import java.net.URI
+import java.nio.file.{Path, Paths}
+import scala.reflect.ClassTag
+
+trait FileConnectors {
+  def listPath(path: => Path): ZStream[Any, IOException, Path]
+
+  final def listFile(file: => File): ZStream[Any, IOException, File] =
+    for {
+      path <- null.asInstanceOf[ZStream[Any, IOException, Path]]
+      r    <- listPath(path).mapZIO(a => ZIO.attempt(a.toFile).refineToOrDie)
+    } yield r
+}
+
+sealed abstract class CanFail[-E]
+object CanFail:
+  given [E]: CanFail[E] = ???
+
+sealed trait ZIO[-R, +E, +A]
+extension [R, E <: Throwable, A](self: ZIO[R, E, A])
+  def refineToOrDie[E1 <: E: ClassTag](using CanFail[E]): ZIO[R, E1, A] = ???
+
+object ZIO:
+  def attempt[A](code: => A): ZIO[Any, Throwable, A] = ???
+
+sealed trait ZStream[-R, +E, +A]:
+  def map[B](f: A => B): ZStream[R, E, B] = ???
+  def flatMap[R1 <: R, E1 >: E, B](f: A => ZStream[R1, E1, B]): ZStream[R1, E1, B]
+  def mapZIO[R1 <: R, E1 >: E, A1](f: A => ZIO[R1, E1, A1]): ZStream[R1, E1, A1]
\ No newline at end of file

From d6bd65ed2181949285730c2e84503136e402220e Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 12 Aug 2025 20:04:44 +0200
Subject: [PATCH 483/505] More careful ClassTag instantiation (#23659)

We now use a blend of the new scheme and a backwards compatible special
case if type variables as ClassTag arguments are constrained by further
type variables.

Fixes #23611
[Cherry-picked cfaa5d390dd225e54ea88383d7dd6e07f6f856de][modified]

From 58930255e8f6d5bbc2950b797c6aa70c5a813c6a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 12 Aug 2025 20:13:46 +0200
Subject: [PATCH 484/505] Warn if implicit default shadows given

-Wrecurse-with-default warns on self-recursion with default arg.

[Cherry-picked 6dac167b2a182194a20b0060918a943ace5c89e6][modified]
---
 .../tools/dotc/config/ScalaSettings.scala     |  2 ++
 .../tools/dotc/reporting/ErrorMessageID.scala |  2 ++
 .../dotty/tools/dotc/reporting/messages.scala | 12 ++++++++
 .../dotty/tools/dotc/transform/TailRec.scala  | 10 +++++--
 .../dotty/tools/dotc/typer/Applications.scala |  5 ++++
 .../tools/scaladoc/tasty/TypesSupport.scala   |  6 ++--
 ...desugared.check => i19414-desugared.check} |  2 +-
 ...desugared.scala => i19414-desugared.scala} |  0
 tests/neg/{19414.check => i19414.check}       |  2 +-
 tests/neg/{19414.scala => i19414.scala}       |  2 +-
 tests/warn/i23541.scala                       | 30 +++++++++++++++++++
 11 files changed, 65 insertions(+), 8 deletions(-)
 rename tests/neg/{19414-desugared.check => i19414-desugared.check} (91%)
 rename tests/neg/{19414-desugared.scala => i19414-desugared.scala} (100%)
 rename tests/neg/{19414.check => i19414.check} (91%)
 rename tests/neg/{19414.scala => i19414.scala} (80%)
 create mode 100644 tests/warn/i23541.scala

diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index ddd184c445f0..c25e5e0db11c 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -175,6 +175,7 @@ private sealed trait WarningSettings:
   private val WNonUnitStatement = BooleanSetting("-Wnonunit-statement", "Warn when block statements are non-Unit expressions.")
   private val WenumCommentDiscard = BooleanSetting("-Wenum-comment-discard", "Warn when a comment ambiguously assigned to multiple enum cases is discarded.")
   private val WtoStringInterpolated = BooleanSetting("-Wtostring-interpolated", "Warn a standard interpolator used toString on a reference type.")
+  private val WrecurseWithDefault = BooleanSetting("-Wrecurse-with-default", "Warn when a method calls itself with a default argument.")
   private val Wunused: Setting[List[ChoiceWithHelp[String]]] = MultiChoiceHelpSetting(
     name = "-Wunused",
     helpArg = "warning",
@@ -292,6 +293,7 @@ private sealed trait WarningSettings:
     def nonUnitStatement(using Context): Boolean = allOr(WNonUnitStatement)
     def enumCommentDiscard(using Context): Boolean = allOr(WenumCommentDiscard)
     def toStringInterpolated(using Context): Boolean = allOr(WtoStringInterpolated)
+    def recurseWithDefault(using Context): Boolean = allOr(WrecurseWithDefault)
     def checkInit(using Context): Boolean = allOr(YcheckInit)
 
 /** -X "Extended" or "Advanced" settings */
diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index f8befc5a19df..7b4dca438bd8 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -233,6 +233,8 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case ErasedNotPureID // errorNumber: 217
   case IllegalErasedDefID // errorNumber: 218
   case CannotInstantiateQuotedTypeVarID // errorNumber: 219
+  case DefaultShadowsGivenID // errorNumber: 220
+  case RecurseWithDefaultID // errorNumber: 221
 
   def errorNumber = ordinal - 1
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index 83ccb45780d4..0e2d64266dbe 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -3307,3 +3307,15 @@ final class NamedPatternNotApplicable(selectorType: Type)(using Context) extends
     i"Named patterns cannot be used with $selectorType, because it is not a named tuple or case class"
 
   override protected def explain(using Context): String = ""
+
+final class DefaultShadowsGiven(name: Name)(using Context) extends TypeMsg(DefaultShadowsGivenID):
+  override protected def msg(using Context): String =
+    i"Argument for implicit parameter $name was supplied using a default argument."
+  override protected def explain(using Context): String =
+    "Usually the given in scope is intended, but you must specify it after explicit `using`."
+
+final class RecurseWithDefault(name: Name)(using Context) extends TypeMsg(RecurseWithDefaultID):
+  override protected def msg(using Context): String =
+    i"Recursive call used a default argument for parameter $name."
+  override protected def explain(using Context): String =
+    "It's more explicit to pass current or modified arguments in a recursion."
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
index a9cfd40967e2..8eb6c069d2e4 100644
--- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
@@ -4,9 +4,9 @@ package transform
 import ast.{TreeTypeMap, tpd}
 import config.Printers.tailrec
 import core.*
-import Contexts.*, Flags.*, Symbols.*, Decorators.em
+import Contexts.*, Flags.*, Symbols.*, Decorators.*
 import Constants.Constant
-import NameKinds.{TailLabelName, TailLocalName, TailTempName}
+import NameKinds.{DefaultGetterName, TailLabelName, TailLocalName, TailTempName}
 import StdNames.nme
 import reporting.*
 import transform.MegaPhase.MiniPhase
@@ -323,7 +323,11 @@ class TailRec extends MiniPhase {
           method.matches(calledMethod) &&
           enclosingClass.appliedRef.widen <:< prefix.tpe.widenDealias
 
-        if (isRecursiveCall)
+        if isRecursiveCall then
+          if ctx.settings.Whas.recurseWithDefault then
+            if tree.args.exists(_.symbol.name.is(DefaultGetterName)) then
+              report.warning(RecurseWithDefault(), tree.srcPos)
+
           if (inTailPosition) {
             tailrec.println("Rewriting tail recursive call:  " + tree.span)
             rewrote = true
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index d2fd7a928eb0..38d5bcf3fe9b 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -674,6 +674,11 @@ trait Applications extends Compatibility {
             def implicitArg = implicitArgTree(formal, appPos.span)
 
             if !defaultArg.isEmpty then
+              if methodType.isImplicitMethod && ctx.mode.is(Mode.ImplicitsEnabled)
+              && !inferImplicitArg(formal, appPos.span).tpe.isError
+              then
+                report.warning(DefaultShadowsGiven(methodType.paramNames(n)), appPos)
+
               defaultArg.tpe.widen match
                 case _: MethodOrPoly if testOnly => matchArgs(args1, formals1, n + 1)
                 case _ => matchArgs(args1, addTyped(treeToArg(defaultArg)), n + 1)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
index 774e775f4e53..ffd161738421 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
@@ -4,9 +4,10 @@ package tasty
 import scala.jdk.CollectionConverters._
 
 import scala.quoted._
+import scala.annotation.*
 
-import NameNormalizer._
-import SyntheticsSupport._
+import NameNormalizer.*
+import SyntheticsSupport.*
 
 trait TypesSupport:
   self: TastyParser =>
@@ -76,6 +77,7 @@ trait TypesSupport:
       case tpe => inner(tpe)
 
   // TODO #23 add support for all types signatures that make sense
+  @nowarn("id=E219")
   private def inner(
     using Quotes,
   )(
diff --git a/tests/neg/19414-desugared.check b/tests/neg/i19414-desugared.check
similarity index 91%
rename from tests/neg/19414-desugared.check
rename to tests/neg/i19414-desugared.check
index cc51ee471553..72a3a5eabd37 100644
--- a/tests/neg/19414-desugared.check
+++ b/tests/neg/i19414-desugared.check
@@ -1,4 +1,4 @@
--- [E172] Type Error: tests/neg/19414-desugared.scala:22:34 ------------------------------------------------------------
+-- [E172] Type Error: tests/neg/i19414-desugared.scala:22:34 -----------------------------------------------------------
 22 |  summon[BodySerializer[JsObject]] // error: Ambiguous given instances
    |                                  ^
    |No best given instance of type BodySerializer[JsObject] was found for parameter x of method summon in object Predef.
diff --git a/tests/neg/19414-desugared.scala b/tests/neg/i19414-desugared.scala
similarity index 100%
rename from tests/neg/19414-desugared.scala
rename to tests/neg/i19414-desugared.scala
diff --git a/tests/neg/19414.check b/tests/neg/i19414.check
similarity index 91%
rename from tests/neg/19414.check
rename to tests/neg/i19414.check
index 016e3942c825..10bc939494c6 100644
--- a/tests/neg/19414.check
+++ b/tests/neg/i19414.check
@@ -1,4 +1,4 @@
--- [E172] Type Error: tests/neg/19414.scala:15:34 ----------------------------------------------------------------------
+-- [E172] Type Error: tests/neg/i19414.scala:15:34 ---------------------------------------------------------------------
 15 |  summon[BodySerializer[JsObject]] // error: Ambiguous given instances
    |                                  ^
    |No best given instance of type BodySerializer[JsObject] was found for parameter x of method summon in object Predef.
diff --git a/tests/neg/19414.scala b/tests/neg/i19414.scala
similarity index 80%
rename from tests/neg/19414.scala
rename to tests/neg/i19414.scala
index bb275ad943b7..8843441e81f2 100644
--- a/tests/neg/19414.scala
+++ b/tests/neg/i19414.scala
@@ -9,7 +9,7 @@ class Printer
 given Writer[JsValue] = ???
 given Writer[JsObject] = ???
 
-given [B: Writer](using printer: Printer = new Printer): BodySerializer[B] = ???
+given [B: Writer] => (printer: Printer = new Printer) => BodySerializer[B] = ???
 
 def f: Unit =
   summon[BodySerializer[JsObject]] // error: Ambiguous given instances
diff --git a/tests/warn/i23541.scala b/tests/warn/i23541.scala
new file mode 100644
index 000000000000..7f374b421ba3
--- /dev/null
+++ b/tests/warn/i23541.scala
@@ -0,0 +1,30 @@
+//> using options -Wrecurse-with-default
+
+def fun(x: Int)(using p: Int, q: Int = 0): Int =
+  if x <= 0 then p * q
+  else fun(x - 1)(using p = p + x) // warn recurse uses default (instead of given passed down the stack)
+
+def gun(x: Int)(p: Int, q: Int = 0): Int =
+  if x <= 0 then p * q
+  else gun(x - 1)(p = p + x) // warn recurse uses default (value not passed down the stack)
+
+def nested(using x: Int, y: Int = 42): Int =
+  def f: Int = nested(using x) // nowarn only self-recursive tailrec is eligible for warning
+  f
+
+def f(using s: String, i: Int = 1): String = s * i
+def g(using s: String)(using i: Int = 1): String = s * i
+
+@main def Test =
+  println(fun(3)(using p = 0, q = 1))
+  locally:
+    given String = "ab"
+    println(f) // prints "ab"
+    println(g) // prints "ab"
+  locally:
+    println(f(using s = "ab")) // prints "ab"
+    println(g(using s = "ab")) // prints "ab"
+  locally:
+    given Int = 2
+    println(f(using s = "ab")) // warn uses default instead of given // prints "ab"
+    println(g(using s = "ab")) // prints "abab"

From 7331d29533b10fa6950cb42a769f82dcd54bb656 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 23 Jul 2025 14:10:51 -0700
Subject: [PATCH 485/505] Use explicit args in recursion

---
 .../tools/scaladoc/tasty/TypesSupport.scala   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
index ffd161738421..8cef8af12604 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
@@ -77,7 +77,6 @@ trait TypesSupport:
       case tpe => inner(tpe)
 
   // TODO #23 add support for all types signatures that make sense
-  @nowarn("id=E219")
   private def inner(
     using Quotes,
   )(
@@ -143,24 +142,24 @@ trait TypesSupport:
             .reduceLeftOption((acc: SSignature, elem: SSignature) => acc ++ plain(", ").l ++ elem).getOrElse(List())
           ++ plain(")").l
 
-        def parseRefinedElem(name: String, info: TypeRepr, polyTyped: SSignature = Nil): SSignature = ( info match {
+        def parseRefinedElem(name: String, info: TypeRepr, polyTyped: SSignature = Nil): SSignature =
+          val ssig = info match
           case m: MethodType => {
             val paramList = getParamList(m)
             keyword("def ").l ++ plain(name).l ++ polyTyped ++ paramList ++ plain(": ").l ++ inner(m.resType)
           }
-          case t: PolyType => {
+          case t: PolyType =>
             val paramBounds = getParamBounds(t)
-            val parsedMethod = parseRefinedElem(name, t.resType)
-            if (!paramBounds.isEmpty){
+            if !paramBounds.isEmpty then
               parseRefinedElem(name, t.resType, plain("[").l ++ paramBounds ++ plain("]").l)
-            } else parseRefinedElem(name, t.resType)
-          }
+            else parseRefinedElem(name, t.resType, polyTyped = Nil)
           case ByNameType(tp) => keyword("def ").l ++ plain(s"$name: ").l ++ inner(tp)
           case t: TypeBounds => keyword("type ").l ++ plain(name).l ++ inner(t)
           case t: TypeRef => keyword("val ").l ++ plain(s"$name: ").l ++ inner(t)
           case t: TermRef => keyword("val ").l ++ plain(s"$name: ").l ++ inner(t)
           case other => noSupported(s"Not supported type in refinement $info")
-        } ) ++ plain("; ").l
+
+          ssig ++ plain("; ").l
 
         def parsePolyFunction(info: TypeRepr): SSignature = info match {
           case t: PolyType =>
@@ -227,6 +226,7 @@ trait TypesSupport:
         }) ++ plain("]").l
 
       case tp @ TypeRef(qual, typeName) =>
+        inline def wrapping = shouldWrapInParens(inner = qual, outer = tp, isLeft = true)
         qual match {
           case r: RecursiveThis => tpe(s"this.$typeName").l
           case t if skipPrefix(t, elideThis) =>
@@ -247,17 +247,17 @@ trait TypesSupport:
                   case _ => tpe(tp.typeSymbol)
               case Some(_) => tpe(tp.typeSymbol)
               case None =>
-                val sig = inParens(inner(qual)(using skipTypeSuffix = true), shouldWrapInParens(qual, tp, true))
+                val sig = inParens(inner(qual)(using indent = indent, skipTypeSuffix = true), wrapping)
                 sig ++ plain(".").l ++ tpe(tp.typeSymbol)
           case _ =>
-            val sig = inParens(inner(qual), shouldWrapInParens(qual, tp, true))
+            val sig = inParens(inner(qual, skipThisTypePrefix), wrapping)
             sig ++ keyword("#").l ++ tpe(tp.typeSymbol)
         }
 
       case tr @ TermRef(qual, typeName) =>
         val prefix = qual match
           case t if skipPrefix(t, elideThis) => Nil
-          case tp => inner(tp)(using skipTypeSuffix = true) ++ plain(".").l
+          case tp => inner(tp)(using indent = indent, skipTypeSuffix = true) ++ plain(".").l
         val suffix = if skipTypeSuffix then Nil else List(plain("."), keyword("type"))
         val typeSig = tr.termSymbol.tree match
           case vd: ValDef if tr.termSymbol.flags.is(Flags.Module) =>
@@ -276,9 +276,9 @@ trait TypesSupport:
         val spaces = " " * (indent)
         val casesTexts = cases.flatMap {
           case MatchCase(from, to) =>
-            keyword(caseSpaces + "case ").l ++ inner(from) ++ keyword(" => ").l ++ inner(to)(using indent = indent + 2) ++ plain("\n").l
+            keyword(caseSpaces + "case ").l ++ inner(from) ++ keyword(" => ").l ++ inner(to)(using indent = indent + 2, skipTypeSuffix = skipTypeSuffix) ++ plain("\n").l
           case TypeLambda(_, _, MatchCase(from, to)) =>
-            keyword(caseSpaces + "case ").l ++ inner(from) ++ keyword(" => ").l ++ inner(to)(using indent = indent + 2) ++ plain("\n").l
+            keyword(caseSpaces + "case ").l ++ inner(from) ++ keyword(" => ").l ++ inner(to)(using indent = indent + 2, skipTypeSuffix = skipTypeSuffix) ++ plain("\n").l
         }
         inner(sc) ++ keyword(" match ").l ++ plain("{\n").l ++ casesTexts ++ plain(spaces + "}").l
 

From b6acf376bc65ba794719a8255f9f48182251aa0b Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 12 Aug 2025 20:20:29 +0200
Subject: [PATCH 486/505] Use explicit args in recursion

[Cherry-picked 4cf87b07b8a11fdca834b2439e65d96f775666b1][modified]

From 2eb4a9f5d9e814959c2437dcfd162d9656c25300 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Wed, 23 Jul 2025 15:05:13 -0700
Subject: [PATCH 487/505] Name the parameter using a default

[Cherry-picked 8ba7cd38423b645ed6ef333f62371a34b9db8fde]
---
 .../dotty/tools/dotc/transform/TailRec.scala   |  7 +++++--
 tests/warn/i23541.check                        | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 tests/warn/i23541.check

diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
index 8eb6c069d2e4..b2be8d4651f0 100644
--- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
@@ -325,8 +325,11 @@ class TailRec extends MiniPhase {
 
         if isRecursiveCall then
           if ctx.settings.Whas.recurseWithDefault then
-            if tree.args.exists(_.symbol.name.is(DefaultGetterName)) then
-              report.warning(RecurseWithDefault(), tree.srcPos)
+            tree.args.find(_.symbol.name.is(DefaultGetterName)) match
+            case Some(arg) =>
+              val DefaultGetterName(_, index) = arg.symbol.name: @unchecked
+              report.warning(RecurseWithDefault(calledMethod.info.firstParamNames(index)), tree.srcPos)
+            case _ =>
 
           if (inTailPosition) {
             tailrec.println("Rewriting tail recursive call:  " + tree.span)
diff --git a/tests/warn/i23541.check b/tests/warn/i23541.check
new file mode 100644
index 000000000000..64ffbd9808d2
--- /dev/null
+++ b/tests/warn/i23541.check
@@ -0,0 +1,18 @@
+-- [E220] Type Warning: tests/warn/i23541.scala:29:13 ------------------------------------------------------------------
+29 |    println(f(using s = "ab")) // warn uses default instead of given // prints "ab"
+   |            ^^^^^^^^^^^^^^^^^
+   |            Argument for implicit parameter i was supplied using a default argument.
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E221] Type Warning: tests/warn/i23541.scala:5:17 -------------------------------------------------------------------
+5 |  else fun(x - 1)(using p = p + x) // warn recurse uses default (instead of given passed down the stack)
+  |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |       Recursive call used a default argument for parameter q.
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E221] Type Warning: tests/warn/i23541.scala:9:17 -------------------------------------------------------------------
+9 |  else gun(x - 1)(p = p + x) // warn recurse uses default (value not passed down the stack)
+  |       ^^^^^^^^^^^^^^^^^^^^^
+  |       Recursive call used a default argument for parameter q.
+  |
+  | longer explanation available when compiling with `-explain`

From 7c902e591ee49638949c6e7bdddeb7eaf5951229 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Mon, 4 Aug 2025 19:44:59 +0200
Subject: [PATCH 488/505] More careful ClassTag instantiation

We now use a blend of the new scheme and backwards compatible special case if type variables
as ClassTag arguments are constrained by further type variables.

Fixes #23611

[Cherry-picked b677f97a1fa26e0c27a4f434e850b4c8214d606c]
---
 compiler/src/dotty/tools/dotc/core/Types.scala | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index f0ca272cce36..65f7ff227f6d 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -4985,11 +4985,17 @@ object Types extends TypeUtils {
      */
     private def currentEntry(using Context): Type = ctx.typerState.constraint.entry(origin)
 
+    /** For uninstantiated type variables: the lower bound */
+    def lowerBound(using Context): Type = currentEntry.loBound
+
+    /** For uninstantiated type variables: the upper bound */
+    def upperBound(using Context): Type = currentEntry.hiBound
+
     /** For uninstantiated type variables: Is the lower bound different from Nothing? */
-    def hasLowerBound(using Context): Boolean = !currentEntry.loBound.isExactlyNothing
+    def hasLowerBound(using Context): Boolean = !lowerBound.isExactlyNothing
 
     /** For uninstantiated type variables: Is the upper bound different from Any? */
-    def hasUpperBound(using Context): Boolean = !currentEntry.hiBound.isTopOfSomeKind
+    def hasUpperBound(using Context): Boolean = !upperBound.isTopOfSomeKind
 
     /** Unwrap to instance (if instantiated) or origin (if not), until result
      *  is no longer a TypeVar

From 1baf2b858ad2228edc747d83ecb6e45ad3cb7fed Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Wed, 6 Aug 2025 11:39:38 +0200
Subject: [PATCH 489/505] Refine criterion when to use fullyDefinedType in
 ClassTag search

[Cherry-picked e4b8f3c7ad6cb727dafee0509db4fb7a44e3a9c2]
---
 compiler/src/dotty/tools/dotc/core/Types.scala | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 65f7ff227f6d..f0ca272cce36 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -4985,17 +4985,11 @@ object Types extends TypeUtils {
      */
     private def currentEntry(using Context): Type = ctx.typerState.constraint.entry(origin)
 
-    /** For uninstantiated type variables: the lower bound */
-    def lowerBound(using Context): Type = currentEntry.loBound
-
-    /** For uninstantiated type variables: the upper bound */
-    def upperBound(using Context): Type = currentEntry.hiBound
-
     /** For uninstantiated type variables: Is the lower bound different from Nothing? */
-    def hasLowerBound(using Context): Boolean = !lowerBound.isExactlyNothing
+    def hasLowerBound(using Context): Boolean = !currentEntry.loBound.isExactlyNothing
 
     /** For uninstantiated type variables: Is the upper bound different from Any? */
-    def hasUpperBound(using Context): Boolean = !upperBound.isTopOfSomeKind
+    def hasUpperBound(using Context): Boolean = !currentEntry.hiBound.isTopOfSomeKind
 
     /** Unwrap to instance (if instantiated) or origin (if not), until result
      *  is no longer a TypeVar

From be5cbda7ef6c0971c1dcd3e610c0819b209f1369 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Tue, 5 Aug 2025 12:04:55 +0200
Subject: [PATCH 490/505] Use more context for implicit search only if no
 default argument

After an "implicit not found", we type additional arguments to get more context which might
give a larger implicit scope to search. With this commit we do that only if there is no
default argument for the implicit.

This might fix #23610
---
 .../src/dotty/tools/dotc/typer/Typer.scala    | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index c574b9ff7889..6289f310ac1e 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3836,6 +3836,12 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
       def addImplicitArgs(using Context) =
         def hasDefaultParams = methPart(tree).symbol.hasDefaultParams
+        def findDefaultArgument(argIndex: Int): Tree =
+          def appPart(t: Tree): Tree = t match
+            case Block(_, expr)      => appPart(expr)
+            case Inlined(_, _, expr) => appPart(expr)
+            case t => t
+          defaultArgument(appPart(tree), n = argIndex, testOnly = false)
         def implicitArgs(formals: List[Type], argIndex: Int, pt: Type): List[Tree] = formals match
           case Nil => Nil
           case formal :: formals1 =>
@@ -3851,11 +3857,17 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
             val arg = inferImplicitArg(formal, tree.span.endPos)
 
+            lazy val defaultArg = findDefaultArgument(argIndex)
+              .showing(i"default argument: for $formal, $tree, $argIndex = $result", typr)
+            def argHasDefault = hasDefaultParams && !defaultArg.isEmpty
+
             def canProfitFromMoreConstraints =
               arg.tpe.isInstanceOf[AmbiguousImplicits]
-                    // ambiguity could be decided by more constraints
-              || !isFullyDefined(formal, ForceDegree.none)
-                    // more context might constrain type variables which could make implicit scope larger
+                    // Ambiguity could be decided by more constraints
+              || !isFullyDefined(formal, ForceDegree.none) && !argHasDefault
+                    // More context might constrain type variables which could make implicit scope larger.
+                    // But in this case we should search with additional arguments typed only if there
+                    // is no default argument.
 
             arg.tpe match
               case failed: SearchFailureType if canProfitFromMoreConstraints =>
@@ -3868,20 +3880,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
               case failed: AmbiguousImplicits =>
                 arg :: implicitArgs(formals1, argIndex + 1, pt)
               case failed: SearchFailureType =>
-                lazy val defaultArg =
-                  def appPart(t: Tree): Tree = t match
-                    case Block(stats, expr) => appPart(expr)
-                    case Inlined(_, _, expr) => appPart(expr)
-                    case _ => t
-                  defaultArgument(appPart(tree), argIndex, testOnly = false)
-                    .showing(i"default argument: for $formal, $tree, $argIndex = $result", typr)
-                if !hasDefaultParams || defaultArg.isEmpty then
-                  // no need to search further, the adapt fails in any case
-                  // the reason why we continue inferring arguments in case of an AmbiguousImplicits
-                  // is that we need to know whether there are further errors.
-                  // If there are none, we have to propagate the ambiguity to the caller.
-                  arg :: formals1.map(dummyArg)
-                else
+                if argHasDefault then
                   // This is tricky. On the one hand, we need the defaultArg to
                   // correctly type subsequent formal parameters in the same using
                   // clause in case there are parameter dependencies. On the other hand,
@@ -3892,6 +3891,12 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
                   // `if propFail.exists` where we re-type the whole using clause with named
                   // arguments for all implicits that were found.
                   arg :: inferArgsAfter(defaultArg)
+                else
+                  // no need to search further, the adapt fails in any case
+                  // the reason why we continue inferring arguments in case of an AmbiguousImplicits
+                  // is that we need to know whether there are further errors.
+                  // If there are none, we have to propagate the ambiguity to the caller.
+                  arg :: formals1.map(dummyArg)
               case _ =>
                 arg :: inferArgsAfter(arg)
         end implicitArgs

From 282f39386a0cee3dbb4a76d4a4a59a5a33de8f4b Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 12 Aug 2025 20:30:52 +0200
Subject: [PATCH 491/505] Use more context for implicit search only if no
 default argument

After an "implicit not found", we type additional arguments to get more context which might
give a larger implicit scope to search. With this commit we do that only if there is no
default argument for the implicit.

This might fix #23610

[Cherry-picked 975c988ed23818c033a433fd91e5c12ec909f359][modified]

From 73a7ac51a59c53843f6a8e8df29b6268cfac9e72 Mon Sep 17 00:00:00 2001
From: katrinafyi <39479354+katrinafyi@users.noreply.github.com>
Date: Tue, 12 Aug 2025 18:07:08 +1000
Subject: [PATCH 492/505] scaladoc: indicate optional parameters with `= ...`
 (#23676)

currently, there is no indication in the scaladoc when parameters may be
optional. this leads to [long and overwhelming signatures][1] which is
not at all user-friendly. users are forced to first intuit that this
method *might* have some optional parameters, then manually find [the
source code][2] to learn which parameters are optional.

[1]:
https://javadoc.io/static/com.lihaoyi/os-lib_3/0.11.5/os/proc.html#call-fffff910
[2]:
https://github.com/com-lihaoyi/os-lib/blob/0.11.5/os/src/ProcessOps.scala#L192-L205

this PR suffixes `= ...` after the type signature of optional
parameters. this makes it possible to tell that these parameters are
optional and may be omitted.

this applies to both method parameters and class parameters. the format
is intentionally similar to the definition of such optional parameters
in code:
```scala
// new scaladoc display:
def f(x: Int, s: String = ...): Nothing

// code:
def f(x: Int, s: String = "a"): Nothing
```
of course, the `...` term is different. i think this is a reasonable
choice because (1) ellipsis commonly represents something present but
omitted, and (2) it is not valid Scala, so there is no risk someone will
think this is denoting a literal default value of `...`. a proper
ellipsis character (rather than 3 periods) could also be considered, but
i found that looked out of place amongst the monospace signature.

about displaying the default value itself, this PR does not display the
default value. this is because of anticipated difficulties around
displaying an expression. this could be re-visited in future, but i
think it should not hold up this PR. i believe that this PR alone is
already a substantial improvement for the documentation of optional
parameters.

finally, here is a screenshot of the scaladoc from the new
optionalParams.scala test case:
<img width="663" height="646" alt="image"
src="https://github.com/user-attachments/assets/870410ee-0535-484b-84c8-8b683464471e"
/>

this might be related to https://github.com/scala/scala3/issues/13424
---
 .../src/tests/extendsCall.scala               |  2 +-
 .../src/tests/optionalParams.scala            | 23 +++++++++++++++++++
 .../scaladoc/tasty/ClassLikeSupport.scala     |  3 ++-
 .../tools/scaladoc/tasty/TypesSupport.scala   |  4 ++--
 .../TranslatableSignaturesTestCases.scala     |  2 ++
 5 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 scaladoc-testcases/src/tests/optionalParams.scala

diff --git a/scaladoc-testcases/src/tests/extendsCall.scala b/scaladoc-testcases/src/tests/extendsCall.scala
index b90af8162e15..3ccd70de4216 100644
--- a/scaladoc-testcases/src/tests/extendsCall.scala
+++ b/scaladoc-testcases/src/tests/extendsCall.scala
@@ -3,4 +3,4 @@ package extendsCall
 
 class Impl() extends Base(Seq.empty, c = "-") //expected: class Impl() extends Base
 
-class Base(val a: Seq[String], val b: String = "", val c: String = "") //expected: class Base(val a: Seq[String], val b: String, val c: String)
+class Base(val a: Seq[String], val b: String = "", val c: String = "") //expected: class Base(val a: Seq[String], val b: String = ..., val c: String = ...)
diff --git a/scaladoc-testcases/src/tests/optionalParams.scala b/scaladoc-testcases/src/tests/optionalParams.scala
new file mode 100644
index 000000000000..551e14f7f811
--- /dev/null
+++ b/scaladoc-testcases/src/tests/optionalParams.scala
@@ -0,0 +1,23 @@
+package tests
+package optionalParams
+
+class C(val a: Seq[String], val b: String = "", var c: String = "") //expected: class C(val a: Seq[String], val b: String = ..., var c: String = ...)
+{
+  def m(x: Int, s: String = "a"): Nothing //expected: def m(x: Int, s: String = ...): Nothing
+    = ???
+}
+
+def f(x: Int, s: String = "a"): Nothing //expected: def f(x: Int, s: String = ...): Nothing
+  = ???
+
+extension (y: Int)
+  def ext(x: Int = 0): Int //expected: def ext(x: Int = ...): Int
+    = 0
+
+def byname(s: => String = "a"): Int //expected: def byname(s: => String = ...): Int
+  = 0
+
+enum E(val x: Int = 0) //expected: enum E(val x: Int = ...)
+{
+  case E1(y: Int = 10) extends E(y) //expected: final case class E1(y: Int = ...) extends E
+}
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
index 4514cb42c9c3..840ec0ac4c0b 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
@@ -443,12 +443,13 @@ trait ClassLikeSupport:
     val inlinePrefix = if argument.symbol.flags.is(Flags.Inline) then "inline " else ""
     val nameIfNotSynthetic = Option.when(!argument.symbol.flags.is(Flags.Synthetic))(argument.symbol.normalizedName)
     val name = argument.symbol.normalizedName
+    val defaultValue = Option.when(argument.symbol.flags.is(Flags.HasDefault))(Plain(" = ..."))
     api.TermParameter(
       argument.symbol.getAnnotations(),
       inlinePrefix + prefix(argument.symbol),
       nameIfNotSynthetic,
       argument.symbol.dri,
-      memberInfo.get(name).fold(argument.tpt.asSignature(classDef))(_.asSignature(classDef)),
+      memberInfo.get(name).fold(argument.tpt.asSignature(classDef))(_.asSignature(classDef)) :++ defaultValue,
       isExtendedSymbol,
       isGrouped
     )
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
index 8cef8af12604..1d5aa4e3a43a 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
@@ -233,7 +233,7 @@ trait TypesSupport:
             tpe(tp.typeSymbol)
           case _: TermRef | _: ParamRef =>
             val suffix = if tp.typeSymbol == Symbol.noSymbol then tpe(typeName).l else tpe(tp.typeSymbol)
-            inner(qual)(using skipTypeSuffix = true) ++ plain(".").l ++ suffix
+            inner(qual)(using indent = indent, skipTypeSuffix = true) ++ plain(".").l ++ suffix
           case ThisType(tr) =>
             findSupertype(elideThis, tr.typeSymbol) match
               case Some((sym, AppliedType(tr2, args))) =>
@@ -250,7 +250,7 @@ trait TypesSupport:
                 val sig = inParens(inner(qual)(using indent = indent, skipTypeSuffix = true), wrapping)
                 sig ++ plain(".").l ++ tpe(tp.typeSymbol)
           case _ =>
-            val sig = inParens(inner(qual, skipThisTypePrefix), wrapping)
+            val sig = inParens(inner(qual), wrapping)
             sig ++ keyword("#").l ++ tpe(tp.typeSymbol)
         }
 
diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
index 78de0ce67124..5469c06c8eb1 100644
--- a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
@@ -124,3 +124,5 @@ class InfixTypes extends SignatureTest("infixTypes", SignatureTest.all)
 class ExtendsCall extends SignatureTest("extendsCall", SignatureTest.all)
 
 class RightAssocExtension extends SignatureTest("rightAssocExtension", SignatureTest.all)
+
+class OptionalParams extends SignatureTest("optionalParams", SignatureTest.all)

From 1e637e9356535ecb3db530c75eda326382d1891a Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 12 Aug 2025 20:34:45 +0200
Subject: [PATCH 493/505] scaladoc: indicate optional parameters with `= ...`
 (#23676)

currently, there is no indication in the scaladoc when parameters may be
optional. this leads to [long and overwhelming signatures][1] which is
not at all user-friendly. users are forced to first intuit that this
method *might* have some optional parameters, then manually find [the
source code][2] to learn which parameters are optional.

[1]:
https://javadoc.io/static/com.lihaoyi/os-lib_3/0.11.5/os/proc.html#call-fffff910
[2]:
https://github.com/com-lihaoyi/os-lib/blob/0.11.5/os/src/ProcessOps.scala#L192-L205

this PR suffixes `= ...` after the type signature of optional
parameters. this makes it possible to tell that these parameters are
optional and may be omitted.

this applies to both method parameters and class parameters. the format
is intentionally similar to the definition of such optional parameters
in code:
```scala
// new scaladoc display:
def f(x: Int, s: String = ...): Nothing

// code:
def f(x: Int, s: String = "a"): Nothing
```
of course, the `...` term is different. i think this is a reasonable
choice because (1) ellipsis commonly represents something present but
omitted, and (2) it is not valid Scala, so there is no risk someone will
think this is denoting a literal default value of `...`. a proper
ellipsis character (rather than 3 periods) could also be considered, but
i found that looked out of place amongst the monospace signature.

about displaying the default value itself, this PR does not display the
default value. this is because of anticipated difficulties around
displaying an expression. this could be re-visited in future, but i
think it should not hold up this PR. i believe that this PR alone is
already a substantial improvement for the documentation of optional
parameters.

finally, here is a screenshot of the scaladoc from the new
optionalParams.scala test case:
<img width="663" height="646" alt="image"
src="https://github.com/user-attachments/assets/870410ee-0535-484b-84c8-8b683464471e"
/>

this might be related to https://github.com/scala/scala3/issues/13424
[Cherry-picked d2404688091a6a40b80e83df72072efa4fea8f22][modified]

From c7d96898163dcb717fe7e62e077dbc84c8527fde Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Tue, 12 Aug 2025 20:49:46 +0200
Subject: [PATCH 494/505] bugfix: Fix tests using newer given syntax

---
 tests/neg/i19414.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/neg/i19414.scala b/tests/neg/i19414.scala
index 8843441e81f2..bb275ad943b7 100644
--- a/tests/neg/i19414.scala
+++ b/tests/neg/i19414.scala
@@ -9,7 +9,7 @@ class Printer
 given Writer[JsValue] = ???
 given Writer[JsObject] = ???
 
-given [B: Writer] => (printer: Printer = new Printer) => BodySerializer[B] = ???
+given [B: Writer](using printer: Printer = new Printer): BodySerializer[B] = ???
 
 def f: Unit =
   summon[BodySerializer[JsObject]] // error: Ambiguous given instances

From aa8ff7f6051ed9a583988f48e0c496ce88d72dd4 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 27 Aug 2025 14:45:20 +0200
Subject: [PATCH 495/505] docs: Add release notes for 3.3.7-RC1

---
 changelogs/3.3.7-RC1.md | 218 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)
 create mode 100644 changelogs/3.3.7-RC1.md

diff --git a/changelogs/3.3.7-RC1.md b/changelogs/3.3.7-RC1.md
new file mode 100644
index 000000000000..1a05d824ab95
--- /dev/null
+++ b/changelogs/3.3.7-RC1.md
@@ -0,0 +1,218 @@
+# Highlights of the release
+
+- Warn if interpolator uses toString [#20578](https://github.com/scala/scala3/pull/20578)
+- Fixes #15736 blocking Scala 3 on Android [#22632](https://github.com/scala/scala3/pull/22632)
+- Implement :jar (deprecate :require) [#22343](https://github.com/scala/scala3/pull/22343)
+- In selector check, prefix of reference must match import qualifier [#20894](https://github.com/scala/scala3/pull/20894)
+- Fix #21242: Add REPL flag to quit after evaluating init script [#22636](https://github.com/scala/scala3/pull/22636)
+- Warn if implicit default shadows given [#23559](https://github.com/scala/scala3/pull/23559)
+
+# Other changes and fixes
+
+## Annotations
+
+- Approximate annotated types in `wildApprox` [#22893](https://github.com/scala/scala3/pull/22893)
+- Fix copy of annotation on @main methods [#22582](https://github.com/scala/scala3/pull/22582)
+
+## CI
+
+- Disable Cats flaky tests [#23007](https://github.com/scala/scala3/pull/23007)
+
+## Developer Experience
+
+- Add support for running the `test` sub-command with the bisect script [#22796](https://github.com/scala/scala3/pull/22796)
+
+## Documentation
+
+- Improve the usage of inclusive language [#22360](https://github.com/scala/scala3/pull/22360)
+- Update indentation.md to fix a typo [#23505](https://github.com/scala/scala3/pull/23505)
+
+## Enums
+
+- Make hashcode of enum items stable [#23218](https://github.com/scala/scala3/pull/23218)
+
+## Erasure
+
+- Add regression test for #23616 [#23623](https://github.com/scala/scala3/pull/23623)
+- Disallow context function types as value-class parameters [#23015](https://github.com/scala/scala3/pull/23015)
+- Handle type aliases in contextFunctionResultTypeAfter [#21517](https://github.com/scala/scala3/pull/21517)
+- Align erasure of `Array[Nothing]` and `Array[Null]` with Scala 2 [#22517](https://github.com/scala/scala3/pull/22517)
+
+## Experimental: Erased definitions
+
+- Erased fields are not nullable [#23311](https://github.com/scala/scala3/pull/23311)
+
+## Implicits
+
+- Refine implicit search fallbacks for better ClassTag handling [#23532](https://github.com/scala/scala3/pull/23532)
+- Fix #20335: Try extensions for arguments with type mismatch error [#23212](https://github.com/scala/scala3/pull/23212)
+
+## Inline
+
+- Fix Symbol.info remapping in TreeTypeMap [#23432](https://github.com/scala/scala3/pull/23432)
+
+## Lambda Lift
+
+- Fix: treat static vals as enclosures in lambdalift [#22452](https://github.com/scala/scala3/pull/22452)
+- Fix: record calls to constructors in lambdaLift [#22487](https://github.com/scala/scala3/pull/22487)
+
+## Linting
+
+- Check OrType in interpolated toString lint [#23365](https://github.com/scala/scala3/pull/23365)
+- Consider setter of effectively private var [#23211](https://github.com/scala/scala3/pull/23211)
+- Nowarn receiver of extension taking params [#23351](https://github.com/scala/scala3/pull/23351)
+- Dealias when looking into imports [#22889](https://github.com/scala/scala3/pull/22889)
+- Revert unconditional lint of Inlined expansion [#22815](https://github.com/scala/scala3/pull/22815)
+- Warn unused member of anonymous class [#22729](https://github.com/scala/scala3/pull/22729)
+- No warning for parameter of overriding method [#22757](https://github.com/scala/scala3/pull/22757)
+- Lazy val def member is pattern var [#22750](https://github.com/scala/scala3/pull/22750)
+- Ignore params to default arg getters [#22749](https://github.com/scala/scala3/pull/22749)
+- Restore resolving prefixes of implicit Ident [#22751](https://github.com/scala/scala3/pull/22751)
+- Exclude synthetic this.m, Any.m from import lookup [#22695](https://github.com/scala/scala3/pull/22695)
+- Nowarn public implicit val class params [#22664](https://github.com/scala/scala3/pull/22664)
+- Don't warn retainedBody [#22510](https://github.com/scala/scala3/pull/22510)
+- Suppress spurious Suppression [#22383](https://github.com/scala/scala3/pull/22383)
+- Handle Typeable [#22663](https://github.com/scala/scala3/pull/22663)
+- CheckUnused checks span.exists before testing its parts [#22504](https://github.com/scala/scala3/pull/22504)
+- Process Export for unused check [#22984](https://github.com/scala/scala3/pull/22984)
+- Enclosing package p.q not visible as q [#23069](https://github.com/scala/scala3/pull/23069)
+- Remove premature caching of lookups for unused lint [#22982](https://github.com/scala/scala3/pull/22982)
+- Improve checking LHS of Assign [#22977](https://github.com/scala/scala3/pull/22977)
+- Improve Unit ascription escape hatch [#23147](https://github.com/scala/scala3/pull/23147)
+- Mention extension in unused param warning [#23132](https://github.com/scala/scala3/pull/23132)
+- Dealias for unused param check [#23256](https://github.com/scala/scala3/pull/23256)
+- Take inferred or explicit refinement result for unused check [#23325](https://github.com/scala/scala3/pull/23325)
+- Add accessible check for import usage [#23348](https://github.com/scala/scala3/pull/23348)
+- Use result of lambda type of implicit in CheckUnused [#23497](https://github.com/scala/scala3/pull/23497)
+
+## Match Types
+
+- Handle NoType in TypeComparer.disjointnessBoundary [#21520](https://github.com/scala/scala3/pull/21520)
+- Fix: #23261 Distinguish 0.0 and -0.0 in ConstantType match types [#23265](https://github.com/scala/scala3/pull/23265)
+
+## Metaprogramming
+
+- Add a check for correct Array shape in quotes.reflect.ClassOfConstant [#22033](https://github.com/scala/scala3/pull/22033)
+
+## Opaque Types
+
+- Fix stack overflow errors when generating opaque type proxies [#22479](https://github.com/scala/scala3/pull/22479)
+
+## Optional Braces
+
+- Correctly detect colon lambda eol indent for optional brace of argument [#22477](https://github.com/scala/scala3/pull/22477)
+
+## Overloading
+
+- Fail compilation if multiple conflicting top-level private defs/vals are in the same package [#22759](https://github.com/scala/scala3/pull/22759)
+
+## Parser
+
+- Allow observing an indent after conditional [#22611](https://github.com/scala/scala3/pull/22611)
+- No outdent at eof [#22435](https://github.com/scala/scala3/pull/22435)
+- Fix annotations being not expected in the middle of an array type by java parser [#22391](https://github.com/scala/scala3/pull/22391)
+- Fix incorrect warning with -no-indent [#23216](https://github.com/scala/scala3/pull/23216)
+
+## Pattern Matching
+
+- Fix issue in lazy symbol completion or bug in nested classfile parser [#23634](https://github.com/scala/scala3/pull/23634)
+- Fix existing GADT constraints with introduced pattern-bound symbols [#22928](https://github.com/scala/scala3/pull/22928)
+- Avoid crash in uninhab check in Space [#22601](https://github.com/scala/scala3/pull/22601)
+
+## Pickling
+
+- Try to handle SkolemTypes in SingletonTypeTree during pickling [#23236](https://github.com/scala/scala3/pull/23236)
+
+## Positions
+
+- Compare span points in pathTo to determine best span [#23581](https://github.com/scala/scala3/pull/23581)
+
+## Presentation Compiler
+
+- Fix: Fix extracting refinements from intersection types in dynamic select hovers [#23640](https://github.com/scala/scala3/pull/23640)
+- Completions for requests just before string [#22894](https://github.com/scala/scala3/pull/22894)
+- Add enum type param support in sourceSymbol [#18603](https://github.com/scala/scala3/pull/18603)
+- Use untpd.Tree instead of tpd.Tree for SelectionRangeProvider [#22702](https://github.com/scala/scala3/pull/22702)
+- Fix: handle multiple params lists in for infer type [#23197](https://github.com/scala/scala3/pull/23197)
+- Fix completion mode filtering + optimize scopeCompletions [#23172](https://github.com/scala/scala3/pull/23172)
+- Add selection ranges for more names [#23257](https://github.com/scala/scala3/pull/23257)
+- Add inlay hints for by-name parameters [#23283](https://github.com/scala/scala3/pull/23283)
+- Add jpath to VirtualFile (for pc) [#23203](https://github.com/scala/scala3/pull/23203)
+
+## Quotes
+
+- Fix issue with static `this` references erroring in quoted code [#22618](https://github.com/scala/scala3/pull/22618)
+- Skip splice level checking for <refinement> symbols [#22782](https://github.com/scala/scala3/pull/22782)
+- Fix stale top level synthetic package object being used in later runs [#23464](https://github.com/scala/scala3/pull/23464)
+
+## REPL
+
+- REPL: JLine 3.29.0 (was 3.27.1) [#22679](https://github.com/scala/scala3/pull/22679)
+- Repl: emit warning for the `:sh` command [#22694](https://github.com/scala/scala3/pull/22694)
+
+## Reflection
+
+- Fix regression: do not approximate prefixes when using memberType in reflect API [#22448](https://github.com/scala/scala3/pull/22448)
+- Forbid `StringConstant(null)` [#23064](https://github.com/scala/scala3/pull/23064)
+- Quotes reflect: sort the typeMembers output list and filter out non-members [#22876](https://github.com/scala/scala3/pull/22876)
+
+## Reporting
+
+- Register nowarn when inlining [#22682](https://github.com/scala/scala3/pull/22682)
+- Filter help renders box border [#22434](https://github.com/scala/scala3/pull/22434)
+- Fix incorrect warning on type ascription for backquoted identifiers [#23088](https://github.com/scala/scala3/pull/23088)
+- Add an explainer to the DoubleDefinition error [#23470](https://github.com/scala/scala3/pull/23470)
+
+## Scaladoc
+
+- Encode path of class [#23503](https://github.com/scala/scala3/pull/23503)
+
+## Settings
+
+- Chore: filter allowed source versions by import and by settings [#23215](https://github.com/scala/scala3/pull/23215)
+
+## Testing framework
+
+- Revert dubious retry in vulpix [#21801](https://github.com/scala/scala3/pull/21801)
+
+## Transform
+
+- Check only stable qual for import prefix [#22633](https://github.com/scala/scala3/pull/22633)
+- Warn trivial recursion with module prefix [#23278](https://github.com/scala/scala3/pull/23278)
+
+## Tuples
+
+- Normalize tuple types in var args seq literals and classOf instances [#23465](https://github.com/scala/scala3/pull/23465)
+
+## Typer
+
+- Generalize "Don't approximate a type using Nothing as prefix" [#23628](https://github.com/scala/scala3/pull/23628)
+- Don't approximate a type using `Nothing` as prefix [#23531](https://github.com/scala/scala3/pull/23531)
+- Tighten condition to preserve denotation in IntegrateMap [#23060](https://github.com/scala/scala3/pull/23060)
+- Disallow context bounds in type lambdas [#22659](https://github.com/scala/scala3/pull/22659)
+- Fix #22724: Revert the PolyType case in #21744 [#22820](https://github.com/scala/scala3/pull/22820)
+- Fix isGenericArrayElement for higher-kinded types [#22938](https://github.com/scala/scala3/pull/22938)
+- Revert lambda cleanup [#22697](https://github.com/scala/scala3/pull/22697)
+- Constructor companion gets privateWithin [#22627](https://github.com/scala/scala3/pull/22627)
+- Add regression test for #22076 [#22602](https://github.com/scala/scala3/pull/22602)
+- Constructor proxy is restricted if class is protected [#22563](https://github.com/scala/scala3/pull/22563)
+- Check if a prefix is valid before selecting from a type [#22368](https://github.com/scala/scala3/pull/22368)
+- Preserve hard unions in widenSingletons [#22369](https://github.com/scala/scala3/pull/22369)
+- Revert recent changes to opaque type proxy generation [#23059](https://github.com/scala/scala3/pull/23059)
+- Compare TypeVar and TypeParamRef in mergeRefinedOrApplied [#23045](https://github.com/scala/scala3/pull/23045)
+- Only keep denotation for methods in IntegrateMap [#23226](https://github.com/scala/scala3/pull/23226)
+- Tighten condition when to do SAM type conversion [#23246](https://github.com/scala/scala3/pull/23246)
+- Revert "Make overload pruning based on result types less aggressive (#21744)" in main [#23331](https://github.com/scala/scala3/pull/23331)
+- Fix #22922: Add TypeParamRef handling in isSingletonBounded [#23501](https://github.com/scala/scala3/pull/23501)
+- Fix this references everywhere in dependent function types [#23514](https://github.com/scala/scala3/pull/23514)
+- More careful ClassTag instantiation [#23659](https://github.com/scala/scala3/pull/23659)
+- Use more context for implicit search only if no default argument [#23664](https://github.com/scala/scala3/pull/23664)
+
+## JDK
+
+- Check path of module prefix for tailrec [#23491](https://github.com/scala/scala3/pull/23491)
+
+## Releases
+
+- [CI] Switch releasing to Sontype Central instead of legacy Sonatype OSS [#23290](https://github.com/scala/scala3/pull/23290)
+

From bfdde52a5a371e441fceec9ce52b6d3a1f78134f Mon Sep 17 00:00:00 2001
From: vder <vder@interia.pl>
Date: Thu, 14 Aug 2025 14:47:47 +0200
Subject: [PATCH 496/505] Draft: additional completions for using clause
 (#23647)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix for  #22939

---------

Co-authored-by: Piotr Fałdrowicz <pfl@touk.pl>
[Cherry-picked 2b004ee695be634f9aea4ed55ededb71a407ce1c]
---
 .../pc/completions/CompletionAffix.scala      |  3 +-
 .../tools/pc/completions/Completions.scala    | 17 +++++-
 .../tests/completion/CompletionArgSuite.scala | 59 +++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionAffix.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionAffix.scala
index 4ed58c773a7c..78f9f5f68bfb 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionAffix.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionAffix.scala
@@ -56,6 +56,7 @@ case class CompletionAffix(
   private def loopPrefix(prefixes: List[PrefixKind]): String =
     prefixes match
       case PrefixKind.New :: tail => "new " + loopPrefix(tail)
+      case PrefixKind.Using :: tail => "using " + loopPrefix(tail)
       case _ => ""
 
   /**
@@ -87,7 +88,7 @@ enum SuffixKind:
   case Brace, Bracket, Template, NoSuffix
 
 enum PrefixKind:
-  case New
+  case New, Using
 
 type Suffix = Affix[SuffixKind]
 type Prefix = Affix[PrefixKind]
diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
index 6b42af504a6e..5256b821ed5e 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
@@ -193,13 +193,24 @@ class Completions(
     )
   end isAbstractType
 
-  private def findSuffix(symbol: Symbol): CompletionAffix =
+  private def findSuffix(symbol: Symbol, adjustedPath: List[untpd.Tree]): CompletionAffix =
     CompletionAffix.empty
       .chain { suffix => // for [] suffix
         if shouldAddSuffix && symbol.info.typeParams.nonEmpty then
           suffix.withNewSuffixSnippet(Affix(SuffixKind.Bracket))
         else suffix
       }
+      .chain{ suffix =>
+        adjustedPath match
+            case (ident: Ident) :: (app@Apply(_, List(arg))) :: _  =>
+              app.symbol.info match
+                case mt@MethodType(termNames) if app.symbol.paramSymss.last.exists(_.is(Given)) &&
+                  !text.substring(app.fun.span.start, arg.span.end).contains("using") =>
+                  suffix.withNewPrefix(Affix(PrefixKind.Using))
+                case _ => suffix    
+            case _ => suffix
+        
+      }
       .chain { suffix => // for () suffix
         if shouldAddSuffix && symbol.is(Flags.Method) then
           val paramss = getParams(symbol)
@@ -273,7 +284,7 @@ class Completions(
       val existsApply = extraMethodDenots.exists(_.symbol.name == nme.apply)
 
       extraMethodDenots.map { methodDenot =>
-        val suffix = findSuffix(methodDenot.symbol)
+        val suffix = findSuffix(methodDenot.symbol, adjustedPath)
         val affix = if methodDenot.symbol.isConstructor && existsApply then
           adjustedPath match
             case (select @ Select(qual, _)) :: _ =>
@@ -295,7 +306,7 @@ class Completions(
 
     if skipOriginalDenot then extraCompletionValues
     else
-      val suffix = findSuffix(denot.symbol)
+      val suffix = findSuffix(denot.symbol, adjustedPath)
       val name = undoBacktick(label)
       val denotCompletionValue = toCompletionValue(name, denot, suffix)
       denotCompletionValue :: extraCompletionValues
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
index 044b5456d31d..910044485896 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
@@ -238,6 +238,65 @@ class CompletionArgSuite extends BaseCompletionSuite:
       ""
     )
 
+  @Test def `using` =
+    checkEdit(
+      s"""|def hello(using String): Unit = ???
+          |@main def main1(): Unit =
+          |  val str = "hello"
+          |  hello(st@@)
+          |""".stripMargin,
+          s"""|def hello(using String): Unit = ???
+              |@main def main1(): Unit =
+              |  val str = "hello"
+              |  hello(using str)
+              |""".stripMargin,
+          assertSingleItem = false)
+
+  @Test def `using2` =
+    checkEdit(
+      s"""|def hello(using String): Unit = ???
+          |@main def main1(): Unit =
+          |  val str = "hello"
+          |  hello(using st@@)
+          |""".stripMargin,
+      s"""|def hello(using String): Unit = ???
+          |@main def main1(): Unit =
+          |  val str = "hello"
+          |  hello(using str)
+          |""".stripMargin,
+          assertSingleItem = false)
+
+  @Test def `using3` =
+    checkEdit(
+      s"""|def hello(using String, Int): Unit = ???
+          |@main def main1(): Unit =
+          |  val str = "hello"
+          |  val int = 4
+          |  hello(str, in@@)
+          |""".stripMargin,
+      s"""|def hello(using String, Int): Unit = ???
+          |@main def main1(): Unit =
+          |  val str = "hello"
+          |  val int = 4
+          |  hello(str, int)
+          |""".stripMargin,
+          assertSingleItem = false)
+
+  @Test def `using4` =
+    checkEdit(
+      s"""|def hello(name: String)(using String): Unit = ???
+          |@main def main1(): Unit =
+          |  val str = "hello"
+          |  hello("name")(str@@)
+          |""".stripMargin,
+      s"""|def hello(name: String)(using String): Unit = ???
+          |@main def main1(): Unit =
+          |  val str = "hello"
+          |  hello("name")(using str)
+          |""".stripMargin,
+          assertSingleItem = false
+          )
+
   @Test def `default-args` =
     check(
       s"""|object Main {

From afa9140fa3cccd934f80e089afa05a96ac277351 Mon Sep 17 00:00:00 2001
From: Vadim Chelyshov <qtankle@gmail.com>
Date: Tue, 26 Aug 2025 19:00:16 +0300
Subject: [PATCH 497/505] pc: completions - do not add `[]` for `... derives
 TC@@` (#23811)

Currently it incorectly adds completion members with square brackets.
Exmaple:
```scala
class X derives CanEqua@@ // returns `CanEqual[@@]` and `CanEqual`
                          // should return only `CanEqual`
```
[Cherry-picked 17f18031d82bc7345b7bb0af8971de85d66d7c11]
---
 .../main/dotty/tools/pc/completions/Completions.scala  | 10 +++++++++-
 .../tools/pc/tests/completion/CompletionSuite.scala    |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
index 5256b821ed5e..99e19e441acc 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
@@ -74,7 +74,15 @@ class Completions(
       case tpe :: (appl: AppliedTypeTree) :: _ if appl.tpt == tpe => false
       case sel  :: (funSel @ Select(fun, name)) :: (appl: GenericApply) :: _
         if appl.fun == funSel && sel == fun => false
-      case _ => true)
+      case _ => true) &&
+      (adjustedPath match
+        /* In case of `class X derives TC@@` we shouldn't add `[]` 
+         */
+        case Ident(_) :: (templ: untpd.DerivingTemplate) :: _ =>
+          val pos = completionPos.toSourcePosition
+          !templ.derived.exists(_.sourcePos.contains(pos))
+        case _ => true
+      )
 
   private lazy val isNew: Boolean = Completion.isInNewContext(adjustedPath)
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
index 13f373f068c4..84dc4cf232b2 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -2241,3 +2241,11 @@ class CompletionSuite extends BaseCompletionSuite:
         |""".stripMargin,
       "asTerm: Term"
     )
+  
+  @Test def `derives-no-square-brackets` =
+    check(
+      """
+        |case class Miau(y: Int) derives Ordering, CanEqu@@
+        |""".stripMargin,
+      "CanEqual scala"
+    )

From e298f9df2a3cfab6ff3105d160f0688afb129657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zieli=C5=84ski=20Patryk?=
 <75637004+zielinsky@users.noreply.github.com>
Date: Fri, 12 Sep 2025 15:07:02 +0200
Subject: [PATCH 498/505] Porting XRayModeHints (#23891)

Porting https://github.com/scalameta/metals/pull/7639

Co-authored-by: Henry Parker <henryxparker@gmail.com>
---
 .../dotty/tools/pc/PcInlayHintsProvider.scala |  84 ++++-
 .../tools/pc/base/BaseInlayHintsSuite.scala   |   1 +
 .../pc/tests/inlayHints/InlayHintsSuite.scala | 334 ++++++++++++++++++
 project/Build.scala                           |   2 +-
 4 files changed, 410 insertions(+), 11 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
index f4e3bc8c9c10..40a351f2354d 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
@@ -54,7 +54,7 @@ class PcInlayHintsProvider(
   val pos = driver.sourcePosition(params)
 
   def provide(): List[InlayHint] =
-    val deepFolder = DeepFolder[InlayHints](collectDecorations)
+    val deepFolder = PcCollector.DeepFolderWithParent[InlayHints](collectDecorations)
     Interactive
       .pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)
       .headOption
@@ -68,11 +68,23 @@ class PcInlayHintsProvider(
   def collectDecorations(
       inlayHints: InlayHints,
       tree: Tree,
+      parent: Option[Tree]
   ): InlayHints =
+    // XRay hints are not mutually exclusive with other hints, so they must be matched separately
+    val firstPassHints = (tree, parent) match {
+      case XRayModeHint(tpe, pos) =>
+        inlayHints.addToBlock(
+          adjustPos(pos).toLsp,
+          LabelPart(": ") :: toLabelParts(tpe, pos),
+          InlayHintKind.Type
+        )
+      case _ => inlayHints
+    }
+    
     tree match
       case ImplicitConversion(symbol, range) =>
         val adjusted = adjustPos(range)
-        inlayHints
+        firstPassHints
           .add(
             adjusted.startPos.toLsp,
             labelPart(symbol, symbol.decodedName) :: LabelPart("(") :: Nil,
@@ -84,17 +96,17 @@ class PcInlayHintsProvider(
             InlayHintKind.Parameter,
           )
       case ImplicitParameters(trees, pos) =>
-        inlayHints.add(
+        firstPassHints.add(
           adjustPos(pos).toLsp,
           ImplicitParameters.partsFromImplicitArgs(trees).map((label, maybeSymbol) =>
              maybeSymbol match
                case Some(symbol) => labelPart(symbol, label)
                case None => LabelPart(label)
            ),
-           InlayHintKind.Parameter
+          InlayHintKind.Parameter,
         )
       case ValueOf(label, pos) =>
-        inlayHints.add(
+        firstPassHints.add(
           adjustPos(pos).toLsp,
           LabelPart("(") :: LabelPart(label) :: List(LabelPart(")")),
           InlayHintKind.Parameter,
@@ -102,7 +114,7 @@ class PcInlayHintsProvider(
       case TypeParameters(tpes, pos, sel)
           if !syntheticTupleApply(sel) =>
         val label = tpes.map(toLabelParts(_, pos)).separated("[", ", ", "]")
-        inlayHints.add(
+        firstPassHints.add(
           adjustPos(pos).endPos.toLsp,
           label,
           InlayHintKind.Type,
@@ -110,9 +122,9 @@ class PcInlayHintsProvider(
       case InferredType(tpe, pos, defTree)
           if !isErrorTpe(tpe) =>
         val adjustedPos = adjustPos(pos).endPos
-        if inlayHints.containsDef(adjustedPos.start) then inlayHints
+        if firstPassHints.containsDef(adjustedPos.start) then firstPassHints
         else
-          inlayHints
+          firstPassHints
             .add(
               adjustedPos.toLsp,
               LabelPart(": ") :: toLabelParts(tpe, pos),
@@ -138,7 +150,7 @@ class PcInlayHintsProvider(
             pos.withStart(pos.start + 1)
 
 
-        args.foldLeft(inlayHints) {
+        args.foldLeft(firstPassHints) {
           case (ih, (name, pos0, isByName)) =>
             val pos = adjustPos(pos0)
             val isBlock = isBlockParam(pos)
@@ -158,7 +170,7 @@ class PcInlayHintsProvider(
                 )
             else ih
         }
-      case _ => inlayHints
+      case _ => firstPassHints
 
   private def toLabelParts(
       tpe: Type,
@@ -491,3 +503,55 @@ object Parameters:
         case _ => None
     else None
 end Parameters
+
+object XRayModeHint:
+  def unapply(trees: (Tree, Option[Tree]))(using params: InlayHintsParams, ctx: Context): Option[(Type, SourcePosition)] =
+    if params.hintsXRayMode() then
+      val (tree, parent) = trees
+      val isParentApply = parent match
+        case Some(_: Apply) => true
+        case _ => false
+      val isParentOnSameLine = parent match
+        case Some(sel: Select) if sel.isForComprehensionMethod => false
+        case Some(par) if par.sourcePos.exists && par.sourcePos.line == tree.sourcePos.line => true
+        case _ => false
+      
+      tree match
+        /*
+        anotherTree
+         .innerSelect()
+         */
+        case a @ Apply(inner, _)
+            if inner.sourcePos.exists && !isParentOnSameLine && !isParentApply &&
+              endsInSimpleSelect(a) && isEndOfLine(tree.sourcePos) =>
+          Some((a.tpe.widen.deepDealiasAndSimplify, tree.sourcePos))
+        /*
+        innerTree
+         .select
+         */
+        case select @ Select(innerTree, _)
+            if innerTree.sourcePos.exists && !isParentOnSameLine && !isParentApply && 
+              isEndOfLine(tree.sourcePos) =>
+          Some((select.tpe.widen.deepDealiasAndSimplify, tree.sourcePos))
+        case _ => None
+    else None
+
+  @tailrec
+  private def endsInSimpleSelect(ap: Tree)(using ctx: Context): Boolean =
+    ap match
+      case Apply(sel: Select, _) =>
+        sel.name != nme.apply && !isInfix(sel)
+      case Apply(TypeApply(sel: Select, _), _) =>
+        sel.name != nme.apply && !isInfix(sel)
+      case Apply(innerTree @ Apply(_, _), _) =>
+        endsInSimpleSelect(innerTree)
+      case _ => false
+
+  private def isEndOfLine(pos: SourcePosition): Boolean =
+    if pos.exists then
+      val source = pos.source
+      val end = pos.end
+      end >= source.length || source(end) == '\n' || source(end) == '\r'
+    else false
+
+end XRayModeHint
diff --git a/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala
index 32c6ad26c6a5..431e4908013a 100644
--- a/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala
@@ -34,6 +34,7 @@ class BaseInlayHintsSuite extends BasePCSuite {
       inferredTypes = true,
       typeParameters = true,
       implicitParameters = true,
+      hintsXRayMode = true,
       byNameParameters = true,
       implicitConversions = true,
       namedParameters = true,
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
index 1152e2928ad6..f91e0e2deb15 100644
--- a/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
+++ b/presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
@@ -1300,4 +1300,338 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
          |""".stripMargin
     )
 
+  @Test def `xray-single-chain-same-line` =
+    check(
+      """|object Main{
+         |  trait Bar {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Foo {
+         |    def foo(): Foo
+         |  }
+         |
+         |val bar: Bar = ???
+         |val foo: Foo = ???
+         |
+         |val thing1: Bar = bar.bar
+         |val thing2: Foo = foo.foo()
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  trait Bar {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Foo {
+         |    def foo(): Foo
+         |  }
+         |
+         |val bar: Bar = ???
+         |val foo: Foo = ???
+         |
+         |val thing1: Bar = bar.bar
+         |val thing2: Foo = foo.foo()
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `xray-multi-chain-same-line` =
+    check(
+      """|object Main{
+         |  trait Bar {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Foo {
+         |    def foo(): Foo
+         |  }
+         |
+         |val bar: Bar = ???
+         |val foo: Foo = ???
+         |
+         |val thing1: Bar = bar.bar.bar
+         |val thing2: Foo = foo.foo().foo()
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  trait Bar {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Foo {
+         |    def foo(): Foo
+         |  }
+         |
+         |val bar: Bar = ???
+         |val foo: Foo = ???
+         |
+         |val thing1: Bar = bar.bar.bar
+         |val thing2: Foo = foo.foo().foo()
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `xray-single-chain-new-line` =
+    check(
+      """|object Main{
+         |  trait Bar {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Foo {
+         |    def foo(): Foo
+         |  }
+         |
+         |val bar: Bar = ???
+         |val foo: Foo = ???
+         |
+         |val thing1: Bar = bar
+         |  .bar
+         |val thing2: Foo = foo
+         |  .foo()
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  trait Bar {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Foo {
+         |    def foo(): Foo
+         |  }
+         |
+         |val bar: Bar = ???
+         |val foo: Foo = ???
+         |
+         |val thing1: Bar = bar
+         |  .bar
+         |val thing2: Foo = foo
+         |  .foo()
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `xray-simple-chain` =
+    check(
+      """|object Main{
+         |  trait Foo {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Bar {
+         |    def foo(): Foo
+         |  }
+         |
+         |val foo: Foo = ???
+         |
+         |val thingy: Bar = foo
+         |  .bar
+         |  .foo()
+         |  .bar
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  trait Foo {
+         |   def bar: Bar
+         |  }
+         |
+         |  trait Bar {
+         |    def foo(): Foo
+         |  }
+         |
+         |val foo: Foo = ???
+         |
+         |val thingy: Bar = foo
+         |  .bar/*  : Bar<<(6:8)>>*/
+         |  .foo()/*: Foo<<(2:8)>>*/
+         |  .bar/*  : Bar<<(6:8)>>*/
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `xray-long-chain` =
+    check(
+      """|object Main{
+         |  trait Foo[F] {
+         |   def intify: Foo[Int]
+         |   def stringListify(s: String*): Foo[String]
+         |  }
+         |
+         |val foo: Foo[String] = ???
+         |
+         |val thingy: Foo[Int] = foo
+         |  .intify
+         |  .stringListify(
+         |    "Hello",
+         |    "World"
+         |  )
+         |  .stringListify(
+         |    "Hello",
+         |    "World"
+         |  )
+         |  .intify
+         |  .intify
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  trait Foo[F] {
+         |   def intify: Foo[Int]
+         |   def stringListify(s: String*): Foo[String]
+         |  }
+         |
+         |val foo: Foo[String] = ???
+         |
+         |val thingy: Foo[Int] = foo
+         |  .intify/*: Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |  .stringListify(
+         |    /*s = */"Hello",
+         |    "World"
+         |  )/*      : Foo<<(2:8)>>[String<<java/lang/String#>>]*/
+         |  .stringListify(
+         |    /*s = */"Hello",
+         |    "World"
+         |  )/*      : Foo<<(2:8)>>[String<<java/lang/String#>>]*/
+         |  .intify/*: Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |  .intify/*: Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `xray-long-chain-same-line` =
+    check(
+      """|object Main{
+         |  trait Foo[F] {
+         |   def intify: Foo[Int]
+         |   def stringListify(s: String*): Foo[String]
+         |  }
+         |
+         |val foo: Foo[String] = ???
+         |
+         |val thingy: Foo[Int] = foo
+         |  .intify
+         |  .stringListify(
+         |    "Hello",
+         |    "World"
+         |  )
+         |  .stringListify(
+         |    "Hello",
+         |    "World"
+         |  )
+         |  .intify.intify
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  trait Foo[F] {
+         |   def intify: Foo[Int]
+         |   def stringListify(s: String*): Foo[String]
+         |  }
+         |
+         |val foo: Foo[String] = ???
+         |
+         |val thingy: Foo[Int] = foo
+         |  .intify/*       : Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |  .stringListify(
+         |    /*s = */"Hello",
+         |    "World"
+         |  )/*             : Foo<<(2:8)>>[String<<java/lang/String#>>]*/
+         |  .stringListify(
+         |    /*s = */"Hello",
+         |    "World"
+         |  )/*             : Foo<<(2:8)>>[String<<java/lang/String#>>]*/
+         |  .intify.intify/*: Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `xray-tikka-masala-curried` =
+    check(
+      """|object Main{
+         |  trait Foo[F] {
+         |   def intify: Foo[Int]
+         |   def stringListify(s: String)(s2: String): Foo[String]
+         |  }
+         |
+         |val foo: Foo[String] = ???
+         |
+         |val thingy: Foo[Int] = foo
+         |  .intify
+         |  .stringListify(
+         |    "Hello"
+         |  )(
+         |    "World"
+         |  )
+         |  .stringListify(
+         |    "Hello"
+         |  )(
+         |    "World"
+         |  )
+         |  .intify
+         |  .intify
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |  trait Foo[F] {
+         |   def intify: Foo[Int]
+         |   def stringListify(s: String)(s2: String): Foo[String]
+         |  }
+         |
+         |val foo: Foo[String] = ???
+         |
+         |val thingy: Foo[Int] = foo
+         |  .intify/*: Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |  .stringListify(
+         |    /*s = */"Hello"
+         |  )(
+         |    /*s2 = */"World"
+         |  )/*      : Foo<<(2:8)>>[String<<java/lang/String#>>]*/
+         |  .stringListify(
+         |    /*s = */"Hello"
+         |  )(
+         |    /*s2 = */"World"
+         |  )/*      : Foo<<(2:8)>>[String<<java/lang/String#>>]*/
+         |  .intify/*: Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |  .intify/*: Foo<<(2:8)>>[Int<<scala/Int#>>]*/
+         |}
+         |""".stripMargin
+    )
+
+  @Test def `xray-for-comprehension` =
+    check(
+      """|object Main{
+         |trait Foo[A]{
+         |  def flatMap[B](f: A => Foo[B]): Foo[B]
+         |  def map[B](f: A => B): Foo[B]
+         |  def bar(s: String): Foo[A]
+         |}
+         |val foo1: Foo[String] = ???
+         |val foo2: Foo[Int] = ???
+         |val result = for {
+         | foo <- foo1
+         | bar <- foo2
+         |   .bar(s = foo)
+         |   .bar(s = foo)
+         |   .bar(s = foo)
+         |} yield bar
+         |}
+         |""".stripMargin,
+      """|object Main{
+         |trait Foo[A]{
+         |  def flatMap[B](f: A => Foo[B]): Foo[B]
+         |  def map[B](f: A => B): Foo[B]
+         |  def bar(s: String): Foo[A]
+         |}
+         |val foo1: Foo[String] = ???
+         |val foo2: Foo[Int] = ???
+         |val result/*: Foo<<(2:6)>>[Int<<scala/Int#>>]*/ = for {
+         | foo <- foo1
+         | bar <- foo2
+         |   .bar(s = foo)/*: Foo<<(2:6)>>[Int<<scala/Int#>>]*/
+         |   .bar(s = foo)/*: Foo<<(2:6)>>[Int<<scala/Int#>>]*/
+         |   .bar(s = foo)/*: Foo<<(2:6)>>[Int<<scala/Int#>>]*/
+         |} yield bar
+         |}
+         |""".stripMargin
+    )
+
 }
diff --git a/project/Build.scala b/project/Build.scala
index 80e63806689c..32651ce13ab9 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -1228,7 +1228,7 @@ object Build {
       BuildInfoPlugin.buildInfoDefaultSettings
 
   lazy val presentationCompilerSettings = {
-    val mtagsVersion = "1.5.3"
+    val mtagsVersion = "1.6.2"
     Seq(
       libraryDependencies ++= Seq(
         "org.lz4" % "lz4-java" % "1.8.0",

From c072f7d224da4292fcca03351207eca24d19b493 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 17 Sep 2025 15:45:59 +0200
Subject: [PATCH 499/505] bugfix: Fix nn missing in Completions

---
 .../src/main/dotty/tools/pc/completions/Completions.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
index 99e19e441acc..959efb963c27 100644
--- a/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
+++ b/presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
@@ -76,7 +76,7 @@ class Completions(
         if appl.fun == funSel && sel == fun => false
       case _ => true) &&
       (adjustedPath match
-        /* In case of `class X derives TC@@` we shouldn't add `[]` 
+        /* In case of `class X derives TC@@` we shouldn't add `[]`
          */
         case Ident(_) :: (templ: untpd.DerivingTemplate) :: _ =>
           val pos = completionPos.toSourcePosition
@@ -213,11 +213,11 @@ class Completions(
             case (ident: Ident) :: (app@Apply(_, List(arg))) :: _  =>
               app.symbol.info match
                 case mt@MethodType(termNames) if app.symbol.paramSymss.last.exists(_.is(Given)) &&
-                  !text.substring(app.fun.span.start, arg.span.end).contains("using") =>
+                  !text.substring(app.fun.span.start, arg.span.end).nn.contains("using") =>
                   suffix.withNewPrefix(Affix(PrefixKind.Using))
-                case _ => suffix    
+                case _ => suffix
             case _ => suffix
-        
+
       }
       .chain { suffix => // for () suffix
         if shouldAddSuffix && symbol.is(Flags.Method) then

From a1aa55659eb2995891e71e93003c78442fd1c569 Mon Sep 17 00:00:00 2001
From: Jan Chyb <48855024+jchyb@users.noreply.github.com>
Date: Fri, 15 Aug 2025 10:58:49 +0200
Subject: [PATCH 500/505] Make coverage more similar to the one in Scala 2
 (#23722)

Closes #21877
* removes coverage of inlined nodes (as mentioned in the accompanying
comment, those are impossible to represent in most cases)
* adds coverage for Literals (ones directly in Apply are omitted)
* removes coverage of `throw` contents
* if apply node is tagged, we do not tag it's prefix, outside of other
prefixing Apply's arguments (eg. when we tag `a+b+c` we do not
redundantly tag `a+b`)
* allows instrumenting synthetic method calls (like apply of a case

After all of these changes the statements tagged are much more similar
to Scala 2, let's look at the #21877 minimisation:
* Scala 2:
<img width="704" height="364" alt="Zrzut ekranu 2025-08-12 o 17 07 31"
src="https://github.com/user-attachments/assets/f647dfa5-973e-424f-9818-483b7d01d550"
/>
<img width="740" height="379" alt="Zrzut ekranu 2025-08-12 o 17 07 46"
src="https://github.com/user-attachments/assets/09eca1c0-a202-4e5e-b3e4-0947d9e8662d"
/>

* Scala 3:
<img width="623" height="360" alt="Zrzut ekranu 2025-08-12 o 17 08 48"
src="https://github.com/user-attachments/assets/efd5baaa-9f52-4ad6-9ba6-2f5bde42a470"
/>
<img width="638" height="428" alt="Zrzut ekranu 2025-08-12 o 17 08 55"
src="https://github.com/user-attachments/assets/01ff6cc6-c348-47db-8ae5-d758ca0bf302"
/>

There are some differences still remaining, most notably the tagging the
DefDefs and its default parameters, but I left them for now, as those
seem more useful than harmful.

BEcouse of those changed most of the .covergae files had to be
regenerated, however I want through each and every diff to make sure
that all of those changes there are expected.

Additionally, this PR also fixes #21695 (issue with certain generated
Block nodes not having assigned the correct type, causing later
undefined errors).
---
 .../dotc/transform/InstrumentCoverage.scala   |  74 ++-
 .../coverage/pos/Constructor.scoverage.check  |  80 ++-
 .../pos/ContextFunctions.scoverage.check      |  43 +-
 tests/coverage/pos/Enum.scoverage.check       | 510 +++++++++++++++++-
 .../coverage/pos/ExcludeClass.scoverage.check |  38 +-
 tests/coverage/pos/For.scoverage.check        | 135 +----
 tests/coverage/pos/Givens.scoverage.check     | 105 +++-
 tests/coverage/pos/Inlined.scala              |   1 +
 tests/coverage/pos/Inlined.scoverage.check    | 250 +--------
 tests/coverage/pos/InlinedFromLib.scala       |   1 +
 .../pos/InlinedFromLib.scoverage.check        | 250 +--------
 tests/coverage/pos/Lift.scoverage.check       |  63 ++-
 tests/coverage/pos/Literals.scoverage.check   |  59 +-
 .../coverage/pos/MatchNumbers.scoverage.check |  61 ++-
 .../pos/PolymorphicExtensions.scoverage.check |  60 +--
 .../pos/PolymorphicMethods.scoverage.check    |  20 +-
 tests/coverage/pos/Select.scoverage.check     |  19 +-
 .../pos/SimpleMethods.scoverage.check         | 249 ++++++++-
 .../pos/StructuralTypes.scoverage.check       |  31 +-
 .../coverage/pos/TypeLambdas.scoverage.check  |  30 +-
 tests/coverage/pos/i21695/A.scala             |   9 +
 tests/coverage/pos/i21695/Builder.java        |   6 +
 tests/coverage/pos/i21695/Service.java        |   3 +
 .../coverage/pos/i21695/test.scoverage.check  |  71 +++
 tests/coverage/pos/i21877.scala               |  21 +
 tests/coverage/pos/i21877.scoverage.check     | 224 ++++++++
 .../macro-late-suspend/test.scoverage.check   |  17 -
 .../scoverage-samples-case.scoverage.check    |  50 +-
 ...age-samples-implicit-class.scoverage.check |  35 +-
 .../run/currying/test.scoverage.check         | 143 ++---
 .../coverage/run/erased/test.scoverage.check  |  38 +-
 .../extend-case-class/test.scoverage.check    |  89 ++-
 .../coverage/run/i16940/test.scoverage.check  | 136 ++---
 .../run/i18233-min/test.scoverage.check       | 118 ++--
 .../coverage/run/i18233/test.scoverage.check  |  27 +-
 .../run/inheritance/test.scoverage.check      |  44 +-
 .../run/inline-def/test.scoverage.check       |  40 +-
 .../run/interpolation/test.scoverage.check    |  99 +++-
 .../run/java-methods/test.scoverage.check     |  27 +-
 .../run/lifting-bool/test.scoverage.check     | 298 +++++++++-
 .../coverage/run/lifting/test.scoverage.check | 207 ++++---
 .../run/macro-suspend/test.scoverage.check    |  70 +--
 .../run/parameterless/test.scoverage.check    | 117 ++--
 tests/coverage/run/trait/test.scoverage.check |  52 +-
 .../run/type-apply/test.measurement.check     |   4 +-
 .../run/type-apply/test.scoverage.check       |  40 +-
 .../coverage/run/varargs/test.scoverage.check | 149 ++++-
 47 files changed, 2795 insertions(+), 1418 deletions(-)
 create mode 100644 tests/coverage/pos/i21695/A.scala
 create mode 100644 tests/coverage/pos/i21695/Builder.java
 create mode 100644 tests/coverage/pos/i21695/Service.java
 create mode 100644 tests/coverage/pos/i21695/test.scoverage.check
 create mode 100644 tests/coverage/pos/i21877.scala
 create mode 100644 tests/coverage/pos/i21877.scoverage.check

diff --git a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
index d05b5044ff5c..543c364439a5 100644
--- a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
+++ b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
@@ -145,6 +145,31 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       val span = pos.span.toSynthetic
       invokeCall(statementId, span)
 
+    private def transformApplyArgs(trees: List[Tree])(using Context): List[Tree] =
+      if allConstArgs(trees) then trees else transform(trees)
+
+    private def transformInnerApply(tree: Tree)(using Context): Tree = tree match
+      case a: Apply if a.fun.symbol == defn.StringContextModule_apply =>
+        a
+      case a: Apply =>
+        cpy.Apply(a)(
+          transformInnerApply(a.fun),
+          transformApplyArgs(a.args)
+        )
+      case a: TypeApply =>
+        cpy.TypeApply(a)(
+          transformInnerApply(a.fun),
+          transformApplyArgs(a.args)
+        )
+      case s: Select =>
+        cpy.Select(s)(transformInnerApply(s.qualifier), s.name)
+      case i: (Ident | This) => i
+      case t: Typed =>
+        cpy.Typed(t)(transformInnerApply(t.expr), t.tpt)
+      case other    => transform(other)
+
+    private def allConstArgs(args: List[Tree]) =
+      args.forall(arg => arg.isInstanceOf[Literal] || arg.isInstanceOf[Ident])
     /**
       * Tries to instrument an `Apply`.
       * These "tryInstrument" methods are useful to tweak the generation of coverage instrumentation,
@@ -158,10 +183,12 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
         // Create a call to Invoker.invoked(coverageDirectory, newStatementId)
         val coverageCall = createInvokeCall(tree, tree.sourcePos)
 
-        if needsLift(tree) then
-          // Transform args and fun, i.e. instrument them if needed (and if possible)
-          val app = cpy.Apply(tree)(transform(tree.fun), tree.args.map(transform))
+        // Transform args and fun, i.e. instrument them if needed (and if possible)
+        val app =
+          if tree.fun.symbol eq defn.throwMethod then tree
+          else cpy.Apply(tree)(transformInnerApply(tree.fun), transformApplyArgs(tree.args))
 
+        if needsLift(tree) then
           // Lifts the arguments. Note that if only one argument needs to be lifted, we lift them all.
           // Also, tree.fun can be lifted too.
           // See LiftCoverage for the internal working of this lifting.
@@ -171,11 +198,10 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
           InstrumentedParts(liftedDefs.toList, coverageCall, liftedApp)
         else
           // Instrument without lifting
-          val transformed = cpy.Apply(tree)(transform(tree.fun), transform(tree.args))
-          InstrumentedParts.singleExpr(coverageCall, transformed)
+          InstrumentedParts.singleExpr(coverageCall, app)
       else
         // Transform recursively but don't instrument the tree itself
-        val transformed = cpy.Apply(tree)(transform(tree.fun), transform(tree.args))
+        val transformed = cpy.Apply(tree)(transformInnerApply(tree.fun), transform(tree.args))
         InstrumentedParts.notCovered(transformed)
 
     private def tryInstrument(tree: Ident)(using Context): InstrumentedParts =
@@ -187,9 +213,14 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       else
         InstrumentedParts.notCovered(tree)
 
+    private def tryInstrument(tree: Literal)(using Context): InstrumentedParts =
+      val coverageCall = createInvokeCall(tree, tree.sourcePos)
+      InstrumentedParts.singleExpr(coverageCall, tree)
+
     private def tryInstrument(tree: Select)(using Context): InstrumentedParts =
       val sym = tree.symbol
-      val transformed = cpy.Select(tree)(transform(tree.qualifier), tree.name)
+      val qual = transform(tree.qualifier).ensureConforms(tree.qualifier.tpe)
+      val transformed = cpy.Select(tree)(qual, tree.name)
       if canInstrumentParameterless(sym) then
         // call to a parameterless method
         val coverageCall = createInvokeCall(tree, tree.sourcePos)
@@ -202,6 +233,7 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       tree match
         case t: Apply => tryInstrument(t)
         case t: Ident => tryInstrument(t)
+        case t: Literal => tryInstrument(t)
         case t: Select => tryInstrument(t)
         case _ => InstrumentedParts.notCovered(transform(tree))
 
@@ -223,10 +255,14 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       inContext(transformCtx(tree)) { // necessary to position inlined code properly
         tree match
           // simple cases
-          case tree: (Import | Export | Literal | This | Super | New) => tree
+          case tree: (Import | Export | This | Super | New) => tree
           case tree if tree.isEmpty || tree.isType => tree // empty Thicket, Ident (referring to a type), TypeTree, ...
           case tree if !tree.span.exists || tree.span.isZeroExtent => tree // no meaningful position
 
+          case tree: Literal =>
+            val rest = tryInstrument(tree).toTree
+            rest
+
           // identifier
           case tree: Ident =>
             tryInstrument(tree).toTree
@@ -280,6 +316,9 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
           case tree: CaseDef =>
             transformCaseDef(tree)
 
+          case tree: ValDef if tree.symbol.is(Inline) =>
+            tree // transforming inline vals will result in `inline value must be pure` errors
+
           case tree: ValDef =>
             // only transform the rhs
             val rhs = transform(tree.rhs)
@@ -323,13 +362,13 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
             )
 
           case tree: Inlined =>
-            // Ideally, tree.call would provide precise information about the inlined call,
-            // and we would use this information for the coverage report.
-            // But PostTyper simplifies tree.call, so we can't report the actual method that was inlined.
-            // In any case, the subtrees need to be repositioned right now, otherwise the
-            // coverage statement will point to a potentially unreachable source file.
-            val dropped = Inlines.dropInlined(tree) // drop and reposition
-            transform(dropped) // transform the content of the Inlined
+            // Inlined code contents might come from another file (or project),
+            // which means that we cannot clearly designate which part of the inlined code
+            // was run using the API we are given.
+            // At best, we can show that the Inlined tree itself was reached.
+            // Additionally, Scala 2's coverage ignores macro calls entirely,
+            // so let's do that here too, also for regular inlined calls.
+            tree
 
           // For everything else just recurse and transform
           case _ =>
@@ -559,15 +598,14 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
     private def isCompilerIntrinsicMethod(sym: Symbol)(using Context): Boolean =
       val owner = sym.maybeOwner
       owner.exists && (
-        owner.eq(defn.AnyClass) ||
-        owner.isPrimitiveValueClass ||
+        (owner.eq(defn.AnyClass) && (sym == defn.Any_asInstanceOf || sym == defn.Any_isInstanceOf)) ||
         owner.maybeOwner == defn.CompiletimePackageClass
       )
 
 object InstrumentCoverage:
   val name: String = "instrumentCoverage"
   val description: String = "instrument code for coverage checking"
-  val ExcludeMethodFlags: FlagSet = Synthetic | Artifact | Erased
+  val ExcludeMethodFlags: FlagSet = Artifact | Erased
 
   /**
    * An instrumented Tree, in 3 parts.
diff --git a/tests/coverage/pos/Constructor.scoverage.check b/tests/coverage/pos/Constructor.scoverage.check
index a95bb21488b8..ed9ac68752bb 100644
--- a/tests/coverage/pos/Constructor.scoverage.check
+++ b/tests/coverage/pos/Constructor.scoverage.check
@@ -110,6 +110,23 @@ C
 Class
 covtest.C
 x
+161
+162
+13
+<none>
+Literal
+false
+0
+false
+1
+
+6
+Constructor.scala
+covtest
+C
+Class
+covtest.C
+x
 153
 158
 13
@@ -120,7 +137,7 @@ false
 false
 def x
 
-6
+7
 Constructor.scala
 covtest
 C
@@ -137,7 +154,7 @@ false
 false
 f(x)
 
-7
+8
 Constructor.scala
 covtest
 C
@@ -154,7 +171,24 @@ false
 false
 x
 
-8
+9
+Constructor.scala
+covtest
+C
+Class
+covtest.C
+g
+188
+189
+16
+<none>
+Literal
+false
+0
+false
+2
+
+10
 Constructor.scala
 covtest
 C
@@ -171,7 +205,7 @@ false
 false
 def g
 
-9
+11
 Constructor.scala
 covtest
 O
@@ -188,7 +222,24 @@ false
 false
 def g
 
-10
+12
+Constructor.scala
+covtest
+O
+Object
+covtest.O
+y
+231
+232
+20
+<none>
+Literal
+false
+0
+false
+1
+
+13
 Constructor.scala
 covtest
 O
@@ -205,7 +256,7 @@ false
 false
 def y
 
-11
+14
 Constructor.scala
 covtest
 O
@@ -222,20 +273,3 @@ false
 false
 g(y)
 
-12
-Constructor.scala
-covtest
-O
-Object
-covtest.O
-<init>
-237
-238
-21
-y
-Ident
-false
-0
-false
-y
-
diff --git a/tests/coverage/pos/ContextFunctions.scoverage.check b/tests/coverage/pos/ContextFunctions.scoverage.check
index 0d616d811ffe..ee5c40b9b1ac 100644
--- a/tests/coverage/pos/ContextFunctions.scoverage.check
+++ b/tests/coverage/pos/ContextFunctions.scoverage.check
@@ -41,6 +41,23 @@ covtest
 Imperative
 Class
 covtest.Imperative
+$anonfun
+178
+184
+9
+<none>
+Literal
+false
+0
+false
+"name"
+
+2
+ContextFunctions.scala
+covtest
+Imperative
+Class
+covtest.Imperative
 readName2
 121
 134
@@ -52,24 +69,24 @@ false
 false
 def readName2
 
-2
+3
 ContextFunctions.scala
 covtest
 Imperative
 Class
 covtest.Imperative
 readPerson
-252
-309
-14
-onError
-Apply
+243
+247
+13
+<none>
+Literal
 false
 0
 false
-OnError((e) => readName2(using e)(using s)).onError(None)
+null
 
-3
+4
 ContextFunctions.scala
 covtest
 Imperative
@@ -77,16 +94,16 @@ Class
 covtest.Imperative
 readPerson
 252
-295
+309
 14
-<init>
+onError
 Apply
 false
 0
 false
-OnError((e) => readName2(using e)(using s))
+OnError((e) => readName2(using e)(using s)).onError(None)
 
-4
+5
 ContextFunctions.scala
 covtest
 Imperative
@@ -103,7 +120,7 @@ false
 false
 readName2(using e)(using s)
 
-5
+6
 ContextFunctions.scala
 covtest
 Imperative
diff --git a/tests/coverage/pos/Enum.scoverage.check b/tests/coverage/pos/Enum.scoverage.check
index 6806934e0dec..4ad02971f6cf 100644
--- a/tests/coverage/pos/Enum.scoverage.check
+++ b/tests/coverage/pos/Enum.scoverage.check
@@ -24,6 +24,57 @@ covtest
 Planet
 Class
 covtest.Planet
+<init>
+322
+333
+14
+<none>
+Literal
+false
+0
+false
+6.67300E-11
+
+1
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
+surfaceGravity
+359
+386
+15
+/
+Apply
+false
+0
+false
+G * mass / (radius * radius
+
+2
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
+surfaceGravity
+371
+386
+15
+*
+Apply
+false
+0
+false
+radius * radius
+
+3
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
 surfaceGravity
 338
 356
@@ -35,7 +86,24 @@ false
 false
 def surfaceGravity
 
-1
+4
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
+surfaceWeight
+432
+458
+16
+*
+Apply
+false
+0
+false
+otherMass * surfaceGravity
+
+5
 Enum.scala
 covtest
 Planet
@@ -52,7 +120,7 @@ false
 false
 surfaceGravity
 
-2
+6
 Enum.scala
 covtest
 Planet
@@ -69,7 +137,381 @@ false
 false
 def surfaceWeight
 
+7
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+492
+501
+18
+<none>
+Literal
+false
+0
+false
+3.303e+23
+
+8
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+503
+511
+18
+<none>
+Literal
+false
+0
+false
+2.4397e6
+
+9
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+545
+554
+19
+<none>
+Literal
+false
+0
+false
+4.869e+24
+
+10
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+556
+564
+19
+<none>
+Literal
+false
+0
+false
+6.0518e6
+
+11
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+598
+607
+20
+<none>
+Literal
+false
+0
+false
+5.976e+24
+
+12
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+609
+618
+20
+<none>
+Literal
+false
+0
+false
+6.37814e6
+
+13
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+652
+661
+21
+<none>
+Literal
+false
+0
+false
+6.421e+23
+
+14
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+663
+671
+21
+<none>
+Literal
+false
+0
+false
+3.3972e6
+
+15
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+705
+712
+22
+<none>
+Literal
+false
+0
+false
+1.9e+27
+
+16
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+716
+724
+22
+<none>
+Literal
+false
+0
+false
+7.1492e7
+
+17
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+758
+767
+23
+<none>
+Literal
+false
+0
+false
+5.688e+26
+
+18
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+769
+777
+23
+<none>
+Literal
+false
+0
+false
+6.0268e7
+
+19
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+811
+820
+24
+<none>
+Literal
+false
+0
+false
+8.686e+25
+
+20
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+822
+830
+24
+<none>
+Literal
+false
+0
+false
+2.5559e7
+
+21
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+864
+873
+25
+<none>
+Literal
+false
+0
+false
+1.024e+26
+
+22
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+875
+883
+25
+<none>
+Literal
+false
+0
+false
+2.4746e7
+
+23
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+970
+1038
+30
+apply
+Apply
+false
+0
+false
+ListEnum.Cons(1, ListEnum.Cons(2, ListEnum.Cons(3, ListEnum.Empty)))
+
+24
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+984
+985
+30
+<none>
+Literal
+false
+0
+false
+1
+
+25
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+987
+1037
+30
+apply
+Apply
+false
+0
+false
+ListEnum.Cons(2, ListEnum.Cons(3, ListEnum.Empty))
+
+26
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1001
+1002
+30
+<none>
+Literal
+false
+0
+false
+2
+
+27
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1004
+1036
+30
+apply
+Apply
+false
+0
+false
+ListEnum.Cons(3, ListEnum.Empty)
+
+28
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1018
+1019
+30
+<none>
+Literal
+false
+0
+false
 3
+
+29
 Enum.scala
 covtest
 EnumTypes
@@ -86,7 +528,7 @@ false
 false
 println("Example 1: \\n"+emptyList)
 
-4
+30
 Enum.scala
 covtest
 EnumTypes
@@ -103,7 +545,24 @@ false
 false
 "Example 1: \\n"+emptyList
 
-5
+31
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1051
+1066
+31
+<none>
+Literal
+false
+0
+false
+"Example 1: \\n"
+
+32
 Enum.scala
 covtest
 EnumTypes
@@ -120,7 +579,7 @@ false
 false
 println(s"${list}\\n")
 
-6
+33
 Enum.scala
 covtest
 EnumTypes
@@ -137,7 +596,24 @@ false
 false
 s"${list}\\n"
 
-7
+34
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+calculateEarthWeightOnPlanets
+1183
+1222
+35
+/
+Apply
+false
+0
+false
+earthWeight/Planet.Earth.surfaceGravity
+
+35
 Enum.scala
 covtest
 EnumTypes
@@ -154,7 +630,7 @@ false
 false
 Planet.Earth.surfaceGravity
 
-8
+36
 Enum.scala
 covtest
 EnumTypes
@@ -171,7 +647,7 @@ false
 false
 for p <- Planet.values do\n        println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 
-9
+37
 Enum.scala
 covtest
 EnumTypes
@@ -181,14 +657,14 @@ calculateEarthWeightOnPlanets
 1238
 1251
 36
-refArrayOps
-Apply
+values
+Select
 false
 0
 false
 Planet.values
 
-10
+38
 Enum.scala
 covtest
 EnumTypes
@@ -205,7 +681,7 @@ false
 false
 println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 
-11
+39
 Enum.scala
 covtest
 EnumTypes
@@ -222,7 +698,7 @@ false
 false
 s"Your weight on $p is ${p.surfaceWeight(mass)}"
 
-12
+40
 Enum.scala
 covtest
 EnumTypes
@@ -239,7 +715,7 @@ false
 false
 p.surfaceWeight(mass)
 
-13
+41
 Enum.scala
 covtest
 EnumTypes
@@ -256,7 +732,7 @@ false
 false
 def calculateEarthWeightOnPlanets
 
-14
+42
 Enum.scala
 covtest
 EnumTypes
@@ -273,7 +749,7 @@ false
 false
 println("Example 2:")
 
-15
+43
 Enum.scala
 covtest
 EnumTypes
@@ -290,7 +766,7 @@ false
 false
 calculateEarthWeightOnPlanets(80)
 
-16
+44
 Enum.scala
 covtest
 EnumTypes
diff --git a/tests/coverage/pos/ExcludeClass.scoverage.check b/tests/coverage/pos/ExcludeClass.scoverage.check
index 5e77f0ce21a1..370410b68091 100644
--- a/tests/coverage/pos/ExcludeClass.scoverage.check
+++ b/tests/coverage/pos/ExcludeClass.scoverage.check
@@ -25,6 +25,23 @@ Klass2
 Class
 covtest.Klass2
 abs
+202
+207
+15
+>
+Apply
+false
+0
+false
+i > 0
+
+1
+ExcludeClass.scala
+covtest
+Klass2
+Class
+covtest.Klass2
+abs
 219
 220
 16
@@ -35,7 +52,24 @@ true
 false
 i
 
-1
+2
+ExcludeClass.scala
+covtest
+Klass2
+Class
+covtest.Klass2
+abs
+236
+238
+18
+unary_-
+Select
+false
+0
+false
+-i
+
+3
 ExcludeClass.scala
 covtest
 Klass2
@@ -52,7 +86,7 @@ true
 false
 -i
 
-2
+4
 ExcludeClass.scala
 covtest
 Klass2
diff --git a/tests/coverage/pos/For.scoverage.check b/tests/coverage/pos/For.scoverage.check
index 7370a3909c54..9942da22d02e 100644
--- a/tests/coverage/pos/For.scoverage.check
+++ b/tests/coverage/pos/For.scoverage.check
@@ -41,40 +41,6 @@ covtest
 For$package
 Object
 covtest.For$package
-testForLoop
-52
-59
-4
-to
-Apply
-false
-0
-false
-1 to 10
-
-2
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
-testForLoop
-52
-53
-4
-intWrapper
-Apply
-false
-0
-false
-1
-
-3
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
 $anonfun
 67
 77
@@ -86,7 +52,7 @@ false
 false
 println(i)
 
-4
+2
 For.scala
 covtest
 For$package
@@ -103,92 +69,58 @@ false
 false
 def testForLoop
 
-5
+3
 For.scala
 covtest
 For$package
 Object
 covtest.For$package
 f
-109
-114
+134
+138
 8
-f
-DefDef
-false
-0
-false
-def f
-
-6
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
-testForAdvanced
-141
-183
-9
-foreach
-Apply
+<none>
+Literal
 false
 0
 false
-for j <- 1 to 10 if f(j) do\n    println(j)
+true
 
-7
+4
 For.scala
 covtest
 For$package
 Object
 covtest.For$package
-testForAdvanced
-145
-165
-9
-withFilter
-Apply
-false
-0
-false
-j <- 1 to 10 if f(j)
-
+f
+109
+114
 8
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
-testForAdvanced
-150
-157
-9
-to
-Apply
+f
+DefDef
 false
 0
 false
-1 to 10
+def f
 
-9
+5
 For.scala
 covtest
 For$package
 Object
 covtest.For$package
 testForAdvanced
-150
-151
+141
+183
 9
-intWrapper
+foreach
 Apply
 false
 0
 false
-1
+for j <- 1 to 10 if f(j) do\n    println(j)
 
-10
+6
 For.scala
 covtest
 For$package
@@ -205,7 +137,7 @@ false
 false
 f(j)
 
-11
+7
 For.scala
 covtest
 For$package
@@ -222,7 +154,7 @@ false
 false
 println(j)
 
-12
+8
 For.scala
 covtest
 For$package
@@ -239,7 +171,7 @@ false
 false
 def testForAdvanced
 
-13
+9
 For.scala
 covtest
 For$package
@@ -256,24 +188,7 @@ false
 false
 Nil.foreach(_ => println("user code here"))
 
-14
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
-testForeach
-301
-304
-14
-Nil
-Ident
-false
-0
-false
-Nil
-
-15
+10
 For.scala
 covtest
 For$package
@@ -290,7 +205,7 @@ false
 false
 println("user code here")
 
-16
+11
 For.scala
 covtest
 For$package
diff --git a/tests/coverage/pos/Givens.scoverage.check b/tests/coverage/pos/Givens.scoverage.check
index 4442f329c6b2..b09e369ee076 100644
--- a/tests/coverage/pos/Givens.scoverage.check
+++ b/tests/coverage/pos/Givens.scoverage.check
@@ -42,6 +42,40 @@ Givens
 Class
 covtest.Givens
 test
+182
+190
+11
+==
+Apply
+false
+0
+false
+3 == "3"
+
+2
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
+182
+183
+11
+<none>
+Literal
+false
+0
+false
+3
+
+3
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
 196
 213
 12
@@ -52,7 +86,41 @@ false
 false
 println(3 == 5.1)
 
-2
+4
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
+204
+212
+12
+==
+Apply
+false
+0
+false
+3 == 5.1
+
+5
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
+204
+205
+12
+<none>
+Literal
+false
+0
+false
+3
+
+6
 Givens.scala
 covtest
 Givens
@@ -69,7 +137,7 @@ false
 false
 def test
 
-3
+7
 Givens.scala
 covtest
 Givens
@@ -86,7 +154,7 @@ false
 false
 println(msg)
 
-4
+8
 Givens.scala
 covtest
 Givens
@@ -103,7 +171,7 @@ false
 false
 println(ctx.id)
 
-5
+9
 Givens.scala
 covtest
 Givens
@@ -120,7 +188,24 @@ false
 false
 def printContext
 
-6
+10
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+getMessage
+348
+358
+18
+toString
+Apply
+false
+0
+false
+i.toString
+
+11
 Givens.scala
 covtest
 Givens
@@ -137,7 +222,7 @@ false
 false
 def getMessage
 
-7
+12
 Givens.scala
 covtest
 Givens
@@ -154,7 +239,7 @@ false
 false
 Context(0)
 
-8
+13
 Givens.scala
 covtest
 Givens
@@ -171,7 +256,7 @@ false
 false
 printContext("test")(using c)
 
-9
+14
 Givens.scala
 covtest
 Givens
@@ -188,7 +273,7 @@ false
 false
 printContext(getMessage(123))
 
-10
+15
 Givens.scala
 covtest
 Givens
@@ -205,7 +290,7 @@ false
 false
 getMessage(123)
 
-11
+16
 Givens.scala
 covtest
 Givens
diff --git a/tests/coverage/pos/Inlined.scala b/tests/coverage/pos/Inlined.scala
index 5e51f037220f..37519e9f63e3 100644
--- a/tests/coverage/pos/Inlined.scala
+++ b/tests/coverage/pos/Inlined.scala
@@ -1,6 +1,7 @@
 package covtest
 
 // Checks that we use the new positions of the inlined code properly
+// NOTE (12.08.2025): After recent changes, the inlined nodes will not be tagged in coverage
 def testInlined(): Unit =
   val l = 1
   assert(l == 1)
diff --git a/tests/coverage/pos/Inlined.scoverage.check b/tests/coverage/pos/Inlined.scoverage.check
index 53008bd727c5..cf8d1bcdb0f7 100644
--- a/tests/coverage/pos/Inlined.scoverage.check
+++ b/tests/coverage/pos/Inlined.scoverage.check
@@ -25,264 +25,26 @@ Inlined$package
 Object
 covtest.Inlined$package
 testInlined
-288
-330
-11
-assertFailed
-Apply
-false
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-1
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-true
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-2
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-330
-330
-11
-<none>
-Literal
-true
-0
-false
-
-
-3
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-155
-162
-7
-apply
-Apply
-false
-0
-false
-List(l)
-
-4
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-155
-159
-7
-List
-Ident
-false
-0
-false
-List
-
-5
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-155
-169
-7
-length
-Select
-false
-0
-false
-List(l).length
-
+215
+216
 6
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-false
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-7
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-true
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-8
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-330
-330
-11
 <none>
 Literal
-true
-0
-false
-
-
-9
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-180
-187
-8
-apply
-Apply
 false
 0
 false
-List(l)
-
-10
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-180
-184
-8
-List
-Ident
-false
-0
-false
-List
+1
 
-11
+1
 Inlined.scala
 covtest
 Inlined$package
 Object
 covtest.Inlined$package
 testInlined
-180
+179
 194
-8
-length
-Select
-false
-0
-false
-List(l).length
-
-12
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-false
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-13
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-true
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-14
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-330
-330
-11
-<none>
-Literal
-true
-0
-false
-
-
-15
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-86
-101
-4
+5
 testInlined
 DefDef
 false
diff --git a/tests/coverage/pos/InlinedFromLib.scala b/tests/coverage/pos/InlinedFromLib.scala
index 1b05e11b7558..7607ded865d7 100644
--- a/tests/coverage/pos/InlinedFromLib.scala
+++ b/tests/coverage/pos/InlinedFromLib.scala
@@ -2,6 +2,7 @@ package covtest
 
 // assert is a `transparent inline` in Predef,
 // but its source path should not appear in the coverage report.
+// NOTE (12.08.2025): After recent changes, the inlined nodes will not be tagged in coverage
 def testInlined(): Unit =
   val l = 1
   assert(l == 1)
diff --git a/tests/coverage/pos/InlinedFromLib.scoverage.check b/tests/coverage/pos/InlinedFromLib.scoverage.check
index 005ce981aa1a..bd7bd1a65b6f 100644
--- a/tests/coverage/pos/InlinedFromLib.scoverage.check
+++ b/tests/coverage/pos/InlinedFromLib.scoverage.check
@@ -25,264 +25,26 @@ InlinedFromLib$package
 Object
 covtest.InlinedFromLib$package
 testInlined
-169
-183
+258
+259
 7
-assertFailed
-Apply
-false
-0
-false
-assert(l == 1)
-
-1
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-169
-183
-7
-assertFailed
-Apply
-true
-0
-false
-assert(l == 1)
-
-2
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-169
-183
-7
-<none>
-Literal
-true
-0
-false
-assert(l == 1)
-
-3
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-198
-205
-8
-apply
-Apply
-false
-0
-false
-List(l)
-
-4
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-198
-202
-8
-List
-Ident
-false
-0
-false
-List
-
-5
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-198
-212
-8
-length
-Select
-false
-0
-false
-List(l).length
-
-6
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-186
-213
-8
-assertFailed
-Apply
-false
-0
-false
-assert(l == List(l).length)
-
-7
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-186
-213
-8
-assertFailed
-Apply
-true
-0
-false
-assert(l == List(l).length)
-
-8
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-186
-213
-8
 <none>
 Literal
-true
-0
-false
-assert(l == List(l).length)
-
-9
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-223
-230
-9
-apply
-Apply
-false
-0
-false
-List(l)
-
-10
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-223
-227
-9
-List
-Ident
 false
 0
 false
-List
+1
 
-11
+1
 InlinedFromLib.scala
 covtest
 InlinedFromLib$package
 Object
 covtest.InlinedFromLib$package
 testInlined
-223
+222
 237
-9
-length
-Select
-false
-0
-false
-List(l).length
-
-12
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-216
-243
-9
-assertFailed
-Apply
-false
-0
-false
-assert(List(l).length == 1)
-
-13
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-216
-243
-9
-assertFailed
-Apply
-true
-0
-false
-assert(List(l).length == 1)
-
-14
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-216
-243
-9
-<none>
-Literal
-true
-0
-false
-assert(List(l).length == 1)
-
-15
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-129
-144
-5
+6
 testInlined
 DefDef
 false
diff --git a/tests/coverage/pos/Lift.scoverage.check b/tests/coverage/pos/Lift.scoverage.check
index cce8c18c6254..516692cd2503 100644
--- a/tests/coverage/pos/Lift.scoverage.check
+++ b/tests/coverage/pos/Lift.scoverage.check
@@ -25,6 +25,23 @@ SomeFunctions
 Class
 covtest.SomeFunctions
 f
+56
+58
+4
+<none>
+Literal
+false
+0
+false
+()
+
+1
+Lift.scala
+covtest
+SomeFunctions
+Class
+covtest.SomeFunctions
+f
 40
 45
 4
@@ -35,7 +52,24 @@ false
 false
 def f
 
-1
+2
+Lift.scala
+covtest
+SomeFunctions
+Class
+covtest.SomeFunctions
+g
+71
+72
+5
+<none>
+Literal
+false
+0
+false
+0
+
+3
 Lift.scala
 covtest
 SomeFunctions
@@ -52,7 +86,7 @@ false
 false
 def g
 
-2
+4
 Lift.scala
 covtest
 SomeFunctions
@@ -69,7 +103,7 @@ false
 false
 SomeFunctions()
 
-3
+5
 Lift.scala
 covtest
 SomeFunctions
@@ -86,7 +120,7 @@ false
 false
 def c
 
-4
+6
 Lift.scala
 covtest
 SomeFunctions
@@ -103,24 +137,7 @@ false
 false
 c.f(g())
 
-5
-Lift.scala
-covtest
-SomeFunctions
-Class
-covtest.SomeFunctions
-test
-113
-114
-8
-c
-Select
-false
-0
-false
-c
-
-6
+7
 Lift.scala
 covtest
 SomeFunctions
@@ -137,7 +154,7 @@ false
 false
 g()
 
-7
+8
 Lift.scala
 covtest
 SomeFunctions
diff --git a/tests/coverage/pos/Literals.scoverage.check b/tests/coverage/pos/Literals.scoverage.check
index cd58a841d5b6..c6ea348844ca 100644
--- a/tests/coverage/pos/Literals.scoverage.check
+++ b/tests/coverage/pos/Literals.scoverage.check
@@ -42,6 +42,57 @@ Literals$package
 Object
 covtest.Literals$package
 block
+119
+121
+5
+<none>
+Literal
+false
+0
+false
+12
+
+2
+Literals.scala
+covtest
+Literals$package
+Object
+covtest.Literals$package
+block
+124
+128
+6
+<none>
+Literal
+false
+0
+false
+true
+
+3
+Literals.scala
+covtest
+Literals$package
+Object
+covtest.Literals$package
+block
+131
+135
+7
+<none>
+Literal
+false
+0
+false
+null
+
+4
+Literals.scala
+covtest
+Literals$package
+Object
+covtest.Literals$package
+block
 17
 26
 3
@@ -52,7 +103,7 @@ false
 false
 def block
 
-2
+5
 Literals.scala
 covtest
 Literals$package
@@ -69,7 +120,7 @@ false
 false
 ???
 
-3
+6
 Literals.scala
 covtest
 Literals$package
@@ -86,7 +137,7 @@ false
 false
 def f
 
-4
+7
 Literals.scala
 covtest
 Literals$package
@@ -103,7 +154,7 @@ false
 false
 f(0,1,2)(3)
 
-5
+8
 Literals.scala
 covtest
 Literals$package
diff --git a/tests/coverage/pos/MatchNumbers.scoverage.check b/tests/coverage/pos/MatchNumbers.scoverage.check
index 43e01018f0ac..74dd5db8fc87 100644
--- a/tests/coverage/pos/MatchNumbers.scoverage.check
+++ b/tests/coverage/pos/MatchNumbers.scoverage.check
@@ -25,6 +25,40 @@ MatchNumbers
 Object
 covtest.MatchNumbers
 f
+121
+126
+7
+<
+Apply
+false
+0
+false
+x < 0
+
+1
+MatchNumbers.scala
+covtest
+MatchNumbers
+Object
+covtest.MatchNumbers
+f
+130
+132
+7
+<none>
+Literal
+false
+0
+false
+-1
+
+2
+MatchNumbers.scala
+covtest
+MatchNumbers
+Object
+covtest.MatchNumbers
+f
 127
 132
 7
@@ -35,7 +69,7 @@ true
 false
 => -1
 
-1
+3
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -52,7 +86,24 @@ true
 false
 => x
 
-2
+4
+MatchNumbers.scala
+covtest
+MatchNumbers
+Object
+covtest.MatchNumbers
+f
+174
+181
+9
+toInt
+Select
+false
+0
+false
+y.toInt
+
+5
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -69,7 +120,7 @@ true
 false
 => y.toInt
 
-3
+6
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -86,7 +137,7 @@ false
 false
 def f
 
-4
+7
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -103,7 +154,7 @@ false
 false
 f(0)
 
-5
+8
 MatchNumbers.scala
 covtest
 MatchNumbers
diff --git a/tests/coverage/pos/PolymorphicExtensions.scoverage.check b/tests/coverage/pos/PolymorphicExtensions.scoverage.check
index 64795070b34f..6eebb8cc94fa 100644
--- a/tests/coverage/pos/PolymorphicExtensions.scoverage.check
+++ b/tests/coverage/pos/PolymorphicExtensions.scoverage.check
@@ -110,15 +110,15 @@ PolyExt
 Object
 covtest.PolyExt
 <init>
-177
-186
-11
-foo
+277
+287
+12
+get
 Apply
 false
 0
 false
-"str".foo
+123.get(0)
 
 6
 PolymorphicExtensions.scala
@@ -126,16 +126,16 @@ covtest
 PolyExt
 Object
 covtest.PolyExt
-<init>
-277
-287
-12
-get
-Apply
+foo
+385
+387
+14
+<none>
+Literal
 false
 0
 false
-123.get(0)
+42
 
 7
 PolymorphicExtensions.scala
@@ -177,40 +177,6 @@ covtest
 PolyExt
 Object
 covtest.PolyExt
-bar
-405
-412
-15
-tap
-Apply
-false
-0
-false
-foo.tap
-
-10
-PolymorphicExtensions.scala
-covtest
-PolyExt
-Object
-covtest.PolyExt
-bar
-405
-408
-15
-foo
-Ident
-false
-0
-false
-foo
-
-11
-PolymorphicExtensions.scala
-covtest
-PolyExt
-Object
-covtest.PolyExt
 $anonfun
 413
 420
@@ -222,7 +188,7 @@ false
 false
 println
 
-12
+10
 PolymorphicExtensions.scala
 covtest
 PolyExt
diff --git a/tests/coverage/pos/PolymorphicMethods.scoverage.check b/tests/coverage/pos/PolymorphicMethods.scoverage.check
index b66aaeb92661..01cc80f6a4dc 100644
--- a/tests/coverage/pos/PolymorphicMethods.scoverage.check
+++ b/tests/coverage/pos/PolymorphicMethods.scoverage.check
@@ -72,19 +72,19 @@ C[String]().f("str", 0)
 3
 PolymorphicMethods.scala
 covtest
-PolyMeth
-Object
-covtest.PolyMeth
-<init>
-147
-158
-7
-<init>
-Apply
+C
+Class
+covtest.C
+f
+221
+223
+10
+<none>
+Literal
 false
 0
 false
-C[String]()
+()
 
 4
 PolymorphicMethods.scala
diff --git a/tests/coverage/pos/Select.scoverage.check b/tests/coverage/pos/Select.scoverage.check
index cfe719552e44..a4830c1a6d5c 100644
--- a/tests/coverage/pos/Select.scoverage.check
+++ b/tests/coverage/pos/Select.scoverage.check
@@ -195,23 +195,6 @@ Select$package
 Object
 covtest.Select$package
 test
-263
-273
-19
-instance
-Select
-false
-0
-false
-a.instance
-
-11
-Select.scala
-covtest
-Select$package
-Object
-covtest.Select$package
-test
 345
 354
 20
@@ -222,7 +205,7 @@ false
 false
 a.print()
 
-12
+11
 Select.scala
 covtest
 Select$package
diff --git a/tests/coverage/pos/SimpleMethods.scoverage.check b/tests/coverage/pos/SimpleMethods.scoverage.check
index 067bd744177b..03d3c1a440ec 100644
--- a/tests/coverage/pos/SimpleMethods.scoverage.check
+++ b/tests/coverage/pos/SimpleMethods.scoverage.check
@@ -42,6 +42,23 @@ C
 Class
 covtest.C
 b
+60
+66
+5
+<none>
+Literal
+false
+0
+false
+return
+
+2
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+b
 46
 51
 5
@@ -52,7 +69,24 @@ false
 false
 def b
 
-2
+3
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+c
+83
+85
+6
+<none>
+Literal
+false
+0
+false
+()
+
+4
 SimpleMethods.scala
 covtest
 C
@@ -69,7 +103,24 @@ false
 false
 def c
 
-3
+5
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+d
+101
+103
+7
+<none>
+Literal
+false
+0
+false
+12
+
+6
 SimpleMethods.scala
 covtest
 C
@@ -86,7 +137,24 @@ false
 false
 def d
 
-4
+7
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+e
+120
+124
+8
+<none>
+Literal
+false
+0
+false
+null
+
+8
 SimpleMethods.scala
 covtest
 C
@@ -103,7 +171,41 @@ false
 false
 def e
 
-5
+9
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+block
+149
+158
+11
+<none>
+Literal
+false
+0
+false
+"literal"
+
+10
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+block
+163
+164
+12
+<none>
+Literal
+false
+0
+false
+0
+
+11
 SimpleMethods.scala
 covtest
 C
@@ -120,7 +222,41 @@ false
 false
 def block
 
-6
+12
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+cond
+195
+200
+15
+<none>
+Literal
+false
+0
+false
+false
+
+13
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+cond
+206
+210
+15
+<none>
+Literal
+false
+0
+false
+true
+
+14
 SimpleMethods.scala
 covtest
 C
@@ -137,7 +273,24 @@ true
 false
 true
 
-7
+15
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+cond
+220
+225
+16
+<none>
+Literal
+false
+0
+false
+false
+
+16
 SimpleMethods.scala
 covtest
 C
@@ -154,7 +307,7 @@ true
 false
 false
 
-8
+17
 SimpleMethods.scala
 covtest
 C
@@ -171,7 +324,41 @@ false
 false
 def cond
 
-9
+18
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+partialCond
+260
+265
+19
+<none>
+Literal
+false
+0
+false
+false
+
+19
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+partialCond
+271
+273
+19
+<none>
+Literal
+false
+0
+false
+()
+
+20
 SimpleMethods.scala
 covtest
 C
@@ -188,7 +375,7 @@ true
 false
 ()
 
-10
+21
 SimpleMethods.scala
 covtest
 C
@@ -205,7 +392,7 @@ true
 false
 
 
-11
+22
 SimpleMethods.scala
 covtest
 C
@@ -222,7 +409,7 @@ false
 false
 def partialCond
 
-12
+23
 SimpleMethods.scala
 covtest
 C
@@ -239,7 +426,24 @@ false
 false
 def new1
 
-13
+24
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+tryCatch
+330
+332
+24
+<none>
+Literal
+false
+0
+false
+()
+
+25
 SimpleMethods.scala
 covtest
 C
@@ -256,7 +460,24 @@ true
 false
 ()
 
-14
+26
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+tryCatch
+370
+371
+26
+<none>
+Literal
+false
+0
+false
+1
+
+27
 SimpleMethods.scala
 covtest
 C
@@ -273,7 +494,7 @@ true
 false
 => 1
 
-15
+28
 SimpleMethods.scala
 covtest
 C
diff --git a/tests/coverage/pos/StructuralTypes.scoverage.check b/tests/coverage/pos/StructuralTypes.scoverage.check
index 91bb60f9f293..b1f7109564c6 100644
--- a/tests/coverage/pos/StructuralTypes.scoverage.check
+++ b/tests/coverage/pos/StructuralTypes.scoverage.check
@@ -43,14 +43,14 @@ Class
 covtest.Record
 $anonfun
 159
-163
+171
 6
-_1
-Select
+==
+Apply
 false
 0
 false
-_._1
+_._1 == name
 
 2
 StructuralTypes.scala
@@ -110,6 +110,23 @@ StructuralTypes
 Object
 covtest.StructuralTypes
 test
+270
+307
+13
+apply
+Apply
+false
+0
+false
+Record("name" -> "Emma", "age" -> 42)
+
+6
+StructuralTypes.scala
+covtest
+StructuralTypes
+Object
+covtest.StructuralTypes
+test
 277
 293
 13
@@ -120,7 +137,7 @@ false
 false
 "name" -> "Emma"
 
-6
+7
 StructuralTypes.scala
 covtest
 StructuralTypes
@@ -137,7 +154,7 @@ false
 false
 "age" -> 42
 
-7
+8
 StructuralTypes.scala
 covtest
 StructuralTypes
@@ -154,7 +171,7 @@ false
 false
 person.name
 
-8
+9
 StructuralTypes.scala
 covtest
 StructuralTypes
diff --git a/tests/coverage/pos/TypeLambdas.scoverage.check b/tests/coverage/pos/TypeLambdas.scoverage.check
index 46c84036a2ff..f5779a45268b 100644
--- a/tests/coverage/pos/TypeLambdas.scoverage.check
+++ b/tests/coverage/pos/TypeLambdas.scoverage.check
@@ -42,15 +42,15 @@ TypeLambdas
 Object
 covtest.TypeLambdas
 test
-306
-309
+310
+318
 14
-Map
-Ident
+->
+Apply
 false
 0
 false
-Map
+1 -> "1"
 
 2
 TypeLambdas.scala
@@ -59,15 +59,15 @@ TypeLambdas
 Object
 covtest.TypeLambdas
 test
-310
-318
-14
-->
+324
+334
+15
+println
 Apply
 false
 0
 false
-1 -> "1"
+println(m)
 
 3
 TypeLambdas.scala
@@ -76,15 +76,15 @@ TypeLambdas
 Object
 covtest.TypeLambdas
 test
-324
-334
-15
-println
+367
+377
+17
+apply
 Apply
 false
 0
 false
-println(m)
+("a", "b")
 
 4
 TypeLambdas.scala
diff --git a/tests/coverage/pos/i21695/A.scala b/tests/coverage/pos/i21695/A.scala
new file mode 100644
index 000000000000..afe534eac46e
--- /dev/null
+++ b/tests/coverage/pos/i21695/A.scala
@@ -0,0 +1,9 @@
+package example
+
+trait A {
+  def x1: Builder[?]
+  def x2: Service
+
+  def create: String =
+    x1.addService(x2).build()
+}
diff --git a/tests/coverage/pos/i21695/Builder.java b/tests/coverage/pos/i21695/Builder.java
new file mode 100644
index 000000000000..c7685043ec00
--- /dev/null
+++ b/tests/coverage/pos/i21695/Builder.java
@@ -0,0 +1,6 @@
+package example;
+
+public abstract class Builder<T extends Builder<T>> {
+  public abstract String build();
+  public abstract T addService(Service service);
+}
diff --git a/tests/coverage/pos/i21695/Service.java b/tests/coverage/pos/i21695/Service.java
new file mode 100644
index 000000000000..624e3c04f67f
--- /dev/null
+++ b/tests/coverage/pos/i21695/Service.java
@@ -0,0 +1,3 @@
+package example;
+
+public class Service{}
diff --git a/tests/coverage/pos/i21695/test.scoverage.check b/tests/coverage/pos/i21695/test.scoverage.check
new file mode 100644
index 000000000000..d9ee3a172e3f
--- /dev/null
+++ b/tests/coverage/pos/i21695/test.scoverage.check
@@ -0,0 +1,71 @@
+# Coverage data, format version: 3.0
+# Statement data:
+# - id
+# - source path
+# - package name
+# - class name
+# - class type (Class, Object or Trait)
+# - full class name
+# - method name
+# - start offset
+# - end offset
+# - line number
+# - symbol name
+# - tree name
+# - is branch
+# - invocations count
+# - is ignored
+# - description (can be multi-line)
+# '' sign
+# ------------------------------------------
+0
+i21695/A.scala
+example
+A
+Trait
+example.A
+create
+94
+119
+8
+build
+Apply
+false
+0
+false
+x1.addService(x2).build()
+
+1
+i21695/A.scala
+example
+A
+Trait
+example.A
+create
+108
+110
+8
+x2
+Select
+false
+0
+false
+x2
+
+2
+i21695/A.scala
+example
+A
+Trait
+example.A
+create
+69
+79
+7
+create
+DefDef
+false
+0
+false
+def create
+
diff --git a/tests/coverage/pos/i21877.scala b/tests/coverage/pos/i21877.scala
new file mode 100644
index 000000000000..13d4c9dfc8e2
--- /dev/null
+++ b/tests/coverage/pos/i21877.scala
@@ -0,0 +1,21 @@
+
+
+class Schema[T]
+object Schema {
+  inline def derived[T]: Schema[T] = new Schema[T]
+}
+
+case class Bar(x: Int)
+
+object Foo {
+  def foo(x: Int): String = {
+    val bar = Bar(x)
+    if (x == 5) "5" else "idk" + bar.toString
+  }
+
+  implicit val schema: Schema[Bar] = Schema.derived
+}
+
+@main def test() =
+  Foo.foo(4)
+  Foo.foo(5)
diff --git a/tests/coverage/pos/i21877.scoverage.check b/tests/coverage/pos/i21877.scoverage.check
new file mode 100644
index 000000000000..7f95bcb7c010
--- /dev/null
+++ b/tests/coverage/pos/i21877.scoverage.check
@@ -0,0 +1,224 @@
+# Coverage data, format version: 3.0
+# Statement data:
+# - id
+# - source path
+# - package name
+# - class name
+# - class type (Class, Object or Trait)
+# - full class name
+# - method name
+# - start offset
+# - end offset
+# - line number
+# - symbol name
+# - tree name
+# - is branch
+# - invocations count
+# - is ignored
+# - description (can be multi-line)
+# '' sign
+# ------------------------------------------
+0
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+169
+175
+12
+apply
+Apply
+false
+0
+false
+Bar(x)
+
+1
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+184
+190
+13
+==
+Apply
+false
+0
+false
+x == 5
+
+2
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+192
+195
+13
+<none>
+Literal
+false
+0
+false
+"5"
+
+3
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+192
+195
+13
+<none>
+Literal
+true
+0
+false
+"5"
+
+4
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+201
+221
+13
++
+Apply
+false
+0
+false
+"idk" + bar.toString
+
+5
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+201
+206
+13
+<none>
+Literal
+false
+0
+false
+"idk"
+
+6
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+209
+221
+13
+toString
+Apply
+false
+0
+false
+bar.toString
+
+7
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+201
+221
+13
++
+Apply
+true
+0
+false
+"idk" + bar.toString
+
+8
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+127
+134
+11
+foo
+DefDef
+false
+0
+false
+def foo
+
+9
+i21877.scala
+<empty>
+i21877$package
+Object
+<empty>.i21877$package
+test
+303
+313
+20
+foo
+Apply
+false
+0
+false
+Foo.foo(4)
+
+10
+i21877.scala
+<empty>
+i21877$package
+Object
+<empty>.i21877$package
+test
+316
+326
+21
+foo
+Apply
+false
+0
+false
+Foo.foo(5)
+
+11
+i21877.scala
+<empty>
+i21877$package
+Object
+<empty>.i21877$package
+test
+282
+296
+19
+test
+DefDef
+false
+0
+false
+@main def test
+
diff --git a/tests/coverage/pos/macro-late-suspend/test.scoverage.check b/tests/coverage/pos/macro-late-suspend/test.scoverage.check
index f962705ed2ce..051f30e08e67 100644
--- a/tests/coverage/pos/macro-late-suspend/test.scoverage.check
+++ b/tests/coverage/pos/macro-late-suspend/test.scoverage.check
@@ -53,23 +53,6 @@ false
 private def mkVisitorTypeImpl
 
 3
-macro-late-suspend/Test.scala
-example
-Test
-Object
-example.Test
-<init>
-102
-121
-8
-<init>
-Apply
-false
-0
-false
-mkVisitorType[Test]
-
-4
 macro-late-suspend/UsesTest.scala
 example
 UsesTest$package
diff --git a/tests/coverage/pos/scoverage-samples-case.scoverage.check b/tests/coverage/pos/scoverage-samples-case.scoverage.check
index 4b67fa77541c..a0fa8febcd99 100644
--- a/tests/coverage/pos/scoverage-samples-case.scoverage.check
+++ b/tests/coverage/pos/scoverage-samples-case.scoverage.check
@@ -24,6 +24,23 @@ org.scoverage.samples
 PriceEngine
 Class
 org.scoverage.samples.PriceEngine
+<init>
+293
+298
+14
+<none>
+Literal
+false
+0
+false
+"abc"
+
+1
+scoverage-samples-case.scala
+org.scoverage.samples
+PriceEngine
+Class
+org.scoverage.samples.PriceEngine
 $anonfun
 362
 368
@@ -35,7 +52,7 @@ false
 false
 stop()
 
-1
+2
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -52,7 +69,7 @@ true
 false
 =>\n      stop()
 
-2
+3
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -69,7 +86,7 @@ false
 false
 stop()
 
-3
+4
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -86,7 +103,7 @@ true
 false
 =>\n      stop()
 
-4
+5
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -103,7 +120,24 @@ false
 false
 def receive
 
-5
+6
+scoverage-samples-case.scala
+org.scoverage.samples
+PriceEngine
+Class
+org.scoverage.samples.PriceEngine
+stop
+443
+462
+25
+!=
+Apply
+false
+0
+false
+cancellable != null
+
+7
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -120,7 +154,7 @@ false
 false
 println("stop")
 
-6
+8
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -137,7 +171,7 @@ true
 false
 println("stop")
 
-7
+9
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -154,7 +188,7 @@ true
 false
 
 
-8
+10
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
diff --git a/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check b/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
index f9bb9e0cd6a3..1c349a5de5c8 100644
--- a/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
+++ b/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
@@ -25,15 +25,15 @@ CreditEngine
 Class
 org.scoverage.samples.CreditEngine
 $anonfun
-263
-276
-11
-!
+245
+255
+10
+<
 Apply
 false
 0
 false
-"if 1" ! "xd"
+req < 2000
 
 1
 scoverage-samples-implicit-class.scala
@@ -43,14 +43,14 @@ Class
 org.scoverage.samples.CreditEngine
 $anonfun
 263
-269
+276
 11
-StringOpssssss
+!
 Apply
 false
 0
 false
-"if 1"
+"if 1" ! "xd"
 
 2
 scoverage-samples-implicit-class.scala
@@ -161,23 +161,6 @@ StringOpssssss
 Class
 org.scoverage.samples.StringOpssssss
 !
-160
-167
-5
-+
-Apply
-false
-0
-false
-s + "!"
-
-9
-scoverage-samples-implicit-class.scala
-org.scoverage.samples
-StringOpssssss
-Class
-org.scoverage.samples.StringOpssssss
-!
 124
 129
 5
@@ -188,7 +171,7 @@ false
 false
 def !
 
-10
+9
 scoverage-samples-implicit-class.scala
 org.scoverage.samples
 scoverage-samples-implicit-class$package
diff --git a/tests/coverage/run/currying/test.scoverage.check b/tests/coverage/run/currying/test.scoverage.check
index abc1876942db..5d1b4233a226 100644
--- a/tests/coverage/run/currying/test.scoverage.check
+++ b/tests/coverage/run/currying/test.scoverage.check
@@ -25,6 +25,23 @@ Test
 Object
 <empty>.Test
 f1
+48
+53
+2
++
+Apply
+false
+0
+false
+a+b+c
+
+1
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+f1
 15
 21
 2
@@ -35,7 +52,24 @@ false
 false
 def f1
 
-1
+2
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+$anonfun
+105
+110
+4
++
+Apply
+false
+0
+false
+a+b+c
+
+3
 currying/test.scala
 <empty>
 Test
@@ -52,7 +86,24 @@ false
 false
 def f2
 
-2
+4
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+$anonfun
+166
+171
+7
++
+Apply
+false
+0
+false
+a+b+c
+
+5
 currying/test.scala
 <empty>
 Test
@@ -69,7 +120,24 @@ false
 false
 def g1
 
-3
+6
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+g2
+226
+231
+9
++
+Apply
+false
+0
+false
+a+b+c
+
+7
 currying/test.scala
 <empty>
 Test
@@ -86,7 +154,7 @@ false
 false
 def g2
 
-4
+8
 currying/test.scala
 <empty>
 Test
@@ -103,7 +171,7 @@ false
 false
 println(f1(0)(1)(2))
 
-5
+9
 currying/test.scala
 <empty>
 Test
@@ -120,7 +188,7 @@ false
 false
 f1(0)(1)(2)
 
-6
+10
 currying/test.scala
 <empty>
 Test
@@ -137,7 +205,7 @@ false
 false
 println(f2(0)(1)(2))
 
-7
+11
 currying/test.scala
 <empty>
 Test
@@ -154,58 +222,7 @@ false
 false
 f2(0)(1)(2)
 
-8
-currying/test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-310
-318
-13
-apply
-Apply
-false
-0
-false
-f2(0)(1)
-
-9
-currying/test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-310
-315
-13
-apply
-Apply
-false
-0
-false
-f2(0)
-
-10
-currying/test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-310
-312
-13
-f2
-Ident
-false
-0
-false
-f2
-
-11
+12
 currying/test.scala
 <empty>
 Test
@@ -222,7 +239,7 @@ false
 false
 println(g1(using 0)(using 1)(using 2))
 
-12
+13
 currying/test.scala
 <empty>
 Test
@@ -239,7 +256,7 @@ false
 false
 g1(using 0)(using 1)(using 2)
 
-13
+14
 currying/test.scala
 <empty>
 Test
@@ -256,7 +273,7 @@ false
 false
 println(g2(using 0)(using 1)(using 2))
 
-14
+15
 currying/test.scala
 <empty>
 Test
@@ -273,7 +290,7 @@ false
 false
 g2(using 0)(using 1)(using 2)
 
-15
+16
 currying/test.scala
 <empty>
 Test
diff --git a/tests/coverage/run/erased/test.scoverage.check b/tests/coverage/run/erased/test.scoverage.check
index dedf5689c490..db822ed9c090 100644
--- a/tests/coverage/run/erased/test.scoverage.check
+++ b/tests/coverage/run/erased/test.scoverage.check
@@ -161,6 +161,23 @@ test$package
 Object
 <empty>.test$package
 Test
+332
+335
+17
+<none>
+Literal
+false
+0
+false
+"a"
+
+9
+erased/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
 345
 374
 18
@@ -171,7 +188,24 @@ false
 false
 foo(e("a"))(identity("idem"))
 
-9
+10
+erased/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+351
+354
+18
+<none>
+Literal
+false
+0
+false
+"a"
+
+11
 erased/test.scala
 <empty>
 test$package
@@ -188,7 +222,7 @@ false
 false
 identity("idem")
 
-10
+12
 erased/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/extend-case-class/test.scoverage.check b/tests/coverage/run/extend-case-class/test.scoverage.check
index b355140d2520..107cef2cc371 100644
--- a/tests/coverage/run/extend-case-class/test.scoverage.check
+++ b/tests/coverage/run/extend-case-class/test.scoverage.check
@@ -21,6 +21,91 @@
 0
 extend-case-class/test.scala
 <empty>
+DecimalConf
+Object
+<empty>.DecimalConf
+<init>
+194
+198
+4
+<none>
+Literal
+false
+0
+false
+6178
+
+1
+extend-case-class/test.scala
+<empty>
+DecimalConf
+Object
+<empty>.DecimalConf
+<init>
+200
+203
+4
+<none>
+Literal
+false
+0
+false
+308
+
+2
+extend-case-class/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+239
+279
+8
+apply
+Apply
+false
+0
+false
+DecimalConf(MathContext.DECIMAL32, 1, 0)
+
+3
+extend-case-class/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+274
+275
+8
+<none>
+Literal
+false
+0
+false
+1
+
+4
+extend-case-class/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+277
+278
+8
+<none>
+Literal
+false
+0
+false
+0
+
+5
+extend-case-class/test.scala
+<empty>
 test$package
 Object
 <empty>.test$package
@@ -35,7 +120,7 @@ false
 false
 println(c.scaleLimit)
 
-1
+6
 extend-case-class/test.scala
 <empty>
 test$package
@@ -52,7 +137,7 @@ false
 false
 println(DecimalConf.scaleLimit)
 
-2
+7
 extend-case-class/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/i16940/test.scoverage.check b/tests/coverage/run/i16940/test.scoverage.check
index 9354a4e67b29..eb8cd5d7d61c 100644
--- a/tests/coverage/run/i16940/test.scoverage.check
+++ b/tests/coverage/run/i16940/test.scoverage.check
@@ -59,23 +59,6 @@ Test
 Object
 <empty>.Test
 <init>
-371
-454
-20
-sequence
-Apply
-false
-0
-false
-Future.sequence(Seq(brokenSynchronizedBlock(false), brokenSynchronizedBlock(true)))
-
-3
-i16940/i16940.scala
-<empty>
-Test
-Object
-<empty>.Test
-<init>
 387
 453
 20
@@ -86,24 +69,7 @@ false
 false
 Seq(brokenSynchronizedBlock(false), brokenSynchronizedBlock(true))
 
-4
-i16940/i16940.scala
-<empty>
-Test
-Object
-<empty>.Test
-<init>
-387
-390
-20
-Seq
-Ident
-false
-0
-false
-Seq
-
-5
+3
 i16940/i16940.scala
 <empty>
 Test
@@ -120,7 +86,7 @@ false
 false
 brokenSynchronizedBlock(false)
 
-6
+4
 i16940/i16940.scala
 <empty>
 Test
@@ -137,7 +103,7 @@ false
 false
 brokenSynchronizedBlock(true)
 
-7
+5
 i16940/i16940.scala
 <empty>
 Test
@@ -154,75 +120,58 @@ false
 false
 println(test)
 
-8
+6
 i16940/i16940.scala
 <empty>
 Test
 Object
 <empty>.Test
-$anonfun
-508
-525
-23
-assertFailed
+<init>
+539
+540
+25
+DurationInt
 Apply
 false
 0
 false
-assert(test == 2)
+3
 
-9
+7
 i16940/i16940.scala
 <empty>
 Test
 Object
 <empty>.Test
-$anonfun
-508
-525
-23
-assertFailed
-Apply
-true
-0
+<init>
+539
+548
+25
+seconds
+Select
 false
-assert(test == 2)
-
-10
-i16940/i16940.scala
-<empty>
-Test
-Object
-<empty>.Test
-$anonfun
-508
-525
-23
-<none>
-Literal
-true
 0
 false
-assert(test == 2)
+3.seconds
 
-11
+8
 i16940/i16940.scala
 <empty>
-Test
+i16940$package
 Object
-<empty>.Test
+<empty>.i16940$package
 <init>
-539
-548
-25
-seconds
-Select
+125
+126
+5
+<none>
+Literal
 false
 0
 false
-3.seconds
+0
 
-12
+9
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -239,7 +188,7 @@ false
 false
 Future {\n  if (option) {\n    Thread.sleep(500)\n  }\n  synchronized {\n    val tmp = test\n    Thread.sleep(1000)\n    test = tmp + 1\n  }\n}
 
-13
+10
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -256,7 +205,7 @@ false
 false
 Thread.sleep(500)
 
-14
+11
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -273,7 +222,7 @@ true
 false
 {\n    Thread.sleep(500)\n  }
 
-15
+12
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -290,7 +239,7 @@ true
 false
 
 
-16
+13
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -307,7 +256,7 @@ false
 false
 synchronized {\n    val tmp = test\n    Thread.sleep(1000)\n    test = tmp + 1\n  }
 
-17
+14
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -324,7 +273,24 @@ false
 false
 Thread.sleep(1000)
 
-18
+15
+i16940/i16940.scala
+<empty>
+i16940$package
+Object
+<empty>.i16940$package
+brokenSynchronizedBlock
+310
+317
+14
++
+Apply
+false
+0
+false
+tmp + 1
+
+16
 i16940/i16940.scala
 <empty>
 i16940$package
diff --git a/tests/coverage/run/i18233-min/test.scoverage.check b/tests/coverage/run/i18233-min/test.scoverage.check
index 108887701017..6bc38ed61a85 100644
--- a/tests/coverage/run/i18233-min/test.scoverage.check
+++ b/tests/coverage/run/i18233-min/test.scoverage.check
@@ -42,23 +42,6 @@ Test
 Object
 <empty>.Test
 <init>
-139
-144
-11
-aList
-Ident
-false
-0
-false
-aList
-
-2
-i18233-min/i18233-min.scala
-<empty>
-Test
-Object
-<empty>.Test
-<init>
 148
 168
 12
@@ -69,24 +52,7 @@ false
 false
 println(anotherList)
 
-3
-i18233-min/i18233-min.scala
-<empty>
-Test
-Object
-<empty>.Test
-<init>
-156
-167
-12
-anotherList
-Ident
-false
-0
-false
-anotherList
-
-4
+2
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -103,24 +69,7 @@ false
 false
 List(Array[String]()*)
 
-5
-i18233-min/i18233-min.scala
-<empty>
-i18233-min$package
-Object
-<empty>.i18233-min$package
-aList
-14
-18
-2
-List
-Ident
-false
-0
-false
-List
-
-6
+3
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -137,7 +86,7 @@ false
 false
 Array[String]()
 
-7
+4
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -154,7 +103,7 @@ false
 false
 def aList
 
-8
+5
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -171,41 +120,58 @@ false
 false
 Array("abc", "def")
 
-9
+6
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
 Object
 <empty>.i18233-min$package
 arr
-38
-45
-4
-arr
-DefDef
+56
+61
+5
+<none>
+Literal
 false
 0
 false
-def arr
+"abc"
 
-10
+7
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
 Object
 <empty>.i18233-min$package
-anotherList
-91
-101
+arr
+63
+68
+5
+<none>
+Literal
+false
+0
+false
+"def"
+
 8
-apply
-Apply
+i18233-min/i18233-min.scala
+<empty>
+i18233-min$package
+Object
+<empty>.i18233-min$package
+arr
+38
+45
+4
+arr
+DefDef
 false
 0
 false
-List(arr*)
+def arr
 
-11
+9
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -213,16 +179,16 @@ Object
 <empty>.i18233-min$package
 anotherList
 91
-95
+101
 8
-List
-Ident
+apply
+Apply
 false
 0
 false
-List
+List(arr*)
 
-12
+10
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -239,7 +205,7 @@ false
 false
 arr
 
-13
+11
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
diff --git a/tests/coverage/run/i18233/test.scoverage.check b/tests/coverage/run/i18233/test.scoverage.check
index 97e16be7839f..878ca8a14705 100644
--- a/tests/coverage/run/i18233/test.scoverage.check
+++ b/tests/coverage/run/i18233/test.scoverage.check
@@ -42,23 +42,6 @@ Foo
 Object
 <empty>.Foo
 render
-54
-58
-5
-List
-Ident
-false
-0
-false
-List
-
-2
-i18233/i18233.scala
-<empty>
-Foo
-Object
-<empty>.Foo
-render
 59
 65
 5
@@ -69,7 +52,7 @@ false
 false
 values
 
-3
+2
 i18233/i18233.scala
 <empty>
 Foo
@@ -86,7 +69,7 @@ false
 false
 values.tail
 
-4
+3
 i18233/i18233.scala
 <empty>
 Foo
@@ -103,7 +86,7 @@ false
 false
 List(values.tail*).mkString
 
-5
+4
 i18233/i18233.scala
 <empty>
 Foo
@@ -120,7 +103,7 @@ false
 false
 def render
 
-6
+5
 i18233/i18233.scala
 <empty>
 Test
@@ -137,7 +120,7 @@ false
 false
 println(Foo.render)
 
-7
+6
 i18233/i18233.scala
 <empty>
 Test
diff --git a/tests/coverage/run/inheritance/test.scoverage.check b/tests/coverage/run/inheritance/test.scoverage.check
index 387a080463e2..48b8e02d59e1 100644
--- a/tests/coverage/run/inheritance/test.scoverage.check
+++ b/tests/coverage/run/inheritance/test.scoverage.check
@@ -21,6 +21,23 @@
 0
 inheritance/test.scala
 <empty>
+B
+Class
+<empty>.B
+<init>
+61
+62
+2
+<none>
+Literal
+false
+0
+false
+0
+
+1
+inheritance/test.scala
+<empty>
 C1
 Class
 <empty>.C1
@@ -35,7 +52,24 @@ false
 false
 println("block")
 
+2
+inheritance/test.scala
+<empty>
+C1
+Class
+<empty>.C1
+<init>
+102
+103
+3
+<none>
+Literal
+false
+0
+false
 1
+
+3
 inheritance/test.scala
 <empty>
 C2
@@ -52,7 +86,7 @@ false
 false
 A(2,2)
 
-2
+4
 inheritance/test.scala
 <empty>
 test$package
@@ -69,7 +103,7 @@ false
 false
 println(C1().x)
 
-3
+5
 inheritance/test.scala
 <empty>
 test$package
@@ -86,7 +120,7 @@ false
 false
 C1()
 
-4
+6
 inheritance/test.scala
 <empty>
 test$package
@@ -103,7 +137,7 @@ false
 false
 println(C2().x)
 
-5
+7
 inheritance/test.scala
 <empty>
 test$package
@@ -120,7 +154,7 @@ false
 false
 C2()
 
-6
+8
 inheritance/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/inline-def/test.scoverage.check b/tests/coverage/run/inline-def/test.scoverage.check
index 17fa7c049107..7ca855c41008 100644
--- a/tests/coverage/run/inline-def/test.scoverage.check
+++ b/tests/coverage/run/inline-def/test.scoverage.check
@@ -76,23 +76,6 @@ test$package
 Object
 <empty>.test$package
 Test
-134
-148
-8
-toString
-Apply
-false
-0
-false
-"foo".toString
-
-4
-inline-def/test.scala
-<empty>
-test$package
-Object
-<empty>.test$package
-Test
 263
 277
 16
@@ -103,24 +86,7 @@ false
 false
 println(a.bar)
 
-5
-inline-def/test.scala
-<empty>
-test$package
-Object
-<empty>.test$package
-Test
-176
-190
-9
-toString
-Apply
-false
-0
-false
-"bar".toString
-
-6
+4
 inline-def/test.scala
 <empty>
 test$package
@@ -137,7 +103,7 @@ false
 false
 println(b.foo)
 
-7
+5
 inline-def/test.scala
 <empty>
 test$package
@@ -154,7 +120,7 @@ false
 false
 b.foo
 
-8
+6
 inline-def/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/interpolation/test.scoverage.check b/tests/coverage/run/interpolation/test.scoverage.check
index 92877b704324..3147a19a61a0 100644
--- a/tests/coverage/run/interpolation/test.scoverage.check
+++ b/tests/coverage/run/interpolation/test.scoverage.check
@@ -127,15 +127,15 @@ Test
 Object
 <empty>.Test
 main
-195
-199
+200
+203
 10
-List
-Ident
+<none>
+Literal
 false
 0
 false
-List
+"d"
 
 7
 interpolation/test.scala
@@ -144,15 +144,15 @@ Test
 Object
 <empty>.Test
 main
-229
-278
-11
-map
-Apply
+205
+208
+10
+<none>
+Literal
 false
 0
 false
-xs.zipWithIndex.map((s, i) => println(s"$i: $s"))
+"o"
 
 8
 interpolation/test.scala
@@ -161,17 +161,68 @@ Test
 Object
 <empty>.Test
 main
+210
+213
+10
+<none>
+Literal
+false
+0
+false
+"t"
+
+9
+interpolation/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+main
+215
+218
+10
+<none>
+Literal
+false
+0
+false
+"t"
+
+10
+interpolation/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+main
+220
+223
+10
+<none>
+Literal
+false
+0
+false
+"y"
+
+11
+interpolation/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+main
 229
-244
+278
 11
-zipWithIndex
-Select
+map
+Apply
 false
 0
 false
-xs.zipWithIndex
+xs.zipWithIndex.map((s, i) => println(s"$i: $s"))
 
-9
+12
 interpolation/test.scala
 <empty>
 Test
@@ -188,7 +239,7 @@ false
 false
 println(s"$i: $s")
 
-10
+13
 interpolation/test.scala
 <empty>
 Test
@@ -205,7 +256,7 @@ false
 false
 s"$i: $s"
 
-11
+14
 interpolation/test.scala
 <empty>
 Test
@@ -222,7 +273,7 @@ false
 false
 println(simple(1, "abc"))
 
-12
+15
 interpolation/test.scala
 <empty>
 Test
@@ -239,7 +290,7 @@ false
 false
 simple(1, "abc")
 
-13
+16
 interpolation/test.scala
 <empty>
 Test
@@ -256,7 +307,7 @@ false
 false
 println(hexa(127))
 
-14
+17
 interpolation/test.scala
 <empty>
 Test
@@ -273,7 +324,7 @@ false
 false
 hexa(127)
 
-15
+18
 interpolation/test.scala
 <empty>
 Test
@@ -290,7 +341,7 @@ false
 false
 println(raw"a\\nb")
 
-16
+19
 interpolation/test.scala
 <empty>
 Test
@@ -307,7 +358,7 @@ false
 false
 raw"a\\nb"
 
-17
+20
 interpolation/test.scala
 <empty>
 Test
diff --git a/tests/coverage/run/java-methods/test.scoverage.check b/tests/coverage/run/java-methods/test.scoverage.check
index 891af1804831..679a5b7dbff4 100644
--- a/tests/coverage/run/java-methods/test.scoverage.check
+++ b/tests/coverage/run/java-methods/test.scoverage.check
@@ -58,6 +58,23 @@ java-methods/test.scala
 test$package
 Object
 <empty>.test$package
+$anonfun
+124
+126
+6
+<none>
+Literal
+false
+0
+false
+()
+
+3
+java-methods/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
 Test
 140
 152
@@ -69,7 +86,7 @@ false
 false
 JavaObject()
 
-3
+4
 java-methods/test.scala
 <empty>
 test$package
@@ -86,7 +103,7 @@ false
 false
 obj.f()
 
-4
+5
 java-methods/test.scala
 <empty>
 test$package
@@ -103,7 +120,7 @@ false
 false
 println(obj.identity[Int](0))
 
-5
+6
 java-methods/test.scala
 <empty>
 test$package
@@ -120,7 +137,7 @@ false
 false
 obj.identity[Int](0)
 
-6
+7
 java-methods/test.scala
 <empty>
 test$package
@@ -137,7 +154,7 @@ false
 false
 println("ok!")
 
-7
+8
 java-methods/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/lifting-bool/test.scoverage.check b/tests/coverage/run/lifting-bool/test.scoverage.check
index 5eb3d864939f..7ed81d8b535c 100644
--- a/tests/coverage/run/lifting-bool/test.scoverage.check
+++ b/tests/coverage/run/lifting-bool/test.scoverage.check
@@ -76,6 +76,40 @@ test$package
 Object
 <empty>.test$package
 Test
+101
+120
+8
+||
+Apply
+false
+0
+false
+true || notCalled()
+
+4
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+101
+105
+8
+<none>
+Literal
+false
+0
+false
+true
+
+5
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
 109
 120
 8
@@ -86,7 +120,41 @@ false
 false
 notCalled()
 
-4
+6
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+150
+170
+9
+&&
+Apply
+false
+0
+false
+false && notCalled()
+
+7
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+150
+155
+9
+<none>
+Literal
+false
+0
+false
+false
+
+8
 lifting-bool/test.scala
 <empty>
 test$package
@@ -103,7 +171,41 @@ false
 false
 notCalled()
 
-5
+9
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+200
+230
+10
+||
+Apply
+false
+0
+false
+(true || false) || notCalled()
+
+10
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+201
+205
+10
+<none>
+Literal
+false
+0
+false
+true
+
+11
 lifting-bool/test.scala
 <empty>
 test$package
@@ -120,7 +222,75 @@ false
 false
 notCalled()
 
-6
+12
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+249
+278
+11
+&&
+Apply
+false
+0
+false
+true && (false && notCalled()
+
+13
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+249
+253
+11
+<none>
+Literal
+false
+0
+false
+true
+
+14
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+258
+278
+11
+&&
+Apply
+false
+0
+false
+false && notCalled()
+
+15
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+258
+263
+11
+<none>
+Literal
+false
+0
+false
+false
+
+16
 lifting-bool/test.scala
 <empty>
 test$package
@@ -137,7 +307,41 @@ false
 false
 notCalled()
 
-7
+17
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+299
+329
+12
+&&
+Apply
+false
+0
+false
+(true && false) && notCalled()
+
+18
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+300
+304
+12
+<none>
+Literal
+false
+0
+false
+true
+
+19
 lifting-bool/test.scala
 <empty>
 test$package
@@ -154,7 +358,7 @@ false
 false
 notCalled()
 
-8
+20
 lifting-bool/test.scala
 <empty>
 test$package
@@ -171,7 +375,7 @@ false
 false
 println(s"$a $b $c $d $e")
 
-9
+21
 lifting-bool/test.scala
 <empty>
 test$package
@@ -188,7 +392,7 @@ false
 false
 s"$a $b $c $d $e"
 
-10
+22
 lifting-bool/test.scala
 <empty>
 test$package
@@ -205,7 +409,7 @@ false
 false
 f(true, false)
 
-11
+23
 lifting-bool/test.scala
 <empty>
 test$package
@@ -222,7 +426,7 @@ false
 false
 println(x)
 
-12
+24
 lifting-bool/test.scala
 <empty>
 test$package
@@ -239,7 +443,41 @@ false
 false
 f(true || notCalled(), false && notCalled())
 
-13
+25
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+424
+443
+18
+||
+Apply
+false
+0
+false
+true || notCalled()
+
+26
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+424
+428
+18
+<none>
+Literal
+false
+0
+false
+true
+
+27
 lifting-bool/test.scala
 <empty>
 test$package
@@ -256,7 +494,41 @@ false
 false
 notCalled()
 
-14
+28
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+445
+465
+18
+&&
+Apply
+false
+0
+false
+false && notCalled()
+
+29
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+445
+450
+18
+<none>
+Literal
+false
+0
+false
+false
+
+30
 lifting-bool/test.scala
 <empty>
 test$package
@@ -273,7 +545,7 @@ false
 false
 notCalled()
 
-15
+31
 lifting-bool/test.scala
 <empty>
 test$package
@@ -290,7 +562,7 @@ false
 false
 println(x)
 
-16
+32
 lifting-bool/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/lifting/test.scoverage.check b/tests/coverage/run/lifting/test.scoverage.check
index 206fc7dfadda..f876ba013f46 100644
--- a/tests/coverage/run/lifting/test.scoverage.check
+++ b/tests/coverage/run/lifting/test.scoverage.check
@@ -42,15 +42,15 @@ Vals
 Class
 <empty>.Vals
 <init>
-22
-26
+27
+28
 2
-List
-Ident
+<none>
+Literal
 false
 0
 false
-List
+1
 
 2
 lifting/test.scala
@@ -76,15 +76,15 @@ Vals
 Class
 <empty>.Vals
 <init>
-46
-57
+51
+52
 3
-apply
-Apply
+<none>
+Literal
 false
 0
 false
-List(1,2,3)
+1
 
 4
 lifting/test.scala
@@ -93,32 +93,32 @@ Vals
 Class
 <empty>.Vals
 <init>
-46
-50
+53
+54
 3
-List
-Ident
+<none>
+Literal
 false
 0
 false
-List
+2
 
 5
 lifting/test.scala
 <empty>
-A
+Vals
 Class
-<empty>.A
-msg
-104
-136
-6
-+
-Apply
+<empty>.Vals
+<init>
+55
+56
+3
+<none>
+Literal
 false
 0
 false
-"string" + a + "." + b + "." + c
+3
 
 6
 lifting/test.scala
@@ -128,14 +128,14 @@ Class
 <empty>.A
 msg
 104
-132
+136
 6
 +
 Apply
 false
 0
 false
-"string" + a + "." + b + "."
+"string" + a + "." + b + "." + c
 
 7
 lifting/test.scala
@@ -145,14 +145,14 @@ Class
 <empty>.A
 msg
 104
-126
+112
 6
-+
-Apply
+<none>
+Literal
 false
 0
 false
-"string" + a + "." + b
+"string"
 
 8
 lifting/test.scala
@@ -161,15 +161,15 @@ A
 Class
 <empty>.A
 msg
-104
-122
+70
+77
 6
-+
-Apply
+msg
+DefDef
 false
 0
 false
-"string" + a + "."
+def msg
 
 9
 lifting/test.scala
@@ -177,35 +177,18 @@ lifting/test.scala
 A
 Class
 <empty>.A
-msg
-104
-116
-6
-+
-Apply
+integer
+158
+159
+7
+<none>
+Literal
 false
 0
 false
-"string" + a
-
-10
-lifting/test.scala
-<empty>
-A
-Class
-<empty>.A
-msg
-70
-77
-6
-msg
-DefDef
-false
 0
-false
-def msg
 
-11
+10
 lifting/test.scala
 <empty>
 A
@@ -222,7 +205,7 @@ false
 false
 def integer
 
-12
+11
 lifting/test.scala
 <empty>
 A
@@ -239,7 +222,7 @@ false
 false
 def ex
 
-13
+12
 lifting/test.scala
 <empty>
 test$package
@@ -256,7 +239,41 @@ false
 false
 A()
 
+13
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+235
+238
+13
+<none>
+Literal
+false
+0
+false
+123
+
+14
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+f
+251
+253
 14
+<none>
+Literal
+false
+0
+false
+-1
+
+15
 lifting/test.scala
 <empty>
 test$package
@@ -273,7 +290,7 @@ false
 false
 def f
 
-15
+16
 lifting/test.scala
 <empty>
 test$package
@@ -290,7 +307,24 @@ false
 false
 a.msg(i, 0, a.integer)
 
-16
+17
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+273
+274
+15
+<none>
+Literal
+false
+0
+false
+0
+
+18
 lifting/test.scala
 <empty>
 test$package
@@ -307,7 +341,7 @@ false
 false
 a.integer
 
-17
+19
 lifting/test.scala
 <empty>
 test$package
@@ -324,7 +358,7 @@ false
 false
 println(x)
 
-18
+20
 lifting/test.scala
 <empty>
 test$package
@@ -341,24 +375,24 @@ false
 false
 a.ex.msg(i, 0, a.ex.integer)
 
-19
+21
 lifting/test.scala
 <empty>
 test$package
 Object
 <empty>.test$package
 Test
-306
-310
+318
+319
 17
-ex
-Select
+<none>
+Literal
 false
 0
 false
-a.ex
+0
 
-20
+22
 lifting/test.scala
 <empty>
 test$package
@@ -375,7 +409,7 @@ false
 false
 a.ex
 
-21
+23
 lifting/test.scala
 <empty>
 test$package
@@ -392,7 +426,7 @@ false
 false
 a.ex.integer
 
-22
+24
 lifting/test.scala
 <empty>
 test$package
@@ -409,7 +443,7 @@ false
 false
 println(x)
 
-23
+25
 lifting/test.scala
 <empty>
 test$package
@@ -426,7 +460,7 @@ false
 false
 a.msg(f(), 0, i)
 
-24
+26
 lifting/test.scala
 <empty>
 test$package
@@ -443,7 +477,24 @@ false
 false
 f()
 
-25
+27
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+365
+366
+19
+<none>
+Literal
+false
+0
+false
+0
+
+28
 lifting/test.scala
 <empty>
 test$package
@@ -460,7 +511,7 @@ false
 false
 println(x)
 
-26
+29
 lifting/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/macro-suspend/test.scoverage.check b/tests/coverage/run/macro-suspend/test.scoverage.check
index 759897eb7747..4cae5a319598 100644
--- a/tests/coverage/run/macro-suspend/test.scoverage.check
+++ b/tests/coverage/run/macro-suspend/test.scoverage.check
@@ -76,6 +76,23 @@ Greeting
 Object
 <empty>.Greeting
 greet
+252
+259
+8
+<none>
+Literal
+false
+0
+false
+"hello"
+
+4
+macro-suspend/Macro.scala
+<empty>
+Greeting
+Object
+<empty>.Greeting
+greet
 238
 247
 8
@@ -86,7 +103,7 @@ false
 false
 def greet
 
-4
+5
 macro-suspend/Test.scala
 <empty>
 Test
@@ -103,23 +120,6 @@ false
 false
 println(Macro.decorate(Greeting.greet()))
 
-5
-macro-suspend/Test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-65
-97
-3
-+
-Apply
-false
-0
-false
-Macro.decorate(Greeting.greet())
-
 6
 macro-suspend/Test.scala
 <empty>
@@ -127,40 +127,6 @@ Test
 Object
 <empty>.Test
 main
-65
-97
-3
-+
-Apply
-false
-0
-false
-Macro.decorate(Greeting.greet())
-
-7
-macro-suspend/Test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-80
-96
-3
-greet
-Apply
-false
-0
-false
-Greeting.greet()
-
-8
-macro-suspend/Test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
 15
 23
 2
diff --git a/tests/coverage/run/parameterless/test.scoverage.check b/tests/coverage/run/parameterless/test.scoverage.check
index 5050180e7886..b792ce9c73ea 100644
--- a/tests/coverage/run/parameterless/test.scoverage.check
+++ b/tests/coverage/run/parameterless/test.scoverage.check
@@ -42,6 +42,23 @@ O
 Object
 <empty>.O
 f
+51
+60
+4
+<none>
+Literal
+false
+0
+false
+"O.f_res"
+
+2
+parameterless/test.scala
+<empty>
+O
+Object
+<empty>.O
+f
 12
 17
 2
@@ -52,7 +69,7 @@ false
 false
 def f
 
-2
+3
 parameterless/test.scala
 <empty>
 O
@@ -69,7 +86,24 @@ false
 false
 println("O.g")
 
-3
+4
+parameterless/test.scala
+<empty>
+O
+Object
+<empty>.O
+g
+106
+115
+8
+<none>
+Literal
+false
+0
+false
+"O.g_res"
+
+5
 parameterless/test.scala
 <empty>
 O
@@ -86,7 +120,7 @@ false
 false
 def g
 
-4
+6
 parameterless/test.scala
 <empty>
 test$package
@@ -103,7 +137,24 @@ false
 false
 println("f")
 
-5
+7
+parameterless/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+f
+179
+186
+14
+<none>
+Literal
+false
+0
+false
+"f_res"
+
+8
 parameterless/test.scala
 <empty>
 test$package
@@ -120,7 +171,7 @@ false
 false
 def f
 
-6
+9
 parameterless/test.scala
 <empty>
 test$package
@@ -137,7 +188,24 @@ false
 false
 println("g")
 
-7
+10
+parameterless/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+g
+230
+237
+18
+<none>
+Literal
+false
+0
+false
+"g_res"
+
+11
 parameterless/test.scala
 <empty>
 test$package
@@ -154,7 +222,7 @@ false
 false
 def g
 
-8
+12
 parameterless/test.scala
 <empty>
 test$package
@@ -171,7 +239,7 @@ false
 false
 f
 
-9
+13
 parameterless/test.scala
 <empty>
 test$package
@@ -188,7 +256,7 @@ false
 false
 g
 
-10
+14
 parameterless/test.scala
 <empty>
 test$package
@@ -205,24 +273,7 @@ false
 false
 println(f)
 
-11
-parameterless/test.scala
-<empty>
-test$package
-Object
-<empty>.test$package
-Test
-273
-274
-22
-f
-Ident
-false
-0
-false
-f
-
-12
+15
 parameterless/test.scala
 <empty>
 test$package
@@ -239,7 +290,7 @@ false
 false
 println(g)
 
-13
+16
 parameterless/test.scala
 <empty>
 test$package
@@ -256,7 +307,7 @@ false
 false
 g
 
-14
+17
 parameterless/test.scala
 <empty>
 test$package
@@ -273,7 +324,7 @@ false
 false
 println(O.f)
 
-15
+18
 parameterless/test.scala
 <empty>
 test$package
@@ -290,7 +341,7 @@ false
 false
 O.f
 
-16
+19
 parameterless/test.scala
 <empty>
 test$package
@@ -307,7 +358,7 @@ false
 false
 println(O.g)
 
-17
+20
 parameterless/test.scala
 <empty>
 test$package
@@ -324,7 +375,7 @@ false
 false
 O.g
 
-18
+21
 parameterless/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/trait/test.scoverage.check b/tests/coverage/run/trait/test.scoverage.check
index 19a88ebc7f6f..1f921a3bfae8 100644
--- a/tests/coverage/run/trait/test.scoverage.check
+++ b/tests/coverage/run/trait/test.scoverage.check
@@ -25,6 +25,23 @@ T1
 Trait
 <empty>.T1
 x
+20
+21
+2
+<none>
+Literal
+false
+0
+false
+0
+
+1
+trait/test.scala
+<empty>
+T1
+Trait
+<empty>.T1
+x
 12
 17
 2
@@ -35,7 +52,24 @@ false
 false
 def x
 
-1
+2
+trait/test.scala
+<empty>
+Impl2
+Class
+<empty>.Impl2
+<init>
+94
+100
+7
+<none>
+Literal
+false
+0
+false
+"test"
+
+3
 trait/test.scala
 <empty>
 Impl3
@@ -52,7 +86,7 @@ false
 false
 Impl2()
 
-2
+4
 trait/test.scala
 <empty>
 test$package
@@ -69,7 +103,7 @@ false
 false
 println(Impl1().x)
 
-3
+5
 trait/test.scala
 <empty>
 test$package
@@ -86,7 +120,7 @@ false
 false
 Impl1()
 
-4
+6
 trait/test.scala
 <empty>
 test$package
@@ -103,7 +137,7 @@ false
 false
 Impl1().x
 
-5
+7
 trait/test.scala
 <empty>
 test$package
@@ -120,7 +154,7 @@ false
 false
 println(Impl2().p)
 
-6
+8
 trait/test.scala
 <empty>
 test$package
@@ -137,7 +171,7 @@ false
 false
 Impl2()
 
-7
+9
 trait/test.scala
 <empty>
 test$package
@@ -154,7 +188,7 @@ false
 false
 println(Impl3().p)
 
-8
+10
 trait/test.scala
 <empty>
 test$package
@@ -171,7 +205,7 @@ false
 false
 Impl3()
 
-9
+11
 trait/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/type-apply/test.measurement.check b/tests/coverage/run/type-apply/test.measurement.check
index f0382d7405be..e199fee6b817 100644
--- a/tests/coverage/run/type-apply/test.measurement.check
+++ b/tests/coverage/run/type-apply/test.measurement.check
@@ -1,7 +1,7 @@
 6
 1
-3
 2
-5
+3
 4
+5
 0
diff --git a/tests/coverage/run/type-apply/test.scoverage.check b/tests/coverage/run/type-apply/test.scoverage.check
index 3ad1944563a3..c20e88c0351d 100644
--- a/tests/coverage/run/type-apply/test.scoverage.check
+++ b/tests/coverage/run/type-apply/test.scoverage.check
@@ -59,15 +59,15 @@ test$package
 Object
 <empty>.test$package
 Test
-171
-182
+176
+177
 5
-apply
-Apply
+<none>
+Literal
 false
 0
 false
-List(1,2,3)
+1
 
 3
 type-apply/test.scala
@@ -76,15 +76,15 @@ test$package
 Object
 <empty>.test$package
 Test
-171
-175
+178
+179
 5
-List
-Ident
+<none>
+Literal
 false
 0
 false
-List
+2
 
 4
 type-apply/test.scala
@@ -92,16 +92,16 @@ type-apply/test.scala
 test$package
 Object
 <empty>.test$package
-$anonfun
-192
-199
+Test
+180
+181
 5
-apply
-Apply
+<none>
+Literal
 false
 0
 false
-List(a)
+3
 
 5
 type-apply/test.scala
@@ -111,14 +111,14 @@ Object
 <empty>.test$package
 $anonfun
 192
-196
+199
 5
-List
-Ident
+apply
+Apply
 false
 0
 false
-List
+List(a)
 
 6
 type-apply/test.scala
diff --git a/tests/coverage/run/varargs/test.scoverage.check b/tests/coverage/run/varargs/test.scoverage.check
index 3c31f9388409..024156dcfeb6 100644
--- a/tests/coverage/run/varargs/test.scoverage.check
+++ b/tests/coverage/run/varargs/test.scoverage.check
@@ -25,6 +25,23 @@ test_1$package
 Object
 <empty>.test_1$package
 repeated
+75
+77
+4
+<none>
+Literal
+false
+0
+false
+()
+
+1
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+repeated
 48
 60
 4
@@ -35,7 +52,7 @@ false
 false
 def repeated
 
-1
+2
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -52,7 +69,7 @@ false
 false
 def f
 
-2
+3
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -69,7 +86,7 @@ false
 false
 repeated()
 
-3
+4
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -86,7 +103,7 @@ false
 false
 repeated(f(""), "b")
 
-4
+5
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -103,7 +120,24 @@ false
 false
 f("")
 
-5
+6
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+149
+152
+11
+<none>
+Literal
+false
+0
+false
+"b"
+
+7
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -120,7 +154,7 @@ false
 false
 JavaVarargs_1.method()
 
-6
+8
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -137,7 +171,24 @@ false
 false
 JavaVarargs_1.method("")
 
-7
+9
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+202
+204
+13
+<none>
+Literal
+false
+0
+false
+""
+
+10
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -154,7 +205,24 @@ false
 false
 JavaVarargs_1.multiple("first")
 
-8
+11
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+240
+247
+15
+<none>
+Literal
+false
+0
+false
+"first"
+
+12
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -171,7 +239,7 @@ false
 false
 println(m)
 
-9
+13
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -188,7 +256,7 @@ false
 false
 JavaVarargs_1.multiple(f("first"))
 
-10
+14
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -205,7 +273,7 @@ false
 false
 f("first")
 
-11
+15
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -222,7 +290,7 @@ false
 false
 println(m)
 
-12
+16
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -239,7 +307,7 @@ false
 false
 JavaVarargs_1.multiple(f("first"), "a", "b", "c")
 
-13
+17
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -256,7 +324,58 @@ false
 false
 f("first")
 
-14
+18
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+357
+360
+19
+<none>
+Literal
+false
+0
+false
+"a"
+
+19
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+362
+365
+19
+<none>
+Literal
+false
+0
+false
+"b"
+
+20
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+367
+370
+19
+<none>
+Literal
+false
+0
+false
+"c"
+
+21
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -273,7 +392,7 @@ false
 false
 println(m)
 
-15
+22
 varargs/test_1.scala
 <empty>
 test_1$package

From c22d7fb2d352b0a0286dd94d7186917b352be7ca Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 17 Sep 2025 14:42:04 +0200
Subject: [PATCH 501/505] Revert "Merge pull request #275 from
 scala/backport-lts-3.3-22604"

This reverts commit 91aacdb7505fa9e78a8e4d8a38194868f9fea3d4, reversing
changes made to cc130d4917a985b0f35920f8f1677686cb3c47b7.
---
 .../tools/backend/jvm/BCodeSkelBuilder.scala  |  2 +-
 .../src/dotty/tools/dotc/core/Comments.scala  | 13 +++--
 .../tools/dotc/transform/patmat/Space.scala   |  6 ++-
 .../dotty/tools/dotc/typer/Implicits.scala    | 47 +++++++++----------
 .../tools/scripting/BashExitCodeTests.scala   |  3 --
 library/src/scala/annotation/newMain.scala    |  1 -
 .../dotty/tools/scaladoc/site/templates.scala |  8 ++--
 tests/pos/switches.scala                      |  1 -
 tests/{warn => pos}/t10373.scala              |  4 +-
 tests/warn/i15662.scala                       |  1 -
 tests/warn/i21218.scala                       |  1 -
 tests/warn/i22590.arity2.scala                | 15 ------
 tests/warn/i22590.scala                       |  9 ----
 tests/warn/opaque-match.scala                 |  2 -
 14 files changed, 45 insertions(+), 68 deletions(-)
 rename tests/{warn => pos}/t10373.scala (74%)
 delete mode 100644 tests/warn/i22590.arity2.scala
 delete mode 100644 tests/warn/i22590.scala

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
index 437a34a53902..955597261327 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
@@ -169,7 +169,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
 
     /* ---------------- helper utils for generating classes and fields ---------------- */
 
-    def genPlainClass(cd0: TypeDef) = (cd0: @unchecked) match {
+    def genPlainClass(cd0: TypeDef) = cd0 match {
       case TypeDef(_, impl: Template) =>
       assert(cnode == null, "GenBCode detected nested methods.")
 
diff --git a/compiler/src/dotty/tools/dotc/core/Comments.scala b/compiler/src/dotty/tools/dotc/core/Comments.scala
index b1d1e387c2cf..92160c97973d 100644
--- a/compiler/src/dotty/tools/dotc/core/Comments.scala
+++ b/compiler/src/dotty/tools/dotc/core/Comments.scala
@@ -405,10 +405,15 @@ object Comments {
       val Trim = "(?s)^[\\s&&[^\n\r]]*(.*?)\\s*$".r
 
       val raw = ctx.docCtx.flatMap(_.docstring(sym).map(_.raw)).getOrElse("")
-      defs(sym) ++= defines(raw).map { str =>
-        val start = skipWhitespace(str, "@define".length)
-        val (key, Trim(value)) = str.splitAt(skipVariable(str, start)): @unchecked
-        variableName(key.drop(start)) -> value.replaceAll("\\s+\\*+$", "")
+      defs(sym) ++= defines(raw).map {
+        str => {
+          val start = skipWhitespace(str, "@define".length)
+          val (key, value) = str.splitAt(skipVariable(str, start))
+          key.drop(start) -> value
+        }
+      } map {
+        case (key, Trim(value)) =>
+          variableName(key) -> value.replaceAll("\\s+\\*+$", "")
       }
     }
 
diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index 0dfa73035099..def5eaec708e 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -801,6 +801,7 @@ object SpaceEngine {
   }
 
   private def exhaustivityCheckable(sel: Tree)(using Context): Boolean = {
+    val seen = collection.mutable.Set.empty[Symbol]
 
     // Possible to check everything, but be compatible with scalac by default
     def isCheckable(tp: Type): Boolean =
@@ -815,7 +816,10 @@ object SpaceEngine {
       }) ||
       tpw.isRef(defn.BooleanClass) ||
       classSym.isAllOf(JavaEnumTrait) ||
-      classSym.is(Case)
+      classSym.is(Case) && {
+        if seen.add(classSym) then productSelectorTypes(tpw, sel.srcPos).exists(isCheckable(_))
+        else true // recursive case class: return true and other members can still fail the check
+      }
 
     !sel.tpe.hasAnnotation(defn.UncheckedAnnot)
     && {
diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
index 063513f1c295..50a7686c3db3 100644
--- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
@@ -1294,30 +1294,29 @@ trait Implicits:
             if alt1.isExtension then
               // Fall back: if both results are extension method applications,
               // compare the extension methods instead of their wrappers.
-              def stripExtension(alt: SearchSuccess) =
-                methPart(stripApply(alt.tree)).tpe: @unchecked match { case ref: TermRef => ref }
-              val ref1 = stripExtension(alt1)
-              val ref2 = stripExtension(alt2)
-              // ref1 and ref2 might refer to type variables owned by
-              // alt1.tstate and alt2.tstate respectively, to compare the
-              // alternatives correctly we need a TyperState that includes
-              // constraints from both sides, see
-              // tests/*/extension-specificity2.scala for test cases.
-              val constraintsIn1 = alt1.tstate.constraint ne ctx.typerState.constraint
-              val constraintsIn2 = alt2.tstate.constraint ne ctx.typerState.constraint
-              def exploreState(alt: SearchSuccess): TyperState =
-                alt.tstate.fresh(committable = false)
-              val comparisonState =
-                if constraintsIn1 && constraintsIn2 then
-                  exploreState(alt1).mergeConstraintWith(alt2.tstate)
-                else if constraintsIn1 then
-                  exploreState(alt1)
-                else if constraintsIn2 then
-                  exploreState(alt2)
-                else
-                  ctx.typerState
-
-              diff = inContext(ctx.withTyperState(comparisonState)):
+              def stripExtension(alt: SearchSuccess) = methPart(stripApply(alt.tree)).tpe
+              (stripExtension(alt1), stripExtension(alt2)) match
+                case (ref1: TermRef, ref2: TermRef) =>
+                  // ref1 and ref2 might refer to type variables owned by
+                  // alt1.tstate and alt2.tstate respectively, to compare the
+                  // alternatives correctly we need a TyperState that includes
+                  // constraints from both sides, see
+                  // tests/*/extension-specificity2.scala for test cases.
+                  val constraintsIn1 = alt1.tstate.constraint ne ctx.typerState.constraint
+                  val constraintsIn2 = alt2.tstate.constraint ne ctx.typerState.constraint
+                  def exploreState(alt: SearchSuccess): TyperState =
+                    alt.tstate.fresh(committable = false)
+                  val comparisonState =
+                    if constraintsIn1 && constraintsIn2 then
+                      exploreState(alt1).mergeConstraintWith(alt2.tstate)
+                    else if constraintsIn1 then
+                      exploreState(alt1)
+                    else if constraintsIn2 then
+                      exploreState(alt2)
+                    else
+                      ctx.typerState
+
+                  diff = inContext(ctx.withTyperState(comparisonState)):
                     compare(ref1, ref2)
             else // alt1 is a conversion, prefer extension alt2 over it
               diff = -1
diff --git a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
index 3aad9ef8813f..f2e64b5fad62 100644
--- a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
+++ b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala
@@ -62,9 +62,6 @@ class BashExitCodeTests:
   @Test def xPluginList   = scala("-Xplugin-list")(0)
   @Test def vPhases       = scala("-Vphases")(0)
 
-  @Test def replEval      =
-    scala("--repl-quit-after-init", "--repl-init-script", "'val i = 2 * 2; val j = i + 2'")(0)
-
   /** A utility for running two commands in a row, like you do in bash. */
   extension (inline u1: Unit) inline def & (inline u2: Unit): Unit = { u1; u2 }
 end BashExitCodeTests
diff --git a/library/src/scala/annotation/newMain.scala b/library/src/scala/annotation/newMain.scala
index 686f3bf14b54..552e4225a648 100644
--- a/library/src/scala/annotation/newMain.scala
+++ b/library/src/scala/annotation/newMain.scala
@@ -253,7 +253,6 @@ final class newMain extends MainAnnotation[FromString, Any]:
             case (arg +: t, "") => recurse(t, arg, acc)
             case (arg +: t, l) if l.length + 1 + arg.length <= maxLength => recurse(t, s"$l $arg", acc)
             case (arg +: t, l) => recurse(t, arg, acc :+ l)
-            case (_, _) => acc
           }
 
         recurse(argsUsage, "", Vector()).toList
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
index 56a0f7f6d6b6..92e0096e5af1 100644
--- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
@@ -102,9 +102,11 @@ case class TemplateFile(
       ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}"))
     )
 
-    def asJavaElement(o: Any): Any = o match
-      case m: Map[?, ?] => m.transform { (k, v) => asJavaElement(v) }.asJava
-      case l: List[?] => l.map(asJavaElement).asJava
+    def asJavaElement(o: Object): Object = o match
+      case m: Map[_, _] => m.transform {
+        case (k: String, v: Object) => asJavaElement(v)
+      }.asJava
+      case l: List[_] => l.map(x => asJavaElement(x.asInstanceOf[Object])).asJava
       case other => other
 
     // Library requires mutable maps..
diff --git a/tests/pos/switches.scala b/tests/pos/switches.scala
index beb378debb40..bd7e44f1c8cf 100644
--- a/tests/pos/switches.scala
+++ b/tests/pos/switches.scala
@@ -42,7 +42,6 @@ class Test {
     case IntAnyVal(100) => 2
     case IntAnyVal(1000) => 3
     case IntAnyVal(10000) => 4
-    case _ => -1
   }
 }
 
diff --git a/tests/warn/t10373.scala b/tests/pos/t10373.scala
similarity index 74%
rename from tests/warn/t10373.scala
rename to tests/pos/t10373.scala
index ca49e7b1ce16..0d91313f694d 100644
--- a/tests/warn/t10373.scala
+++ b/tests/pos/t10373.scala
@@ -1,4 +1,4 @@
-//> using options -deprecation -feature
+//> using options -Xfatal-warnings -deprecation -feature
 
 abstract class Foo {
   def bar(): Unit = this match {
@@ -7,7 +7,7 @@ abstract class Foo {
                     // Works fine
   }
 
-  def baz(that: Foo): Unit = (this, that) match { // warn: match may not be exhaustive.
+  def baz(that: Foo): Unit = (this, that) match {
     case (Foo_1(), _) => //do something
     case (Foo_2(), _) => //do something
                          // match may not be exhaustive
diff --git a/tests/warn/i15662.scala b/tests/warn/i15662.scala
index f17a040b4980..0cf0e57ed0c3 100644
--- a/tests/warn/i15662.scala
+++ b/tests/warn/i15662.scala
@@ -5,7 +5,6 @@ case class Composite[T](v: T)
 def m(composite: Composite[?]): Unit =
   composite match {
     case Composite[Int](v) => println(v)  // warn: cannot be checked at runtime
-    case _ => println("OTHER")
   }
 
 def m2(composite: Composite[?]): Unit =
diff --git a/tests/warn/i21218.scala b/tests/warn/i21218.scala
index db0810c5d7b0..29fa957e2e70 100644
--- a/tests/warn/i21218.scala
+++ b/tests/warn/i21218.scala
@@ -6,6 +6,5 @@ def Test[U, A](thisElem: A, thatElem: U) = {
       case (`passedEnd`, r: U @unchecked) => (thisElem, r)
       case (l: A @unchecked, `passedEnd`) => (l, thatElem)
       case t: (A, U) @unchecked           => t // false-positive warning
-      case (t1, t2) => (t1, t2)
     }
 }
diff --git a/tests/warn/i22590.arity2.scala b/tests/warn/i22590.arity2.scala
deleted file mode 100644
index 8ce84ab299f1..000000000000
--- a/tests/warn/i22590.arity2.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-sealed trait T_B
-case class CC_A() extends T_B
-case class CC_C() extends T_B
-
-sealed trait T_A
-case class CC_B[B](a: B,b:T_B) extends T_A
-
-
-@main def test() = {
-  val v_a: CC_B[Int] = null
-  val v_b: Int = v_a match { // warn: match may not be exhaustive.
-    case CC_B(12, CC_A()) => 0
-    case CC_B(_, CC_C()) => 0
-  }
-}
diff --git a/tests/warn/i22590.scala b/tests/warn/i22590.scala
deleted file mode 100644
index 1520a07b86b8..000000000000
--- a/tests/warn/i22590.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-sealed trait T_A
-case class CC_B[T](a: T) extends T_A
-
-@main def test() = {
-  val v_a: CC_B[Int] = CC_B(10)
-  val v_b: Int = v_a match{ // warn: match may not be exhaustive.
-    case CC_B(12) => 0
-  }
-}
diff --git a/tests/warn/opaque-match.scala b/tests/warn/opaque-match.scala
index f66370def9b2..06cca835ab91 100644
--- a/tests/warn/opaque-match.scala
+++ b/tests/warn/opaque-match.scala
@@ -13,10 +13,8 @@ def Test[T] =
     case _: C => ???   // ok
   C() match
     case _: O.T => ???  // warn
-    case _ => ???
   C() match
     case _: T => ???   // warn
-    case _ => ???
 
   (??? : Any) match
     case _: List[O.T] => ???  // warn

From ecb6475cd31d1108f3c7ee0e4012d8889c69bd71 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 24 Sep 2025 19:10:49 +0200
Subject: [PATCH 502/505] Add release notes for Scala 3.3.7-RC2

---
 changelogs/3.3.7-RC2.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 changelogs/3.3.7-RC2.md

diff --git a/changelogs/3.3.7-RC2.md b/changelogs/3.3.7-RC2.md
new file mode 100644
index 000000000000..dcee5f9ab7bd
--- /dev/null
+++ b/changelogs/3.3.7-RC2.md
@@ -0,0 +1,19 @@
+# Backported fixes
+
+- Backport: Make coverage more similar to the one in Scala 2 [#23955](https://github.com/scala/scala3/pull/23955)
+- Backport: latest Scala Presentation Improvements to 3.3.7 [#23945](https://github.com/scala/scala3/pull/23945). This includes [X-Ray Inlay Hints](https://github.com/scala/scala3/pull/23891), [using completions](https://github.com/scala/scala3/pull/23647), [do not add \[\] after `derives`](https://github.com/scala/scala3/pull/23811).
+- Revert: "Check exhaustivity of any case class" to 3.3 LTS [#23943](https://github.com/scala/scala3/pull/23943)
+
+# Contributors
+
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.3.7-RC1..3.3.7-RC2` these are:
+
+```
+     2  Tomasz Godzik
+     1  Jan Chyb
+     1  Vadim Chelyshov
+     1  Zieliński Patryk
+     1  vder
+```
\ No newline at end of file

From 1c6ee2fdbe5d523e80cc6122fd6a4b088d5ecb94 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 24 Sep 2025 19:12:15 +0200
Subject: [PATCH 503/505] chore: Update version to 3.3.7-RC2

---
 project/Build.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index 32651ce13ab9..805bf563b45f 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -107,7 +107,7 @@ object Build {
    *  During release candidate cycle incremented by the release officer before publishing a subsequent RC version;
    *  During final, stable release is set exactly to `developedVersion`.
   */
-  val baseVersion = s"$developedVersion-RC1"
+  val baseVersion = s"$developedVersion-RC2"
 
   /** The version of TASTY that should be emitted, checked in runtime test
    *  For defails on how TASTY version should be set see related discussions:

From ab5a0074f2c48208d6492db2ebda32ec65e17260 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Thu, 25 Sep 2025 14:22:45 +0200
Subject: [PATCH 504/505] bugfix: Fix issue with JDK 8 compatibility in
 mtagsShared

This got introduced, because we no longer check in Scala Next. I added an additional check in metals to make sure this doesn't happen anymore.
---
 project/Build.scala | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index 805bf563b45f..25bc25b53ba3 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -597,6 +597,17 @@ object Build {
     recur(lines, false)
   }
 
+  // Hotfix for JDK 8
+  def replaceJDK11APIs(lines: List[String], file: File): List[String] = {
+    if (file.getName == "InlayHints.scala") {
+      lines.map{
+        _.replace(".repeat(naiveIndent)", " * naiveIndent")
+      }
+    } else {
+      lines
+    }
+  }
+
   /** replace imports of `com.google.protobuf.*` with compiler implemented version */
   def replaceProtobuf(lines: List[String]): List[String] = {
     def recur(ls: List[String]): List[String] = ls match {
@@ -1271,7 +1282,7 @@ object Build {
           val mtagsSharedSources = (targetDir ** "*.scala").get.toSet
           mtagsSharedSources.foreach(f => {
             val lines = IO.readLines(f)
-            val substitutions = (replaceProtobuf(_)) andThen (insertUnsafeNullsImport(_))
+            val substitutions = (replaceProtobuf(_)) andThen (insertUnsafeNullsImport(_)) andThen (replaceJDK11APIs(_, f))
             IO.writeLines(f, substitutions(lines))
           })
           mtagsSharedSources

From 07335bb6431fd21eae49628be6a55c8660d06ba6 Mon Sep 17 00:00:00 2001
From: Tomasz Godzik <tgodzik@virtuslab.com>
Date: Wed, 8 Oct 2025 19:12:37 +0200
Subject: [PATCH 505/505] chore: Update baseVersion to 3.3.7 amd add release
 notes

---
 changelogs/3.3.7.md | 283 ++++++++++++++++++++++++++++++++++++++++++++
 project/Build.scala |   2 +-
 2 files changed, 284 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/3.3.7.md

diff --git a/changelogs/3.3.7.md b/changelogs/3.3.7.md
new file mode 100644
index 000000000000..87f4220ef16c
--- /dev/null
+++ b/changelogs/3.3.7.md
@@ -0,0 +1,283 @@
+# Highlights of the release
+
+- Warn a standard interpolator used toString on a reference type with `-Wtostring-interpolated` [#20578](https://github.com/scala/scala3/pull/20578)
+- Unblock Scala 3 on Android [#22632](https://github.com/scala/scala3/pull/22632)
+- Implement :jar (deprecate :require) in REPL [#22343](https://github.com/scala/scala3/pull/22343)
+- Linting rework: In selector check, prefix of reference must match import qualifier [#20894](https://github.com/scala/scala3/pull/20894)
+- Add REPL flag to quit after evaluating init script [#22636](https://github.com/scala/scala3/pull/22636)
+- Warn if implicit default shadows given with `-Wrecurse-with-default` [#23559](https://github.com/scala/scala3/pull/23559)
+
+# Other changes and fixes
+
+## Annotations
+
+- Approximate annotated types in `wildApprox` [#22893](https://github.com/scala/scala3/pull/22893)
+- Fix copy of annotation on @main methods [#22582](https://github.com/scala/scala3/pull/22582)
+
+## Coverage
+
+- Make coverage more similar to the one in Scala 2 [#23722](https://github.com/scala/scala3/pull/23722)
+
+## CI
+
+- Disable Cats flaky tests [#23007](https://github.com/scala/scala3/pull/23007)
+- Switch releasing to Sontype Central instead of legacy Sonatype OSS [#23290](https://github.com/scala/scala3/pull/23290)
+- Revert dubious retry in vulpix [#21801](https://github.com/scala/scala3/pull/21801)
+
+## Developer Experience
+
+- Add support for running the `test` sub-command with the bisect script [#22796](https://github.com/scala/scala3/pull/22796)
+
+## Documentation
+
+- Improve the usage of inclusive language [#22360](https://github.com/scala/scala3/pull/22360)
+- Update indentation.md to fix a typo [#23505](https://github.com/scala/scala3/pull/23505)
+
+## Enums
+
+- Make hashcode of enum items stable [#23218](https://github.com/scala/scala3/pull/23218)
+
+## Erasure
+
+- Add regression test for [#23616](https://github.com/scala/scala3/issues/23616) [#23623](https://github.com/scala/scala3/pull/23623)
+- Disallow context function types as value-class parameters to avoid crashes [#23015](https://github.com/scala/scala3/pull/23015)
+- Handle type aliases in contextFunctionResultTypeAfter [#21517](https://github.com/scala/scala3/pull/21517)
+- Align erasure of `Array[Nothing]` and `Array[Null]` with Scala 2 [#22517](https://github.com/scala/scala3/pull/22517)
+
+## Experimental: Erased definitions
+
+- Erased fields are not nullable [#23311](https://github.com/scala/scala3/pull/23311)
+
+## Implicits
+
+- Refine implicit search fallbacks for better ClassTag handling [#23532](https://github.com/scala/scala3/pull/23532)
+- Try extensions for arguments with type mismatch error [#23212](https://github.com/scala/scala3/pull/23212)
+
+## Inline
+
+- Fix Symbol.info remapping in TreeTypeMap [#23432](https://github.com/scala/scala3/pull/23432)
+
+## Lambda Lift
+
+- Fix: treat static vals as enclosures in lambdalift [#22452](https://github.com/scala/scala3/pull/22452)
+- Fix: record calls to constructors in lambdaLift [#22487](https://github.com/scala/scala3/pull/22487)
+
+## Linting
+
+- Check OrType in interpolated toString lint [#23365](https://github.com/scala/scala3/pull/23365)
+- Consider setter of effectively private var [#23211](https://github.com/scala/scala3/pull/23211)
+- Nowarn receiver of extension taking params [#23351](https://github.com/scala/scala3/pull/23351)
+- Dealias when looking into imports [#22889](https://github.com/scala/scala3/pull/22889)
+- Revert unconditional lint of Inlined expansion [#22815](https://github.com/scala/scala3/pull/22815)
+- Warn unused member of anonymous class [#22729](https://github.com/scala/scala3/pull/22729)
+- No warning for parameter of overriding method [#22757](https://github.com/scala/scala3/pull/22757)
+- Lazy val def member is pattern var [#22750](https://github.com/scala/scala3/pull/22750)
+- Ignore params to default arg getters [#22749](https://github.com/scala/scala3/pull/22749)
+- Restore resolving prefixes of implicit Ident [#22751](https://github.com/scala/scala3/pull/22751)
+- Exclude synthetic this.m, Any.m from import lookup [#22695](https://github.com/scala/scala3/pull/22695)
+- Nowarn public implicit val class params [#22664](https://github.com/scala/scala3/pull/22664)
+- Don't warn retainedBody [#22510](https://github.com/scala/scala3/pull/22510)
+- Suppress spurious Suppression [#22383](https://github.com/scala/scala3/pull/22383)
+- Handle Typeable [#22663](https://github.com/scala/scala3/pull/22663)
+- CheckUnused checks span.exists before testing its parts [#22504](https://github.com/scala/scala3/pull/22504)
+- Process Export for unused check [#22984](https://github.com/scala/scala3/pull/22984)
+- Enclosing package p.q not visible as q [#23069](https://github.com/scala/scala3/pull/23069)
+- Remove premature caching of lookups for unused lint [#22982](https://github.com/scala/scala3/pull/22982)
+- Improve checking LHS of Assign [#22977](https://github.com/scala/scala3/pull/22977)
+- Improve Unit ascription escape hatch [#23147](https://github.com/scala/scala3/pull/23147)
+- Mention extension in unused param warning [#23132](https://github.com/scala/scala3/pull/23132)
+- Dealias for unused param check [#23256](https://github.com/scala/scala3/pull/23256)
+- Take inferred or explicit refinement result for unused check [#23325](https://github.com/scala/scala3/pull/23325)
+- Add accessible check for import usage [#23348](https://github.com/scala/scala3/pull/23348)
+- Use result of lambda type of implicit in CheckUnused [#23497](https://github.com/scala/scala3/pull/23497)
+
+## Match Types
+
+- Handle NoType in TypeComparer.disjointnessBoundary [#21520](https://github.com/scala/scala3/pull/21520)
+- Distinguish 0.0 and -0.0 in ConstantType match types [#23265](https://github.com/scala/scala3/pull/23265)
+
+## Metaprogramming
+
+- Add a check for correct Array shape in quotes.reflect.ClassOfConstant [#22033](https://github.com/scala/scala3/pull/22033)
+
+## Opaque Types
+
+- Fix stack overflow errors when generating opaque type proxies [#22479](https://github.com/scala/scala3/pull/22479)
+
+## Optional Braces
+
+- Correctly detect colon lambda eol indent for optional brace of argument [#22477](https://github.com/scala/scala3/pull/22477)
+
+## Overloading
+
+- Fail compilation if multiple conflicting top-level private defs/vals are in the same package [#22759](https://github.com/scala/scala3/pull/22759)
+
+## Parser
+
+- Allow observing an indent after conditional [#22611](https://github.com/scala/scala3/pull/22611)
+- No outdent at eof [#22435](https://github.com/scala/scala3/pull/22435)
+- Fix annotations not expected in the middle of an array type by java parser [#22391](https://github.com/scala/scala3/pull/22391)
+- Fix incorrect warning with -no-indent [#23216](https://github.com/scala/scala3/pull/23216)
+
+## Pattern Matching
+
+- Fix issue in lazy symbol completion or bug in nested classfile parser [#23634](https://github.com/scala/scala3/pull/23634)
+- Fix existing GADT constraints with introduced pattern-bound symbols [#22928](https://github.com/scala/scala3/pull/22928)
+- Avoid crash in uninhab check in Space [#22601](https://github.com/scala/scala3/pull/22601)
+
+## Pickling
+
+- Try to handle SkolemTypes in SingletonTypeTree during pickling [#23236](https://github.com/scala/scala3/pull/23236)
+
+## Presentation Compiler
+
+- Compare span points in pathTo to determine best span [#23581](https://github.com/scala/scala3/pull/23581)
+- Fix: Fix extracting refinements from intersection types in dynamic select hovers [#23640](https://github.com/scala/scala3/pull/23640)
+- Completions for requests just before string [#22894](https://github.com/scala/scala3/pull/22894)
+- Add enum type param support in sourceSymbol [#18603](https://github.com/scala/scala3/pull/18603)
+- Use untpd.Tree instead of tpd.Tree for SelectionRangeProvider [#22702](https://github.com/scala/scala3/pull/22702)
+- Fix: handle multiple params lists in for infer type [#23197](https://github.com/scala/scala3/pull/23197)
+- Fix completion mode filtering + optimize scopeCompletions [#23172](https://github.com/scala/scala3/pull/23172)
+- Add selection ranges for more names [#23257](https://github.com/scala/scala3/pull/23257)
+- Add inlay hints for by-name parameters [#23283](https://github.com/scala/scala3/pull/23283)
+- Add jpath to VirtualFile (for pc) [#23203](https://github.com/scala/scala3/pull/23203)
+- Add X-Ray Inlay Hints [#23891](https://github.com/scala/scala3/pull/23891)
+- Add using to completions when applicable [#23647](https://github.com/scala/scala3/pull/23647)
+- Do not add \[\] after `derives` [#23811](https://github.com/scala/scala3/pull/23811)
+
+## Quotes
+
+- Fix issue with static `this` references erroring in quoted code [#22618](https://github.com/scala/scala3/pull/22618)
+- Skip splice level checking for <refinement> symbols [#22782](https://github.com/scala/scala3/pull/22782)
+- Fix stale top level synthetic package object being used in later runs [#23464](https://github.com/scala/scala3/pull/23464)
+
+## REPL
+
+- REPL: JLine 3.29.0 (was 3.27.1) [#22679](https://github.com/scala/scala3/pull/22679)
+- REPL: emit warning for the `:sh` command [#22694](https://github.com/scala/scala3/pull/22694)
+
+## Reflection
+
+- Fix regression: do not approximate prefixes when using memberType in reflect API [#22448](https://github.com/scala/scala3/pull/22448)
+- Forbid `StringConstant(null)` [#23064](https://github.com/scala/scala3/pull/23064)
+- Quotes reflect: sort the typeMembers output list and filter out non-members [#22876](https://github.com/scala/scala3/pull/22876)
+
+## Reporting
+
+- Register nowarn when inlining [#22682](https://github.com/scala/scala3/pull/22682)
+- Filter help renders box border [#22434](https://github.com/scala/scala3/pull/22434)
+- Fix incorrect warning on type ascription for backquoted identifiers [#23088](https://github.com/scala/scala3/pull/23088)
+- Add an explainer to the DoubleDefinition error [#23470](https://github.com/scala/scala3/pull/23470)
+
+## Scaladoc
+
+- Encode path of class [#23503](https://github.com/scala/scala3/pull/23503)
+
+## Settings
+
+- Chore: filter allowed source versions by import and by settings [#23215](https://github.com/scala/scala3/pull/23215)
+
+## Transform
+
+- Check only stable qual for import prefix [#22633](https://github.com/scala/scala3/pull/22633)
+- Warn trivial recursion with module prefix [#23278](https://github.com/scala/scala3/pull/23278)
+
+## Tuples
+
+- Normalize tuple types in var args seq literals and classOf instances [#23465](https://github.com/scala/scala3/pull/23465)
+
+## Typer
+
+- Generalize "Don't approximate a type using Nothing as prefix" [#23628](https://github.com/scala/scala3/pull/23628)
+- Don't approximate a type using `Nothing` as prefix [#23531](https://github.com/scala/scala3/pull/23531)
+- Tighten condition to preserve denotation in IntegrateMap [#23060](https://github.com/scala/scala3/pull/23060)
+- Disallow context bounds in type lambdas [#22659](https://github.com/scala/scala3/pull/22659)
+- Revert the PolyType case in #21744 [#22820](https://github.com/scala/scala3/pull/22820)
+- Fix isGenericArrayElement for higher-kinded types [#22938](https://github.com/scala/scala3/pull/22938)
+- Revert lambda cleanup [#22697](https://github.com/scala/scala3/pull/22697)
+- Constructor companion gets privateWithin [#22627](https://github.com/scala/scala3/pull/22627)
+- Add regression test for #22076 [#22602](https://github.com/scala/scala3/pull/22602)
+- Constructor proxy is restricted if class is protected [#22563](https://github.com/scala/scala3/pull/22563)
+- Check if a prefix is valid before selecting from a type [#22368](https://github.com/scala/scala3/pull/22368)
+- Preserve hard unions in widenSingletons [#22369](https://github.com/scala/scala3/pull/22369)
+- Revert recent changes to opaque type proxy generation [#23059](https://github.com/scala/scala3/pull/23059)
+- Compare TypeVar and TypeParamRef in mergeRefinedOrApplied [#23045](https://github.com/scala/scala3/pull/23045)
+- Only keep denotation for methods in IntegrateMap [#23226](https://github.com/scala/scala3/pull/23226)
+- Tighten condition when to do SAM type conversion [#23246](https://github.com/scala/scala3/pull/23246)
+- Revert "Make overload pruning based on result types less aggressive (#21744)" in main [#23331](https://github.com/scala/scala3/pull/23331)
+- Fix #22922: Add TypeParamRef handling in isSingletonBounded [#23501](https://github.com/scala/scala3/pull/23501)
+- Fix this references everywhere in dependent function types [#23514](https://github.com/scala/scala3/pull/23514)
+- More careful ClassTag instantiation [#23659](https://github.com/scala/scala3/pull/23659)
+- Use more context for implicit search only if no default argument [#23664](https://github.com/scala/scala3/pull/23664)
+
+## JDK
+
+- Check path of module prefix for tailrec [#23491](https://github.com/scala/scala3/pull/23491)
+
+
+# Contributors
+
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.3.6..3.3.7` these are:
+
+```
+   164  Tomasz Godzik
+    81  Som Snytt
+    27  Jan Chyb
+    25  Matt Bovel
+    23  aherlihy
+    20  kasiaMarek
+    15  Martin Odersky
+    13  Hamza Remmal
+    11  Dale Wijnand
+    11  noti0na1
+    10  Kacper Korban
+    10  Wojciech Mazur
+     8  Guillaume Martres
+     7  Zieliński Patryk
+     5  Jędrzej Rochala
+     5  Quentin Bernet
+     5  Seth Tisue
+     4  Alexander
+     4  Joel Wilsson
+     4  Katarzyna Marek
+     4  Oliver Bračevac
+     3  Natsu Kagami
+     3  Yoonjae Jeon
+     3  anna herlihy
+     2  Daisy Li
+     2  Dolphin von Chips
+     2  Mikołaj Fornal
+     2  Sébastien Doeraene
+     2  Vadim Chelyshov
+     2  rochala
+     1  Alec Theriault
+     1  Aleksey Troitskiy
+     1  Alex1005a
+     1  Daniel Thoma
+     1  Felix Herrmann
+     1  HarrisL2
+     1  Jan
+     1  Jan-Pieter van den Heuvel
+     1  Jentsch
+     1  João Ferreira
+     1  Lukas Rytz
+     1  Marc GRIS
+     1  MatthieuSLR9
+     1  Nikita Glushchenko
+     1  Niklas Fiekas
+     1  Patryk Zieliński
+     1  Piotr Chabelski
+     1  Przemysław Sajnóg
+     1  Rocco Mathijn Andela
+     1  Tomas Mikula
+     1  Yichen Xu
+     1  bingchen-li
+     1  fan-tom
+     1  katrinafyi
+     1  kijuky
+     1  philippus
+     1  philwalk
+     1  vder
+```
diff --git a/project/Build.scala b/project/Build.scala
index 25bc25b53ba3..78ced371512f 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -107,7 +107,7 @@ object Build {
    *  During release candidate cycle incremented by the release officer before publishing a subsequent RC version;
    *  During final, stable release is set exactly to `developedVersion`.
   */
-  val baseVersion = s"$developedVersion-RC2"
+  val baseVersion = s"$developedVersion"
 
   /** The version of TASTY that should be emitted, checked in runtime test
    *  For defails on how TASTY version should be set see related discussions: