diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa7060f82..313b1d7b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: matrix: OS: [ubuntu-latest] JDK: [8] - SCALA: [2.12.18, 2.12.19, 2.13.13, 2.13.14, 3.3.0] + SCALA: [2.12.18, 2.12.19, 2.13.13, 2.13.14, 3.3.3] include: - OS: windows-latest JDK: 8 diff --git a/modules/scala/scala-interpreter/src/main/scala-3/almond/internals/ScalaInterpreterCompletions.scala b/modules/scala/scala-interpreter/src/main/scala-3/almond/internals/ScalaInterpreterCompletions.scala index c48c73701..6ea16ef83 100644 --- a/modules/scala/scala-interpreter/src/main/scala-3/almond/internals/ScalaInterpreterCompletions.scala +++ b/modules/scala/scala-interpreter/src/main/scala-3/almond/internals/ScalaInterpreterCompletions.scala @@ -21,6 +21,38 @@ object ScalaInterpreterCompletions { private def newLine = System.lineSeparator() + private val blacklist = { + val scalaList = Seq( + "Predef.any2stringadd.+", + "Any.##", + "", + "", + "", + "", + "Predef.StringFormat.formatted", + "Predef.Ensuring.ensuring", + "Predef.ArrowAssoc.->", + "Predef.ArrowAssoc.→" + ) + val javaLangList = Set( + "Object.##", + "Object.synchronized", + "Object.ne", + "Object.eq", + "Object.wait", + "Object.notifyAll", + "Object.notify", + "Object.clone", + "Object.finalize" + ) + val it = + Iterator("", "scala.") + .flatMap(prefix => scalaList.iterator.map(prefix + _)) ++ + Iterator("", "java.lang.") + .flatMap(prefix => javaLangList.iterator.map(prefix + _)) + it.toSet + } + def complete( compilerManager: ammonite.compiler.iface.CompilerLifecycleManager, dependencyCompleteOpt: Option[String => (Int, Seq[String])], @@ -108,27 +140,6 @@ object ScalaInterpreterCompletions { def blacklisted(s: Symbol) = { given Context = ctx1 - val blacklist = Set( - "scala.Predef.any2stringadd.+", - "scala.Any.##", - "java.lang.Object.##", - "scala.", - "scala.", - "scala.", - "scala.", - "scala.Predef.StringFormat.formatted", - "scala.Predef.Ensuring.ensuring", - "scala.Predef.ArrowAssoc.->", - "scala.Predef.ArrowAssoc.→", - "java.lang.Object.synchronized", - "java.lang.Object.ne", - "java.lang.Object.eq", - "java.lang.Object.wait", - "java.lang.Object.notifyAll", - "java.lang.Object.notify", - "java.lang.Object.clone", - "java.lang.Object.finalize" - ) blacklist(s.showFullName) || s.isOneOf(Flags.GivenOrImplicit) || diff --git a/project/deps.sc b/project/deps.sc index ac09f6ac9..3d35036c2 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -75,7 +75,7 @@ object Deps { } object ScalaVersions { - def scala3Latest = "3.3.1" + def scala3Latest = "3.3.3" def scala3Compat = "3.3.0" def scala213 = "2.13.14" def scala212 = "2.12.19" @@ -83,6 +83,8 @@ object ScalaVersions { val scala2Binaries = Seq(scala213, scala212) val all = Seq( scala3Latest, + "3.3.2", + "3.3.1", scala3Compat, scala213, "2.13.13",