-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support custom forbid reason messages #11
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package forbidigo | ||
|
||
import ( | ||
"fmt" | ||
"regexp" | ||
"regexp/syntax" | ||
"strings" | ||
) | ||
|
||
type pattern struct { | ||
pattern *regexp.Regexp | ||
msg string | ||
} | ||
|
||
func parse(ptrn string) (*pattern, error) { | ||
ptrnRe, err := regexp.Compile(ptrn) | ||
if err != nil { | ||
return nil, fmt.Errorf("unable to compile pattern `%s`: %s", ptrn, err) | ||
} | ||
re, err := syntax.Parse(ptrn, syntax.Perl) | ||
if err != nil { | ||
return nil, fmt.Errorf("unable to parse pattern `%s`: %s", ptrn, err) | ||
} | ||
msg := extractComment(re) | ||
return &pattern{pattern: ptrnRe, msg: msg}, nil | ||
} | ||
|
||
// Traverse the leaf submatches in the regex tree and extract a comment, if any | ||
// is present. | ||
func extractComment(re *syntax.Regexp) string { | ||
for _, sub := range re.Sub { | ||
if len(sub.Sub) > 0 { | ||
if comment := extractComment(sub); comment != "" { | ||
return comment | ||
} | ||
} | ||
subStr := sub.String() | ||
if strings.HasPrefix(subStr, "#") { | ||
return strings.TrimSpace(strings.TrimPrefix(subStr, "#")) | ||
} | ||
} | ||
return "" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
package forbidigo | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestParseValidPatterns(t *testing.T) { | ||
for _, tc := range []struct { | ||
name string | ||
ptrn string | ||
expectedComment string | ||
}{ | ||
{ | ||
name: "simple expression, no comment", | ||
ptrn: `fmt\.Errorf`, | ||
}, | ||
{ | ||
name: "anchored expression, no comment", | ||
ptrn: `^fmt\.Errorf$`, | ||
}, | ||
{ | ||
name: "contains multiple subexpression, with comment", | ||
ptrn: `(f)mt\.Errorf(# a comment)?`, | ||
expectedComment: "a comment", | ||
}, | ||
{ | ||
name: "simple expression with comment", | ||
ptrn: `fmt\.Println(# Please don't use this!)?`, | ||
expectedComment: "Please don't use this!", | ||
}, | ||
{ | ||
name: "deeply nested expression with comment", | ||
ptrn: `fmt\.Println((((# Please don't use this!))))?`, | ||
expectedComment: "Please don't use this!", | ||
}, | ||
{ | ||
name: "anchored expression with comment", | ||
ptrn: `^fmt\.Println(# Please don't use this!)?$`, | ||
expectedComment: "Please don't use this!", | ||
}, | ||
} { | ||
t.Run(tc.name, func(t *testing.T) { | ||
ptrn, err := parse(tc.ptrn) | ||
require.Nil(t, err) | ||
assert.Equal(t, tc.ptrn, ptrn.pattern.String()) | ||
assert.Equal(t, tc.expectedComment, ptrn.msg) | ||
}) | ||
} | ||
} | ||
|
||
func TestParseInvalidPattern_ReturnsError(t *testing.T) { | ||
_, err := parse(`fmt\`) | ||
assert.NotNil(t, err) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I couldn't spot a way in the stdlib to convert between a
regexp.Regexp
and asyntax.Regexp
, so I think we might have to parse it twice if we want to support this feature, which is a bit of a shame.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree it's not ideal but it only happens once per expression so I'm not too concerned.