Skip to content

Commit d7c2fb1

Browse files
refactor(lint): rename Failure, RuleFailure to Result, Issue
1 parent a3a9938 commit d7c2fb1

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

formatter/default.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ type DefaultFormatter struct{}
1616
func (f *DefaultFormatter) Name() string { return "default" }
1717

1818
// Format formats the lint.Failure
19-
func (f *DefaultFormatter) Format(res *lint.Failure) (string, error) {
19+
func (f *DefaultFormatter) Format(res *lint.Result) (string, error) {
2020
return formatFailure(res), nil
2121
}
2222

23-
func formatFailure(res *lint.Failure) string {
23+
func formatFailure(res *lint.Result) string {
2424
if res.IsOK() {
2525
return " ✔ commit message"
2626
}
2727
return writeFailure(res)
2828
}
2929

30-
func writeFailure(res *lint.Failure) string {
30+
func writeFailure(res *lint.Result) string {
3131
str := &strings.Builder{}
3232

3333
quotedStr := strconv.Quote(truncate(25, res.Input()))
@@ -45,7 +45,7 @@ func writeFailure(res *lint.Failure) string {
4545
return strings.Trim(str.String(), "\n")
4646
}
4747

48-
func writeRuleFailure(w *strings.Builder, sign, title string, resArr []*lint.RuleFailure) {
48+
func writeRuleFailure(w *strings.Builder, sign, title string, resArr []*lint.Issue) {
4949
if len(resArr) == 0 {
5050
return
5151
}
@@ -56,7 +56,7 @@ func writeRuleFailure(w *strings.Builder, sign, title string, resArr []*lint.Rul
5656
}
5757
}
5858

59-
func writeMessages(w *strings.Builder, ruleRes *lint.RuleFailure, sign string) {
59+
func writeMessages(w *strings.Builder, ruleRes *lint.Issue, sign string) {
6060
msgs := ruleRes.Message()
6161

6262
if len(msgs) == 0 {

formatter/json.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type JSONFormatter struct{}
1414
func (f *JSONFormatter) Name() string { return "json" }
1515

1616
// Format formats the lint.Result
17-
func (f *JSONFormatter) Format(res *lint.Failure) (string, error) {
17+
func (f *JSONFormatter) Format(res *lint.Result) (string, error) {
1818
output := make(map[string]interface{}, 4)
1919

2020
errs, warns, others := bySeverity(res)
@@ -33,7 +33,7 @@ func (f *JSONFormatter) Format(res *lint.Failure) (string, error) {
3333
return strings.Trim(string(msg), "\n"), nil
3434
}
3535

36-
func (f *JSONFormatter) formRuleFailure(res []*lint.RuleFailure, includeSev bool) []map[string]interface{} {
36+
func (f *JSONFormatter) formRuleFailure(res []*lint.Issue, includeSev bool) []map[string]interface{} {
3737
outs := make([]map[string]interface{}, 0, len(res))
3838

3939
for _, r := range res {

formatter/util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package formatter
33
import "github.com/conventionalcommit/commitlint/lint"
44

55
// bySeverity returns all messages with given severity
6-
func bySeverity(res *lint.Failure) (errs, warns, others []*lint.RuleFailure) {
7-
for _, r := range res.Failures() {
6+
func bySeverity(res *lint.Result) (errs, warns, others []*lint.Issue) {
7+
for _, r := range res.Issues() {
88
switch r.Severity() {
99
case lint.SeverityError:
1010
errs = append(errs, r)

internal/cmd/lint.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ func readStdInPipe() (string, error) {
136136
return strings.TrimSpace(s), nil
137137
}
138138

139-
func hasErrorSeverity(res *lint.Failure) bool {
140-
for _, r := range res.Failures() {
139+
func hasErrorSeverity(res *lint.Result) bool {
140+
for _, r := range res.Issues() {
141141
if r.Severity() == lint.SeverityError {
142142
return true
143143
}

lint/lint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type Formatter interface {
5050
Name() string
5151

5252
// Format formats the linter result
53-
Format(result *Failure) (string, error)
53+
Format(result *Result) (string, error)
5454
}
5555

5656
// Rule represent a linter rule

lint/linter.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func New(conf *Config, rules []Rule) (*Linter, error) {
2020
}
2121

2222
// Lint checks the given commitMsg string against rules
23-
func (l *Linter) Lint(commitMsg string) (*Failure, error) {
23+
func (l *Linter) Lint(commitMsg string) (*Result, error) {
2424
msg, err := l.parser.Parse(commitMsg)
2525
if err != nil {
2626
return l.parserErrorRule(commitMsg, err)
@@ -29,8 +29,8 @@ func (l *Linter) Lint(commitMsg string) (*Failure, error) {
2929
}
3030

3131
// LintCommit checks the given Commit against rules
32-
func (l *Linter) LintCommit(msg Commit) (*Failure, error) {
33-
res := newFailure(msg.Message())
32+
func (l *Linter) LintCommit(msg Commit) (*Result, error) {
33+
res := newResult(msg.Message())
3434

3535
for _, rule := range l.rules {
3636
currentRule := rule
@@ -44,21 +44,21 @@ func (l *Linter) LintCommit(msg Commit) (*Failure, error) {
4444
return res, nil
4545
}
4646

47-
func (l *Linter) runRule(rule Rule, severity Severity, msg Commit) (*RuleFailure, bool) {
47+
func (l *Linter) runRule(rule Rule, severity Severity, msg Commit) (*Issue, bool) {
4848
failMsgs, isOK := rule.Validate(msg)
4949
if isOK {
5050
return nil, true
5151
}
52-
res := newRuleFailure(rule.Name(), failMsgs, severity)
52+
res := newIssue(rule.Name(), failMsgs, severity)
5353
return res, false
5454
}
5555

56-
func (l *Linter) parserErrorRule(commitMsg string, err error) (*Failure, error) {
57-
res := newFailure(commitMsg)
56+
func (l *Linter) parserErrorRule(commitMsg string, err error) (*Result, error) {
57+
res := newResult(commitMsg)
5858

5959
errMsg := err.Error()
6060

61-
ruleFail := newRuleFailure("parser", []string{errMsg}, SeverityError)
61+
ruleFail := newIssue("parser", []string{errMsg}, SeverityError)
6262
res.add(ruleFail)
6363

6464
return res, nil

lint/result.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
package lint
22

3-
// Failure holds Failure of linter
4-
type Failure struct {
3+
// Result holds Result of linter
4+
type Result struct {
55
inputMsg string
66

7-
failures []*RuleFailure
7+
issues []*Issue
88
}
99

10-
func newFailure(inputMsg string) *Failure {
11-
return &Failure{
10+
func newResult(inputMsg string) *Result {
11+
return &Result{
1212
inputMsg: inputMsg,
1313
}
1414
}
1515

1616
// AddError adds
17-
func (res *Failure) add(r *RuleFailure) {
18-
res.failures = append(res.failures, r)
17+
func (res *Result) add(r *Issue) {
18+
res.issues = append(res.issues, r)
1919
}
2020

2121
// IsOK returns true if commit message passed all the rules
22-
func (res *Failure) IsOK() bool { return len(res.failures) == 0 }
22+
func (res *Result) IsOK() bool { return len(res.issues) == 0 }
2323

2424
// Input returns input commit message
25-
func (res *Failure) Input() string { return res.inputMsg }
25+
func (res *Result) Input() string { return res.inputMsg }
2626

27-
// Failures returns rule Failures
28-
func (res *Failure) Failures() []*RuleFailure { return res.failures }
27+
// Issues returns rule Issues
28+
func (res *Result) Issues() []*Issue { return res.issues }
2929

30-
// RuleFailure holds Failure of a linter rule
31-
type RuleFailure struct {
30+
// Issue holds Failure of a linter rule
31+
type Issue struct {
3232
name string
3333
severity Severity
3434
messages []string
3535
}
3636

37-
func newRuleFailure(name string, msgs []string, severity Severity) *RuleFailure {
38-
return &RuleFailure{
37+
func newIssue(name string, msgs []string, severity Severity) *Issue {
38+
return &Issue{
3939
name: name,
4040
messages: msgs,
4141
severity: severity,
4242
}
4343
}
4444

4545
// Name returns rule name
46-
func (r *RuleFailure) Name() string { return r.name }
46+
func (r *Issue) Name() string { return r.name }
4747

4848
// Severity returns severity of the Rule Failure
49-
func (r *RuleFailure) Severity() Severity { return r.severity }
49+
func (r *Issue) Severity() Severity { return r.severity }
5050

5151
// Message returns the error messages of failed rule
52-
func (r *RuleFailure) Message() []string { return r.messages }
52+
func (r *Issue) Message() []string { return r.messages }

0 commit comments

Comments
 (0)