Merge pull request #1 from cybozu/fix_jsonnetfmt_output

Fix output of jsonnet-fmt hook with --test option

Author: thombashi

Makefile

@@ -12,7 +12,7 @@ fmt:
 
 .PHONY: lint
 lint:
-	@golangci-lint run ./...
+	@golangci-lint run -v ./...
 
 .PHONY: test
 test:

hooks/jsonnet-fmt-hook/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"regexp"
 	"strings"
 
 	"io/ioutil"
@@ -76,12 +77,13 @@ func summarizeDiff(diffs []diffmatchpatch.Diff) *FileDiff {
 		}
 	}
 	splitLines := func(text string) []string {
-		return strings.Split(strings.TrimSpace(strings.ReplaceAll(text, "\r\n", "\n")), "\n")
+		return strings.Split(strings.ReplaceAll(text, "\r\n", "\n"), "\n")
 	}
 
 	const maxShowLine = 3
 	const omissionText = "...\n"
 	lastDiffIdx := len(diffs) - 1
+	spaceRegexp := regexp.MustCompile(`\s`)
 
 	for i, diff := range diffs {
 		text := diff.Text
@@ -92,7 +94,7 @@ func summarizeDiff(diffs []diffmatchpatch.Diff) *FileDiff {
 			writeString(&builder, ansiGreen+text+ansiReset)
 			fileDiff.numInsert += len(text)
 		case diffmatchpatch.DiffDelete:
-			writeString(&builder, ansiRed+text+ansiReset)
+			writeString(&builder, ansiRed+regexp.QuoteMeta(spaceRegexp.ReplaceAllString(text, "␣"))+ansiReset)
 			fileDiff.numDelete += len(text)
 		case diffmatchpatch.DiffEqual:
 			var showHead, showTail bool

hooks/jsonnet-fmt-hook/main_test.go

@@ -16,8 +16,9 @@ func normalizeDiff(diff string) string {
 	reSpaces := regexp.MustCompile(`\s+`)
 
 	normDiff := strings.TrimSpace(diff)
-	normDiff = reSpaces.ReplaceAllString(normDiff, " ")
+	normDiff = strings.ReplaceAll(normDiff, "\n", " ")
 	normDiff = reAnsiEscape.ReplaceAllString(normDiff, "")
+	normDiff = reSpaces.ReplaceAllString(normDiff, " ")
 	return strings.ToLower(normDiff)
 }
 
@@ -38,6 +39,10 @@ func TestHasTestOpt(t *testing.T) {
 			opts: []string{"test", "hoge"},
 			want: false,
 		},
+		{
+			opts: []string{"-t"},
+			want: false,
+		},
 	}
 
 	for _, param := range params {
@@ -116,9 +121,10 @@ func TestExecJsonnetFmt(t *testing.T) {
 					text: `...
 						metadata: {
 							name: name,
-							namespace: namespace,  // missing the trailing comma
+							namespace: namespace,
 						},
-					}`,
+					}
+					... `,
 					numInsert: 1,
 					numDelete: 0,
 				},

testutil/util.go

@@ -15,7 +15,7 @@ var (
     kind: 'SubNamespace',
     metadata: {
       name: name,
-      namespace: namespace  // missing the trailing comma
+      namespace: namespace
     },
   }
 `)