gopls/goxls/testdata: update overload

goplus · visualfc · Apr 8, 2024 · Apr 8, 2024 · Apr 9, 2024 · Apr 9, 2024
commit 75ac9954032c18f8ece1990d99a1037a9da6a8d5
diff --git a/gopls/internal/goxls/testdata/overload/godef.gop b/gopls/internal/goxls/testdata/overload/godef.gop
@@ -0,0 +1,57 @@
+import (
+	"golang.org/lsptests/overload/a"
+	"golang.org/lsptests/overload/b"
+)
+
+func _() {
+	add "hello"       //@godef("add", addString)
+	add 100, 200      //@godef("add", addInt)
+	add 100, 200, 300 //@godef("add", addFloat)
+}
+
+func _() {
+	var m M
+	m.add "hello"       //@godef("add", m_addString)
+	m.add 100, 200      //@godef("add", m_addInt)
+	m.add 100, 200, 300 //@godef("add", m_addFloat)
+}
+
+func _() {
+	Demo          //@godef("Demo",Demo__0)
+	Demo 100      //@godef("Demo",Demo__1)
+	Demo 100, 200 //@godef("Demo",Demo__2)
+	Demo "hello"  //@godef("Demo",Demo__3)
+}
+
+func _() {
+	var n N
+	n.add 100     //@godef("add",Add__0)
+	n.add "hello" //@godef("add",Add__1)
+}
+
+func _() {
+	a.demo          //@godef("demo",a_demo__0)
+	a.demo 100      //@godef("demo",a_demo__1)
+	a.demo 100, 200 //@godef("demo",a_demo__2)
+	a.demo "hello"  //@godef("demo",a_demo__3)
+}
+
+func _() {
+	var n a.N
+	n.add 100     //@godef("add",a_add__0)
+	n.add "hello" //@godef("add",a_add__1)
+}
+
+func _() {
+	b.gopDemo       //@godef("gopDemo",b_gopdemo)
+	b.demo          //@godef("demo",b_demo__0)
+	b.demo 100      //@godef("demo",b_demo__1)
+	b.demo 100, 200 //@godef("demo",b_demo__2)
+	b.demo "hello"  //@godef("demo",b_demo__3)
+}
+
+func _() {
+	var n b.N
+	n.add 100     //@godef("add",b_add__0)
+	n.add "hello" //@godef("add",b_add__1)
+}
diff --git a/...xls/testdata/overload/overload.gop.golden → .../goxls/testdata/overload/godef.gop.golden b/...xls/testdata/overload/overload.gop.golden → .../goxls/testdata/overload/godef.gop.golden
@@ -66,6 +66,18 @@ func a.Demo__3(s ...string)
 ```
 
 [`a.Demo__3` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/a#Demo__3)
+-- addFloat-hoverdef --
+```go
+func addFloat(n1 float64, n2 float64, n3 float64) float64
+```
+-- addInt-hoverdef --
+```go
+func addInt(n1 int, n2 int) int
+```
+-- addString-hoverdef --
+```go
+func addString(s ...string) string
+```
 -- b_add__0-hoverdef --
 ```go
 func (*b.N).Add__0(a int)
@@ -108,33 +120,15 @@ func b.GopDemo()
 ```
 
 [`b.GopDemo` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/b#GopDemo)
--- pkg_add__0-hoverdef --
+-- m_addFloat-hoverdef --
 ```go
-func (*pkg.N).Add__0(a int)
+func (*M).addFloat(n1 float64, n2 float64, n3 float64) float64
 ```
-
-[`(pkg.N).Add__0` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#N.Add__0)
--- pkg_add__1-hoverdef --
+-- m_addInt-hoverdef --
 ```go
-func (*pkg.N).Add__1(a ...string)
+func (*M).addInt(n1 int, n2 int) int
 ```
-
-[`(pkg.N).Add__1` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#N.Add__1)
--- pkg_demo__0-hoverdef --
+-- m_addString-hoverdef --
 ```go
-func pkg.Demo__0()
+func (*M).addString(s ...string) string
 ```
-
-[`pkg.Demo__0` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#Demo__0)
--- pkg_demo__1-hoverdef --
-```go
-func pkg.Demo__1(n int) int
-```
-
-[`pkg.Demo__1` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#Demo__1)
--- pkg_demo__3-hoverdef --
-```go
-func pkg.Demo__3(s ...string)
-```
-
-[`pkg.Demo__3` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#Demo__3)
diff --git a/gopls/internal/goxls/testdata/overload/gop_autogen.go b/gopls/internal/goxls/testdata/overload/gop_autogen.go
diff --git a/gopls/internal/goxls/testdata/overload/overload.gop b/gopls/internal/goxls/testdata/overload/overload.gop
@@ -1,32 +1,42 @@
 import (
-	"golang.org/lsptests/overload/a"
-	"golang.org/lsptests/overload/b"
+	"strings"
 )
 
-Demo          //@godef("Demo",Demo__0)
-Demo 100      //@godef("Demo",Demo__1)
-Demo 100, 200 //@godef("Demo",Demo__2)
-Demo "hello"  //@godef("Demo",Demo__3)
-
-var n N
-n.add 100     //@godef("add",Add__0)
-n.add "hello" //@godef("add",Add__1)
-
-a.demo          //@godef("demo",a_demo__0)
-a.demo 100      //@godef("demo",a_demo__1)
-a.demo 100, 200 //@godef("demo",a_demo__2)
-a.demo "hello"  //@godef("demo",a_demo__3)
-
-var n1 a.N
-n1.add 100     //@godef("add",a_add__0)
-n1.add "hello" //@godef("add",a_add__1)
-
-b.gopDemo       //@godef("gopDemo",b_gopdemo)
-b.demo          //@godef("demo",b_demo__0)
-b.demo 100      //@godef("demo",b_demo__1)
-b.demo 100, 200 //@godef("demo",b_demo__2)
-b.demo "hello"  //@godef("demo",b_demo__3)
-
-var n2 b.N
-n2.add 100     //@godef("add",b_add__0)
-n2.add "hello" //@godef("add",b_add__1)
+func addInt(n1, n2 int) int { //@addInt
+	return n1 + n2
+}
+
+func addFloat(n1, n2, n3 float64) float64 { //@addFloat
+	return n1 + n2 + n3
+}
+
+func addString(s ...string) string { //@addString
+	return strings.Join(s, "")
+}
+
+func add = (
+	addInt
+	addFloat
+	addString
+)
+
+type M struct {
+}
+
+func (m *M) addInt(n1, n2 int) int { //@mark(m_addInt,"addInt")
+	return n1 + n2
+}
+
+func (m *M) addFloat(n1, n2, n3 float64) float64 { //@mark(m_addFloat,"addFloat")
+	return n1 + n2 + n3
+}
+
+func (m *M) addString(s ...string) string { //@mark(m_addString,"addString")
+	return strings.Join(s, "")
+}
+
+func (M).add = (
+	(M).addInt
+	(M).addFloat
+	(M).addString
+)
diff --git a/gopls/internal/goxls/testdata/overload/signature.gop b/gopls/internal/goxls/testdata/overload/signature.gop
@@ -1,11 +1,29 @@
 func _() {
-	Demo(100) //@signature_overload("100", "Demo__1(n int) int", 1, 0)
+	Demo(100)      //@signature_overload("100", "Demo__1(n int) int", 1, 0)
 	Demo(100, 200) //@signature_overload("100", "Demo__2(n1 int, n2 int)", 2, 0)
 	Demo(100, 200) //@signature_overload("200", "Demo__2(n1 int, n2 int)", 2, 1)
 }
 
 func _() {
-	Demo 100 //@signature_overload("100", "Demo__1(n int) int", 1, 0)
+	Demo 100      //@signature_overload("100", "Demo__1(n int) int", 1, 0)
 	Demo 100, 200 //@signature_overload("100", "Demo__2(n1 int, n2 int)", 2, 0)
 	Demo 100, 200 //@signature_overload("200", "Demo__2(n1 int, n2 int)", 2, 1)
 }
+
+func _() {
+	add(100, 200)      //@signature_overload("100", "addInt(n1 int, n2 int) int", 0, 0)
+	add(100, 200)      //@signature_overload("200", "addInt(n1 int, n2 int) int", 0, 1)
+	add(100, 200, 300) //@signature_overload("100", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 0)
+	add(100, 200, 300) //@signature_overload(", 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 1)
+	add(100, 200, 300) //@signature_overload(" 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
+	add(100, 200, 300) //@signature_overload(")", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
+}
+
+func _() {
+	add 100, 200      //@signature_overload("100", "addInt(n1 int, n2 int) int", 0, 0)
+	add 100, 200      //@signature_overload("200", "addInt(n1 int, n2 int) int", 0, 1)
+	add 100, 200, 300 //@signature_overload("100", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 0)
+	add 100, 200, 300 //@signature_overload(", 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 1)
+	add 100, 200, 300 //@signature_overload(" 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
+	add 100, 200, 300 //@signature_overload(" //", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
+}
diff --git a/gopls/internal/goxls/testdata/summary.txt.golden b/gopls/internal/goxls/testdata/summary.txt.golden
@@ -13,7 +13,7 @@ FoldingRangesCount = 0
 SemanticTokenCount = 0
 SuggestedFixCount = 0
 MethodExtractionCount = 0
-DefinitionsCount = 23
+DefinitionsCount = 29
 TypeDefinitionsCount = 1
 HighlightsCount = 0
 InlayHintsCount = 0

diff --git a/gopls/internal/goxls/testdata/summary_go1.18.txt.golden b/gopls/internal/goxls/testdata/summary_go1.18.txt.golden
@@ -13,7 +13,7 @@ FoldingRangesCount = 0
 SemanticTokenCount = 0
 SuggestedFixCount = 0
 MethodExtractionCount = 0
-DefinitionsCount = 23
+DefinitionsCount = 29
 TypeDefinitionsCount = 1
 HighlightsCount = 0
 InlayHintsCount = 0

diff --git a/gopls/internal/goxls/testdata/summary_go1.21.txt.golden b/gopls/internal/goxls/testdata/summary_go1.21.txt.golden
@@ -13,7 +13,7 @@ FoldingRangesCount = 0
 SemanticTokenCount = 0
 SuggestedFixCount = 0
 MethodExtractionCount = 0
-DefinitionsCount = 23
+DefinitionsCount = 29
 TypeDefinitionsCount = 1
 HighlightsCount = 0
 InlayHintsCount = 0