Skip to content

Commit f327005

Browse files
committed
Rename NewPatternMatcher to New
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent a5d4bd7 commit f327005

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

patternmatcher.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ type PatternMatcher struct {
3737
exclusions bool
3838
}
3939

40-
// NewPatternMatcher creates a new matcher object for specific patterns that can
40+
// New creates a new matcher object for specific patterns that can
4141
// be used later to match against patterns against paths
42-
func NewPatternMatcher(patterns []string) (*PatternMatcher, error) {
42+
func New(patterns []string) (*PatternMatcher, error) {
4343
pm := &PatternMatcher{
4444
patterns: make([]*Pattern, 0, len(patterns)),
4545
}
@@ -442,7 +442,7 @@ func (p *Pattern) compile(sl string) error {
442442
// This implementation is buggy (it only checks a single parent dir against the
443443
// pattern) and will be removed soon. Use MatchesOrParentMatches instead.
444444
func Matches(file string, patterns []string) (bool, error) {
445-
pm, err := NewPatternMatcher(patterns)
445+
pm, err := New(patterns)
446446
if err != nil {
447447
return false, err
448448
}
@@ -459,7 +459,7 @@ func Matches(file string, patterns []string) (bool, error) {
459459
// MatchesOrParentMatches returns true if file matches any of the patterns
460460
// and isn't excluded by any of the subsequent patterns.
461461
func MatchesOrParentMatches(file string, patterns []string) (bool, error) {
462-
pm, err := NewPatternMatcher(patterns)
462+
pm, err := New(patterns)
463463
if err != nil {
464464
return false, err
465465
}

patternmatcher_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func TestMatches(t *testing.T) {
200200

201201
t.Run("MatchesOrParentMatches", func(t *testing.T) {
202202
for _, test := range tests {
203-
pm, err := NewPatternMatcher([]string{test.pattern})
203+
pm, err := New([]string{test.pattern})
204204
if err != nil {
205205
t.Fatalf("%v (pattern=%q, text=%q)", err, test.pattern, test.text)
206206
}
@@ -211,7 +211,7 @@ func TestMatches(t *testing.T) {
211211
}
212212

213213
for _, test := range multiPatternTests {
214-
pm, err := NewPatternMatcher(test.patterns)
214+
pm, err := New(test.patterns)
215215
if err != nil {
216216
t.Fatalf("%v (patterns=%q, text=%q)", err, test.patterns, test.text)
217217
}
@@ -224,7 +224,7 @@ func TestMatches(t *testing.T) {
224224

225225
t.Run("MatchesUsingParentResult", func(t *testing.T) {
226226
for _, test := range tests {
227-
pm, err := NewPatternMatcher([]string{test.pattern})
227+
pm, err := New([]string{test.pattern})
228228
if err != nil {
229229
t.Fatalf("%v (pattern=%q, text=%q)", err, test.pattern, test.text)
230230
}
@@ -266,7 +266,7 @@ func TestMatches(t *testing.T) {
266266

267267
for _, test := range tests {
268268
desc := fmt.Sprintf("(pattern=%q text=%q)", test.pattern, test.text)
269-
pm, err := NewPatternMatcher([]string{test.pattern})
269+
pm, err := New([]string{test.pattern})
270270
if err != nil {
271271
t.Fatal(err, desc)
272272
}
@@ -276,7 +276,7 @@ func TestMatches(t *testing.T) {
276276

277277
for _, test := range multiPatternTests {
278278
desc := fmt.Sprintf("pattern=%q text=%q", test.patterns, test.text)
279-
pm, err := NewPatternMatcher(test.patterns)
279+
pm, err := New(test.patterns)
280280
if err != nil {
281281
t.Fatal(err, desc)
282282
}
@@ -295,7 +295,7 @@ func TestMatches(t *testing.T) {
295295

296296
for _, test := range tests {
297297
desc := fmt.Sprintf("(pattern=%q text=%q)", test.pattern, test.text)
298-
pm, err := NewPatternMatcher([]string{test.pattern})
298+
pm, err := New([]string{test.pattern})
299299
if err != nil {
300300
t.Fatal(err, desc)
301301
}
@@ -305,7 +305,7 @@ func TestMatches(t *testing.T) {
305305

306306
for _, test := range multiPatternTests {
307307
desc := fmt.Sprintf("(pattern=%q text=%q)", test.patterns, test.text)
308-
pm, err := NewPatternMatcher(test.patterns)
308+
pm, err := New(test.patterns)
309309
if err != nil {
310310
t.Fatal(err, desc)
311311
}
@@ -317,7 +317,7 @@ func TestMatches(t *testing.T) {
317317

318318
func TestCleanPatterns(t *testing.T) {
319319
patterns := []string{"docs", "config"}
320-
pm, err := NewPatternMatcher(patterns)
320+
pm, err := New(patterns)
321321
if err != nil {
322322
t.Fatalf("invalid pattern %v", patterns)
323323
}
@@ -329,7 +329,7 @@ func TestCleanPatterns(t *testing.T) {
329329

330330
func TestCleanPatternsStripEmptyPatterns(t *testing.T) {
331331
patterns := []string{"docs", "config", ""}
332-
pm, err := NewPatternMatcher(patterns)
332+
pm, err := New(patterns)
333333
if err != nil {
334334
t.Fatalf("invalid pattern %v", patterns)
335335
}
@@ -341,7 +341,7 @@ func TestCleanPatternsStripEmptyPatterns(t *testing.T) {
341341

342342
func TestCleanPatternsExceptionFlag(t *testing.T) {
343343
patterns := []string{"docs", "!docs/README.md"}
344-
pm, err := NewPatternMatcher(patterns)
344+
pm, err := New(patterns)
345345
if err != nil {
346346
t.Fatalf("invalid pattern %v", patterns)
347347
}
@@ -352,7 +352,7 @@ func TestCleanPatternsExceptionFlag(t *testing.T) {
352352

353353
func TestCleanPatternsLeadingSpaceTrimmed(t *testing.T) {
354354
patterns := []string{"docs", " !docs/README.md"}
355-
pm, err := NewPatternMatcher(patterns)
355+
pm, err := New(patterns)
356356
if err != nil {
357357
t.Fatalf("invalid pattern %v", patterns)
358358
}
@@ -363,7 +363,7 @@ func TestCleanPatternsLeadingSpaceTrimmed(t *testing.T) {
363363

364364
func TestCleanPatternsTrailingSpaceTrimmed(t *testing.T) {
365365
patterns := []string{"docs", "!docs/README.md "}
366-
pm, err := NewPatternMatcher(patterns)
366+
pm, err := New(patterns)
367367
if err != nil {
368368
t.Fatalf("invalid pattern %v", patterns)
369369
}
@@ -374,7 +374,7 @@ func TestCleanPatternsTrailingSpaceTrimmed(t *testing.T) {
374374

375375
func TestCleanPatternsErrorSingleException(t *testing.T) {
376376
patterns := []string{"!"}
377-
_, err := NewPatternMatcher(patterns)
377+
_, err := New(patterns)
378378
if err == nil {
379379
t.Errorf("expected error on single exclamation point, got %v", err)
380380
}

0 commit comments

Comments
 (0)