Skip to content

Commit a55f1df

Browse files
fixup! Address scala/scala3#23499; dev.properties proper solution
1 parent 4a63dcc commit a55f1df

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/patcher/Contexts.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,13 @@ private[compiletime] trait Contexts { this: Derivation =>
5555

5656
protected object Patched {
5757

58-
def unapply[Patch, A](implicit ctx: TransformationContext[Patch, A]): Option[Expr[A]] =
58+
def parse[Patch, A](implicit ctx: TransformationContext[Patch, A]): Option[Expr[A]] =
5959
ctx.config.filterCurrentOverridesForFallbacks.collectFirst {
6060
case TransformerOverride.Fallback(fallback) if fallback.Underlying =:= Type[A] =>
6161
fallback.value.asInstanceOf[Expr[A]]
6262
}
63+
64+
def unapply[Patch, A](ctx: TransformationContext[Patch, A]): Option[Expr[A]] = parse(using ctx)
6365
}
6466

6567
// unpacks Types from Contexts

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/integrations/OptionalValues.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ trait OptionalValues { this: Derivation =>
2727

2828
private type Cached[A] = Option[Existential[OptionalValue[A, *]]]
2929
private val optionalCache = new Type.Cache[Cached]
30-
def unapply[Optional](implicit Optional: Type[Optional]): Option[Existential[OptionalValue[Optional, *]]] =
30+
def parse[Optional](implicit Optional: Type[Optional]): Option[Existential[OptionalValue[Optional, *]]] =
3131
optionalCache(Optional)(providedSupport[Optional].orElse(buildInOptionSupport[Optional]))
32+
def unapply[Optional](Optional: Type[Optional]): Option[Existential[OptionalValue[Optional, *]]] = parse(using
33+
Optional
34+
)
3235

3336
private def providedSupport[Optional: Type]: Option[Existential[OptionalValue[Optional, *]]] =
3437
summonOptionalValue[Optional].map { optionalValue =>

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/integrations/PartialOuterTransformers.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ trait PartialOuterTransformers { this: Derivation =>
3333
protected object PartialOuterTransformer {
3434

3535
private val implicitCache = new Type.Cache[Option]
36-
def unapply[From, To](implicit from: Type[From], to: Type[To]): Option[PartialOuterTransformer[From, To]] =
36+
def parse[From, To](implicit from: Type[From], to: Type[To]): Option[PartialOuterTransformer[From, To]] =
3737
implicitCache(
3838
Type[integrations.PartialOuterTransformer[From, To, From, To]]
3939
.asInstanceOf[Type[PartialOuterTransformer[From, To]]]
4040
)(summonPartialOuterTransformer[From, To])
41+
def unapply[From, To](pair: (Type[From], Type[To])): Option[PartialOuterTransformer[From, To]] =
42+
parse(using pair._1, pair._2)
4143
}
4244
}

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/integrations/TotalOuterTransformers.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ trait TotalOuterTransformers { this: Derivation =>
3131
protected object TotalOuterTransformer {
3232

3333
private val implicitCache = new Type.Cache[Option]
34-
def unapply[From, To](implicit from: Type[From], to: Type[To]): Option[TotalOuterTransformer[From, To]] =
34+
def parse[From, To](implicit from: Type[From], to: Type[To]): Option[TotalOuterTransformer[From, To]] =
3535
implicitCache(
3636
Type[integrations.TotalOuterTransformer[From, To, From, To]].asInstanceOf[Type[TotalOuterTransformer[From, To]]]
3737
)(summonTotalOuterTransformer[From, To])
38+
def unapply[From, To](pair: (Type[From], Type[To])): Option[TotalOuterTransformer[From, To]] =
39+
parse(using pair._1, pair._2)
3840
}
3941
}

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/rules/TransformProductToProductRuleModule.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ private[compiletime] trait TransformProductToProductRuleModule { this: Derivatio
282282
availableMethodAccessors,
283283
availableInheritedAccessors,
284284
availableDefault = defaultValue.isDefined,
285-
availableNone = OptionalValue.unapply[CtorParam].isDefined
285+
availableNone = OptionalValue.parse[CtorParam].isDefined
286286
)
287287
case Product.Parameter.TargetType.SetterParameter(_) if fieldFlags.beanSettersIgnoreUnmatched =>
288288
DerivationResult.pure(unmatchedSetter)
@@ -295,7 +295,7 @@ private[compiletime] trait TransformProductToProductRuleModule { this: Derivatio
295295
toName,
296296
availableMethodAccessors,
297297
availableInheritedAccessors,
298-
availableNone = OptionalValue.unapply[CtorParam].isDefined
298+
availableNone = OptionalValue.parse[CtorParam].isDefined
299299
)
300300
}
301301
}
@@ -616,7 +616,7 @@ private[compiletime] trait TransformProductToProductRuleModule { this: Derivatio
616616

617617
def useNone: Option[DerivationResult[Existential[TransformationExpr]]] =
618618
// OptionalValue handles both scala.Options as well as a support provided through integrations.OptionalValue.
619-
OptionalValue.unapply[CtorParam].filter(_ => fieldFlags.optionDefaultsToNone).map { optional =>
619+
OptionalValue.parse[CtorParam].filter(_ => fieldFlags.optionDefaultsToNone).map { optional =>
620620
// We're constructing:
621621
// '{ None }
622622
DerivationResult.existential[TransformationExpr, CtorParam](

0 commit comments

Comments
 (0)