nil check

Author: tjmtmmnk

filter/fuzzy.go

@@ -55,22 +55,16 @@ func (fs *fileSystem) ReadDir(name string) ([]fs.DirEntry, error) {
 }
 
 func (f *fuzzySearch) Search(q string, option *SearchOption) ([]SearchResult, error) {
-	var (
-		dir string
-	)
-
 	f.cachedFile = make(map[string]string, option.Limit)
 	texts := make([]string, 0, option.Limit)
 	results := make([]SearchResult, 0, option.Limit)
 	isDuplicateLine := make(map[string]bool, option.Limit)
 
-	if option.TargetDir != "" {
-		dir = option.TargetDir
-	} else {
-		dir = "."
+	if option.TargetDir == "" {
+		option.TargetDir = "."
 	}
 
-	files, err := f.getFiles(dir, option.Limit)
+	files, err := f.getFiles(option.TargetDir, option.Limit)
 	if err != nil {
 		util.Logger.Warn("get file error : ", err)
 		return nil, err

filter/ripgrep.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	timeout = 100 * time.Millisecond
+	timeout = 150 * time.Millisecond
 )
 
 type rg struct{}
@@ -105,7 +105,9 @@ func (r *rg) Search(q string, option *SearchOption) ([]SearchResult, error) {
 		if err != nil {
 			continue
 		}
-		results = append(results, *result)
+		if result != nil {
+			results = append(results, *result)
+		}
 	}
 	if err := ecmd.Wait(); err != nil {
 		util.Logger.Warn("command exec wait error : ", err)