feat: move sugeest to domain

phodal · Dec 31, 2019 · 2cf880a · 2cf880a
1 parent a11dd58
commit 2cf880a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/core/context/suggest/suggest_app.go b/core/context/suggest/suggest_app.go
@@ -2,7 +2,6 @@ package suggest
 
 import (
 	"github.com/phodal/coca/core/domain"
-	"strings"
 )
 
 type SuggestApp struct {
@@ -65,24 +64,7 @@ func factorySuggest(clz domain.JClassNode, suggests []domain.Suggest) []domain.S
 		currentSuggestList = append(currentSuggestList, suggest)
 	}
 
-	var suggest = domain.NewSuggest(clz, "", "")
-	for _, s := range currentSuggestList {
-		if !strings.Contains(suggest.Pattern, s.Pattern) {
-			if suggest.Pattern != "" {
-				suggest.Pattern = suggest.Pattern + ", " + s.Pattern
-			} else {
-				suggest.Pattern = s.Pattern
-			}
-		}
-
-		if !strings.Contains(suggest.Reason, s.Reason) {
-			if suggest.Reason != "" {
-				suggest.Reason = suggest.Reason + ", " + s.Reason
-			} else {
-				suggest.Reason = s.Reason
-			}
-		}
-	}
+	suggest := domain.MergeSuggest(clz, currentSuggestList)
 
 	if suggest.Pattern != "" {
 		suggests = append(suggests, suggest)

diff --git a/core/domain/suggest.go b/core/domain/suggest.go
@@ -1,5 +1,7 @@
 package domain
 
+import "strings"
+
 type Suggest struct {
 	File    string
 	Package string
@@ -19,3 +21,25 @@ func NewSuggest(clz JClassNode, pattern, reason string) Suggest {
 		Reason:  reason,
 	}
 }
+
+func MergeSuggest(clz JClassNode, currentSuggestList []Suggest) Suggest {
+	var suggest = NewSuggest(clz, "", "")
+	for _, s := range currentSuggestList {
+		if !strings.Contains(suggest.Pattern, s.Pattern) {
+			if suggest.Pattern != "" {
+				suggest.Pattern = suggest.Pattern + ", " + s.Pattern
+			} else {
+				suggest.Pattern = s.Pattern
+			}
+		}
+
+		if !strings.Contains(suggest.Reason, s.Reason) {
+			if suggest.Reason != "" {
+				suggest.Reason = suggest.Reason + ", " + s.Reason
+			} else {
+				suggest.Reason = s.Reason
+			}
+		}
+	}
+	return suggest
+}