Skip to content

Commit 7aa2694

Browse files
lucuma-steward[bot]lucuma-steward[bot]
committed
Reformat with scalafmt 3.11.2
Executed command: scalafmt --non-interactive
1 parent d4ab864 commit 7aa2694

14 files changed

Lines changed: 40 additions & 38 deletions

File tree

‎modules/engine/src/main/scala/seqexec/engine/Engine.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class Engine[F[_]: MonadError[*[_], Throwable]: Logger, S, U](stateL: Engine.Sta
252252
): HandleType[Unit] =
253253
getS(id).flatMap(_.map { s =>
254254
(Handle(
255-
StateT[F, S, (Unit, Option[Stream[F, EventType]])](st => ((st, ((), f(st)))).pure[F])
255+
StateT[F, S, (Unit, Option[Stream[F, EventType]])](st => (st, ((), f(st))).pure[F])
256256
) *>
257257
modifyS(id)(Sequence.State.internalStopSet(true))).whenA(Sequence.State.isRunning(s))
258258
}.getOrElse(unit))

‎modules/engine/src/main/scala/seqexec/engine/Event.scala‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ object Event {
3434
user: UserDetails,
3535
step: StepId,
3636
v: Boolean
37-
): Event[F, S, U] = EventUser[F, S, U](Breakpoint(id, user.some, step, v))
37+
): Event[F, S, U] = EventUser[F, S, U](Breakpoint(id, user.some, step, v))
3838
def skip[F[_], S, U](
3939
id: Observation.Id,
4040
user: UserDetails,
4141
step: StepId,
4242
v: Boolean
43-
): Event[F, S, U] = EventUser[F, S, U](SkipMark(id, user.some, step, v))
43+
): Event[F, S, U] = EventUser[F, S, U](SkipMark(id, user.some, step, v))
4444
def poll[F[_]](clientId: ClientId): Event[F, Nothing, Nothing] =
4545
EventUser[F, Nothing, Nothing](Poll(clientId))
4646
def getState[F[_], S, U](f: S => Option[Stream[F, Event[F, S, U]]]): Event[F, S, U] =
@@ -50,12 +50,12 @@ object Event {
5050
def actionStop[F[_], S, U](
5151
id: Observation.Id,
5252
f: S => Option[Stream[F, Event[F, S, U]]]
53-
): Event[F, S, U] = EventUser[F, S, U](ActionStop(id, f))
53+
): Event[F, S, U] = EventUser[F, S, U](ActionStop(id, f))
5454
def actionResume[F[_], S, U](
5555
id: Observation.Id,
5656
i: Int,
5757
c: Stream[F, Result[F]]
58-
): Event[F, S, U] =
58+
): Event[F, S, U] =
5959
EventUser[F, S, U](ActionResume(id, i, c))
6060
def logDebugMsg[F[_], S, U](msg: String, ts: Instant): Event[F, S, U] =
6161
EventUser[F, S, U](LogDebug(msg, ts))
@@ -77,25 +77,25 @@ object Event {
7777
stepId: StepId,
7878
i: Int,
7979
r: Result.OK[R]
80-
): Event[F, Nothing, Nothing] = EventSystem[F](Completed(id, stepId, i, r))
80+
): Event[F, Nothing, Nothing] = EventSystem[F](Completed(id, stepId, i, r))
8181
def stopCompleted[F[_], R <: Result.RetVal](
8282
id: Observation.Id,
8383
stepId: StepId,
8484
i: Int,
8585
r: Result.OKStopped[R]
86-
): Event[F, Nothing, Nothing] = EventSystem[F](StopCompleted(id, stepId, i, r))
86+
): Event[F, Nothing, Nothing] = EventSystem[F](StopCompleted(id, stepId, i, r))
8787
def aborted[F[_], R <: Result.RetVal](
8888
id: Observation.Id,
8989
stepId: StepId,
9090
i: Int,
9191
r: Result.OKAborted[R]
92-
): Event[F, Nothing, Nothing] = EventSystem[F](Aborted(id, stepId, i, r))
92+
): Event[F, Nothing, Nothing] = EventSystem[F](Aborted(id, stepId, i, r))
9393
def partial[F[_], R <: Result.PartialVal](
9494
id: Observation.Id,
9595
stepId: StepId,
9696
i: Int,
9797
r: Result.Partial[R]
98-
): Event[F, Nothing, Nothing] =
98+
): Event[F, Nothing, Nothing] =
9999
EventSystem[F](PartialResult(id, stepId, i, r))
100100
def paused[F[_]](id: Observation.Id, i: Int, c: Result.Paused[F]): Event[F, Nothing, Nothing] =
101101
EventSystem[F](Paused[F](id, i, c))
@@ -111,7 +111,7 @@ object Event {
111111
def singleRunCompleted[F[_], R <: Result.RetVal](
112112
c: ActionCoords,
113113
r: Result.OK[R]
114-
): Event[F, Nothing, Nothing] =
114+
): Event[F, Nothing, Nothing] =
115115
EventSystem[F](SingleRunCompleted(c, r))
116116
def singleRunFailed[F[_]](c: ActionCoords, e: Result.Error): Event[F, Nothing, Nothing] =
117117
EventSystem[F](SingleRunFailed(c, e))

‎modules/engine/src/test/scala/seqexec/engine/SequenceSpec.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class SequenceSpec extends AnyFlatSpec {
151151
pending: List[ParallelActions[IO]],
152152
focus: Execution[IO],
153153
done: List[NonEmptyList[Result[IO]]]
154-
): Step.Zipper[IO] = {
154+
): Step.Zipper[IO] = {
155155
val rollback: (Execution[IO], List[ParallelActions[IO]]) = {
156156
val doneParallelActions: List[ParallelActions[IO]] = done.map(_.map(const(action)))
157157
val focusParallelActions: List[ParallelActions[IO]] = focus.toParallelActionsList

‎modules/engine/src/test/scala/seqexec/engine/packageSpec.scala‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,14 @@ class packageSpec extends AnyFlatSpec with NonImplicitAssertions {
353353
Sequence.State.init(
354354
Sequence(
355355
id = Observation.Id.unsafeFromString("GS-2018B-Q-0-8"),
356-
steps = List(
357-
Step.init(id = 1, executions = executions),
358-
Step.init(id = 2, executions = executions).copy(skipMark = Step.SkipMark(true)),
359-
Step.init(id = 3, executions = executions).copy(skipMark = Step.SkipMark(true)),
360-
Step.init(id = 4, executions = executions).copy(skipMark = Step.SkipMark(true)),
361-
Step.init(id = 5, executions = executions)
362-
)
356+
steps =
357+
List(
358+
Step.init(id = 1, executions = executions),
359+
Step.init(id = 2, executions = executions).copy(skipMark = Step.SkipMark(true)),
360+
Step.init(id = 3, executions = executions).copy(skipMark = Step.SkipMark(true)),
361+
Step.init(id = 4, executions = executions).copy(skipMark = Step.SkipMark(true)),
362+
Step.init(id = 5, executions = executions)
363+
)
363364
)
364365
)
365366
)
@@ -464,15 +465,16 @@ class packageSpec extends AnyFlatSpec with NonImplicitAssertions {
464465
Sequence.State.init(
465466
Sequence(
466467
Observation.Id.unsafeFromString("GS-2019A-Q-3"),
467-
steps = List(
468-
Step.init(id = 1, executions = executions).copy(skipped = Step.Skipped(true)),
469-
Step
470-
.init(id = 2, executions = executions)
471-
.copy(skipMark = Step.SkipMark(true), breakpoint = Step.BreakpointMark(true)),
472-
Step
473-
.init(id = 2, executions = executions)
474-
.copy(skipMark = Step.SkipMark(true), breakpoint = Step.BreakpointMark(true))
475-
)
468+
steps =
469+
List(
470+
Step.init(id = 1, executions = executions).copy(skipped = Step.Skipped(true)),
471+
Step
472+
.init(id = 2, executions = executions)
473+
.copy(skipMark = Step.SkipMark(true), breakpoint = Step.BreakpointMark(true)),
474+
Step
475+
.init(id = 2, executions = executions)
476+
.copy(skipMark = Step.SkipMark(true), breakpoint = Step.BreakpointMark(true))
477+
)
476478
)
477479
)
478480
)

‎modules/server/src/main/scala/seqexec/server/OdbProxy.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ object OdbProxy {
6363
obsId: Observation.Id,
6464
dataId: DataId,
6565
fileId: ImageFileId
66-
): F[Boolean] = true.pure[F]
66+
): F[Boolean] = true.pure[F]
6767
override def datasetComplete(
6868
obsId: Observation.Id,
6969
dataId: DataId,
7070
fileId: ImageFileId
71-
): F[Boolean] = true.pure[F]
71+
): F[Boolean] = true.pure[F]
7272
override def obsAbort(obsId: Observation.Id, reason: String): F[Boolean] = false.pure[F]
7373
override def sequenceEnd(obsId: Observation.Id): F[Boolean] = false.pure[F]
7474
override def sequenceStart(obsId: Observation.Id, dataId: DataId): F[Boolean] = false.pure[F]

‎modules/server/src/main/scala/seqexec/server/Systems.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ object Systems {
367367

368368
(igrins2Client, igrins2GDS(httpClient)).mapN(Igrins2Controller(_, _))
369369
}
370-
def gws: IO[GwsKeywordReader[IO]] =
370+
def gws: IO[GwsKeywordReader[IO]] =
371371
if (settings.systemControl.gws.realKeywords)
372372
GwsEpics.instance[IO](service, tops).map(GwsKeywordsReaderEpics[IO])
373373
else DummyGwsKeywordsReader[IO].pure[IO]

‎modules/server/src/main/scala/seqexec/server/gmos/GmosKeywordReader.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ object GmosKeywordReaderEpics {
202202
override def gratingAdjustedWavelength: F[Double] = sys.disperserWavel
203203
override def gratingOrder: F[Int] = sys.disperserOrder
204204
override def gratingTilt: F[Double] = sys.gratingTilt
205-
override def gratingStep: F[Double] =
205+
override def gratingStep: F[Double] =
206206
// Set the value to the epics channel if inBeam is 1
207207
sys.disperserInBeam.map(_ === 1).ifM(sys.reqGratingMotorSteps, doubleDefault[F])
208208
override def dtaX: F[Double] = sys.dtaX

‎modules/server/src/main/scala/seqexec/server/package.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ package server {
4747
sequences: Map[Observation.Id, SequenceData[F]]
4848
)
4949

50-
object EngineState {
50+
object EngineState {
5151
def default[F[_]]: EngineState[F] =
5252
EngineState[F](
5353
Map(CalibrationQueueId -> ExecutionQueue.init(CalibrationQueueName)),

‎modules/server/src/main/scala/seqexec/server/tcs/Tcs.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object Tcs {
2626
def calcGuiderConfig(
2727
inUse: Boolean,
2828
guideWith: Option[StandardGuideOptions.Value]
29-
): GuiderConfig =
29+
): GuiderConfig =
3030
guideWith
3131
.flatMap(v => inUse.option(GuiderConfig(v.toProbeTracking, v.toGuideSensorOption)))
3232
.getOrElse(defaultGuiderConf)

‎modules/server/src/main/scala/seqexec/server/tcs/TcsNorth.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class TcsNorth[F[_]: Sync: Logger] private (
7575
val defaultGuiderConf: GuiderConfig = GuiderConfig(ProbeTrackingConfig.Parked, GuiderSensorOff)
7676
def calcGuiderConfig(
7777
guideWith: Option[StandardGuideOptions.Value]
78-
): GuiderConfig =
78+
): GuiderConfig =
7979
guideWith
8080
.map(v => GuiderConfig(v.toProbeTracking, v.toGuideSensorOption))
8181
.getOrElse(defaultGuiderConf)

0 commit comments

Comments
 (0)