Bump to dotty 0.27.0-RC1 (#67)

* Bump Dotty version

* Bump Dotty version to 0.27.0-RC1

- The biggest change in 0.27.0-RC1 is the change in the extension methods
  syntax
- Because of [#9688](scala/scala3#9688) a temporary
  fix was applied in calls to `log.xxx` that pass in a single object to log

* Organise code snippets

* Fix extension method syntax/Fix indentation

* Switch to Significant Indentation Based Syntax

- Switch to SIB syntax for exercise 3 and later

* Remove option for .sbtopts that will be deprecated in the future

Author: eloots

.gitignore

@@ -13,7 +13,7 @@ collectedLogs.zip
 .bloop/
 .metals/
 .swp
-project/metals.sbt
+**/project/metals.sbt
 
 # sbt specific
 .cache/

code-snippets/build.sbt

@@ -1,4 +1,4 @@
-val dottyVersion = "0.24.0-RC1"
+val dottyVersion = "0.27.0-RC1"
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
@@ -9,8 +9,8 @@ lazy val `dotty-snippets` = project
     name := "dotty-simple",
     version := "0.1.0",
 
-    ThisBuild / scalaVersion := dottyVersion,
-    //ThisBuild / scalaVersion := dottyLatestNightlyBuild.get,
+    //ThisBuild / scalaVersion := dottyVersion,
+    ThisBuild / scalaVersion := dottyLatestNightlyBuild.get,
 
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
   )

code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/CollectiveExtensions.scala

@@ -0,0 +1,18 @@
+package org.lunatech.dotty.extensionmethods.collective
+
+extension (i: Int)
+  def isEven: Boolean = i % 2 == 0
+
+  def unary_! : Int = -i
+
+  def square : Int = i * i
+
+extension [T](xs: List[T]):
+  def second: T = xs.tail.head
+  def third: T = xs.tail.second
+
+@main def collective() =
+  println(List(1,2,3).second)
+  println(! 5)
+  println(5.isEven)
+  println(5.square)

code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/ExtensionOperators.scala

@@ -0,0 +1,9 @@
+package org.lunatech.dotty.extensionmethods
+
+extension (a: String) def < (b: String): Boolean = a.compareTo(b) < 0
+  
+extension (a: Int) def  +++: (b: List[Int]) = a::b
+
+@main def extensionOperators() =
+  println("abc" < "pqr")  // true
+  println(1 +++: List(2,3,4))  // val lst: List[Int] = List(1, 2, 3, 4)

code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/GenericExtension.scala

@@ -0,0 +1,21 @@
+package org.lunatech.dotty.extensionmethods
+
+extension [T](xs: List[T])
+  def second =
+    xs.tail.head
+
+extension [T](xs: List[List[T]])
+  def flattened =
+    xs.foldLeft[List[T]](Nil)(_ ++ _)
+
+extension [T: Numeric](x: T)
+  def  + (y: T): T =
+    summon[Numeric[T]].plus(x, y)
+
+def [T: Numeric](x: T) - (y: T) = summon[Numeric[T]].plus(x, y)
+
+case class Circle(x: Double, y: Double, radius: Double)
+def (c: Circle).circumference: Double = c.radius * math.Pi * 2
+
+@main def circles() =
+  println(s"Circle: ${Circle(1.0, 2.0, 4).circumference}")

code-snippets/src/main/scala/org/lunatech/dotty/extensionmethods/IntOps.scala renamed to code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/IntOps.scala

@@ -1,12 +1,9 @@
 package org.lunatech.dotty.extensionmethods
 
-trait IntOps {
-  def (i: Int).isEven: Boolean = i % 2 == 0
+extension (i: Int):
+  def isEven: Boolean = i % 2 == 0
 
-  def (i: Int).unary_! : Int = -i
-}
-
-object IntOperations {
+  def unary_! : Int = -i
 
     // 1. An extension method is applicable if it is visible under a simple name, 
     //    by being defined or inherited or imported in a scope enclosing the application
@@ -17,10 +14,7 @@ object IntOperations {
     // we could define this object as `IntOperations extends IntOps`.
     // A more elegant way to bring `IntOps` to the context is by using a `given`
 
-    given IntOps
+@main def show(): Unit =
+    println(2.isEven)  // true
+    println(!5)        // -5
 
-    @main def show(): Unit = {
-        println(2.isEven)  // true
-        println(!5)        // -5
-    }
-}

code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/ScopeExtensionMethods.worksheet.sc

@@ -0,0 +1,49 @@
+trait IntOps:
+  extension (i: Int) def isZero: Boolean = i == 0
+
+  extension (i: Int) def safeMod(x: Int): Option[Int] =
+    // extension method defined in same scope IntOps
+    if x.isZero then None
+    else Some(i % x)
+
+object IntOpsEx extends IntOps:
+  extension (i: Int) def safeDiv(x: Int): Option[Int] =
+    // extension method brought into scope via inheritance from IntOps
+    if x.isZero then None
+    else Some(i / x)
+
+object SafeDiv:
+  import IntOpsEx._ // brings safeDiv and safeMod into scope
+
+  extension (i: Int) def divide(d: Int) : Option[(Int, Int)] =
+    // extension methods imported and thus in scope
+    (i.safeDiv(d), i.safeMod(d)) match
+      case (Some(d), Some(r)) => Some((d, r))
+      case _ => None
+  
+  val d1 = 25.divide(3)
+  val d2 = 25.divide(0)
+
+SafeDiv.d1
+SafeDiv.d2
+
+given IntOps
+
+20.safeMod(0)
+20.safeMod(3)
+
+extension [T](xs: List[List[T]])
+  def flatten: List[T] = xs.foldLeft(Nil: List[T])(_ ++ _)
+
+given [T: Ordering] as Ordering[List[T]]:
+  override def compare(l1: List[T], l2: List[T]): Int = 1
+  extension (xs: List[T])
+    def < (ys: List[T]): Boolean = summon[Ordering[T]].lt(xs.head, ys.head)
+
+
+// extension method available since it is in the implicit scope of List[List[Int]]
+List(List(1, 2), List(3, 4)).flatten
+
+// extension method available since it is in the given Ordering[List[T]],
+// which is itself in the implicit scope of List[Int]
+List(1, 2) < List(3)

code-snippets/src/main/scala/org/lunatech/dotty/multiversalequality/BadRepository.scala renamed to code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/multiversalequality/BadRepository.scala

@@ -138,15 +138,15 @@ object Scala3OpaqueTypeAliasesDefinitions {
     def apply(d: Double): Miles = d
   }
 
-  extension {
-    def (a: Kilometres) + (b: Kilometres): Kilometres = a + b
-    def (km: Kilometres).toMiles: Miles = km / 1.6
-  }
+  extension (a: Kilometres):
+    def +(b: Kilometres): Kilometres = a + b
+    def toMiles: Miles = a / 1.6
 
-  extension {
-    def (a: Miles) + (b: Miles): Miles = a + b
-    def (miles: Miles).toKm: Kilometres = miles * 1.6
-  }
+
+  extension (a: Miles):
+    // def +(b: Miles): Miles = a + b
+    def toKm: Kilometres = a * 1.6
+  
 
 }
 

code-snippets/src/main/scala/org/lunatech/dotty/multiversalequality/GoodRepository.scala renamed to code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/multiversalequality/GoodRepository.scala

@@ -1,4 +1,4 @@
 // DO NOT EDIT! This file is auto-generated.
 // This file enables sbt-bloop to create bloop config files.
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.0-RC1-229-b7c15aa9")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.3-31-b16d7e50")

code-snippets/src/main/scala/org/lunatech/dotty/opaquetypes/Units.scala renamed to code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/opaquetypes/Units.scala

@@ -0,0 +1,4 @@
+// DO NOT EDIT! This file is auto-generated.
+// This file enables sbt-bloop to create bloop config files.
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.3-31-b16d7e50")

code-snippets/project/metals.sbt

@@ -0,0 +1,4 @@
+// DO NOT EDIT! This file is auto-generated.
+// This file enables sbt-bloop to create bloop config files.
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.3-31-b16d7e50")

code-snippets/project/project/metals.sbt

@@ -1,4 +1,3 @@
 -J-Xmx4G
--J-XX:+CMSClassUnloadingEnabled
 -J-Xss4M
 -Duser.timezone=GMT

code-snippets/project/project/project/metals.sbt

@@ -40,7 +40,8 @@ class SudokuProgressTracker private (
       case NewUpdatesInFlight(updateCount) =>
         trackProgress(updatesInFlight + updateCount)
       case msg: SudokuDetailState =>
-        context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
+        // context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
+        context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
         Behaviors.same
     }
 
@@ -58,7 +59,8 @@ class SudokuProgressTracker private (
       case detail: SudokuDetailState =>
         collectEndState(remainingRows = remainingRows - 1, detail +: endState)
       case msg: NewUpdatesInFlight =>
-        context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
+        // context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
+        context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
         Behaviors.same
     }
 }

code-snippets/src/main/scala/org/lunatech/dotty/extensionmethods/CollectiveExtensions.scala

@@ -90,7 +90,8 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
         progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
         processRequest(Some(sender), System.currentTimeMillis())
       case unexpectedMsg =>
-        context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
+        // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
+        context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
         Behaviors.same
 
     }

code-snippets/src/main/scala/org/lunatech/dotty/extensionmethods/ExtensionInstance.scala

@@ -40,7 +40,8 @@ class SudokuProgressTracker private (
       case NewUpdatesInFlight(updateCount) =>
         trackProgress(updatesInFlight + updateCount)
       case msg: SudokuDetailState =>
-        context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
+        // context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
+        context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
         Behaviors.same
     }
 
@@ -58,7 +59,8 @@ class SudokuProgressTracker private (
       case detail: SudokuDetailState =>
         collectEndState(remainingRows = remainingRows - 1, detail +: endState)
       case msg: NewUpdatesInFlight =>
-        context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
+        // context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
+        context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
         Behaviors.same
     }
 }

code-snippets/src/main/scala/org/lunatech/dotty/extensionmethods/ExtensionOperators.scala

@@ -90,7 +90,8 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
         progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
         processRequest(Some(sender), System.currentTimeMillis())
       case unexpectedMsg =>
-        context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
+        // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
+        context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
         Behaviors.same
 
     }

code-snippets/src/main/scala/org/lunatech/dotty/extensionmethods/GenericExtension.scala

@@ -40,7 +40,8 @@ class SudokuProgressTracker private (
       case NewUpdatesInFlight(updateCount) =>
         trackProgress(updatesInFlight + updateCount)
       case msg: SudokuDetailState =>
-        context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
+        // context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
+        context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
         Behaviors.same
     }
 
@@ -58,7 +59,8 @@ class SudokuProgressTracker private (
       case detail: SudokuDetailState =>
         collectEndState(remainingRows = remainingRows - 1, detail +: endState)
       case msg: NewUpdatesInFlight =>
-        context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
+        // context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
+        context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
         Behaviors.same
     }
 }

code-snippets/src/test/scala/Test1.scala

@@ -90,7 +90,8 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
         progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
         processRequest(Some(sender), System.currentTimeMillis())
       case unexpectedMsg =>
-        context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
+        // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
+        context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
         Behaviors.same
 
     }

exercises/.sbtopts

@@ -28,7 +28,7 @@ import org.lunatechlabs.dotty.sudoku.{ SudokuProblemSender, SudokuSolver, Sudoku
 import scala.io.StdIn
 import scala.Console.{ GREEN, RESET }
 
-object Main {
+object Main:
   def apply(): Behavior[NotUsed] =
     Behaviors.setup { context =>
       val sudokuSolverSettings = SudokuSolverSettings("sudokusolver.conf")
@@ -44,16 +44,13 @@ object Main {
           Behaviors.stopped
       }
     }
-}
 
-object SudokuSolverMain {
+object SudokuSolverMain:
 
-  def main(args: Array[String]): Unit = {
+  def main(args: Array[String]): Unit =
 
     val system = ActorSystem[NotUsed](Main(), "sudoku-solver-system")
 
     println(s"${GREEN}Hit RETURN to stop solver${RESET}")
     StdIn.readLine()
     system.terminate()
-  }
-}