Fix #83 (as shown by #143 but diff branch)

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -71,4 +71,11 @@ Guillaume Smaha (GuillaumeSmaha@github)
 Filip Hrisafov (filiphr@github)
 * Suggested #139: Support for Map<String, String> in `JavaPropsMapper`
  (2.10.0)
- 
+
+Matti Bickel (wundrian@github)
+* Reported #83: Update index of sequence context
+ (2.10.0)
+
+Maarten Winkels (mwinkels@github)
+* Contributed fix for #83: Update index of sequence context
+ (2.10.0)

release-notes/VERSION-2.x

@@ -8,6 +8,11 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.10.0 (not yet released)
+
+#83: (yaml) Update index of sequence context
+ (reported by Matti B; fix contributed by Maarten W)
+
 2.10.0.pr2 (31-Aug-2019)
 
 #139: (properties) Support for Map<String, String> in `JavaPropsMapper`

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java

@@ -399,10 +399,10 @@ public JsonToken nextToken() throws IOException
                     _parsingContext.setCurrentName(name);
                     return (_currToken = JsonToken.FIELD_NAME);
                 }
+            } else if (_parsingContext.inArray()) {
+                _parsingContext.expectComma();
             }
 
-            _currentAnchor = null;
-
             // Ugh. Why not expose id, to be able to Switch?
             _currentAnchor = null;
 

yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/StreamingParseTest.java

@@ -423,7 +423,6 @@ public void testAnchorParsing() throws Exception
         yp.close();
     }
 
-    // [Issue#10]
     // Scalars should not be parsed when not in the plain flow style.
     public void testQuotedStyles() throws Exception
     {
@@ -435,8 +434,10 @@ public void testQuotedStyles() throws Exception
         assertEquals("strings", p.getCurrentName());
         assertToken(JsonToken.START_ARRAY, p.nextToken());
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertEquals(0, p.getParsingContext().getCurrentIndex());
         assertEquals("true", p.getText());
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertEquals(1, p.getParsingContext().getCurrentIndex());
         assertEquals("false", p.getText());
         assertToken(JsonToken.END_ARRAY, p.nextToken());
         assertToken(JsonToken.END_OBJECT, p.nextToken());
@@ -507,8 +508,10 @@ public void testObjectWithNumbers() throws Exception
 
         assertToken(JsonToken.START_ARRAY, p.nextToken());
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertEquals(0, p.getParsingContext().getCurrentIndex());
         assertEquals("Foo Bar", p.getText());
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertEquals(1, p.getParsingContext().getCurrentIndex());
         assertEquals("Max Power", p.getText());
         assertToken(JsonToken.END_ARRAY, p.nextToken());