Fix issue collapse when previous line has code (#19)

* Fix issue collapse when previous line has code Signed-off-by: Akshit Garg <[email protected]> * Apply suggestions from review Signed-off-by: Akshit Garg <[email protected]> --------- Signed-off-by: Akshit Garg <[email protected]>
DeepSourceCorp · Feb 24, 2023 · b622fdc · b622fdc
1 parent 2a9c9b8
commit b622fdc
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 3 deletions.
diff --git a/pragma/file.go b/pragma/file.go
@@ -48,10 +48,11 @@ func readLine(reader *bufio.Reader) (string, error) {
 func (f *File) extractPragmas() {
 	reader := bufio.NewReader(strings.NewReader(f.Content))
 
-	currentLine := 0
+	currentLineNum := 0
+	previousLine := ""
 	var previousPragmaWithCode *Pragma
 	for {
-		currentLine++
+		currentLineNum++
 
 		line, err := readLine(reader)
 		if err != nil {
@@ -61,10 +62,11 @@ func (f *File) extractPragmas() {
 			break
 		}
 
+		previousLine = line
 		line = strings.TrimSpace(line)
 
 		var pragma *Pragma
-		lineNum := currentLine
+		lineNum := currentLineNum
 		for _, prefix := range f.CommentPrefix {
 			split := strings.Split(line, prefix)
 			if len(split) < 2 {
@@ -108,8 +110,23 @@ func (f *File) extractPragmas() {
 				continue
 			}
 
+			// Previous line also has code
+			if !hasPrefixes(previousLine, f.CommentPrefix) {
+				continue
+			}
+
 			pragma.merge(previousPragma)
 			delete(f.Pragmas, lineNum-1)
 		}
 	}
 }
+
+func hasPrefixes(line string, prefixes []string) bool {
+	for _, prefix := range prefixes {
+		if strings.HasPrefix(line, prefix) {
+			return true
+		}
+	}
+
+	return false
+}
diff --git a/pragma/file_test.go b/pragma/file_test.go
@@ -334,6 +334,40 @@ fmt.Println("Hello") // [GO-W1003]: 30
 				},
 			},
 		},
+		{
+			name: "issue collapse bug - cxx",
+			args: args{
+				content: `issueCaseNotRaised(00); // [CXX-S111]
+issueCaseRaised(010); // [CXX-S112]`,
+				commentPrefix: []string{"//"},
+			},
+			want: map[int]*Pragma{
+				1: {
+					Issues: map[string][]*Issue{"CXX-S111": {}},
+					Hit:    map[string]bool{"CXX-S111": false},
+				},
+				2: {
+					Issues: map[string][]*Issue{"CXX-S112": {}},
+					Hit:    map[string]bool{"CXX-S112": false},
+				},
+			},
+		},
+		{
+			name: "issue collapse - blank line",
+			args: args{
+				content: `code();
+
+// [CXX-S112]
+issueCaseRaised(010);`,
+				commentPrefix: []string{"//"},
+			},
+			want: map[int]*Pragma{
+				4: {
+					Issues: map[string][]*Issue{"CXX-S112": {}},
+					Hit:    map[string]bool{"CXX-S112": false},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {