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.

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

Update scalafmt-core to 3.8.3 #2626

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ e9a0384427db7e3e54c83446a9de40a845064f07

# Scala Steward: Reformat with scalafmt 3.8.2
66fed6a12b2b2fb3c5204b3eff02c858b9eccb71

# Scala Steward: Reformat with scalafmt 3.8.3
04303e6dc6a9ee87a7ec480dec3268ad201754b1
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.2"
version = "3.8.3"
style = default
runner.dialect = scala213source3

Expand Down
2 changes: 1 addition & 1 deletion modules/engine/src/main/scala/seqexec/engine/Engine.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]]

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading