From 6c8a6c40933532ebe1271a3a5c8ff53bfdb8f1d5 Mon Sep 17 00:00:00 2001
From: Suzy Mueller <suzmue@golang.org>
Date: Tue, 26 Jul 2022 13:16:49 -0400
Subject: [PATCH] internal/lsp: suppress parameter hint when argument matches
 parameter

Suppress the parameter hint when it would present redundant
information.

Fixes golang/go#2361

Change-Id: I4340a903046f212f8a035eab847da665e2692f1a
Reviewed-on: https://go-review.googlesource.com/c/tools/+/419497
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Suzy Mueller <suzmue@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
---
 internal/lsp/source/inlay_hint.go                 | 15 +++++++++++----
 .../lsp/testdata/inlay_hint/parameter_names.go    |  5 +++++
 .../testdata/inlay_hint/parameter_names.go.golden |  5 +++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/internal/lsp/source/inlay_hint.go b/internal/lsp/source/inlay_hint.go
index 6ca51930a7f..4fb1cfb44f8 100644
--- a/internal/lsp/source/inlay_hint.go
+++ b/internal/lsp/source/inlay_hint.go
@@ -154,17 +154,24 @@ func parameterNames(node ast.Node, tmap *lsppos.TokenMapper, info *types.Info, _
 		if i > params.Len()-1 {
 			break
 		}
-		value := params.At(i).Name()
+		param := params.At(i)
 		// param.Name is empty for built-ins like append
-		if value == "" {
+		if param.Name() == "" {
 			continue
 		}
+		// Skip the parameter name hint if the arg matches the
+		// the parameter name.
+		if i, ok := v.(*ast.Ident); ok && i.Name == param.Name() {
+			continue
+		}
+
+		label := param.Name()
 		if signature.Variadic() && i == params.Len()-1 {
-			value = value + "..."
+			label = label + "..."
 		}
 		hints = append(hints, protocol.InlayHint{
 			Position:     &start,
-			Label:        buildLabel(value + ":"),
+			Label:        buildLabel(label + ":"),
 			Kind:         protocol.Parameter,
 			PaddingRight: true,
 		})
diff --git a/internal/lsp/testdata/inlay_hint/parameter_names.go b/internal/lsp/testdata/inlay_hint/parameter_names.go
index 6fba23530aa..0d930e5d426 100644
--- a/internal/lsp/testdata/inlay_hint/parameter_names.go
+++ b/internal/lsp/testdata/inlay_hint/parameter_names.go
@@ -42,4 +42,9 @@ func foobar() {
 	kipp("a", "b", "c")
 	plex("a", "b", "c")
 	tars("a", "b", "c")
+	foo, bar, baz := "a", "b", "c"
+	kipp(foo, bar, baz)
+	plex("a", bar, baz)
+	tars(foo+foo, (bar), "c")
+
 }
diff --git a/internal/lsp/testdata/inlay_hint/parameter_names.go.golden b/internal/lsp/testdata/inlay_hint/parameter_names.go.golden
index 46d3ea4e9bf..4e93a4f9268 100644
--- a/internal/lsp/testdata/inlay_hint/parameter_names.go.golden
+++ b/internal/lsp/testdata/inlay_hint/parameter_names.go.golden
@@ -43,5 +43,10 @@ func foobar() {
 	kipp(<foo: >"a", <bar: >"b", <baz: >"c")
 	plex(<foo: >"a", <bar: >"b", <baz: >"c")
 	tars(<foo: >"a", <bar: >"b", <baz: >"c")
+	foo< string>, bar< string>, baz< string> := "a", "b", "c"
+	kipp(foo, bar, baz)
+	plex(<foo: >"a", bar, baz)
+	tars(<foo: >foo+foo, <bar: >(bar), <baz: >"c")
+
 }