From d7d9a35f2fa52b14d9cb55031dab65ea0a644d4f Mon Sep 17 00:00:00 2001 From: Jan De Dobbeleer Date: Sat, 30 Nov 2024 11:16:49 +0100 Subject: [PATCH] refactor(golang): clean GetVersion --- src/segments/golang.go | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/segments/golang.go b/src/segments/golang.go index ccb2b21e..88ad935c 100644 --- a/src/segments/golang.go +++ b/src/segments/golang.go @@ -18,22 +18,6 @@ func (g *Golang) Template() string { return languageTemplate } -func (g *Golang) getVersion() (string, error) { - if !g.props.GetBool(ParseModFile, false) { - return "", nil - } - gomod, err := g.language.env.HasParentFilePath("go.mod", false) - if err != nil { - return "", nil - } - contents := g.language.env.FileContent(gomod.Path) - file, err := modfile.Parse(gomod.Path, []byte(contents), nil) - if err != nil { - return "", err - } - return file.Go.Version, nil -} - func (g *Golang) Enabled() bool { g.extensions = []string{"*.go", "go.mod"} g.commands = []*cmd{ @@ -51,3 +35,22 @@ func (g *Golang) Enabled() bool { return g.language.Enabled() } + +func (g *Golang) getVersion() (string, error) { + if !g.props.GetBool(ParseModFile, false) { + return "", nil + } + + gomod, err := g.language.env.HasParentFilePath("go.mod", false) + if err != nil { + return "", nil + } + + contents := g.language.env.FileContent(gomod.Path) + file, err := modfile.Parse(gomod.Path, []byte(contents), nil) + if err != nil { + return "", err + } + + return file.Go.Version, nil +}