.github/workflows/build.yml

@@ -0,0 +1,15 @@
+name: build
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: '1.16'
+    - name: Run tests
+      run: go test -cover ./...

CHANGELOG.md

@@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.1]
+## [0.4.0] - 2021-12-19
+### Added
+- Support method receivers with type parameters introduced in Go 1.18
+
+### Changed
+- Use more efficient filepath.WalkDir instead of filepath.Walk
+
+## [0.3.1] - 2020-10-20
 ### Added
 - Test coverage
 

README.md

@@ -1,6 +1,7 @@
 # gocyclo
 
 [![PkgGoDev](https://pkg.go.dev/badge/github.com/fzipp/gocyclo)](https://pkg.go.dev/github.com/fzipp/gocyclo)
+![Build Status](https://github.com/fzipp/gocyclo/workflows/build/badge.svg)
 [![Go Report Card](https://goreportcard.com/badge/github.com/fzipp/gocyclo)](https://goreportcard.com/report/github.com/fzipp/gocyclo)
 
 Gocyclo calculates
@@ -31,7 +32,7 @@ to smaller functions.
 To install the `gocyclo` command, run
 
 ```
-$ go get github.com/fzipp/gocyclo/cmd/gocyclo
+$ go install github.com/fzipp/gocyclo/cmd/gocyclo@latest
 ```
 
 and put the resulting binary in one of your PATH directories if

analyze.go

@@ -9,6 +9,7 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
+	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
@@ -39,17 +40,17 @@ func Analyze(paths []string, ignore *regexp.Regexp) Stats {
 }
 
 func analyzeDir(dirname string, ignore *regexp.Regexp, stats Stats) Stats {
-	filepath.Walk(dirname, func(path string, info os.FileInfo, err error) error {
-		if err == nil && isGoFile(info) {
+	filepath.WalkDir(dirname, func(path string, entry fs.DirEntry, err error) error {
+		if err == nil && isGoFile(entry) {
 			stats = analyzeFile(path, ignore, stats)
 		}
 		return err
 	})
 	return stats
 }
 
-func isGoFile(f os.FileInfo) bool {
-	return !f.IsDir() && strings.HasSuffix(f.Name(), ".go")
+func isGoFile(entry fs.DirEntry) bool {
+	return !entry.IsDir() && strings.HasSuffix(entry.Name(), ".go")
 }
 
 func analyzeFile(path string, ignore *regexp.Regexp, stats Stats) Stats {
@@ -137,15 +138,3 @@ func funcName(fn *ast.FuncDecl) string {
 	}
 	return fn.Name.Name
 }
-
-// recvString returns a string representation of recv of the
-// form "T", "*T", or "BADRECV" (if not a proper receiver type).
-func recvString(recv ast.Expr) string {
-	switch t := recv.(type) {
-	case *ast.Ident:
-		return t.Name
-	case *ast.StarExpr:
-		return "*" + recvString(t.X)
-	}
-	return "BADRECV"
-}

analyze_test.go

@@ -23,9 +23,9 @@ func TestAnalyze(t *testing.T) {
 		},
 		{
 			[]string{"testdata/loops.go"},
-			`4 testdata l4 testdata/loops.go:19:1
+			`4 testdata l4 testdata/loops.go:20:1
 3 testdata l3 testdata/loops.go:8:1
-2 testdata l2range testdata/loops.go:14:1
+2 testdata l2range testdata/loops.go:15:1
 2 testdata l2 testdata/loops.go:3:1`,
 		},
 		{

cmd/gocyclo/main.go

@@ -116,6 +116,6 @@ func printTotal(s gocyclo.Stats, short bool) {
 }
 
 func usage() {
-	_, _ = fmt.Fprintf(os.Stderr, usageDoc)
+	_, _ = fmt.Fprint(os.Stderr, usageDoc)
 	os.Exit(2)
 }

go.mod

@@ -1,3 +1,3 @@
 module github.com/fzipp/gocyclo
 
-go 1.15
+go 1.18

recv.go

@@ -0,0 +1,26 @@
+// Copyright 2021 Frederik Zipp. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.18
+// +build go1.18
+
+package gocyclo
+
+import "go/ast"
+
+// recvString returns a string representation of recv of the
+// form "T", "*T", or "BADRECV" (if not a proper receiver type).
+func recvString(recv ast.Expr) string {
+	switch t := recv.(type) {
+	case *ast.Ident:
+		return t.Name
+	case *ast.StarExpr:
+		return "*" + recvString(t.X)
+	case *ast.IndexExpr:
+		return recvString(t.X)
+	case *ast.IndexListExpr:
+		return recvString(t.X)
+	}
+	return "BADRECV"
+}

recv_pre118.go

@@ -0,0 +1,24 @@
+// Copyright 2021 Frederik Zipp. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build !go1.18
+// +build !go1.18
+
+package gocyclo
+
+import "go/ast"
+
+// recvString returns a string representation of recv of the
+// form "T", "*T", or "BADRECV" (if not a proper receiver type).
+func recvString(recv ast.Expr) string {
+	switch t := recv.(type) {
+	case *ast.Ident:
+		return t.Name
+	case *ast.StarExpr:
+		return "*" + recvString(t.X)
+	case *ast.IndexExpr:
+		return recvString(t.X)
+	}
+	return "BADRECV"
+}

testdata/loops.go

@@ -11,6 +11,7 @@ func l3() {
 		}
 	}
 }
+
 func l2range() {
 	for range []struct{}{} {
 	}