Fix printf parsing of %#v and %+v

Author: polyfloyd

errorlint/printf.go

@@ -53,23 +53,26 @@ func (pp *printfParser) parseVerb() (*verb, error) {
 	}
 
 	index := -1
-	switch pp.peek() {
-	case '%':
-		pp.next()
-		return pp.parseVerb()
-	case '+', '#':
-		pp.next()
-		fallthrough
-	case '[':
-		var err error
-		index, err = pp.parseIndex()
-		if err != nil {
-			return nil, err
+	for {
+		switch pp.peek() {
+		case '%':
+			pp.next()
+			return pp.parseVerb()
+		case '+', '#':
+			pp.next()
+			continue
+		case '[':
+			var err error
+			index, err = pp.parseIndex()
+			if err != nil {
+				return nil, err
+			}
+		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.':
+			pp.parsePrecision()
+		case 0:
+			return nil, io.EOF
 		}
-	case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.':
-		pp.parsePrecision()
-	case 0:
-		return nil, io.EOF
+		break
 	}
 
 	format := pp.next()

errorlint/printf_test.go

@@ -49,6 +49,13 @@ func TestPrintfParser(t *testing.T) {
 				{format: "v", index: 1},
 			},
 		},
+		{
+			format: "%#v %+v",
+			verbs: []verb{
+				{format: "v", index: -1},
+				{format: "v", index: -1},
+			},
+		},
 	}
 
 	for _, tc := range testCases {