improve pattern matching with current directory

Author: makiuchi-d

arelo.go

@@ -61,6 +61,8 @@ func main() {
 	if *patterns == nil {
 		*patterns = []string{"**"}
 	}
+	*patterns = removeCurDirPrefix(*patterns)
+	*ignores = removeCurDirPrefix(*ignores)
 	sig, sigstr := parseSignalOption(*sigopt)
 	filtOp, err := parseFilters(*filters)
 	if err != nil {
@@ -147,6 +149,15 @@ func versionstr() string {
 	return info.Main.Version
 }
 
+func removeCurDirPrefix(arr []string) []string {
+	for i, s := range arr {
+		if strings.HasPrefix(s, "./") {
+			arr[i] = s[2:]
+		}
+	}
+	return arr
+}
+
 func parseFilters(filters []string) (fsnotify.Op, error) {
 	var op fsnotify.Op
 	for _, f := range filters {
@@ -243,6 +254,9 @@ func watcher(targets, patterns, ignores []string, filtOp fsnotify.Op, interval t
 }
 
 func matchPatterns(t string, pats []string) (bool, error) {
+	if strings.HasPrefix(t, "./") {
+		t = t[2:]
+	}
 	for _, p := range pats {
 		m, err := doublestar.Match(p, t)
 		if err != nil {
@@ -251,15 +265,6 @@ func matchPatterns(t string, pats []string) (bool, error) {
 		if m {
 			return true, nil
 		}
-		if strings.HasPrefix(t, "./") {
-			m, err = doublestar.Match(p, t[2:])
-			if err != nil {
-				return false, xerrors.Errorf("match(%v, %v): %w", p, t[2:], err)
-			}
-			if m {
-				return true, nil
-			}
-		}
 	}
 	return false, nil
 }

arelo_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 	"path"
+	"reflect"
 	"testing"
 	"time"
 )
@@ -107,6 +108,9 @@ func TestMatchPatterns(t *testing.T) {
 		{"./abc.efg", "*.efg", true},
 		{"./.abc", "**/.*", true},
 		{"./.abc", ".*", true},
+		{"./", "", true},
+		{"./", "*", true},
+		{"./", "**", true},
 	}
 
 	for _, test := range tests {
@@ -119,3 +123,34 @@ func TestMatchPatterns(t *testing.T) {
 		}
 	}
 }
+
+func TestRemoveCurDirPrefix(t *testing.T) {
+	arr := []string{
+		".a",
+		".aa",
+		"./.*",
+		"./abc",
+		"../a",
+		".",
+		"./",
+		"abc",
+		"a./",
+		"a/./b",
+	}
+	exp := []string{
+		".a",
+		".aa",
+		".*",
+		"abc",
+		"../a",
+		".",
+		"",
+		"abc",
+		"a./",
+		"a/./b",
+	}
+	r := removeCurDirPrefix(arr)
+	if !reflect.DeepEqual(r, exp) {
+		t.Fatalf("removeCurDirPrefix: %#v wants %#v", r, exp)
+	}
+}