Skip to content

Commit

Permalink
relpaths: fix rendering of RelPath starting with ./../...
Browse files Browse the repository at this point in the history
  • Loading branch information
oyvindberg committed Nov 10, 2022
1 parent f312020 commit d38d616
Show file tree
Hide file tree
Showing 21 changed files with 1,098 additions and 1,094 deletions.
6 changes: 5 additions & 1 deletion bleep-model/src/scala/bleep/RelPath.scala
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ object RelPath {
Decoder[String].emap(apply)

implicit val encodesRelPath: Encoder[RelPath] =
Encoder[String].contramap(_.segments.mkString("./", "/", ""))
Encoder[String].contramap {
case RelPath(segments @ (".." :: _)) => segments.mkString("/")
case RelPath(segments) => segments.mkString("./", "/", "")

}

implicit val ordering: Ordering[RelPath] =
Ordering.by(_.segments.mkString(""))
Expand Down
Loading

0 comments on commit d38d616

Please sign in to comment.