fix string cleanup

vilmibm · vilmibm · commit 9a3691089946 · 2020-05-14T14:23:34.000-05:00
diff --git a/command/pr_review.go b/command/pr_review.go
@@ -153,7 +153,6 @@ func prReview(cmd *cobra.Command, args []string) error {
 			return err
 		}
 		// for now just return
-		fmt.Fprintln(out, "done with patch mode, stopping here for now")
 		return nil
 	}
 
@@ -429,7 +428,7 @@ func patchReview(cmd *cobra.Command) (*api.PullRequestReviewInput, error) {
 				skipFile = false
 			}
 		}
-		fmt.Fprintf(out, "%s\n\n", utils.Bold(hunk.File))
+		fmt.Fprintf(out, "\n%s\n", utils.Bold(hunk.File))
 		md := fmt.Sprintf("```diff\n%s\n```", hunk.Diff)
 		rendered, err := utils.RenderMarkdown(md)
 		if err != nil {
@@ -497,8 +496,8 @@ func patchReview(cmd *cobra.Command) (*api.PullRequestReviewInput, error) {
 		}
 	}
 
-	// TODO commentsMade ending up at 0, debug the string helpers.
-	fmt.Fprintf(out, "\nWrapping up a review with %s comments.\n", utils.Bold(fmt.Sprintf("%d", commentsMade)))
+	fmt.Fprintf(out, "\n\nWrapping up a review with %s.\n",
+		utils.Bold(utils.Pluralize(commentsMade, "comment")))
 
 	reviewData, err := reviewSurvey(cmd)
 
@@ -573,6 +572,6 @@ func trimBody(body string) string {
 
 func isBlank(body string) bool {
 	fmt.Println(body)
-	r := regexp.MustCompile(`(?s)\w*`)
+	r := regexp.MustCompile(`(?s)^\s*$`)
 	return r.MatchString(body)
 }

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ func prReview(cmd *cobra.Command, args []string) error {`
`153`	`153`	`return err`
`154`	`154`	`}`
`155`	`155`	`// for now just return`
`156`		`- fmt.Fprintln(out, "done with patch mode, stopping here for now")`
`157`	`156`	`return nil`
`158`	`157`	`}`
`159`	`158`
`@@ -429,7 +428,7 @@ func patchReview(cmd cobra.Command) (api.PullRequestReviewInput, error) {`
`429`	`428`	`skipFile = false`
`430`	`429`	`}`
`431`	`430`	`}`
`432`		`- fmt.Fprintf(out, "%s\n\n", utils.Bold(hunk.File))`
	`431`	`+ fmt.Fprintf(out, "\n%s\n", utils.Bold(hunk.File))`
`433`	`432`	md := fmt.Sprintf("```diff\n%s\n```", hunk.Diff)
`434`	`433`	`rendered, err := utils.RenderMarkdown(md)`
`435`	`434`	`if err != nil {`
`@@ -497,8 +496,8 @@ func patchReview(cmd cobra.Command) (api.PullRequestReviewInput, error) {`
`497`	`496`	`}`
`498`	`497`	`}`
`499`	`498`
`500`		`- // TODO commentsMade ending up at 0, debug the string helpers.`
`501`		`- fmt.Fprintf(out, "\nWrapping up a review with %s comments.\n", utils.Bold(fmt.Sprintf("%d", commentsMade)))`
	`499`	`+ fmt.Fprintf(out, "\n\nWrapping up a review with %s.\n",`
	`500`	`+ utils.Bold(utils.Pluralize(commentsMade, "comment")))`
`502`	`501`
`503`	`502`	`reviewData, err := reviewSurvey(cmd)`
`504`	`503`
`@@ -573,6 +572,6 @@ func trimBody(body string) string {`
`573`	`572`
`574`	`573`	`func isBlank(body string) bool {`
`575`	`574`	`fmt.Println(body)`
`576`		- r := regexp.MustCompile(`(?s)\w*`)
	`575`	+ r := regexp.MustCompile(`(?s)^\s*$`)
`577`	`576`	`return r.MatchString(body)`
`578`	`577`	`}`