diff --git a/.scalafmt-common.conf b/.scalafmt-common.conf index 18e403eefb..3b69a26b6d 100644 --- a/.scalafmt-common.conf +++ b/.scalafmt-common.conf @@ -4,7 +4,7 @@ # this file by hand! Instead, if you wish to make changes, you should # make a PR to sbt-lucuma. -version = "3.8.3" +version = "3.9.10" style = default runner.dialect = scala3 diff --git a/common/src/main/scala/explore/common/AlignerF.scala b/common/src/main/scala/explore/common/AlignerF.scala index 24266e3c8d..23038db8a2 100644 --- a/common/src/main/scala/explore/common/AlignerF.scala +++ b/common/src/main/scala/explore/common/AlignerF.scala @@ -33,11 +33,11 @@ trait AlignerF[F[_], B, S]: protected type _T // Base delta structure type protected val _undoCtx: UndoSetter[_A] // Base model instance within an `UndoContext` - protected val _remoteBaseInput: _T // Base delta structure instance - protected val _onMod: _T => F[Unit] // Effect to send the delta structure to the remote server + protected val _remoteBaseInput: _T // Base delta structure instance + protected val _onMod: _T => F[Unit] // Effect to send the delta structure to the remote server - protected val _modelGet: _A => B // Model drill-down getter function - protected val _modelMod: (B => B) => _A => _A // Model drill-down modifier function + protected val _modelGet: _A => B // Model drill-down getter function + protected val _modelMod: (B => B) => _A => _A // Model drill-down modifier function protected val _remoteMod: (S => S) => _T => _T // Delta structure drill-down modifier function /** Get the value of the model. */ diff --git a/common/src/main/scala/explore/syntax/ui/package.scala b/common/src/main/scala/explore/syntax/ui/package.scala index 9516abbd47..912f5bb923 100644 --- a/common/src/main/scala/explore/syntax/ui/package.scala +++ b/common/src/main/scala/explore/syntax/ui/package.scala @@ -116,7 +116,7 @@ extension [A](pot: Pot[A]) pot.renderPot(valueRender = f, pendingRender = Icons.Spinner.withSpin(true)) // TODO: Move to lucuma-react? -extension (tag: TagOf[HTMLElement]) +extension (tag: TagOf[HTMLElement]) def withTooltipWhen( condition: Boolean, content: VdomNode, diff --git a/explore/src/main/scala/explore/EditableLabel.scala b/explore/src/main/scala/explore/EditableLabel.scala index c03e062c86..76ce27d5f8 100644 --- a/explore/src/main/scala/explore/EditableLabel.scala +++ b/explore/src/main/scala/explore/EditableLabel.scala @@ -91,7 +91,7 @@ object EditableLabel: .useStateBy(props => Editing(props.forceEditing)) // editing .useEffectWithDepsBy((props, _) => props.forceEditing): (_, editing) => forceEditing => if forceEditing then editing.setState(InEdition) else Callback.empty - .useState("") // displayValue + .useState("") // displayValue .useId .render: (props, editing, displayValue, id) => def editCB(e: ReactMouseEvent): Callback = diff --git a/explore/src/main/scala/explore/cache/ProgramCacheController.scala b/explore/src/main/scala/explore/cache/ProgramCacheController.scala index a804f99a65..b08921289d 100644 --- a/explore/src/main/scala/explore/cache/ProgramCacheController.scala +++ b/explore/src/main/scala/explore/cache/ProgramCacheController.scala @@ -66,7 +66,9 @@ object ProgramCacheController // TODO: Move into updateStream and use the keyedSwitchEvalMap for recursion? private def updateGroupTimeRange( groupId: Option[Group.Id] - )(using odbApi: OdbGroupApi[IO]): IO[ + )(using + odbApi: OdbGroupApi[IO] + ): IO[ ProgramSummaries => ProgramSummaries ] = def go( diff --git a/explore/src/main/scala/explore/config/ModesTableCommon.scala b/explore/src/main/scala/explore/config/ModesTableCommon.scala index e42c9cac20..408bef932e 100644 --- a/explore/src/main/scala/explore/config/ModesTableCommon.scala +++ b/explore/src/main/scala/explore/config/ModesTableCommon.scala @@ -110,8 +110,7 @@ trait ModesTableCommon: style: Css, indexCondition: Int => Boolean ): TagMod = - index.whenDefined( - using + index.whenDefined(using idx => Button( clazz = ExploreStyles.ScrollButton |+| style, diff --git a/explore/src/main/scala/explore/config/ObsTimeEditor.scala b/explore/src/main/scala/explore/config/ObsTimeEditor.scala index d831618dcb..54e7217cc8 100644 --- a/explore/src/main/scala/explore/config/ObsTimeEditor.scala +++ b/explore/src/main/scala/explore/config/ObsTimeEditor.scala @@ -52,7 +52,8 @@ object ObsTimeEditor defaultDuration <- useMemo(props.pendingTime)(_.getOrElse(TimeSpan.fromHours(1).get)) } yield val nowTooltip = - s"Set time to the current time${props.pendingTime.fold("")(_ => " and duration to remaining time")}" + s"Set time to the current time${props.pendingTime + .fold("")(_ => " and duration to remaining time")}" val staleTooltipString = props.calcDigest.staleTooltipString <.div(ExploreStyles.ObsInstantTileTitle)( diff --git a/explore/src/main/scala/explore/config/SpectroscopyConfigurationPanel.scala b/explore/src/main/scala/explore/config/SpectroscopyConfigurationPanel.scala index 1e7a91338d..e0a902c30a 100644 --- a/explore/src/main/scala/explore/config/SpectroscopyConfigurationPanel.scala +++ b/explore/src/main/scala/explore/config/SpectroscopyConfigurationPanel.scala @@ -103,7 +103,9 @@ object SpectroscopyConfigurationPanel extends ConfigurationFormats: p.units, p.calibrationRole ), - Option.when(focalPlaneSupported) { // Hide until supported + Option.when( + focalPlaneSupported + ) { // Hide until supported ReactFragment( FormLabel("focal-plane".refined)("Focal Plane", HelpIcon("configuration/focal_plane.md".refined) diff --git a/explore/src/main/scala/explore/constraints/ConstraintsSummaryTile.scala b/explore/src/main/scala/explore/constraints/ConstraintsSummaryTile.scala index 167195733e..ca555f23fd 100644 --- a/explore/src/main/scala/explore/constraints/ConstraintsSummaryTile.scala +++ b/explore/src/main/scala/explore/constraints/ConstraintsSummaryTile.scala @@ -183,48 +183,40 @@ object ConstraintsSummaryTile: ) .withCell(_.value match case ElevationRange.ByAirMass(min, _) => f"${min.value}%.1f" - case ElevationRange.ByHourAngle(_, _) => "" - ) + case ElevationRange.ByHourAngle(_, _) => "") .sortableBy(_ match case ElevationRange.ByAirMass(min, _) => min.toBigDecimal - case ElevationRange.ByHourAngle(_, _) => AirMassBound.Min.toBigDecimal - 1 - ), + case ElevationRange.ByHourAngle(_, _) => AirMassBound.Min.toBigDecimal - 1), column( MaxAMColumnId, ConstraintGroup.constraintSet.andThen(ConstraintSet.elevationRange).get ) .withCell(_.value match case ElevationRange.ByAirMass(_, max) => f"${max.value}%.1f" - case ElevationRange.ByHourAngle(_, _) => "" - ) + case ElevationRange.ByHourAngle(_, _) => "") .sortableBy(_ match case ElevationRange.ByAirMass(_, max) => max.toBigDecimal - case ElevationRange.ByHourAngle(_, _) => AirMassBound.Min.toBigDecimal - 1 - ), + case ElevationRange.ByHourAngle(_, _) => AirMassBound.Min.toBigDecimal - 1), column( MinHAColumnId, ConstraintGroup.constraintSet.andThen(ConstraintSet.elevationRange).get ) .withCell(_.value match case ElevationRange.ByAirMass(_, _) => "" - case ElevationRange.ByHourAngle(min, _) => f"${min.value}%.1f" - ) + case ElevationRange.ByHourAngle(min, _) => f"${min.value}%.1f") .sortableBy(_ match case ElevationRange.ByAirMass(_, _) => HourAngleBound.Min.toBigDecimal - 1 - case ElevationRange.ByHourAngle(min, _) => min.toBigDecimal - ), + case ElevationRange.ByHourAngle(min, _) => min.toBigDecimal), column( MaxHAColumnId, ConstraintGroup.constraintSet.andThen(ConstraintSet.elevationRange).get ) .withCell(_.value match case ElevationRange.ByAirMass(_, _) => "" - case ElevationRange.ByHourAngle(_, max) => f"${max.value}%.1f" - ) + case ElevationRange.ByHourAngle(_, max) => f"${max.value}%.1f") .sortableBy(_ match case ElevationRange.ByAirMass(_, _) => HourAngleBound.Min.toBigDecimal - 1 - case ElevationRange.ByHourAngle(_, max) => max.toBigDecimal - ), + case ElevationRange.ByHourAngle(_, max) => max.toBigDecimal), column(CountColumnId, _.obsIds.length), column(ObservationsColumnId, ConstraintGroup.obsIds.get) .withCell(cell => diff --git a/explore/src/main/scala/explore/itc/ItcImagingTile.scala b/explore/src/main/scala/explore/itc/ItcImagingTile.scala index 8abe069aee..3122c1d243 100644 --- a/explore/src/main/scala/explore/itc/ItcImagingTile.scala +++ b/explore/src/main/scala/explore/itc/ItcImagingTile.scala @@ -242,9 +242,8 @@ object ItcImagingTile extends ModesTableCommon: // Display target selector if we have targets and results selectedTarget.map: (gr: ImagingTargetAndResults) => val options = - props.tileState.get.imagingTargetResults.map(t => - SelectItem(label = t.target.name.value, value = t) - ) + props.tileState.get.imagingTargetResults + .map(t => SelectItem(label = t.target.name.value, value = t)) <.div( ExploreStyles.ItcTileTitle, diff --git a/explore/src/main/scala/explore/itc/ItcSpectroscopyTile.scala b/explore/src/main/scala/explore/itc/ItcSpectroscopyTile.scala index 922e7072c6..b4eac30c75 100644 --- a/explore/src/main/scala/explore/itc/ItcSpectroscopyTile.scala +++ b/explore/src/main/scala/explore/itc/ItcSpectroscopyTile.scala @@ -238,9 +238,8 @@ object ItcSpectroscopyTile: // The only way this should be empty is if there are no targets in the results. props.tileState.get.selectedTarget.map: (gr: TargetAndResults) => val options = - props.tileState.get.targetResults.map(t => - SelectItem(label = t.target.name.value, value = t) - ) + props.tileState.get.targetResults + .map(t => SelectItem(label = t.target.name.value, value = t)) <.div( ExploreStyles.ItcTileTitle, diff --git a/explore/src/main/scala/explore/observationtree/ObsBadge.scala b/explore/src/main/scala/explore/observationtree/ObsBadge.scala index 70b69b6d89..7b2e58b888 100644 --- a/explore/src/main/scala/explore/observationtree/ObsBadge.scala +++ b/explore/src/main/scala/explore/observationtree/ObsBadge.scala @@ -180,7 +180,9 @@ object ObsBadge: else <.div( obs.workflow.value.validationErrors - .toTagMod(using ov => <.div(ov.code.name, <.ul(ov.messages.toList.toTagMod(using i => <.li(i))))) + .toTagMod(using + ov => <.div(ov.code.name, <.ul(ov.messages.toList.toTagMod(using i => <.li(i)))) + ) ) val validationIcon = <.span(Icons.ErrorIcon).withTooltip(content = validationTooltip) diff --git a/explore/src/main/scala/explore/observationtree/SchedulingGroupObsList.scala b/explore/src/main/scala/explore/observationtree/SchedulingGroupObsList.scala index eb0d6e7eaf..6b642a7256 100644 --- a/explore/src/main/scala/explore/observationtree/SchedulingGroupObsList.scala +++ b/explore/src/main/scala/explore/observationtree/SchedulingGroupObsList.scala @@ -94,8 +94,7 @@ object SchedulingGroupObsList: private given Render[TimingWindowInclusion] = Render.by: twt => <.span(twt match case TimingWindowInclusion.Include => ExploreStyles.TimingWindowInclude - case TimingWindowInclusion.Exclude => ExploreStyles.TimingWindowExclude - )( + case TimingWindowInclusion.Exclude => ExploreStyles.TimingWindowExclude)( <.span(Icons.CircleSolid).withTooltip(tooltip = twt.shortName) ) diff --git a/explore/src/main/scala/explore/plots/NightPlot.scala b/explore/src/main/scala/explore/plots/NightPlot.scala index 674b1e1395..174e72b9b7 100644 --- a/explore/src/main/scala/explore/plots/NightPlot.scala +++ b/explore/src/main/scala/explore/plots/NightPlot.scala @@ -214,7 +214,9 @@ object NightPlot: val seriesIndex: Int = ctx.series.index.toInt / chartData.size.toInt val value = seriesIndex match case 0 => // Target elevation with airmass - formatAngle(y) + s"
Airmass: ${"%.3f".format(ctx.point.asInstanceOf[ElevationPointWithAirmass].airmass)}" + formatAngle( + y + ) + s"
Airmass: ${"%.3f".format(ctx.point.asInstanceOf[ElevationPointWithAirmass].airmass)}" case 2 => "%.2f".format(ctx.y) // Sky Brightness case _ => formatAngle(y) // Other elevations diff --git a/explore/src/main/scala/explore/programs/ProgramTable.scala b/explore/src/main/scala/explore/programs/ProgramTable.scala index 27e7627072..cc30e594c7 100644 --- a/explore/src/main/scala/explore/programs/ProgramTable.scala +++ b/explore/src/main/scala/explore/programs/ProgramTable.scala @@ -68,7 +68,9 @@ object ProgramTable: pinf.zoom(ProgramInfo.deleted).set(false).toAsync >> odbApi.undeleteProgram(pinf.get.id) - private def onModName(pinf: ProgramInfo)(using odbApi: OdbProgramApi[IO])(using + private def onModName(pinf: ProgramInfo)(using + odbApi: OdbProgramApi[IO] + )(using Logger[IO] ): Callback = odbApi.updateProgramName(pinf.id, pinf.name).runAsync diff --git a/explore/src/main/scala/explore/proposal/ProposalAttachmentsTable.scala b/explore/src/main/scala/explore/proposal/ProposalAttachmentsTable.scala index 4a2e62394f..1e10dd251e 100644 --- a/explore/src/main/scala/explore/proposal/ProposalAttachmentsTable.scala +++ b/explore/src/main/scala/explore/proposal/ProposalAttachmentsTable.scala @@ -119,8 +119,10 @@ object ProposalAttachmentsTable extends ProposalAttachmentUtils { (readOnly, client) => import ctx.given - def column[V](id: ColumnId, accessor: Row => V) - : ColumnDef.Single.WithTableMeta[Row, V, TableMeta] = + def column[V]( + id: ColumnId, + accessor: Row => V + ): ColumnDef.Single.WithTableMeta[Row, V, TableMeta] = ColDef(id, v => accessor(v), columnNames(id)) List( @@ -219,9 +221,8 @@ object ProposalAttachmentsTable extends ProposalAttachmentUtils { .forPurpose(AttachmentPurpose.Proposal) .filterNot( // Fast turnaround proposals do not have a team attachment - _ === AttachmentType.Team && pt.exists(t => - t.scienceSubtype === ScienceSubtype.FastTurnaround - ) + _ === AttachmentType.Team && pt + .exists(t => t.scienceSubtype === ScienceSubtype.FastTurnaround) ) .map(pat => pas.find(_.attachmentType === pat).toRight(pat)) .useReactTableBy: (_, _, _, action, urlMap, cols, rows) => diff --git a/explore/src/main/scala/explore/proposal/ProposalErrorsTile.scala b/explore/src/main/scala/explore/proposal/ProposalErrorsTile.scala index 37b50fa52e..e2ab61005b 100644 --- a/explore/src/main/scala/explore/proposal/ProposalErrorsTile.scala +++ b/explore/src/main/scala/explore/proposal/ProposalErrorsTile.scala @@ -24,8 +24,7 @@ object ProposalErrorsTile: extends ReactFnComponent[Body](props => <.div( ExploreStyles.ProposalErrorsTile, - props.errors.toTagMod( - using + props.errors.toTagMod(using e => <.div( Icons.ErrorIcon, diff --git a/explore/src/main/scala/explore/schedulingWindows/SchedulingWindowsTile.scala b/explore/src/main/scala/explore/schedulingWindows/SchedulingWindowsTile.scala index fb0abe399e..d499c845bf 100644 --- a/explore/src/main/scala/explore/schedulingWindows/SchedulingWindowsTile.scala +++ b/explore/src/main/scala/explore/schedulingWindows/SchedulingWindowsTile.scala @@ -175,8 +175,7 @@ object SchedulingWindowsTile: private given Render[TimingWindowInclusion] = Render.by: swt => <.span(swt match case TimingWindowInclusion.Include => ExploreStyles.TimingWindowInclude - case TimingWindowInclusion.Exclude => ExploreStyles.TimingWindowExclude - )(swt.shortName) + case TimingWindowInclusion.Exclude => ExploreStyles.TimingWindowExclude)(swt.shortName) private given Render[TimingWindow] = Render.by: case TimingWindow(inclusion, start, Some(TimingWindowEnd.At(endAt))) => diff --git a/explore/src/main/scala/explore/tabs/GroupEditBody.scala b/explore/src/main/scala/explore/tabs/GroupEditBody.scala index 4143bc3aa5..514d739c55 100644 --- a/explore/src/main/scala/explore/tabs/GroupEditBody.scala +++ b/explore/src/main/scala/explore/tabs/GroupEditBody.scala @@ -272,7 +272,13 @@ object GroupEditBody <.div( ExploreStyles.GroupWarnings, nes.toList - .toTagMod(using w => Message(id = s"${group.id}-${w.shortMsg}", text = w.longMsg, severity = Message.Severity.Warning)) + .toTagMod(using + w => + Message(id = s"${group.id}-${w.shortMsg}", + text = w.longMsg, + severity = Message.Severity.Warning + ) + ) ) ) ) diff --git a/explore/src/main/scala/explore/tabs/ObsTabContents.scala b/explore/src/main/scala/explore/tabs/ObsTabContents.scala index 2f4ef820ea..487592b943 100644 --- a/explore/src/main/scala/explore/tabs/ObsTabContents.scala +++ b/explore/src/main/scala/explore/tabs/ObsTabContents.scala @@ -93,7 +93,7 @@ object ObsTabContents extends TwoPanels: case (None, SelectedPanel.Editor) => selected.set(SelectedPanel.Summary) case _ => Callback.empty .useResizeDetector() // Measure its size - .useState(none[ObsIdSet]) // shadowClipboardObs (a copy as state only if it has observations) + .useState(none[ObsIdSet]) // shadowClipboardObs (a copy as state only if it has observations) .useEffectOnMountBy: (_, ctx, _, _, shadowClipboardObs) => // initialize shadowClipboard import ctx.given @@ -162,7 +162,7 @@ object ObsTabContents extends TwoPanels: callbacks ) .useStateView(DeckShown.Shown) - .useStateView(AddingObservation(false)) // adding new observation or duplicating + .useStateView(AddingObservation(false)) // adding new observation or duplicating .render: ( props, diff --git a/explore/src/main/scala/explore/tabs/TargetTabContents.scala b/explore/src/main/scala/explore/tabs/TargetTabContents.scala index 33069299a4..06cdec2760 100644 --- a/explore/src/main/scala/explore/tabs/TargetTabContents.scala +++ b/explore/src/main/scala/explore/tabs/TargetTabContents.scala @@ -126,7 +126,7 @@ object TargetTabContents extends TwoPanels: case (Focused(None, None, _), SelectedPanel.Editor) => selectedPanel.set(SelectedPanel.Summary) case _ => Callback.empty - .useStateViewBy((_, _, _) => List.empty[Target.Id]) // Selected targets on table + .useStateViewBy((_, _, _) => List.empty[Target.Id]) // Selected targets on table .useLayoutEffectWithDepsBy((props, _, _, _) => props.focused.target): // If a target enters edit mode, unselect the rows. (_, _, _, selTargetIds) => _.foldMap(_ => selTargetIds.set(List.empty)) @@ -139,7 +139,7 @@ object TargetTabContents extends TwoPanels: TargetIdSet.fromTargetIdList(selTargetIds).map(_.asLeft) .useState[LocalClipboard]( LocalClipboard.Empty - ) // shadowClipboard (a copy of the clipboard as state) + ) // shadowClipboard (a copy of the clipboard as state) .useEffectOnMountBy: (_, ctx, _, _, _, shadowClipboard) => // initialize shadowClipboard import ctx.given ExploreClipboard.get.flatMap(shadowClipboard.setStateAsync) @@ -239,7 +239,7 @@ object TargetTabContents extends TwoPanels: UseHotkeysProps((GoToSummary :: (CopyKeys ::: PasteKeys)).toHotKeys, callbacks) .useStateView(AladinFullScreen.Normal) // full screen aladin - .useResizeDetector() // Measure its size + .useResizeDetector() // Measure its size .useStateView[GuideStarSelection](AgsSelection(none)) // required for aladin but not in use .render: ( @@ -508,7 +508,7 @@ object TargetTabContents extends TwoPanels: val targetForPage: Option[Target.Id] = if (params.areAddingTarget) params.targetId.some else none // if we're deleting, let UI focus the first one in the asterism - val setPage: Callback = + val setPage: Callback = if (params.isUndo) setCurrentTarget(idsToEdit.some)(targetForPage, SetRouteVia.HistoryReplace) else diff --git a/explore/src/main/scala/explore/targeteditor/AladinCell.scala b/explore/src/main/scala/explore/targeteditor/AladinCell.scala index 545a850911..82dd7d6db9 100644 --- a/explore/src/main/scala/explore/targeteditor/AladinCell.scala +++ b/explore/src/main/scala/explore/targeteditor/AladinCell.scala @@ -370,7 +370,7 @@ object AladinCell extends ModelOptics with AladinCommon: val selectedGS = index.flatMap(i => r.flatMap(_.lift(i))) props.guideStarSelection .mod: - case AgsSelection(_) => + case AgsSelection(_) => AgsSelection(selectedGS.tupleLeft(0)) // replace automatic selection case rem @ RemoteGSSelection(name) => // Recover the analysis for the remotely selected star diff --git a/explore/src/main/scala/explore/targeteditor/AladinContainer.scala b/explore/src/main/scala/explore/targeteditor/AladinContainer.scala index fb3e318b73..ad30553193 100644 --- a/explore/src/main/scala/explore/targeteditor/AladinContainer.scala +++ b/explore/src/main/scala/explore/targeteditor/AladinContainer.scala @@ -285,16 +285,16 @@ object AladinContainer extends AladinCommon { .flatten // Use fov from aladin - fov <- useState(none[Fov]) + fov <- useState(none[Fov]) // Survey - survey <- useState( - props.vizConf - .flatMap(_.centralWavelength) - .map(w => surveyForWavelength(w.value)) - .getOrElse(ImageSurvey.DSS) - ) + survey <- useState( + props.vizConf + .flatMap(_.centralWavelength) + .map(w => surveyForWavelength(w.value)) + .getOrElse(ImageSurvey.DSS) + ) // Update survey if conf changes - _ <- + _ <- useEffectWithDeps(props.vizConf.flatMap(_.centralWavelength.map(_.value))): w => w.map(w => survey.setState(surveyForWavelength(w))).getOrEmpty } yield { diff --git a/explore/src/main/scala/explore/targeteditor/AsterismModifier.scala b/explore/src/main/scala/explore/targeteditor/AsterismModifier.scala index 84ce3a05bd..f12dfd3e0c 100644 --- a/explore/src/main/scala/explore/targeteditor/AsterismModifier.scala +++ b/explore/src/main/scala/explore/targeteditor/AsterismModifier.scala @@ -66,7 +66,9 @@ trait AsterismModifier: onAsterismUpdate: OnAsterismUpdateParams => Callback, readOnly: Boolean = false, buttonClass: Css = Css.Empty - )(using odbApi: OdbTargetApi[IO] & OdbAsterismApi[IO])(using + )(using + odbApi: OdbTargetApi[IO] & OdbAsterismApi[IO] + )(using Logger[IO] ): TargetSelectionPopup = TargetSelectionPopup( diff --git a/explore/src/main/scala/explore/targeteditor/SearchForm.scala b/explore/src/main/scala/explore/targeteditor/SearchForm.scala index 72fcd36868..df58bb3786 100644 --- a/explore/src/main/scala/explore/targeteditor/SearchForm.scala +++ b/explore/src/main/scala/explore/targeteditor/SearchForm.scala @@ -48,8 +48,8 @@ object SearchForm: .withHooks[Props] .useContext(AppContext.ctx) .useStateViewBy((props, _) => props.targetName.get) // term - .useState(true) // enabled - .useState(none[NonEmptyString]) // error + .useState(true) // enabled + .useState(none[NonEmptyString]) // error .useEffectWithDepsBy((props, _, _, _, _) => props.targetName.get)((_, _, term, enabled, _) => name => term.set(name) >> enabled.setState(true) ) diff --git a/model-tests/shared/src/test/scala/explore/model/ExploreModelValidatorsSuite.scala b/model-tests/shared/src/test/scala/explore/model/ExploreModelValidatorsSuite.scala index 553d88c1ee..6921ff1aa0 100644 --- a/model-tests/shared/src/test/scala/explore/model/ExploreModelValidatorsSuite.scala +++ b/model-tests/shared/src/test/scala/explore/model/ExploreModelValidatorsSuite.scala @@ -45,7 +45,7 @@ class ExploreModelValidatorsSuite extends DisciplineSuite: private val perturbations: List[String => Gen[String]] = List( - _ => arbitrary[String], // swap for a random string + _ => arbitrary[String], // swap for a random string s => Gen.const(s.replace("2", "0")) // create a leading zero, maybe (ok) ) diff --git a/model/shared/src/main/scala/explore/data/tree/KeyedIndexedTree.scala b/model/shared/src/main/scala/explore/data/tree/KeyedIndexedTree.scala index 1618dc4c45..eff9aca6ae 100644 --- a/model/shared/src/main/scala/explore/data/tree/KeyedIndexedTree.scala +++ b/model/shared/src/main/scala/explore/data/tree/KeyedIndexedTree.scala @@ -242,7 +242,7 @@ object KeyedIndexedTree { .map(node => (getKey(node.value), node)) .distinctBy(_._1) // key .filterNot(accumKeys.contains.compose(_._1)) - val newAccumKeys: Set[K] = accumKeys ++ keyedNewNodes.map(_._1) + val newAccumKeys: Set[K] = accumKeys ++ keyedNewNodes.map(_._1) keyedNewNodes.zipWithIndex.foldLeft( List.empty[Node[IndexedElem[K, A]]] ) { case (nodes, ((key, node), idx)) => diff --git a/model/shared/src/main/scala/explore/model/ProgramSummaries.scala b/model/shared/src/main/scala/explore/model/ProgramSummaries.scala index fba94d16aa..6843412b7c 100644 --- a/model/shared/src/main/scala/explore/model/ProgramSummaries.scala +++ b/model/shared/src/main/scala/explore/model/ProgramSummaries.scala @@ -207,7 +207,7 @@ case class ProgramSummaries( val newOrphans = if (obs.contains(obsId)) orphans - obsId // shouldn't be there in the first place... else orphans.updated(obsId, (workflow, digest)) - val newObs = obs.updatedWith(obsId)( + val newObs = obs.updatedWith(obsId)( _.map(Observation.calculatedValues.replace((workflow, digest))) ) (newObs, newOrphans) diff --git a/model/shared/src/main/scala/explore/modes/ConfigSelection.scala b/model/shared/src/main/scala/explore/modes/ConfigSelection.scala index 4f5fe81962..e9a8f5a82f 100644 --- a/model/shared/src/main/scala/explore/modes/ConfigSelection.scala +++ b/model/shared/src/main/scala/explore/modes/ConfigSelection.scala @@ -94,8 +94,7 @@ final case class ConfigSelection private (configs: List[InstrumentConfigAndItcRe val filters = configs.collect: case InstrumentConfigAndItcResult(ItcInstrumentConfig.GmosSouthImaging(f, _), _) => f NonEmptyList.fromList(filters).map(BasicConfiguration.GmosSouthImaging.apply) - case _ => none - ) + case _ => none) object ConfigSelection: val Empty: ConfigSelection = ConfigSelection(Nil) diff --git a/model/shared/src/main/scala/explore/modes/SpectroscopyModesMatrix.scala b/model/shared/src/main/scala/explore/modes/SpectroscopyModesMatrix.scala index 6eb9b74aaf..c0e51c16b0 100644 --- a/model/shared/src/main/scala/explore/modes/SpectroscopyModesMatrix.scala +++ b/model/shared/src/main/scala/explore/modes/SpectroscopyModesMatrix.scala @@ -336,9 +336,9 @@ case class SpectroscopyModesMatrix(matrix: List[SpectroscopyModeRow]) derives Eq } matrix - .filter(filter) // Only include matches + .filter(filter) // Only include matches .fproduct(score) // Give it a score - .sortBy(_._2) // Sort by score + .sortBy(_._2) // Sort by score .map(_._1) .reverse } diff --git a/model/shared/src/main/scala/explore/undo/Restorer.scala b/model/shared/src/main/scala/explore/undo/Restorer.scala index a6caee503b..59c4ef197c 100644 --- a/model/shared/src/main/scala/explore/undo/Restorer.scala +++ b/model/shared/src/main/scala/explore/undo/Restorer.scala @@ -9,7 +9,7 @@ import cats.Eq sealed trait Restorer[F[_], M] { // M = (Local) Model type T // T = Value type - val value: T // Value that will be restored upon undo/redo + val value: T // Value that will be restored upon undo/redo val getter: M => T // How to refresh the value from the model. Used when going from undo=>redo or viceversa. val setter: T => M => M diff --git a/project/Versions.scala b/project/Versions.scala index c8fb72aceb..f9adca536e 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -31,7 +31,7 @@ object Versions { val mUnitScalacheck = "1.2.0" val mUnitCatsEffect = "2.1.0" val sbtBuildInfo = "0.13.1" - val sbtLucuma = "0.14.3" + val sbtLucuma = "0.14.4" val scalaCollectionContrib = "0.4.0" val scalaJsDom = "2.8.1" val scalaJsReact = "3.0.0-beta12"