From 15eda6f0de7f04fe27ebe45656fe8fe4f4c5ceef Mon Sep 17 00:00:00 2001
From: Renovate
 <group_2759636_bot_1c34751f7eccad09e089ac15ee7bd902@noreply.gitlab.com>
Date: Mon, 24 Mar 2025 12:53:43 +0000
Subject: [PATCH] chore(deps): update pre-commit hook golangci/golangci-lint to
 v2

---
 .golangci.yml                       | 21 ++++++++++++++++++++-
 .pre-commit-config.yaml             |  2 +-
 sdlmerge/merge_duplicated_fields.go |  6 +++---
 sdlmerge/shared_types.go            |  6 +++---
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 49d25da..5381cc5 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,3 +1,22 @@
+version: "2"
 run:
   allow-parallel-runners: true
-  timeout: 5m
+linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ac7cfab..7f5606b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
   - id: go-test
   - id: gofumpt
 - repo: https://github.com/golangci/golangci-lint
-  rev: v1.64.8
+  rev: v2.0.0
   hooks:
   - id: golangci-lint-full
 - repo: https://github.com/gitleaks/gitleaks
diff --git a/sdlmerge/merge_duplicated_fields.go b/sdlmerge/merge_duplicated_fields.go
index fcfcf98..da2f132 100644
--- a/sdlmerge/merge_duplicated_fields.go
+++ b/sdlmerge/merge_duplicated_fields.go
@@ -41,15 +41,15 @@ func (m *mergeDuplicatedFieldsVisitor) LeaveObjectTypeDefinition(ref int) {
 			}
 			oldFieldTypeNameBytes, err := m.document.PrintTypeBytes(oldTypeRef, nil)
 			if err != nil {
-				m.Walker.StopWithInternalErr(err)
+				m.StopWithInternalErr(err)
 				return
 			}
 			newFieldTypeNameBytes, err := m.document.PrintTypeBytes(newTypeRef, nil)
 			if err != nil {
-				m.Walker.StopWithInternalErr(err)
+				m.StopWithInternalErr(err)
 				return
 			}
-			m.Walker.StopWithExternalErr(operationreport.ErrDuplicateFieldsMustBeIdentical(
+			m.StopWithExternalErr(operationreport.ErrDuplicateFieldsMustBeIdentical(
 				fieldName, m.document.ObjectTypeDefinitionNameString(ref), string(oldFieldTypeNameBytes), string(newFieldTypeNameBytes),
 			))
 			return
diff --git a/sdlmerge/shared_types.go b/sdlmerge/shared_types.go
index 4fdfb64..bd0555c 100644
--- a/sdlmerge/shared_types.go
+++ b/sdlmerge/shared_types.go
@@ -154,14 +154,14 @@ func (u unionSharedType) valueName(ref int) string {
 
 type scalarSharedType struct{}
 
-func (_ scalarSharedType) areValuesIdentical(_ []int) bool {
+func (scalarSharedType) areValuesIdentical(_ []int) bool {
 	return true
 }
 
-func (_ scalarSharedType) valueRefs() []int {
+func (scalarSharedType) valueRefs() []int {
 	return nil
 }
 
-func (_ scalarSharedType) valueName(_ int) string {
+func (scalarSharedType) valueName(_ int) string {
 	return ""
 }