luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8063 from xuwei-k/scala-21779-workaround 

[2.x] remove scala 3 issues 21779 workaround
This commit is contained in:
eugene yokota 2025-03-12 21:57:30 -04:00 committed by GitHub
parent ef6da07433 cbc065f0ff
commit 57b7317251
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
View File

@ -41,40 +41,16 @@ trait ContextUtil[C <: Quotes & scala.Singleton](val valStart: Int):
def typed[A: Type](value: Term): Term =
Typed(value, TypeTree.of[A])
/**
* [[https://github.com/sbt/sbt/issues/7768]]
* [[https://github.com/scala/scala3/issues/21779]]
*/
private def exprOfTupleFromSeq(seq: Seq[Expr[Any]])(using q: Quotes): Expr[scala.Tuple] = {
def tupleTypeFromSeq(seq: Seq[Expr[Any]]): q.reflect.TypeRepr = {
import q.reflect.*
val consRef = Symbol.classSymbol("scala.*:").typeRef
seq.foldRight(TypeRepr.of[EmptyTuple]) { (expr, ts) =>
AppliedType(consRef, expr.asTerm.tpe :: ts :: Nil)
}
}
if (seq.sizeIs <= 22) {
Expr.ofTupleFromSeq(seq)
} else {
val tupleTpe = tupleTypeFromSeq(seq)
tupleTpe.asType match {
case '[tpe] =>
'{ Tuple.fromIArray(IArray(${ Varargs(seq) }*)).asInstanceOf[tpe & scala.Tuple] }
}
}
}
def makeTuple(inputs: List[Input]): BuilderResult =
new BuilderResult:
override lazy val inputTupleTypeRepr: TypeRepr =
tupleTypeRepr(inputs.map(_.tpe))
override def tupleExpr: Expr[Tuple] =
exprOfTupleFromSeq(inputs.map(_.term.asExpr))
Expr.ofTupleFromSeq(inputs.map(_.term.asExpr))
override def cacheInputTupleTypeRepr: TypeRepr =
tupleTypeRepr(inputs.withFilter(_.isCacheInput).map(_.tpe))
override def cacheInputExpr(tupleTerm: Term): Expr[Tuple] =
exprOfTupleFromSeq(inputs.zipWithIndex.flatMap { (input, idx) =>
Expr.ofTupleFromSeq(inputs.zipWithIndex.flatMap { (input, idx) =>
if input.tags.nonEmpty then
input.tpe.asType match
case '[a] =>