diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d51b2fc97..c3eab4154 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -18,3 +18,6 @@ e9a0384427db7e3e54c83446a9de40a845064f07 # Scala Steward: Reformat with scalafmt 3.8.2 66fed6a12b2b2fb3c5204b3eff02c858b9eccb71 + +# Scala Steward: Reformat with scalafmt 3.8.3 +04303e6dc6a9ee87a7ec480dec3268ad201754b1 diff --git a/.scalafmt.conf b/.scalafmt.conf index 1e6d04ccb..230f08807 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.2" +version = "3.8.3" style = default runner.dialect = scala213source3 diff --git a/modules/engine/src/main/scala/seqexec/engine/Engine.scala b/modules/engine/src/main/scala/seqexec/engine/Engine.scala index 1b613e12a..9d57b7e97 100644 --- a/modules/engine/src/main/scala/seqexec/engine/Engine.scala +++ b/modules/engine/src/main/scala/seqexec/engine/Engine.scala @@ -64,7 +64,7 @@ class Engine[F[_]: MonadError[*[_], Throwable]: Logger, S, U](stateL: Engine.Sta ) => val steps = seq.toSequence.steps .takeWhile(_.id =!= step) - .mapFilter(p => (!p.status.isFinished).option(p.id)) + .mapFilter(p => !p.status.isFinished.option(p.id)) val withSkips = steps.foldLeft[Sequence.State[F]](seq) { case (s, i) => s.setSkipMark(i, v = true) } diff --git a/modules/server/src/main/scala/seqexec/server/SeqexecEngine.scala b/modules/server/src/main/scala/seqexec/server/SeqexecEngine.scala index 506eca315..2cfd164dc 100644 --- a/modules/server/src/main/scala/seqexec/server/SeqexecEngine.scala +++ b/modules/server/src/main/scala/seqexec/server/SeqexecEngine.scala @@ -456,19 +456,19 @@ object SeqexecEngine { val reqWV = extractWaterVapor(step.config) val ccCmp = reqCC.flatMap(x => - (!checkCloudCover(actualObsConditions.cc, x)) + !checkCloudCover(actualObsConditions.cc, x) .option(Discrepancy(actualObsConditions.cc.label, x.displayValue())) ) val iqCmp = reqIQ.flatMap(x => - (!checkImageQuality(actualObsConditions.iq, x)) + !checkImageQuality(actualObsConditions.iq, x) .option(Discrepancy(actualObsConditions.iq.label, x.displayValue())) ) val sbCmp = reqSB.flatMap(x => - (!checkSkyBackground(actualObsConditions.sb, x)) + !checkSkyBackground(actualObsConditions.sb, x) .option(Discrepancy(actualObsConditions.sb.label, x.displayValue())) ) val wvCmp = reqWV.flatMap(x => - (!checkWaterVapor(actualObsConditions.wv, x)) + !checkWaterVapor(actualObsConditions.wv, x) .option(Discrepancy(actualObsConditions.wv.label, x.displayValue())) ) diff --git a/modules/server/src/main/scala/seqexec/server/ghost/GhostConfig.scala b/modules/server/src/main/scala/seqexec/server/ghost/GhostConfig.scala index aadffabfd..be3e4fda7 100644 --- a/modules/server/src/main/scala/seqexec/server/ghost/GhostConfig.scala +++ b/modules/server/src/main/scala/seqexec/server/ghost/GhostConfig.scala @@ -420,7 +420,7 @@ object GhostConfig { val extracted = (sifu1, srifu1Type, sifu2, hifu1, hrifu1Type, hifu2) match { // SR Single Sidereal // (sifu1, srifu1Type, sifu2, hifu1, hrifu1Type, hifu2) - case (Target(t), Some(TargetType.Sidereal), NoTarget, NoTarget, None, NoTarget) => + case (Target(t), Some(TargetType.Sidereal), NoTarget, NoTarget, None, NoTarget) => srifu1Coords.map( StandardResolutionMode .SingleTarget( @@ -492,7 +492,7 @@ object GhostConfig { // SR Target + Sky // (sifu1, srifu1Type, sifu2, hifu1, hrifu1Type, hifu2) - case (Target(t), _, SkyPosition, NoTarget, None, NoTarget) => + case (Target(t), _, SkyPosition, NoTarget, None, NoTarget) => (srifu1Coords, srifu2Coords).mapN( StandardResolutionMode .TargetPlusSky( @@ -542,7 +542,7 @@ object GhostConfig { // HR Sidereal // (sifu1, srifu1Type, sifu2, hifu1, hrifu1Type, hifu2) - case (NoTarget, _, NoTarget, Target(t), Some(TargetType.Sidereal), SkyPosition) => + case (NoTarget, _, NoTarget, Target(t), Some(TargetType.Sidereal), SkyPosition) => (hrifu1Coords, hrifu2Coords).mapN( HighResolutionMode .TargetPlusSky( @@ -567,7 +567,7 @@ object GhostConfig { // HR Non-Sidereal // (sifu1, srifu1Type, sifu2, hifu1, hrifu1Type, hifu2) - case (NoTarget, _, NoTarget, Target(t), Some(TargetType.NonSidereal), _) => + case (NoTarget, _, NoTarget, Target(t), Some(TargetType.NonSidereal), _) => HighResolutionMode .NonSidereal( obsType, diff --git a/modules/server/src/main/scala/seqexec/server/gmos/GmosControllerEpics.scala b/modules/server/src/main/scala/seqexec/server/gmos/GmosControllerEpics.scala index d9bfad5e8..a32611945 100644 --- a/modules/server/src/main/scala/seqexec/server/gmos/GmosControllerEpics.scala +++ b/modules/server/src/main/scala/seqexec/server/gmos/GmosControllerEpics.scala @@ -333,7 +333,7 @@ object GmosControllerEpics extends GmosEncoders { // TODO Improve data model to remove this case. It is here because search includes types of // both sites. - case _ => List.empty + case _ => List.empty } // If disperser, order or wavelength are set, force mode configuration. If not, check if it needs to be set anyways diff --git a/modules/server/src/main/scala/seqexec/server/gmos/GmosInstrumentActions.scala b/modules/server/src/main/scala/seqexec/server/gmos/GmosInstrumentActions.scala index f5124de51..1c7e59a04 100644 --- a/modules/server/src/main/scala/seqexec/server/gmos/GmosInstrumentActions.scala +++ b/modules/server/src/main/scala/seqexec/server/gmos/GmosInstrumentActions.scala @@ -138,7 +138,7 @@ class GmosInstrumentActions[F[_]: Temporal: Logger, A <: GmosController.SiteDepe .flatMap(observeTail(fileId, env, nsCfg)) // We reach here only if the result was Paused and no command made it stop/pause/abort - case _ => Result.Partial(NSContinue).pure[F].widen[Result[F]] + case _ => Result.Partial(NSContinue).pure[F].widen[Result[F]] } diff --git a/modules/server/src/main/scala/seqexec/server/nifs/NifsControllerEpics.scala b/modules/server/src/main/scala/seqexec/server/nifs/NifsControllerEpics.scala index 8a14cb8b6..5932d6fd8 100644 --- a/modules/server/src/main/scala/seqexec/server/nifs/NifsControllerEpics.scala +++ b/modules/server/src/main/scala/seqexec/server/nifs/NifsControllerEpics.scala @@ -242,7 +242,7 @@ object NifsControllerEpics extends NifsEncoders { // So if any of those conditions is not true; need to move the disperser to the new position. def checkInvalid(current: String): F[Option[F[Unit]]] = epicsSys.lastSelectedDisperser.map { lsd => - (!(current === "INVALID" && lsd === disperser)) + !(current === "INVALID" && lsd === disperser) .option(setDisperserIO) } diff --git a/modules/server/src/main/scala/seqexec/server/tcs/TcsNorthControllerEpicsAo.scala b/modules/server/src/main/scala/seqexec/server/tcs/TcsNorthControllerEpicsAo.scala index 3f324a626..baf6fd0f7 100644 --- a/modules/server/src/main/scala/seqexec/server/tcs/TcsNorthControllerEpicsAo.scala +++ b/modules/server/src/main/scala/seqexec/server/tcs/TcsNorthControllerEpicsAo.scala @@ -344,12 +344,12 @@ object TcsNorthControllerEpicsAo { List( demand.tc.offsetA.flatMap { v => val u = v.toFocalPlaneOffset(current.base.iaa) - (!offsetNear(u, current.base.offset)) + !offsetNear(u, current.base.offset) .option(PauseCondition.OffsetMove(current.base.offset, u)) }, - (!demand.gds.oiwfs.isActive).option(PauseCondition.OiOff), - (!demand.gds.pwfs1.isActive).option(PauseCondition.P1Off), - (!demand.gds.aoguide.isActive).option(PauseCondition.GaosGuideOff) + !demand.gds.oiwfs.isActive.option(PauseCondition.OiOff), + !demand.gds.pwfs1.isActive.option(PauseCondition.P1Off), + !demand.gds.aoguide.isActive.option(PauseCondition.GaosGuideOff) ).flattenOption ) diff --git a/modules/web/client/src/main/scala/seqexec/web/client/handlers/ObservationsProgressStateHandler.scala b/modules/web/client/src/main/scala/seqexec/web/client/handlers/ObservationsProgressStateHandler.scala index f77cde9b6..09e40399a 100644 --- a/modules/web/client/src/main/scala/seqexec/web/client/handlers/ObservationsProgressStateHandler.scala +++ b/modules/web/client/src/main/scala/seqexec/web/client/handlers/ObservationsProgressStateHandler.scala @@ -109,7 +109,7 @@ class ObservationsProgressStateHandler[M](modelRW: ModelRW[M, AllObservationsPro resetStepProgress(e, obsId) // Remove the progress once the step completes - case ServerMessage(e @ StepExecuted(obsId, _)) => + case ServerMessage(e @ StepExecuted(obsId, _)) => resetStepProgress( e, obsId,