From be351c2a1801dc7686db7adbb984b59507f4ffbe Mon Sep 17 00:00:00 2001 From: Thomas Koehler Date: Mon, 3 Feb 2025 17:31:28 +0100 Subject: [PATCH 1/2] Fixes for VSCode Metals setup --- build.sbt | 4 ++-- src/main/scala/elevate/core/strategies/traversal.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index c5dadd66c..e78acad1e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ -ThisBuild / scalaVersion := "2.13.3" +ThisBuild / scalaVersion := "2.13.14" ThisBuild / organization := "org.elevate-lang" lazy val commonSettings = Seq( - javaOptions ++= Seq("-Xss16m"), + javaOptions ++= Seq("-Xss64m"), scalacOptions ++= Seq( "-Wunused:nowarn", diff --git a/src/main/scala/elevate/core/strategies/traversal.scala b/src/main/scala/elevate/core/strategies/traversal.scala index c823862f0..8a923bf6b 100644 --- a/src/main/scala/elevate/core/strategies/traversal.scala +++ b/src/main/scala/elevate/core/strategies/traversal.scala @@ -89,7 +89,7 @@ object traversal { def apply(p: P): RewriteResult[P] = s(p) match { case Failure(a) => oneUsingState(skip(n)(a)).apply(p) case Success(_) if n > 0 => oneUsingState(skip(n - 1)(s)).apply(p) - case Success(r) if n <= 0 => Success(r) + case Success(r) /*if n <= 0*/ => Success(r) } } } From bb2c593dec1549a1c40f439c89ac5e6fedfc7c33 Mon Sep 17 00:00:00 2001 From: Thomas Koehler Date: Mon, 10 Mar 2025 14:53:27 +0100 Subject: [PATCH 2/2] update to Scala 2.13.16 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e78acad1e..c7b4023f0 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.13.14" +ThisBuild / scalaVersion := "2.13.16" ThisBuild / organization := "org.elevate-lang" lazy val commonSettings = Seq(