UPDATE: go lint fixes

Author: fileformat

cmd/fflint/main_test.go

@@ -80,7 +80,7 @@ func TestMain(m *testing.M) {
 	os.Exit(exitVal)
 }
 
-func Testfflint(t *testing.T) {
+func TestFflint(t *testing.T) {
 	testscript.Run(t, testscript.Params{
 		Dir: "../../testdata",
 	})

internal/command/frontmatter.go

@@ -12,7 +12,6 @@ import (
 )
 
 var (
-	fmReport     bool
 	fmStrict     bool
 	fmStrictSet  map[string]bool
 	fmSorted     bool

internal/command/html.go

@@ -3,13 +3,14 @@ package command
 import (
 	"bytes"
 	"encoding/xml"
-	"fmt"
+
+	//"fmt"
 	"io"
-	"os"
+	//"os"
 
 	"github.com/FileFormatInfo/fflint/internal/shared"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/html"
+	//"golang.org/x/net/html"
 )
 
 // htmlCmd represents the html command
@@ -71,6 +72,7 @@ func validateHTML(r *bytes.Reader) error {
 	}
 }
 
+/*
 func hasErrorNodes(node *html.Node) bool {
 	if shared.Debug {
 		fmt.Fprintf(os.Stderr, "Node type=%d text=%d doc=%d\n", node.Type, html.TextNode, html.DocumentNode)
@@ -91,3 +93,4 @@ func hasErrorNodes(node *html.Node) bool {
 	}
 	return false
 }
+*/

internal/command/svg.go

@@ -142,7 +142,7 @@ func svgCheck(f *shared.FileContext) {
 		}
 	}
 
-	if svgText == false {
+	if !svgText {
 		textNodes := rootElement.FindAll("text")
 		if len(textNodes) > 0 {
 			f.RecordResult("svgText", false, map[string]interface{}{
@@ -153,7 +153,7 @@ func svgCheck(f *shared.FileContext) {
 	}
 
 	/* doesn't seem to work??? */
-	if svgForeign == false {
+	if !svgForeign {
 		foNodes := rootElement.FindAll("foreignObject")
 		if len(foNodes) > 0 {
 			f.RecordResult("svgForeignObject", false, map[string]interface{}{

internal/command/text.go

@@ -90,10 +90,7 @@ func IsAsciiBytes(bytes []byte) error {
 }
 
 func IsAscii(b byte) bool {
-	if b > unicode.MaxASCII {
-		return false
-	}
-	return true
+	return b <= unicode.MaxASCII && !IsBadControl(b)
 }
 
 func IsBadControl(b byte) bool {

run.sh

@@ -11,4 +11,4 @@ rm -rf ./fflint
 go build -o ./fflint cmd/fflint/main.go
 export PATH=$PATH:$(pwd)
 fflint version
-go test -timeout 30s -run "^Testfflint$" github.com/FileFormatInfo/fflint/cmd/fflint
+go test -timeout 30s -run "^TestFflint$" github.com/FileFormatInfo/fflint/cmd/fflint

testdata/json.txt

@@ -6,8 +6,8 @@ exec fflint json object.json
 exec fflint json something.json
 ! exec fflint json trailingcomma.json
 
-exec fflint json --schema=object.schema.json object.json --show-tests=all --debug
-exec fflint json --schema=object.schema.json --show-tests=all string.json --debug
+exec fflint json --schema=object.schema.json --show-tests=all --debug object.json 
+! exec fflint json --schema=object.schema.json --show-tests=all --debug string.json
 
 
 -- toosmall.json --