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.

Sign up for GitHub

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

Jump to bottom

Avoid throwing an exception when sorting identical paths #90

Merged
merged 7 commits into from
Dec 10, 2021
Merged

Avoid throwing an exception when sorting identical paths #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbb3c27
.
lihaoyi Dec 10, 2021
77557d9
.
lihaoyi Dec 10, 2021
91c1465
.
lihaoyi Dec 10, 2021
f8e10c8
.
lihaoyi Dec 10, 2021
c7a187b
.
lihaoyi Dec 10, 2021
3a9ec3f
.
lihaoyi Dec 10, 2021
d06ad99
.
lihaoyi Dec 10, 2021
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
16 changes: 11 additions & 5 deletions os/src/Path.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,15 +408,21 @@ object Path {
else{
var xSeg = ""
var ySeg = ""
var i = -1
var i = 0
var result: Integer = null
while ({
i += 1
xSeg = x.getSegment(i)
ySeg = y.getSegment(i)
i < xSegCount && xSeg == ySeg
i += 1
val compared = Ordering.String.compare(xSeg, ySeg)
if (i < xSegCount && compared == 0) true // continue
else {
result = compared
false
}
}) ()
if (i == xSegCount) 0
else Ordering.String.compare(xSeg, ySeg)

result
}
}
}
Expand Down
17 changes: 14 additions & 3 deletions os/test/src/PathTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,21 @@ object PathTests extends TestSuite{
}
}
test("sorting"){
assert(
Seq(root/"c", root, root/"b", root/"a").sorted == Seq(root, root/"a", root/"b", root/"c"),
test - {
assert(
Seq(root/"c", root, root/"b", root/"a").sorted ==
Seq(root, root/"a", root/"b", root/"c")
)
}

test - assert(
Seq(up/"c", up/up/"c", rel/"b"/"c", rel/"a"/"c", rel/"a"/"d").sorted ==
Seq(rel/"a"/"c", rel/"a"/"d", rel/"b"/"c", up/"c", up/up/"c")
Seq(rel/"a"/"c", rel/"a"/"d", rel/"b"/"c", up/"c", up/up/"c")
)

test - assert(
Seq(os.root / "yo", os.root / "yo").sorted ==
Seq(os.root / "yo", os.root / "yo")
)
}
test("construction"){
Expand Down