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.4 #275

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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.4
8efd8b89b006133455c8cf9d26ce963ec1aabdac
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.3
version = 3.8.4
align.openParenCallSite = true
align.openParenDefnSite = true
maxColumn = 120
Expand Down
51 changes: 27 additions & 24 deletions core/src/main/scala/org/http4s/session/SessionMiddleware.scala
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,15 @@ object SessionMiddleware {
)
case (Some(id), None) =>
sessionStore
.modifySession(id,
{ now =>
val next: Option[A] = mergeOnChanged.fold(Option.empty[A]) { mm =>
if (!mm.eqv(sessionOpt, now)) mm.whenDifferent(now, Option.empty)
else None
}
(next, ())
}
.modifySession(
id,
{ now =>
val next: Option[A] = mergeOnChanged.fold(Option.empty[A]) { mm =>
if (!mm.eqv(sessionOpt, now)) mm.whenDifferent(now, Option.empty)
else None
}
(next, ())
}
)
.as(response.response.putHeaders(deleteCookie))
})
Expand Down Expand Up @@ -198,25 +199,27 @@ object SessionMiddleware {
response <- sessionApp(ContextRequest(sessionOpt.getOrElse(default), req))
out <- OptionT.liftF(sessionId match {
case Some(id) =>
sessionStore.modifySession(id,
{ now =>
val next: Option[A] = mergeOnChanged.fold(Option.empty[A]) { mm =>
if (!mm.eqv(sessionOpt, now)) mm.whenDifferent(now, Option.empty)
else None
}
(next, ())
}
sessionStore.modifySession(
id,
{ now =>
val next: Option[A] = mergeOnChanged.fold(Option.empty[A]) { mm =>
if (!mm.eqv(sessionOpt, now)) mm.whenDifferent(now, Option.empty)
else None
}
(next, ())
}
) >> sessionCookie(id).map(response.response.putHeaders(_))
case None =>
sessionStore.createSessionId.flatMap(id =>
sessionStore.modifySession(id,
{ now =>
val next: Option[A] = mergeOnChanged.fold(Option.empty[A]) { mm =>
if (!mm.eqv(sessionOpt, now)) mm.whenDifferent(now, Option.empty)
else None
}
(next, ())
}
sessionStore.modifySession(
id,
{ now =>
val next: Option[A] = mergeOnChanged.fold(Option.empty[A]) { mm =>
if (!mm.eqv(sessionOpt, now)) mm.whenDifferent(now, Option.empty)
else None
}
(next, ())
}
) >> sessionCookie(id).map(response.response.putHeaders(_))
)
})
Expand Down
Loading