Fix misaligned indentation in comments (#734)

parser/parser.go

@@ -539,6 +539,9 @@ func (p *parser) validateMapKeyValueNextToken(ctx *context, keyTk, tk *Token) er
 	if tk.Column() <= keyTk.Column() {
 		return nil
 	}
+	if ctx.isComment() {
+		return nil
+	}
 	if ctx.isFlow && (tk.Type() == token.CollectEntryType || tk.Type() == token.SequenceEndType) {
 		return nil
 	}

parser/parser_test.go

@@ -1454,6 +1454,7 @@ func TestComment(t *testing.T) {
 	tests := []struct {
 		name     string
 		yaml     string
+		expected string
 	}{
 		{
 			name: "map with comment",
@@ -1541,6 +1542,52 @@ foo: > # comment
 # This comment is in its own document
 ---
 a: b
+`,
+		},
+		{
+			name: "map with misaligned indentation in comments",
+			yaml: `
+ # commentA
+a:  #commentB
+   # commentC
+  b: c  # commentD
+    # commentE
+  d: e  # commentF
+ # commentG
+`,
+			expected: `
+# commentA
+a: #commentB
+  # commentC
+  b: c # commentD
+  # commentE
+  d: e # commentF
+# commentG
+`,
+		},
+		{
+			name: "sequence with misaligned indentation in comments",
+			yaml: `
+ # commentA
+- a  # commentB
+ # commentC
+- b:   # commentD
+   # commentE
+  - d  # commentF
+    # commentG
+  - e  # commentG
+ # commentH
+`,
+			expected: `
+# commentA
+- a # commentB
+# commentC
+- b: # commentD
+  # commentE
+  - d # commentF
+  # commentG
+  - e # commentG
+# commentH
 `,
 		},
 	}
@@ -1551,8 +1598,12 @@ a: b
 				t.Fatalf("%+v", err)
 			}
 			got := "\n" + f.String()
-			if test.yaml != got {
+			expected := test.yaml
-				t.Fatalf("expected:%s\ngot:%s", test.yaml, got)
+			if test.expected != "" {
+				expected = test.expected
+			}
+			if expected != got {
+				t.Fatalf("expected:%s\ngot:%s", expected, got)
 			}
 		})
 	}