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

Fix sorting indices of a list with children #6897

Merged
merged 9 commits into from
Jul 27, 2024
+23 −1
Merged

Fix sorting indices of a list with children #6897

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf311bb
Fix sorting indices of a list with children
potarodev Jul 12, 2024
809254e
Add test with 3 levels
potarodev Jul 12, 2024
1468a02
Add test for checking wrongly modified children
potarodev Jul 14, 2024
051a280
Fix incorrect test & map as pair instead of modifying entry
potarodev Jul 14, 2024
6c3057c
Fix incorrect mapping
potarodev Jul 16, 2024
4db8eb5
Change formatting of test
potarodev Jul 16, 2024
2f4232d
Apply new conventions to lang package (#6918)
sovdeeth Jul 24, 2024
9a77531
Merge branch 'dev/feature' into dev/feature
sovdeeth Jul 24, 2024
8679518
Revert "Apply new conventions to lang package (#6918)"
APickledWalrus Jul 27, 2024
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
1 change: 1 addition & 0 deletions src/main/java/ch/njol/skript/expressions/ExprIndices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ protected String[] get(Event e) {
if (sort) {
int direction = descending ? -1 : 1;
return variable.entrySet().stream()
.peek((entry) -> entry.setValue(entry.getValue() instanceof Map<?,?> ? ((Map<?, ?>) entry.getValue()).get(null) : entry.getValue()))
potarodev marked this conversation as resolved.
Show resolved Hide resolved
.sorted((a, b) -> ExprSortedList.compare(a.getValue(), b.getValue()) * direction)
.map(Entry::getKey)
sovdeeth marked this conversation as resolved.
Show resolved Hide resolved
.toArray(String[]::new);
Expand Down
9 changes: 9 additions & 0 deletions src/test/skript/tests/regressions/6881-sorted indices with children.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
test "sorted indices on map":
set {_test::1} to 111
set {_test::2} to 555
set {_test::3} to 444
set {_test::1::a} to 2
set {_test::2::b} to 3
set {_test::3::c} to 6
sovdeeth marked this conversation as resolved.
Show resolved Hide resolved
set {_indices::*} to (sorted indices of {_test::*} in ascending order)
assert {_indices::*} is ("1", "3", "2") with "sorted indices on list with children threw or was incorrect"