Merge pull request #31 from golangci/feature/use-gocyclo-prepared-for-upstreaming

use gocyclo with changes for upstreaming, also speedup it 10x when pr…

Author: golangci

Gopkg.lock

@@ -109,6 +109,6 @@
   branch = "master"
   name = "github.com/golangci/ineffassign"
 
-[[constraint]]
+[[override]]
   branch = "master"
   name = "github.com/golangci/lint"

Gopkg.toml

@@ -0,0 +1,71 @@
+package astcache
+
+import (
+	"go/ast"
+	"go/parser"
+	"go/token"
+
+	"golang.org/x/tools/go/loader"
+)
+
+type File struct {
+	F    *ast.File
+	Fset *token.FileSet
+	err  error
+}
+
+type Cache struct {
+	m map[string]*File
+	s []*File
+}
+
+func (c Cache) GetAllValidFiles() []*File {
+	return c.s
+}
+
+func (c *Cache) prepareValidFiles() {
+	files := make([]*File, 0, len(c.m))
+	for _, f := range c.m {
+		if f.err != nil || f.F == nil {
+			continue
+		}
+		files = append(files, f)
+	}
+	c.s = files
+}
+
+func LoadFromProgram(prog *loader.Program) *Cache {
+	c := &Cache{
+		m: map[string]*File{},
+	}
+	for _, pkg := range prog.InitialPackages() {
+		for _, f := range pkg.Files {
+			pos := prog.Fset.Position(0)
+			c.m[pos.Filename] = &File{
+				F:    f,
+				Fset: prog.Fset,
+			}
+		}
+	}
+
+	c.prepareValidFiles()
+	return c
+}
+
+func LoadFromFiles(files []string) *Cache {
+	c := &Cache{
+		m: map[string]*File{},
+	}
+	fset := token.NewFileSet()
+	for _, filePath := range files {
+		f, err := parser.ParseFile(fset, filePath, nil, parser.ParseComments) // comments needed by e.g. golint
+		c.m[filePath] = &File{
+			F:    f,
+			Fset: fset,
+			err:  err,
+		}
+	}
+
+	c.prepareValidFiles()
+	return c
+}

pkg/astcache/astcache.go

@@ -16,6 +16,7 @@ import (
 	"github.com/golangci/go-tools/ssa"
 	"github.com/golangci/go-tools/ssa/ssautil"
 	"github.com/golangci/golangci-lint/pkg"
+	"github.com/golangci/golangci-lint/pkg/astcache"
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/fsutils"
 	"github.com/golangci/golangci-lint/pkg/golinters"
@@ -195,12 +196,20 @@ func buildLintCtx(ctx context.Context, linters []pkg.Linter, cfg *config.Config)
 		ssaProg = buildSSAProgram(ctx, prog)
 	}
 
+	var astCache *astcache.Cache
+	if prog != nil {
+		astCache = astcache.LoadFromProgram(prog)
+	} else {
+		astCache = astcache.LoadFromFiles(paths.Files)
+	}
+
 	return &golinters.Context{
 		Paths:        paths,
 		Cfg:          cfg,
 		Program:      prog,
 		SSAProgram:   ssaProg,
 		LoaderConfig: loaderConfig,
+		ASTCache:     astCache,
 	}, nil
 }
 

pkg/commands/run.go

@@ -2,6 +2,7 @@ package golinters
 
 import (
 	"github.com/golangci/go-tools/ssa"
+	"github.com/golangci/golangci-lint/pkg/astcache"
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/fsutils"
 	"golang.org/x/tools/go/loader"
@@ -13,6 +14,7 @@ type Context struct {
 	Program      *loader.Program
 	SSAProgram   *ssa.Program
 	LoaderConfig *loader.Config
+	ASTCache     *astcache.Cache
 }
 
 func (c *Context) Settings() *config.LintersSettings {

pkg/golinters/context.go

@@ -3,8 +3,9 @@ package golinters
 import (
 	"context"
 	"fmt"
+	"sort"
 
-	gocycloAPI "github.com/golangci/gocyclo"
+	gocycloAPI "github.com/golangci/gocyclo/pkg/gocyclo"
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
@@ -19,7 +20,14 @@ func (Gocyclo) Desc() string {
 }
 
 func (g Gocyclo) Run(ctx context.Context, lintCtx *Context) ([]result.Issue, error) {
-	stats := gocycloAPI.Run(lintCtx.Paths.MixedPaths())
+	var stats []gocycloAPI.Stat
+	for _, f := range lintCtx.ASTCache.GetAllValidFiles() {
+		stats = gocycloAPI.BuildStats(f.F, f.Fset, stats)
+	}
+
+	sort.Slice(stats, func(i, j int) bool {
+		return stats[i].Complexity > stats[j].Complexity
+	})
 
 	var res []result.Issue
 	for _, s := range stats {