From ef0f8c60c3781689b8bee2bc276741b2455f85d1 Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Wed, 17 Aug 2022 15:59:04 +0100
Subject: [PATCH] v1.0.2 - Fix issues with jumper buttons, add tests for them

---
 .idea/workspace.xml                           | 55 +++++++++++++++++--
 build.gradle                                  |  2 +-
 .../william278/paginedown/ListOptions.java    |  2 +-
 .../william278/paginedown/PaginatedList.java  | 46 +++++++++-------
 .../paginedown/PaginatedListTests.java        | 38 +++++++++++++
 5 files changed, 116 insertions(+), 27 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a829567..e6add69 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1adcdbad-26db-47ae-b8e5-83088ba9f2ff" name="Changes" comment="Fix no builders for page button formats">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    <list default="true" id="1adcdbad-26db-47ae-b8e5-83088ba9f2ff" name="Changes" comment="Fix lower bounds handling of getNearestValidPage">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/william278/paginedown/ListOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/william278/paginedown/ListOptions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/william278/paginedown/PaginatedList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/william278/paginedown/PaginatedList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/net/william278/paginedown/PaginatedListTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/net/william278/paginedown/PaginatedListTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -52,7 +56,30 @@
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;
   }
 }</component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Gradle.PaginatedListTests">
+    <configuration name="PaginatedListTests" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" value="" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;net.william278.paginedown.PaginatedListTests&quot;" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <method v="2" />
+    </configuration>
     <configuration name="PagineDown build" type="GradleRunConfiguration" factoryName="Gradle">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -76,6 +103,15 @@
       <DebugAllEnabled>false</DebugAllEnabled>
       <method v="2" />
     </configuration>
+    <list>
+      <item itemvalue="Gradle.PagineDown build" />
+      <item itemvalue="Gradle.PaginatedListTests" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Gradle.PaginatedListTests" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
@@ -87,6 +123,7 @@
       <updated>1660688177518</updated>
       <workItem from="1660688178768" duration="664000" />
       <workItem from="1660734365241" duration="1564000" />
+      <workItem from="1660746781694" duration="1536000" />
     </task>
     <task id="LOCAL-00001" summary="Make gradlew executable">
       <created>1660688283740</created>
@@ -109,7 +146,14 @@
       <option name="project" value="LOCAL" />
       <updated>1660735113793</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="Fix lower bounds handling of getNearestValidPage">
+      <created>1660746908828</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1660746908828</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -131,6 +175,7 @@
     <MESSAGE value="Make gradlew executable" />
     <MESSAGE value="Fix javadoc encoding and warnings" />
     <MESSAGE value="Fix no builders for page button formats" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix no builders for page button formats" />
+    <MESSAGE value="Fix lower bounds handling of getNearestValidPage" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix lower bounds handling of getNearestValidPage" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 41ed08a..0f57e4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'net.william278'
-version '1.0.1'
+version '1.0.2'
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/net/william278/paginedown/ListOptions.java b/src/main/java/net/william278/paginedown/ListOptions.java
index 59ca57c..5cbb5b2 100644
--- a/src/main/java/net/william278/paginedown/ListOptions.java
+++ b/src/main/java/net/william278/paginedown/ListOptions.java
@@ -24,7 +24,7 @@ public class ListOptions {
     @NotNull
     protected String pageJumperGroupSeparator = "…";
     @NotNull
-    protected String pageJumperCurrentPageFormat = "[%page%](%color%)";
+    protected String pageJumperCurrentPageFormat = "[%current_page%](%color%)";
     @NotNull
     protected String pageJumperPageFormat = "[%target_page_index%](show_text=&7Jump to page %target_page_index% run_command=/%command% %target_page_index%)";
     @NotNull
diff --git a/src/main/java/net/william278/paginedown/PaginatedList.java b/src/main/java/net/william278/paginedown/PaginatedList.java
index 95c4e6a..4e8a336 100644
--- a/src/main/java/net/william278/paginedown/PaginatedList.java
+++ b/src/main/java/net/william278/paginedown/PaginatedList.java
@@ -222,26 +222,7 @@ public class PaginatedList {
                             }
                             break;
                         case "page_jump_buttons": {
-                            final StringJoiner pageGroups = new StringJoiner(options.pageJumperGroupSeparator);
-                            StringJoiner pages = new StringJoiner(options.pageJumperPageSeparator);
-
-                            for (int i = 1; i <= getTotalPages(); i++) {
-                                int startCutOff = (page <= 3 ? page - 1 : 3);
-                                int endCutOff = (page > getTotalPages() - 3 ? page + 1 : getTotalPages() - 3);
-                                if (i == startCutOff + 1 || i == endCutOff) {
-                                    pageGroups.add(pages.toString());
-                                    pages = new StringJoiner(options.pageJumperPageSeparator);
-                                }
-                                if ((i <= startCutOff) || (i > endCutOff)) {
-                                    pages.add(formatPageString(formatPageJumper(i), i));
-                                } else if (i == page) {
-                                    pages.add(formatPageString(options.pageJumperCurrentPageFormat, i));
-                                }
-                            }
-                            if (!pages.toString().isBlank()) {
-                                pageGroups.add(pages.toString());
-                            }
-                            convertedFormat.append(pageGroups);
+                            convertedFormat.append(getPageJumperButtons(page));
                             break;
                         }
                     }
@@ -272,4 +253,29 @@ public class PaginatedList {
                 Integer.toString(page)), page);
     }
 
+    @NotNull
+    protected String getPageJumperButtons(final int page) {
+        final StringJoiner pageGroups = new StringJoiner(options.pageJumperGroupSeparator);
+        StringJoiner pages = new StringJoiner(options.pageJumperPageSeparator);
+        int lastPage = 1;
+        for (int i = 1; i <= getTotalPages(); i++) {
+            if (i < 3 || i > getTotalPages() - 2 || page == i) {
+                if (i - lastPage > 1) {
+                    pageGroups.add(pages.toString());
+                    pages = new StringJoiner(options.pageJumperPageSeparator);
+                }
+                if (page == i) {
+                    pages.add(formatPageString(options.pageJumperCurrentPageFormat, i));
+                } else {
+                    pages.add(formatPageString(formatPageJumper(i), i));
+                }
+                lastPage = i;
+            }
+        }
+        if (!pages.toString().isBlank()) {
+            pageGroups.add(pages.toString());
+        }
+        return pageGroups.toString();
+    }
+
 }
diff --git a/src/test/java/net/william278/paginedown/PaginatedListTests.java b/src/test/java/net/william278/paginedown/PaginatedListTests.java
index 11f89e2..8ef2aca 100644
--- a/src/test/java/net/william278/paginedown/PaginatedListTests.java
+++ b/src/test/java/net/william278/paginedown/PaginatedListTests.java
@@ -32,4 +32,42 @@ public class PaginatedListTests {
         ).getTotalPages();
         Assertions.assertEquals(4, pageCount);
     }
+
+    @Test
+    public void testPageJumperButtonsOnLongList() {
+        final PaginatedList longList = PaginatedList.of(generateListData(200, "Item #"),
+                new ListOptions.Builder()
+                        .setItemsPerPage(10)
+                        .setPageJumperPageFormat("%target_page_index%")
+                        .setPageJumperCurrentPageFormat("%current_page%")
+                        .build());
+        Assertions.assertEquals("1|2…19|20", longList.getPageJumperButtons(2));
+        Assertions.assertEquals("1|2…6…19|20", longList.getPageJumperButtons(6));
+        Assertions.assertEquals("1|2…19|20", longList.getPageJumperButtons(20));
+        Assertions.assertEquals("1|2…19|20", longList.getPageJumperButtons(1));
+    }
+
+    @Test
+    public void testPageJumperButtonsOnMediumList() {
+        final PaginatedList mediumList = PaginatedList.of(generateListData(45, "Item #"),
+                new ListOptions.Builder()
+                        .setItemsPerPage(10)
+                        .setPageJumperPageFormat("%target_page_index%")
+                        .setPageJumperCurrentPageFormat("%current_page%")
+                        .build());
+        Assertions.assertEquals("1|2…4|5", mediumList.getPageJumperButtons(1));
+        Assertions.assertEquals("1|2|3|4|5", mediumList.getPageJumperButtons(3));
+        Assertions.assertEquals("1|2…4|5", mediumList.getPageJumperButtons(5));
+    }
+
+    @Test
+    public void testPageJumperButtonsOnShortList() {
+        final PaginatedList shortList = PaginatedList.of(generateListData(20, "Item #"),
+                new ListOptions.Builder()
+                        .setItemsPerPage(10)
+                        .setPageJumperPageFormat("%target_page_index%")
+                        .setPageJumperCurrentPageFormat("%current_page%")
+                        .build());
+        Assertions.assertEquals("1|2", shortList.getPageJumperButtons(2));
+    }
 }