Fix tests for paragraph tracking

Author: thockin

v2/parser/parse.go

@@ -392,14 +392,14 @@ func minimize(lines []string) []string {
 	inDeprecated := false // paragraph tracking
 	prevWasBlank := false
 	for _, line := range lines {
-		if inDeprecated {
-			continue
-		}
 		if len(strings.TrimSpace(line)) == 0 {
 			prevWasBlank = true
 			inDeprecated = false
 			continue
 		}
+		if inDeprecated {
+			continue
+		}
 		if prevWasBlank && strings.HasPrefix(strings.TrimSpace(line), "Deprecated:") {
 			prevWasBlank = false
 			inDeprecated = true

v2/parser/parse_test.go

@@ -1120,7 +1120,7 @@ func TestStructParse(t *testing.T) {
 				"k8s.io/gengo/v2/parser/testdata/type-alias/v2",
 			},
 			expected: func() *types.Type {
-				expectedTypeComments := []string{"Blah is a test.", "A test, I tell you."}
+				expectedTypeComments := []string{"Blah is a test.", "A test, I tell you.", "", "Another paragraph of comments."}
 				if !typeAliasEnabled {
 					// Comments from the last processed package wins.
 					expectedTypeComments = []string{"This is an alias for v1.Blah."}
@@ -1230,7 +1230,7 @@ func TestCommentsWithAliasedType(t *testing.T) {
 			continue
 		}
 
-		expectedTypeComments := []string{"Blah is a test.", "A test, I tell you."}
+		expectedTypeComments := []string{"Blah is a test.", "A test, I tell you.", "", "Another paragraph of comments."}
 		if !typeAliasEnabled {
 			// Comments from the last processed package wins.
 			expectedTypeComments = []string{"This is an alias for v1.Blah."}

v2/parser/testdata/type-alias/v1/file.go

@@ -6,6 +6,8 @@ type LocalBlahAlias = Blah
 
 // Blah is a test.
 // A test, I tell you.
+//
+// Another paragraph of comments.
 type Blah struct {
 	// A is the first field.
 	A int64 `json:"a"`
@@ -19,11 +21,15 @@ type Blah struct {
 // A test, I tell you.
 //
 // Deprecated: use Blah instead. This is another alias within the same package.
+//
+// Another paragraph of comments.
 type LocalBlahAliasDeprecated = Blah
 
 // Blah is a test.
 // A test, I tell you.
 //
 // Deprecated: use Blah instead. This is a third alias within the same package.
 // It's a whole paragraph of deprecated notes
+//
+// Another paragraph of comments.
 type LocalBlahAliasDeprecatedLong = Blah