Fix pragmas that contain # (#14)

* Fix pragmas that contain `#` Signed-off-by: Akshit Garg <[email protected]> * Bump version Signed-off-by: Akshit Garg <[email protected]> Signed-off-by: Akshit Garg <[email protected]>
DeepSourceCorp · Jan 23, 2023 · bd39749 · bd39749
1 parent a03d42a
commit bd39749
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/cmd/scatr/version.go b/cmd/scatr/version.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const version = "0.3.0"
+const version = "0.3.1"
 
 var versionCmd = &cobra.Command{
 	Use:   "version",

diff --git a/pragma/pragma.go b/pragma/pragma.go
@@ -36,7 +36,7 @@ func (p *Pragma) merge(other *Pragma) {
 }
 
 var (
-	pragmaRegex = regexp.MustCompile(`\s*\[([\w-]+)](:\s*([^#]+))?`)
+	pragmaRegex = regexp.MustCompile(`\s*\[([\w-]+)](:\s*(.*))?`)
 	issueRegex  = regexp2.MustCompile(`\s*(\d+)?\s*("(.*?(?<!\\))")?`, regexp2.None)
 )
 

diff --git a/pragma/pragma_test.go b/pragma/pragma_test.go
@@ -155,6 +155,16 @@ func TestParsePragma(t *testing.T) {
 				Hit: map[string]bool{"GO-W1000": false, "GO-W1001": false},
 			},
 		},
+		{
+			name: "rust pragma with #[must_use]",
+			args: args{comment: "[RS-E1017]: \"Calling `.hash(_)` on expression with unit-type `#[must_use]`\""},
+			want: &Pragma{
+				Issues: map[string][]*Issue{
+					"RS-E1017": {{Message: "Calling `.hash(_)` on expression with unit-type `#[must_use]`"}},
+				},
+				Hit: map[string]bool{"RS-E1017": false},
+			},
+		},
 	}
 
 	for _, tt := range tests {
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ func (p *Pragma) merge(other *Pragma) { @@
     }
     var (
-    	pragmaRegex = regexp.MustCompile(`\s*\[([\w-]+)](:\s*([^#]+))?`)
+    	pragmaRegex = regexp.MustCompile(`\s*\[([\w-]+)](:\s*(.*))?`)
     	issueRegex  = regexp2.MustCompile(`\s*(\d+)?\s*("(.*?(?<!\\))")?`, regexp2.None)
     )
@@ Expand Down @@