From 787907319deb8976c486ff48d0fae77f432bd106 Mon Sep 17 00:00:00 2001
From: Florian Vogt <florian@vorlif.org>
Date: Tue, 28 Nov 2023 21:55:20 +0100
Subject: [PATCH] Lint adjustments

---
 Makefile                         |  2 --
 commands/merge.go                |  2 +-
 goextractors/comments.go         |  2 +-
 goextractors/funcreturn.go       |  9 +++++----
 goextractors/testlib_test.go     |  8 ++++----
 goextractors/utils.go            | 12 +++++++-----
 testdata/project/globalassign.go |  1 +
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index b096950..c63fa90 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,6 @@ gofmt:
 
 
 lint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.1
-
 	@echo Running golangci-lint
 	golangci-lint run --fix ./...
 
diff --git a/commands/merge.go b/commands/merge.go
index 7a6f740..761e685 100644
--- a/commands/merge.go
+++ b/commands/merge.go
@@ -33,7 +33,7 @@ func init() {
 	rootCmd.AddCommand(mergeCmd)
 }
 
-func mergeCmdF(cmd *cobra.Command, args []string) {
+func mergeCmdF(cmd *cobra.Command, _ []string) {
 	targetLang, errL := cmd.Flags().GetString("lang")
 	if errL != nil {
 		log.WithError(errL).Fatal("Invalid source file")
diff --git a/goextractors/comments.go b/goextractors/comments.go
index 1f14403..9a20743 100644
--- a/goextractors/comments.go
+++ b/goextractors/comments.go
@@ -16,7 +16,7 @@ func NewCommentsExtractor() extractors.Extractor {
 	return &commentsExtractor{}
 }
 
-func (d *commentsExtractor) Run(ctx context.Context, extractCtx *extractors.Context) ([]result.Issue, error) {
+func (d *commentsExtractor) Run(_ context.Context, extractCtx *extractors.Context) ([]result.Issue, error) {
 	util.TrackTime(time.Now(), "Extract comments")
 	for _, pkg := range extractCtx.OriginalPackages {
 		for _, file := range pkg.Syntax {
diff --git a/goextractors/funcreturn.go b/goextractors/funcreturn.go
index 5b8cde9..094644c 100644
--- a/goextractors/funcreturn.go
+++ b/goextractors/funcreturn.go
@@ -36,13 +36,14 @@ func (e *funcReturnExtractor) Run(_ context.Context, extractCtx *extractors.Cont
 		extractedResults := make([]etype.Token, len(node.Type.Results.List))
 		var foundType bool
 		for i, res := range node.Type.Results.List {
-			if tok, _ := extractCtx.SearchIdentAndToken(res); tok == etype.None {
+			tok, _ := extractCtx.SearchIdentAndToken(res)
+			if tok == etype.None {
 				extractedResults[i] = etype.None
 				continue
-			} else {
-				extractedResults[i] = tok
-				foundType = true
 			}
+
+			extractedResults[i] = tok
+			foundType = true
 		}
 
 		if !foundType {
diff --git a/goextractors/testlib_test.go b/goextractors/testlib_test.go
index 22fbf4f..d0b56fc 100644
--- a/goextractors/testlib_test.go
+++ b/goextractors/testlib_test.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/vorlif/xspreak/config"
@@ -23,11 +24,10 @@ const (
 func TestPrintAst(t *testing.T) {
 	fset := token.NewFileSet() // positions are relative to fset
 	f, err := parser.ParseFile(fset, filepath.Join(testdataDir, "funccall.go"), nil, 0)
-	if err != nil {
-		panic(err)
-	}
+	require.NoError(t, err)
 
-	ast.Print(fset, f)
+	err = ast.Print(fset, f)
+	assert.NoError(t, err)
 }
 
 func runExtraction(t *testing.T, dir string, testExtractors ...extractors.Extractor) []result.Issue {
diff --git a/goextractors/utils.go b/goextractors/utils.go
index 1bc17c0..db01e48 100644
--- a/goextractors/utils.go
+++ b/goextractors/utils.go
@@ -32,13 +32,15 @@ func searchSelector(expr interface{}) *ast.SelectorExpr {
 }
 
 func calculatePosIdx(first, second int) int {
-	if first > 0 && second > 0 {
-		return first * second
-	} else if first > 0 {
+	if first > 0 {
+		if second > 0 {
+			return first * second
+		}
+
 		return first
-	} else {
-		return second
 	}
+
+	return second
 }
 
 type searchCollector struct {
diff --git a/testdata/project/globalassign.go b/testdata/project/globalassign.go
index a24fc44..81c5725 100644
--- a/testdata/project/globalassign.go
+++ b/testdata/project/globalassign.go
@@ -5,6 +5,7 @@ import (
 )
 
 // TRANSLATORS: Name of the app
+//
 //goland:noinspection GoVarAndConstTypeMayBeOmitted
 var applicationName alias.Singular = "app"