From b5d8dddab599d95d380ab662357957697ce6ea77 Mon Sep 17 00:00:00 2001 From: Jesse Portnoy Date: Tue, 18 Jul 2023 19:30:52 +0100 Subject: [PATCH] gofmt --- examples/go.mod | 15 --------------- examples/go.sum | 18 ------------------ go.mod | 11 ++++++++++- go.sum | 10 ++++++++++ highlighter.go | 18 +++++++++--------- 5 files changed, 29 insertions(+), 43 deletions(-) delete mode 100644 examples/go.mod delete mode 100644 examples/go.sum diff --git a/examples/go.mod b/examples/go.mod deleted file mode 100644 index 24ba34c..0000000 --- a/examples/go.mod +++ /dev/null @@ -1,15 +0,0 @@ -module examples - -go 1.19 - -require ( - github.com/fatih/color v1.15.0 - github.com/jessp01/gohighlight v0.21.1-1 -) - -require ( - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect - golang.org/x/sys v0.6.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect -) diff --git a/examples/go.sum b/examples/go.sum deleted file mode 100644 index ac488d3..0000000 --- a/examples/go.sum +++ /dev/null @@ -1,18 +0,0 @@ -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= -github.com/jessp01/gohighlight v0.21.1-1 h1:Vf612pFhltUSZrUlnGPb2GT+JVHvCAXP/WUxEsgQVqY= -github.com/jessp01/gohighlight v0.21.1-1/go.mod h1:xNaUZAOKsRUL9Gyh/sSs1mTanML17Rx8Pn5kg80uIgI= -github.com/jessp01/highlight v0.0.0-20230716160321-8969d1f05a45 h1:XKfU3AV4wfMbzX0jlqSRXYdsPueivQhHgSqlyUjf28g= -github.com/jessp01/highlight v0.0.0-20230716160321-8969d1f05a45/go.mod h1:Kgvk5uZPhFlZvcS8u0zOB38emtWGrUgnfOvjINkvhyM= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/go.mod b/go.mod index 13b96aa..cade106 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,13 @@ module github.com/jessp01/gohighlight go 1.19 -require gopkg.in/yaml.v2 v2.4.0 +require ( + github.com/fatih/color v1.15.0 + gopkg.in/yaml.v2 v2.4.0 +) + +require ( + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + golang.org/x/sys v0.6.0 // indirect +) diff --git a/go.sum b/go.sum index dd0bc19..b069e00 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,13 @@ +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/highlighter.go b/highlighter.go index 9eeb3ce..388987e 100644 --- a/highlighter.go +++ b/highlighter.go @@ -62,7 +62,7 @@ func NewHighlighter(def *Def) *Highlighter { // color's group (represented as one byte) type LineMatch map[int]Group -func ParseSyntaxFiles(dir string, defs *[]*Def) (error, []string){ +func ParseSyntaxFiles(dir string, defs *[]*Def) (error, []string) { pattern := "*.yaml" files, err := filepath.Glob(dir + "/" + pattern) var warnings []string @@ -73,14 +73,14 @@ func ParseSyntaxFiles(dir string, defs *[]*Def) (error, []string){ for _, file_path := range files { file, err := ioutil.ReadFile(file_path) if err != nil { - warnings = append(warnings,err.Error()) - }else { - d, err := ParseDef(file) - if err != nil { - warnings = append(warnings,err.Error()) - }else{ - *defs = append(*defs, d) - } + warnings = append(warnings, err.Error()) + } else { + d, err := ParseDef(file) + if err != nil { + warnings = append(warnings, err.Error()) + } else { + *defs = append(*defs, d) + } } } return err, warnings