From f2be9d1166d4ccaeca706963794a37868f84bafc Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Thu, 28 Jul 2022 19:14:22 +0200
Subject: [PATCH] all: Fix nested `if` with `else if` (#8467)

Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
---
 lib/discover/global_test.go | 12 ++++--------
 lib/ignore/ignore.go        |  6 ++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/discover/global_test.go b/lib/discover/global_test.go
index d7379cb59..174156b44 100644
--- a/lib/discover/global_test.go
+++ b/lib/discover/global_test.go
@@ -142,10 +142,8 @@ func TestGlobalOverHTTPS(t *testing.T) {
 	url = "https://" + list.Addr().String() + "?insecure"
 	if addresses, err := testLookup(url); err != nil {
 		t.Fatalf("unexpected error: %v", err)
-	} else {
-		if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
-			t.Errorf("incorrect addresses list: %+v", addresses)
-		}
+	} else if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
+		t.Errorf("incorrect addresses list: %+v", addresses)
 	}
 
 	// With "id" set to something incorrect, the checks should fail again.
@@ -162,10 +160,8 @@ func TestGlobalOverHTTPS(t *testing.T) {
 	url = "https://" + list.Addr().String() + "?id=" + id.String()
 	if addresses, err := testLookup(url); err != nil {
 		t.Fatalf("unexpected error: %v", err)
-	} else {
-		if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
-			t.Errorf("incorrect addresses list: %+v", addresses)
-		}
+	} else if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
+		t.Errorf("incorrect addresses list: %+v", addresses)
 	}
 }
 
diff --git a/lib/ignore/ignore.go b/lib/ignore/ignore.go
index 243f178d9..a23f25ca7 100644
--- a/lib/ignore/ignore.go
+++ b/lib/ignore/ignore.go
@@ -289,10 +289,8 @@ func (m *Matcher) Match(file string) (result Result) {
 			if pattern.match.Match(lowercaseFile) {
 				return pattern.result
 			}
-		} else {
-			if pattern.match.Match(file) {
-				return pattern.result
-			}
+		} else if pattern.match.Match(file) {
+			return pattern.result
 		}
 	}