Fix command matching

Makefile

@@ -3,7 +3,7 @@ all:
 	go build -o build/def-matcher def-matcher.go
 .PHONY: test
 test:
-	go test -v def-matcher.go def-matcher_test.go
+	go test ./...
 .PHONY: clean
 clean:
 	rm -f build/def-matcher

def-matcher.go

@@ -28,12 +28,5 @@ func main() {
 	}
 
 	command := os.Args[1]
-	match, isFullMatch := matcher.Match(defs, command)
-	if match != nil {
-		if isFullMatch {
-			fmt.Printf("%s\n", match.Name)
-		} else {
-			fmt.Printf("%s%s\n", match.Name, command[len(match.Abbr):])
-		}
-	}
+	fmt.Println(matcher.Match(defs, command))
 }

matcher/matcher.go

@@ -8,39 +8,29 @@ import (
 	"github.com/sei40kr/zsh-fast-alias-tips/model"
 )
 
-func Match(defs []model.AliasDef, command string) (*model.AliasDef, bool) {
+func Match(defs []model.AliasDef, command string) string {
 	sort.Slice(defs, func(i, j int) bool {
 		return len(defs[j].Abbr) <= len(defs[i].Abbr)
 	})
 
-	var candidate model.AliasDef
-	isFullMatch := false
-
 	for true {
 		var match model.AliasDef
 		for _, def := range defs {
 
 			if command == def.Abbr {
 				match = def
-				isFullMatch = true
 				break
-			} else if strings.HasPrefix(command, def.Abbr) {
+			} else if strings.HasPrefix(command, def.Abbr+" ") {
 				match = def
 				break
 			}
 		}
 
 		if match != (model.AliasDef{}) {
 			command = fmt.Sprintf("%s%s", match.Name, command[len(match.Abbr):])
-			candidate = match
 		} else {
 			break
 		}
 	}
-
-	if candidate != (model.AliasDef{}) {
-		return &candidate, isFullMatch
-	} else {
-		return nil, false
-	}
+	return command
 }

matcher/matcher_test.go

@@ -8,54 +8,47 @@ import (
 )
 
 var mockAliasDefs = []model.AliasDef{
-	{
-		Name: "dk",
-		Abbr: "docker",
-	},
-	{
-		Name: "gb",
-		Abbr: "git branch",
-	},
-	{
-		Name: "gco",
-		Abbr: "git checkout",
-	},
-	{
-		Name: "gcb",
-		Abbr: "git checkout -b",
-	},
-	{
-		Name: "ls",
-		Abbr: "ls -G",
-	},
-	{
-		Name: "ll",
-		Abbr: "ls -lh",
-	},
+	{Name: "dk", Abbr: "docker"},
+	{Name: "gb", Abbr: "git branch"},
+	{Name: "gco", Abbr: "git checkout"},
+	{Name: "gcb", Abbr: "git checkout -b"},
+	{Name: "ls", Abbr: "ls -G"},
+	{Name: "ll", Abbr: "ls -lh"},
+	{Name: "yst", Abbr: "yarn start"},
 }
 
 func TestMatch_NoMatches(t *testing.T) {
-	candidate, _ := Match(mockAliasDefs, "cd ..")
-	assert.Nil(t, candidate, "should return nil when no matches found")
+	aliasTips := Match(mockAliasDefs, "cd ..")
+	assert.Equal(t, aliasTips, "cd ..")
+}
+
+func TestMatch_NoMatches2(t *testing.T) {
+	aliasTips := Match(mockAliasDefs, "yarn start :ja")
+	assert.Equal(t, aliasTips, "yarn start:ja")
 }
 
 func TestMatch_SingleToken(t *testing.T) {
-	candidate, _ := Match(mockAliasDefs, "docker")
-	assert.Equal(t, candidate.Name, "dk")
+	aliasTips := Match(mockAliasDefs, "docker")
+	assert.Equal(t, aliasTips, "dk")
 }
 
 func TestMatch_MultipleTokens(t *testing.T) {
-	candidate, _ := Match(mockAliasDefs, "git branch")
-	assert.Equal(t, candidate.Name, "gb")
+	aliasTips := Match(mockAliasDefs, "git branch")
+	assert.Equal(t, aliasTips, "gb")
 }
 
 func TestMatch_MultipleMatches(t *testing.T) {
-	candidate, _ := Match(mockAliasDefs, "git checkout -b")
-	assert.Equal(t, candidate.Name, "gcb",
+	aliasTips := Match(mockAliasDefs, "git checkout -b")
+	assert.Equal(t, aliasTips, "gcb",
 		"should return the alias definition that has the longest abbreviation when multiple matches found")
 }
 
 func TestMatch_RecursiveDefs(t *testing.T) {
-	candidate, _ := Match(mockAliasDefs, "ls -G -lh")
-	assert.Equal(t, candidate.Name, "ll", "should apply aliases recursively")
+	aliasTips := Match(mockAliasDefs, "ls -G -lh")
+	assert.Equal(t, aliasTips, "ll", "should apply aliases recursively")
+}
+
+func TestMatch_RecursiveDefsWithPartialMatch(t *testing.T) {
+	aliasTips := Match(mockAliasDefs, "ls -G -lh -a")
+	assert.Equal(t, aliasTips, "ll -a", "should apply aliases recursively")
 }