Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scala3-library to 3.3.3 #1323

Closed
wants to merge 3 commits into from
Closed

Update scala3-library to 3.3.3 #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d9ecac
Update scala3-library to 3.3.3
scala-steward May 9, 2024
4806e0e
fixup
alexarchambault May 30, 2024
ea6b363
fixup
alexarchambault May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
53 changes: 32 additions & 21 deletions ...ala/scala-interpreter/src/main/scala-3/almond/internals/ScalaInterpreterCompletions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,38 @@ object ScalaInterpreterCompletions {

private def newLine = System.lineSeparator()

private val blacklist = {
val scalaList = Seq(
"Predef.any2stringadd.+",
"Any.##",
"<byname>",
"<empty>",
"<repeated>",
"<repeated...>",
"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])],
Expand Down Expand Up @@ -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.<byname>",
"scala.<empty>",
"scala.<repeated>",
"scala.<repeated...>",
"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) ||
Expand Down
4 changes: 3 additions & 1 deletion project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,16 @@ 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"
val binaries = Seq(scala3Compat, scala213, scala212)
val scala2Binaries = Seq(scala213, scala212)
val all = Seq(
scala3Latest,
"3.3.2",
"3.3.1",
scala3Compat,
scala213,
"2.13.13",
Expand Down
Loading