Merge branch 'main' into fix-wunused-false-positive-in-for

Author: szymon-rd

compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala

@@ -60,7 +60,7 @@ class CrossStageSafety extends TreeMapWithStages {
         val healedType = healType(tree.srcPos)(tp1)
         if healedType == tree.tpe then tree
         else TypeTree(healedType).withSpan(tree.span)
-      case _: RefTree if tree.isType =>
+      case _: RefTree | _: SingletonTypeTree if tree.isType =>
         val healedType = healType(tree.srcPos)(tree.tpe)
         if healedType == tree.tpe then tree
         else TypeTree(healedType).withSpan(tree.span)

compiler/src/dotty/tools/dotc/transform/CheckUnused.scala

@@ -605,11 +605,13 @@ object CheckUnused:
           case (sel, sym) if dealias(sym) == dealiasedSym => sel
         }.headOption else None
         def wildcard = sels.find(sel => sel.isWildcard && ((sym.is(Given) == sel.isGiven) || sym.is(Implicit)))
-        if qualHasSymbol && !isAccessible && sym.exists then
+        if qualHasSymbol && (!isAccessible || sym.isRenamedSymbol(symName)) && sym.exists then
           selector.orElse(dealiasedSelector).orElse(wildcard) // selector with name or wildcard (or given)
         else
           None
 
+      private def isRenamedSymbol(symNameInScope: Option[Name])(using Context) =
+        sym.name != nme.NO_NAME && symNameInScope.exists(_.toSimpleName != sym.name.toSimpleName)
 
       private def dealias(symbol: Symbol)(using Context): Symbol =
         if(symbol.isType && symbol.asType.denot.isAliasType) then

docs/_docs/reference/changed-features/lazy-vals-init.md

@@ -4,8 +4,7 @@ title: Lazy Vals Initialization
 nightlyOf: https://docs.scala-lang.org/scala3/reference/changed-features/lazy-vals-init.html
 ---
 
-Scala 3 implements [Version 6](https://docs.scala-lang.org/sips/improved-lazy-val-initialization.html#version-6---no-synchronization-on-this-and-concurrent-initialization-of-fields)
-of the [SIP-20] improved lazy vals initialization proposal.
+Scala 3 implements Version 6 of the [SIP-20] improved lazy vals initialization proposal.
 
 ## Motivation
 
@@ -77,4 +76,4 @@ recursive lazy vals is undefined (initialization may result in a deadlock).
 
 * [SIP-20]
 
-[SIP-20]: https://docs.scala-lang.org/sips/improved-lazy-val-initialization.html
+[SIP-20]: https://github.com/scala/improvement-proposals/pull/19

docs/_docs/reference/metaprogramming/tasty-inspect.md

@@ -4,17 +4,33 @@ title: "TASTy Inspection"
 nightlyOf: https://docs.scala-lang.org/scala3/reference/metaprogramming/tasty-inspect.html
 ---
 
-```scala
-libraryDependencies += "org.scala-lang" %% "scala3-tasty-inspector" % scalaVersion.value
-```
-
 TASTy files contain the full typed tree of a class including source positions
 and documentation. This is ideal for tools that analyze or extract semantic
-information from the code. To avoid the hassle of working directly with the TASTy
+information from the code.
+
+To avoid the hassle of working directly with the TASTy
 file we provide the `Inspector` which loads the contents and exposes it
 through the TASTy reflect API.
 
-## Inspecting TASTy files
+We also showcase TASTyViz, a visualiser for tasty, useful for debugging and checking your understanding of TASTy
+
+## TASTyViz
+
+<!-- Keep synced with https://github.com/scala/docs.scala-lang/blob/main/scala3/guides/tasty-overview.md -->
+
+TASTyViz is a tool to inspect TASTy files visually.
+At the time of writing, it is still in the early stages of developement, therefore you can expect missing functionality and less-than-ideal user experience, but it could still prove useful when debugging.
+You can check it out [here](https://github.com/shardulc/tastyviz).
+
+## `Inspector`
+
+`Inspector` is a tool which provides API access to TASTy.
+
+You can add the depency to your sbt build like so:
+```scala
+libraryDependencies += "org.scala-lang" %% "scala3-tasty-inspector" % scalaVersion.value
+```
+
 
 To inspect the trees of a TASTy file a consumer can be defined in the following way.
 

docs/_docs/reference/new-types/union-types.md

@@ -4,7 +4,7 @@ title: "Union Types"
 nightlyOf: https://docs.scala-lang.org/scala3/reference/new-types/union-types.html
 ---
 
-A union type `A | B` has as values all values of type `A` and also all values of type `B`.
+A union type `A | B` includes all values of both types.
 
 
 ```scala

scaladoc/resources/dotty_res/styles/theme/layout/header.css

@@ -63,6 +63,14 @@
   align-items: center;
 }
 
+.logo-container .project-logo {
+  max-width: 40px;
+}
+
+.logo-container .project-logo img {
+  max-width: 100%;
+}
+
 #mobile-menu-toggle {
   display: none;
 }

tests/neg-custom-args/fatal-warnings/i15503i.scala

@@ -288,6 +288,7 @@ package foo.test.i17156:
     import b.Xd
     trait Z derives Xd
 
+
 package foo.test.i17175:
   val continue = true
   def foo =
@@ -296,4 +297,18 @@ package foo.test.i17175:
       if continue
     } {
       println(i)
-    }
+    }
+   
+package foo.test.i17117:
+  package example {
+    object test1 {
+      val test = "test"
+    }
+
+    object test2 {
+
+      import example.test1 as t1
+
+      val test = t1.test
+    }
+  }

tests/neg-macros/i8887.scala

@@ -0,0 +1,5 @@
+import scala.quoted._
+
+def expr[X](x: Any)(using Quotes): Expr[Any] =
+  '{ foo[x.type] } // error
+def foo[X]: Any = ???

tests/neg-macros/quote-this-a.scala

@@ -4,9 +4,7 @@ class Foo {
 
   def f(using Quotes): Unit = '{
     def bar[T](x: T): T = x
-    bar[
-      this.type  // error
-      ] {
+    bar[this.type] {
       this  // error
     }
   }

tests/pos-macros/i8887.scala

@@ -0,0 +1,3 @@
+import scala.quoted._
+inline def foo(x: Any): Any = ${ expr[x.type] }
+def expr[X](using Quotes): Expr[Any] = ???