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

chore: Update scalafmt-core from 3.7.15 to 3.7.16 #1787

Closed
wants to merge 3 commits into from
Closed
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 @@ -24,3 +24,6 @@ b20f0ba57795f003fe4d90817422e14b880d6c8c

# Scala Steward: Reformat with scalafmt 3.7.15
506650a1df56b0088fd732560ad1385670395f98

# Scala Steward: Reformat with scalafmt 3.7.16
1e9cca0747142e9809966bf86bbf5f8a2c373166
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.15"
version = "3.7.16"

runner.dialect = "scala213"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import testentities._

object Generators {

val queryParams: Gen[Filters.Query] = nonBlankStrings(minLength = 5).map(v => Filters.Query(v.value))
val typeParams: Gen[Filters.EntityType] = Gen.oneOf(Filters.EntityType.all)
val sinceParams: Gen[Filters.Since] = localDatesNotInTheFuture.toGeneratorOf(Filters.Since)
val untilParams: Gen[Filters.Until] = localDatesNotInTheFuture.toGeneratorOf(Filters.Until)
val matchingScores: Gen[MatchingScore] = choose(MatchingScore.min.value, 10f).toGeneratorOf(MatchingScore)
val queryParams: Gen[Filters.Query] = nonBlankStrings(minLength = 5).map(v => Filters.Query(v.value))
val typeParams: Gen[Filters.EntityType] = Gen.oneOf(Filters.EntityType.all)
val sinceParams: Gen[Filters.Since] = localDatesNotInTheFuture.toGeneratorOf(Filters.Since)
val untilParams: Gen[Filters.Until] = localDatesNotInTheFuture.toGeneratorOf(Filters.Until)
val matchingScores: Gen[MatchingScore] = choose(MatchingScore.min.value, 10f).toGeneratorOf(MatchingScore)

val modelProjects: Gen[model.Entity.Project] = anyProjectEntities.map(_.to[model.Entity.Project])
val modelDatasets: Gen[model.Entity.Dataset] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private object Generators {

implicit lazy val tsDatasetSearchInfoObjects: Gen[TSDatasetSearchInfo] = for {
topmostSameAs <- datasetTopmostSameAs
links <- linkObjectsGen(topmostSameAs).toGeneratorOfList(max = 2)
links <- linkObjectsGen(topmostSameAs).toGeneratorOfList(max = 2)
} yield TSDatasetSearchInfo(topmostSameAs, links)

def tsDatasetSearchInfoObjects(withLinkTo: projects.ResourceId, and: projects.ResourceId*): Gen[TSDatasetSearchInfo] =
Expand All @@ -115,9 +115,9 @@ private object Generators {
}(i)
}

def tsDatasetSearchInfoObjects(withLinkTo: entities.Project,
def tsDatasetSearchInfoObjects(withLinkTo: entities.Project,
topSameAsGen: Gen[datasets.TopmostSameAs] = datasetTopmostSameAs
): Gen[TSDatasetSearchInfo] =
): Gen[TSDatasetSearchInfo] =
tsDatasetSearchInfoObjects.map(_.copy(topmostSameAs = topSameAsGen.generateOne)).flatMap { si =>
linkObjectsGen(si.topmostSameAs)
.map(linkProjectId replace withLinkTo.resourceId)
Expand Down
Loading