fix: Corrected Cursor.prevIf() and .nextIf() feedback

They would not correctly indicate if they were pointing to a valid
element or not. This is now fixed.

See #17 for more information

Author: quintesse

src/main/java/org/codejive/properties/Cursor.java

@@ -95,7 +95,8 @@ public boolean nextIf(PropertiesParser.Type type) {
 
     public boolean nextIf(Predicate<PropertiesParser.Token> accept) {
         if (hasToken() && accept.test(token())) {
-            return next().hasToken();
+            next();
+            return true;
         } else {
             return false;
         }
@@ -120,7 +121,8 @@ public boolean prevIf(PropertiesParser.Type type) {
 
     public boolean prevIf(Predicate<PropertiesParser.Token> accept) {
         if (hasToken() && accept.test(token())) {
-            return prev().hasToken();
+            prev();
+            return true;
         } else {
             return false;
         }

src/main/java/org/codejive/properties/Properties.java

@@ -969,15 +969,15 @@ private Cursor skipHeaderCommentLines() {
         }
     }
 
-    private Cursor index(int index) {
+    Cursor index(int index) {
         return Cursor.index(tokens, index);
     }
 
-    private Cursor first() {
+    Cursor first() {
         return Cursor.first(tokens);
     }
 
-    private Cursor last() {
+    Cursor last() {
         return Cursor.last(tokens);
     }
 

src/test/java/org/codejive/properties/TestProperties.java

@@ -206,6 +206,15 @@ void testGetComment() throws IOException, URISyntaxException {
                 .containsExactly("# another comment", "! and a comment", "! block");
     }
 
+    @Test
+    void testCommentFirstLine() throws IOException, URISyntaxException {
+        Properties p = Properties.loadProperties(getResource("/test-commentfirstline.properties"));
+        assertThat(p.getComment("one")).containsExactly("#comment1", "#  comment2");
+        StringWriter sw = new StringWriter();
+        p.store(sw);
+        assertThat(sw.toString()).isEqualTo(readAll(getResource("/test-commentfirstline.properties")));
+    }
+
     @Test
     void testSetComment() throws IOException, URISyntaxException {
         Properties p = Properties.loadProperties(getResource("/test.properties"));
@@ -611,6 +620,15 @@ void testUnescaped() throws IOException, URISyntaxException {
         assertThat(sw.toString()).isEqualTo(readAll(getResource("/test-unescaped.properties")));
     }
 
+    @Test
+    void testCursor() throws IOException, URISyntaxException {
+        Properties p = Properties.loadProperties(getResource("/test.properties"));
+        Cursor c = p.first();
+        assertThat(c.nextCount(t -> true)).isEqualTo(p.last().position() + 1);
+        c = p.last();
+        assertThat(c.prevCount(t -> true)).isEqualTo(p.last().position() + 1);
+    }
+
     private Path getResource(String name) throws URISyntaxException {
         return Paths.get(getClass().getResource(name).toURI());
     }

src/test/resources/test-commentfirstline.properties

@@ -0,0 +1,3 @@
+#comment1
+#  comment2
+one=simple