Skip to content
This repository has been archived by the owner on Feb 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #264 from scala-steward/update/scalafmt-core-3.5.9
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.5.9
  • Loading branch information
mergify[bot] committed Aug 14, 2022
2 parents e73b166 + 3c7e3f5 commit 2e5d9eb
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 33 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.5.8
f9323ef0326aaadb1a6905dd4f4f011c6f304865

# Scala Steward: Reformat with scalafmt 3.5.9
c1fde1cfa3bf6bdd33a08b98866cf40fb8abf71c
2 changes: 1 addition & 1 deletion .scalafmt.conf
@@ -1,4 +1,4 @@
version = "3.5.8"
version = "3.5.9"
style = default

runner.dialect = scala213source3
Expand Down
66 changes: 34 additions & 32 deletions facade/src/main/scala/react/gridlayout/package.scala
Expand Up @@ -210,43 +210,45 @@ package gridlayout {
)

private[gridlayout] def fromRaw(l: raw.LayoutItem): LayoutItem =
new LayoutItem(l.w,
l.h,
l.x,
l.y,
l.i,
l.minW,
l.minH,
l.maxW,
l.maxH,
l.static,
l.isDraggable,
l.isResizable,
l.resizeHandles.map(_.toList.map(ResizeHandle.fromRaw).collect {
case Some(x) => x
}),
l.isBounded
new LayoutItem(
l.w,
l.h,
l.x,
l.y,
l.i,
l.minW,
l.minH,
l.maxW,
l.maxH,
l.static,
l.isDraggable,
l.isResizable,
l.resizeHandles.map(_.toList.map(ResizeHandle.fromRaw).collect { case Some(x) =>
x
}),
l.isBounded
)

private[gridlayout] def fromRawO(l: raw.LayoutItem): Option[LayoutItem] =
if (l != null)
Some(
new LayoutItem(l.w,
l.h,
l.x,
l.y,
l.i,
l.minW,
l.minH,
l.maxW,
l.maxH,
l.static,
l.isDraggable,
l.isResizable,
l.resizeHandles.map(_.toList.map(ResizeHandle.fromRaw).collect {
case Some(x) => x
}),
l.isBounded
new LayoutItem(
l.w,
l.h,
l.x,
l.y,
l.i,
l.minW,
l.minH,
l.maxW,
l.maxH,
l.static,
l.isDraggable,
l.isResizable,
l.resizeHandles.map(_.toList.map(ResizeHandle.fromRaw).collect { case Some(x) =>
x
}),
l.isBounded
)
)
else
Expand Down

0 comments on commit 2e5d9eb

Please sign in to comment.