diff --git a/go.mod b/go.mod index 171b91950d23..8bfb987efab0 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b github.com/gofrs/flock v0.8.0 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 - github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d @@ -36,6 +35,7 @@ require ( github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb // v1.0 github.com/mattn/go-colorable v0.1.8 github.com/mbilski/exhaustivestruct v1.1.0 + github.com/mibk/dupl v1.0.0 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-ps v1.0.0 github.com/moricho/tparallel v0.2.1 @@ -75,3 +75,5 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 ) + +replace github.com/mibk/dupl => github.com/iwankgb/dupl v0.0.0-20201219201750-a7c1664a1424 diff --git a/go.sum b/go.sum index 45f63714f9d6..9cb12659bd27 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,6 @@ github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 h1:YYWNAGTKWhKpcLLt7aSj/odlKrSrelQwlovBpDuf19w= github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 h1:9kfjN3AdxcbsZBf8NjltjWihK2QfBBBZuv91cMFfDHw= @@ -197,6 +195,8 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/iwankgb/dupl v0.0.0-20201219201750-a7c1664a1424 h1:kpysjImPrNNQlmxEAv5Cdzggl4JpNhhjz6oZQWUhv7g= +github.com/iwankgb/dupl v0.0.0-20201219201750-a7c1664a1424/go.mod h1:vyuodddbfgn9L9UncCU4U774dM2+hbx05V5EyPdJpNw= github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3 h1:7nkB9fLPMwtn/R6qfPcHileL/x9ydlhw8XyDrLI1ZXg= github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a h1:GmsqmapfzSJkm28dhRoHz2tLRbJmqhU86IPgBtN3mmk= diff --git a/pkg/golinters/dupl.go b/pkg/golinters/dupl.go index ed1c4fcbdc50..3b4993b56bd6 100644 --- a/pkg/golinters/dupl.go +++ b/pkg/golinters/dupl.go @@ -5,7 +5,7 @@ import ( "go/token" "sync" - duplAPI "github.com/golangci/dupl" + duplAPI "github.com/mibk/dupl/api" "github.com/pkg/errors" "golang.org/x/tools/go/analysis" @@ -49,22 +49,22 @@ func NewDupl() *goanalysis.Linter { res := make([]goanalysis.Issue, 0, len(issues)) for _, i := range issues { - toFilename, err := fsutils.ShortestRelPath(i.To.Filename(), "") + toFilename, err := fsutils.ShortestRelPath(i.To.Filename, "") if err != nil { - return nil, errors.Wrapf(err, "failed to get shortest rel path for %q", i.To.Filename()) + return nil, errors.Wrapf(err, "failed to get shortest rel path for %q", i.To.Filename) } - dupl := fmt.Sprintf("%s:%d-%d", toFilename, i.To.LineStart(), i.To.LineEnd()) + dupl := fmt.Sprintf("%s:%d-%d", toFilename, i.To.LineStart, i.To.LineEnd) text := fmt.Sprintf("%d-%d lines are duplicate of %s", - i.From.LineStart(), i.From.LineEnd(), + i.From.LineStart, i.From.LineEnd, formatCode(dupl, lintCtx.Cfg)) res = append(res, goanalysis.NewIssue(&result.Issue{ Pos: token.Position{ - Filename: i.From.Filename(), - Line: i.From.LineStart(), + Filename: i.From.Filename, + Line: i.From.LineStart, }, LineRange: &result.Range{ - From: i.From.LineStart(), - To: i.From.LineEnd(), + From: i.From.LineStart, + To: i.From.LineEnd, }, Text: text, FromLinter: duplLinterName,