diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 37585cae..d36a09f8 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.8.4 f02d45a6f6abeed0724ab0224e05437fc58cbd56 + +# Scala Steward: Reformat with scalafmt 3.9.10 +ecce4a763e35e2a3bdbf91dc9fbe6f47d7ea39d8 diff --git a/.scalafmt.conf b/.scalafmt.conf index ccadb811..4dffb6f5 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.4 +version = 3.9.10 maxColumn = 120 runner.dialect = scala213 fileOverride { diff --git a/macros/src/main/scala-2/com/softwaremill/macwire/MacwireMacros.scala b/macros/src/main/scala-2/com/softwaremill/macwire/MacwireMacros.scala index 0d548b3a..4bfa1e3f 100644 --- a/macros/src/main/scala-2/com/softwaremill/macwire/MacwireMacros.scala +++ b/macros/src/main/scala-2/com/softwaremill/macwire/MacwireMacros.scala @@ -117,7 +117,7 @@ object MacwireMacros { .flatMap { m => extractTypeFromNullaryType(m.typeSignature) match { case Some(tpe) => Some((m, tpe)) - case None => + case None => log(s"Cannot extract type from ${m.typeSignature} for member $m!") None } diff --git a/macros/src/main/scala-2/com/softwaremill/macwire/internals/DependencyResolver.scala b/macros/src/main/scala-2/com/softwaremill/macwire/internals/DependencyResolver.scala index f38942a8..199e87f5 100644 --- a/macros/src/main/scala-2/com/softwaremill/macwire/internals/DependencyResolver.scala +++ b/macros/src/main/scala-2/com/softwaremill/macwire/internals/DependencyResolver.scala @@ -19,7 +19,7 @@ class DependencyResolver[C <: blackbox.Context, TypeC <: C#Type, TreeC <: C#Tree */ def resolve(param: Symbol, t: Type): Tree = { eligibleValues.findInFirstScope(t).toList match { - case Nil => resolutionFallback(t.asInstanceOf[TypeC]).asInstanceOf[Tree] + case Nil => resolutionFallback(t.asInstanceOf[TypeC]).asInstanceOf[Tree] case value :: Nil => val forwardValues = eligibleValues.findInScope(t, LocalForward) if (forwardValues.nonEmpty) { diff --git a/macros/src/main/scala-2/com/softwaremill/macwire/internals/EligibleValuesFinder.scala b/macros/src/main/scala-2/com/softwaremill/macwire/internals/EligibleValuesFinder.scala index 203524be..c22c2161 100644 --- a/macros/src/main/scala-2/com/softwaremill/macwire/internals/EligibleValuesFinder.scala +++ b/macros/src/main/scala-2/com/softwaremill/macwire/internals/EligibleValuesFinder.scala @@ -16,7 +16,7 @@ private[macwire] class EligibleValuesFinder[C <: blackbox.Context](val c: C, log @tailrec def doFind(trees: List[(Scope, Tree)], values: EligibleValues): EligibleValues = trees match { - case Nil => values + case Nil => values case (scope, tree) :: tail => tree match { @@ -150,7 +150,7 @@ private[macwire] class EligibleValuesFinder[C <: blackbox.Context](val c: C, log pp ++ selfTypes case ModuleDef(_, _, Template(pp, _, _)) => pp - case e => + case e => c.error(c.enclosingPosition, s"Unknown type of enclosing class: ${e.getClass}") Nil } @@ -314,7 +314,7 @@ private[macwire] class EligibleValuesFinder[C <: blackbox.Context](val c: C, log findInScope(tpe, scope) match { case coll if coll.isEmpty && !scope.isMax => forScope(scope.widen) case coll if coll.isEmpty => log(s"Could not find $tpe in any scope"); Nil - case exprs => + case exprs => log(s"Found [${exprs.mkString(", ")}] of type [$tpe] in scope $scope") exprs } @@ -348,7 +348,7 @@ private[macwire] class EligibleValuesFinder[C <: blackbox.Context](val c: C, log private def enclosingClassBody: List[Tree] = c.enclosingClass match { case ClassDef(_, _, _, Template(_, _, body)) => body case ModuleDef(_, _, Template(_, _, body)) => body - case e => + case e => c.error(c.enclosingPosition, s"Unknown type of enclosing class: ${e.getClass}") Nil } diff --git a/macros/src/main/scala-2/com/softwaremill/macwire/internals/package.scala b/macros/src/main/scala-2/com/softwaremill/macwire/internals/package.scala index 095272da..825a696e 100644 --- a/macros/src/main/scala-2/com/softwaremill/macwire/internals/package.scala +++ b/macros/src/main/scala-2/com/softwaremill/macwire/internals/package.scala @@ -14,7 +14,7 @@ package object internals { val (sym: Symbol, tpeArgs: List[Type]) = targetTypeD match { case TypeRef(_, sym, tpeArgs) => (sym, tpeArgs) - case t => + case t => c.abort( c.enclosingPosition, s"Target type not supported for wiring: $t. Please file a bug report with your use-case." diff --git a/macros/src/main/scala-3/com/softwaremill/macwire/internals/EligibleValuesFinder.scala b/macros/src/main/scala-3/com/softwaremill/macwire/internals/EligibleValuesFinder.scala index 906f7062..1743c701 100644 --- a/macros/src/main/scala-3/com/softwaremill/macwire/internals/EligibleValuesFinder.scala +++ b/macros/src/main/scala-3/com/softwaremill/macwire/internals/EligibleValuesFinder.scala @@ -105,7 +105,7 @@ private[macwire] class EligibleValuesFinder[Q <: Quotes](log: Logger)(using val findInScope(tpe, scope) match { case coll if coll.isEmpty && !scope.isMax => forScope(scope.widen) case coll if coll.isEmpty => log(s"Could not find $tpe in any scope"); Nil - case exprs => + case exprs => log(s"Found [${exprs.mkString(", ")}] of type [$tpe] in scope $scope") exprs } diff --git a/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/AutowireProviders.scala b/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/AutowireProviders.scala index 35d0151f..e1986dad 100644 --- a/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/AutowireProviders.scala +++ b/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/AutowireProviders.scala @@ -33,7 +33,7 @@ class AutowireProviders[Q <: Quotes](using val q: Q)( @tailrec def createProviders(deps: List[Expr[Any]], acc: Vector[Provider], seenTpes: Set[TypeRepr]): Vector[Provider] = deps match - case Nil => acc + case Nil => acc case dep :: otherDeps => val term = dep.asTerm val tpe = term.tpe.dealias.widen // dealias, and widen from singleton types diff --git a/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/autowireImpl.scala b/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/autowireImpl.scala index 05580d46..ba99b95d 100644 --- a/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/autowireImpl.scala +++ b/macros/src/main/scala-3/com/softwaremill/macwire/internals/autowire/autowireImpl.scala @@ -14,7 +14,7 @@ def autowireImpl[T: Type](dependencies: Expr[Seq[Any]])(using q: Quotes): Expr[T // extracting the provided varargs - we need an explicitly provided list of dependencies val rawDependencies: Seq[Expr[Any]] = dependencies match case Varargs(exprs) => exprs - case _ => + case _ => report.errorAndAbort( s"depedencies need to be provided directly as parameters to the autowire call; got: $dependencies" ) diff --git a/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/CatsProvidersGraphContext.scala b/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/CatsProvidersGraphContext.scala index f2f3ccf6..98aa166c 100644 --- a/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/CatsProvidersGraphContext.scala +++ b/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/CatsProvidersGraphContext.scala @@ -52,7 +52,7 @@ class CatsProvidersGraphContext[C <: blackbox.Context](val c: C, val log: Logger ctx.withProvider(sym, provider) { currentCtx => provider match { case _: NotResolvedProvider => currentCtx.missingPath() - case _ => + case _ => provider.dependencies.foldLeft(currentCtx) { case (paramsCtx, deps) => deps.foldLeft(paramsCtx) { case (paramCtx, (sym, param)) => go(paramCtx)(sym, param) } } @@ -230,7 +230,7 @@ class CatsProvidersGraphContext[C <: blackbox.Context](val c: C, val log: Logger case ((currentCtx, resolvedParams), Param(paramSym, paramTpe)) => currentCtx.resolve(paramTpe) match { case Some(Left(provider)) => (currentCtx, resolvedParams.:+((paramSym, provider))) - case Some(Right(fmt)) => { + case Some(Right(fmt)) => { val (updatedCtx, fm) = resolveFactoryMethod(currentCtx)(fmt) (updatedCtx, resolvedParams.:+((paramSym, fm))) @@ -287,7 +287,7 @@ class CatsProvidersGraphContext[C <: blackbox.Context](val c: C, val log: Logger /** DFS based algorithm that resolves all `FactoryMethodTree` */ private def resolveFactoryMethods(ctx: BuilderContext): BuilderContext = ctx.next() match { - case None => ctx + case None => ctx case Some(fmt) => { val (updatedCtx, _) = resolveFactoryMethod(ctx)(fmt) diff --git a/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/GraphBuilderUtils.scala b/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/GraphBuilderUtils.scala index a28b7d21..18b08dbd 100644 --- a/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/GraphBuilderUtils.scala +++ b/macrosAutoCats/src/main/scala/com/softwaremill/macwire/autocats/internals/GraphBuilderUtils.scala @@ -46,8 +46,8 @@ trait GraphBuilderUtils[C <: blackbox.Context] { this: CatsProviders[C] => .map(_.asRight[Provider]) val result = (resolvedProviders ++ resolvedFMT) match { - case Nil => None - case List(result) => Some(result) + case Nil => None + case List(result) => Some(result) case ambiguousProviders => { val duplicates = ambiguousProviders.map { case Left(value) => value.resultType diff --git a/proxy/src/main/scala/com/softwaremill/macwire/proxy/ProxyCreator.scala b/proxy/src/main/scala/com/softwaremill/macwire/proxy/ProxyCreator.scala index 6cf99e00..3904d401 100644 --- a/proxy/src/main/scala/com/softwaremill/macwire/proxy/ProxyCreator.scala +++ b/proxy/src/main/scala/com/softwaremill/macwire/proxy/ProxyCreator.scala @@ -18,7 +18,7 @@ object ProxyCreator { // not possible, we invoke any constructor with default values for arguments. val instance = UnsafeInstance match { case Some(unsafe) => unsafe.allocateInstance(proxiedClass) - case None => + case None => val constructor = findBestConstructor(proxiedClass) constructor.newInstance(constructor.getParameterTypes.map(getDefaultValueForClass): _*) } diff --git a/proxy/src/main/scala/com/softwaremill/macwire/scopes/ThreadLocalScopeStorage.scala b/proxy/src/main/scala/com/softwaremill/macwire/scopes/ThreadLocalScopeStorage.scala index 3eeb59a2..2d0be807 100644 --- a/proxy/src/main/scala/com/softwaremill/macwire/scopes/ThreadLocalScopeStorage.scala +++ b/proxy/src/main/scala/com/softwaremill/macwire/scopes/ThreadLocalScopeStorage.scala @@ -14,7 +14,7 @@ trait ThreadLocalScopeStorage extends Scope { storage.get(key) match { case Some(obj) => obj.asInstanceOf[T] - case None => { + case None => { val obj = createT storage.set(key, obj) obj diff --git a/test-util/src/main/scala-2/com/softwaremill/macwire/CompileTestsSupport.scala b/test-util/src/main/scala-2/com/softwaremill/macwire/CompileTestsSupport.scala index bfeb676c..f6c99fde 100644 --- a/test-util/src/main/scala-2/com/softwaremill/macwire/CompileTestsSupport.scala +++ b/test-util/src/main/scala-2/com/softwaremill/macwire/CompileTestsSupport.scala @@ -34,9 +34,9 @@ trait CompileTestsSupport extends BaseCompileTestsSupport { val warnings = tb.frontEnd.infos.filter(_.severity == tb.frontEnd.WARNING).map(_.msg).toList lazy val warningsString = "\n - " + warnings.mkString("\n - ") (warnings, expectedWarningsFragments) match { - case (Nil, Nil) => () // ok - case (_, Nil) => fail(s"Expected compilation to have no warning, but got:" + warningsString) - case (Nil, _) => fail(s"Expected the following compile warnings fragments: $expectedWarningsFragments") + case (Nil, Nil) => () // ok + case (_, Nil) => fail(s"Expected compilation to have no warning, but got:" + warningsString) + case (Nil, _) => fail(s"Expected the following compile warnings fragments: $expectedWarningsFragments") case (one :: Nil, _) => expectedWarningsFragments.foreach(expectedWarning => one should include(expectedWarning)) case (_, _) => fail(s"More than one warning found:" + warningsString) diff --git a/test-util/src/main/scala/com/softwaremill/macwire/BaseCompileTestSupport.scala b/test-util/src/main/scala/com/softwaremill/macwire/BaseCompileTestSupport.scala index 8229ff1c..030baeed 100644 --- a/test-util/src/main/scala/com/softwaremill/macwire/BaseCompileTestSupport.scala +++ b/test-util/src/main/scala/com/softwaremill/macwire/BaseCompileTestSupport.scala @@ -92,7 +92,7 @@ private[macwire] trait BaseCompileTestsSupport extends AnyFlatSpec with Matchers val (successNames, nonSuccess) = names.partition(_.endsWith(".success")) val (warningNames, failureNames) = nonSuccess.partition(_.endsWith(".warning")) failureNames.filterNot(_.endsWith(".failure")) match { - case Nil => () + case Nil => () case neitherSuccessNorFailure => sys.error( "Test case files must either end with .success, .failure or .warning:\n- " + diff --git a/util/src/main/scala/com/softwaremill/macwire/DynamicInstantiate.scala b/util/src/main/scala/com/softwaremill/macwire/DynamicInstantiate.scala index cd46dc61..963414f4 100644 --- a/util/src/main/scala/com/softwaremill/macwire/DynamicInstantiate.scala +++ b/util/src/main/scala/com/softwaremill/macwire/DynamicInstantiate.scala @@ -18,7 +18,7 @@ private[macwire] trait DynamicInstantiate { s"dependency of type ${paramCls.getName} cannot be found" ) case inst :: Nil => inst.asInstanceOf[AnyRef] - case insts => + case insts => throw new InstantiationException( s"Cannot instantiate ${cls.getName}, " + s"multiple dependencies of type ${paramCls.getName} found: ${insts.map(_.getClass.getName)}"