Skip to content

Commit 069e483

Browse files
committed
Reformat with scalafmt 3.5.9
Executed command: scalafmt --non-interactive
1 parent c5ad98c commit 069e483

50 files changed

Lines changed: 1169 additions & 899 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modules/depGraphs/src/main/scala/es/weso/depgraphs/InheritanceJGraphT.scala

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import alleycats.std.set._
77
import cats.effect._
88
import scala.util.Try
99

10-
1110
case class Edge[Node, EdgeType](sub: Node, sup: Node, etype: EdgeType) {
1211

13-
def show(showNode: Node => String, showEdge: EdgeType => String): String =
12+
def show(showNode: Node => String, showEdge: EdgeType => String): String =
1413
s"${showNode(sub)}${showEdge(etype)}${showNode(sup)}"
1514

1615
}
@@ -19,11 +18,13 @@ case class InheritanceJGraphT[Node, EdgeType](
1918
refGraph: Ref[IO, DirectedAcyclicGraph[Node, Edge[Node, EdgeType]]]
2019
) extends Inheritance[Node, EdgeType] {
2120

22-
case class ErrorAddingNode(node: Node, e: Throwable)
23-
extends RuntimeException(s"Error adding node: $node. Err: ${e.getMessage()}")
21+
case class ErrorAddingNode(node: Node, e: Throwable)
22+
extends RuntimeException(s"Error adding node: $node. Err: ${e.getMessage()}")
2423

25-
case class ErrorAddingInheritance(node1: Node, node2: Node, etype: EdgeType, e: Throwable)
26-
extends RuntimeException(s"Error adding inheritance. Node1: $node1, Node2: $node2, etype: $etype, err: ${e.getMessage()}")
24+
case class ErrorAddingInheritance(node1: Node, node2: Node, etype: EdgeType, e: Throwable)
25+
extends RuntimeException(
26+
s"Error adding inheritance. Node1: $node1, Node2: $node2, etype: $etype, err: ${e.getMessage()}"
27+
)
2728

2829
override def clear: IO[Unit] = for {
2930
graph <- getGraph
@@ -39,25 +40,23 @@ case class InheritanceJGraphT[Node, EdgeType](
3940
graph <- getGraph
4041
} yield graph.vertexSet.asScala.toSet
4142

42-
override def addNode(node: Node): IO[Unit] =
43-
getGraph.flatMap(graph => {
44-
Try(graph.addVertex(node)).fold(e =>
45-
IO.raiseError(ErrorAddingNode(node, e)),
46-
v => IO.pure(())
47-
)
48-
})
43+
override def addNode(node: Node): IO[Unit] =
44+
getGraph.flatMap { graph =>
45+
Try(graph.addVertex(node))
46+
.fold(e => IO.raiseError(ErrorAddingNode(node, e)), v => IO.pure(()))
47+
}
4948

5049
override def addInheritance(node1: Node, node2: Node, etype: EdgeType): IO[Unit] =
5150
getGraph.flatMap(graph =>
5251
Try {
53-
graph.addVertex(node1)
54-
graph.addVertex(node2)
55-
graph.addEdge(node1, node2, Edge(node1, node2, etype))
52+
graph.addVertex(node1)
53+
graph.addVertex(node2)
54+
graph.addEdge(node1, node2, Edge(node1, node2, etype))
5655
}.fold(
57-
e => IO.raiseError(ErrorAddingInheritance(node1,node2,etype,e)),
56+
e => IO.raiseError(ErrorAddingInheritance(node1, node2, etype, e)),
5857
v => IO.pure(())
5958
)
60-
)
59+
)
6160

6261
override def descendants(node: Node): IO[Set[Node]] = for {
6362
graph <- getGraph

modules/rbe/src/main/scala/es/weso/graph/GraphMap.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package es.weso.graph
33
/** Implementation of graph as a map
44
*/
55
case class GraphMap[Edge, Node](
6-
m: Map[Node, Seq[(Edge, Node)]]
7-
) extends Graph[Edge, Node] {
6+
m: Map[Node, Seq[(Edge, Node)]]
7+
) extends Graph[Edge, Node] {
88
def nodes = m.keys.toSeq
99
def triples =
1010
m.map { case (x, out) => out.map { case (e, o) => (x, e, o) } }.flatten.toSeq

modules/rbe/src/main/scala/es/weso/rbe/Schema.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ case class Schema[Edge, Node, Label, Err, Evidence](
1616
}
1717

1818
object Schema {
19-
def empty[Edge, Node, Label, Err, Evidence]():
20-
Schema[Edge, Node, Label, Err, Evidence] =
19+
def empty[Edge, Node, Label, Err, Evidence](): Schema[Edge, Node, Label, Err, Evidence] =
2120
Schema(Map(), Seq())
2221

2322
}

modules/rbe/src/main/scala/es/weso/rbe/deriv/DerivChecker.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import cats.implicits._
77

88
case class DerivChecker[A: Show, Ordering](rbe: Rbe[A]) extends BagChecker[A] {
99

10-
def check(bag: Bag[A], open: Boolean): Either[NonEmptyList[RbeError], Bag[A]] = {
10+
def check(bag: Bag[A], open: Boolean): Either[NonEmptyList[RbeError], Bag[A]] =
1111
rbe.derivBag(bag, open, rbe.symbols) match {
1212
case f: Fail => NonEmptyList.one(f.error).asLeft
1313
case d =>
@@ -16,5 +16,4 @@ case class DerivChecker[A: Show, Ordering](rbe: Rbe[A]) extends BagChecker[A] {
1616
case Left(m) => NonEmptyList.one(NonNullableError(d, rbe, bag, open, m)).asLeft
1717
}
1818
}
19-
}
2019
}

modules/rbe/src/main/scala/es/weso/rbe/interval/IntervalChecker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ case class IntervalChecker[A: Show](rbe: Rbe[A]) extends BagChecker[A] {
3939
// In case of fail, check using derivatives to obtain better error messages
4040
// TODO: Could it be optimized knowing that it will fail?
4141
derivChecker.check(bag, open)
42-
// NonEmptyList.one(IntervalError(interval,rbe,bag,open)).asLeft
42+
// NonEmptyList.one(IntervalError(interval,rbe,bag,open)).asLeft
4343
} yield v
4444
}
4545

modules/shapepath/src/main/scala/es/weso/shapepath/ShapePath.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ object ShapePath {
217217
case _: ShapeNot =>
218218
warning(s"ShapeNot: evaluating index ${index.show} returns no item") >>
219219
ok(current)
220-
case sd: ShapeDecl =>
220+
case sd: ShapeDecl =>
221221
cmb(current, ShapeExprItem(sd.shapeExpr))
222222
case s: Shape =>
223223
index match {

modules/shex/src/main/scala/es/weso/shex/ExtendsConverter.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,14 @@ object ExtendsConverter {
8181
case _ => ok(ShapeOr(id = Some(lbl), shapeExprs = maybeR.map(_.rmId), None, None))
8282
}
8383
} yield r
84-
case ShapeDecl(lbl, se, false) => cnvDescendants(schema)(se).flatMap(ds => ds match {
85-
case Nil => err[ShapeExpr](s"No descendants for ${schema.qualify(lbl)}?")
86-
case s :: Nil => ok(s.addId(lbl))
87-
case _ => ok(ShapeOr(id = Some(lbl), shapeExprs = ds.map(_.rmId), None, None))
88-
})
84+
case ShapeDecl(lbl, se, false) =>
85+
cnvDescendants(schema)(se).flatMap(ds =>
86+
ds match {
87+
case Nil => err[ShapeExpr](s"No descendants for ${schema.qualify(lbl)}?")
88+
case s :: Nil => ok(s.addId(lbl))
89+
case _ => ok(ShapeOr(id = Some(lbl), shapeExprs = ds.map(_.rmId), None, None))
90+
}
91+
)
8992
}
9093

9194
private def mkDisj(schema: ResolvedSchema)(se: ShapeExpr): Cnv[ShapeExpr] = for {

modules/shex/src/main/scala/es/weso/shex/InheritanceGraph.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ object InheritanceGraph {
5353
): IO[Unit] =
5454
se match {
5555
case s: Shape => addExtendsRestricts(g, sub, s)
56-
/* case s: ShapeAnd =>
57-
s.shapeExprs.foldM(()){
58-
case (_, se) => addShapeExpr(g, sub, se, verbose)
56+
/* case s: ShapeAnd =>
57+
s.shapeExprs.foldM(()){
58+
case (_, se) => addShapeExpr(g, sub, se, verbose)
5959
} */
6060
case sd: ShapeDecl => addShapeExpr(g, sub, sd.shapeExpr, verbose)
61-
case sr: ShapeRef => g.addInheritance(sub, sr.reference, References)
62-
case _ => ().pure[IO]
61+
case sr: ShapeRef => g.addInheritance(sub, sr.reference, References)
62+
case _ => ().pure[IO]
6363
}
6464

6565
private def addPair(g: Inheritance[ShapeLabel, ShapesRelation], verboseLevel: VerboseLevel)(

modules/shex/src/main/scala/es/weso/shex/ResolvedShapeExpr.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ case class ResolvedShapeExpr(
1818

1919
object ResolvedShapeExpr {
2020
def apply(se: ShapeExpr): ResolvedShapeExpr = ResolvedShapeExpr(se, None, Set(), List())
21-
def apply(se: ShapeExpr, iri: IRI): ResolvedShapeExpr = ResolvedShapeExpr(se, Some(iri), Set(), List())
21+
def apply(se: ShapeExpr, iri: IRI): ResolvedShapeExpr =
22+
ResolvedShapeExpr(se, Some(iri), Set(), List())
2223
}

modules/shex/src/main/scala/es/weso/shex/compact/CompactShow.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ object CompactShow {
144144
semActsDoc(pm)
145145
)
146146
case ShapeDecl(id, se, b) =>
147-
(if (b) str("abstract") else str("")):: space :: idDoc(Some(id), pm) :: space :: shapeExprDoc(pm)(se)
147+
(if (b) str("abstract") else str("")) :: space :: idDoc(
148+
Some(id),
149+
pm
150+
) :: space :: shapeExprDoc(pm)(se)
148151
case other => str(s"ERROR: Unknown type of ShapeExpr: ${other}")
149152
}
150153

0 commit comments

Comments
 (0)