Skip to content

Commit 311b35b

Browse files
visualfcvisualfc
committed
gopls/goxls/testdata: update overload
1 parent f84ec2e commit 311b35b

File tree

8 files changed

+139
-58
lines changed

8 files changed

+139
-58
lines changed

‎gopls/internal/goxls/testdata/overload/godef.gop

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import (
2+
"golang.org/lsptests/overload/a"
3+
"golang.org/lsptests/overload/b"
4+
)
5+
6+
func _() {
7+
add "hello" //@godef("add", addString)
8+
add 100, 200 //@godef("add", addInt)
9+
add 100, 200, 300 //@godef("add", addFloat)
10+
}
11+
12+
func _() {
13+
var m M
14+
m.add "hello" //@godef("add", m_addString)
15+
m.add 100, 200 //@godef("add", m_addInt)
16+
m.add 100, 200, 300 //@godef("add", m_addFloat)
17+
}
18+
19+
func _() {
20+
Demo //@godef("Demo",Demo__0)
21+
Demo 100 //@godef("Demo",Demo__1)
22+
Demo 100, 200 //@godef("Demo",Demo__2)
23+
Demo "hello" //@godef("Demo",Demo__3)
24+
}
25+
26+
func _() {
27+
var n N
28+
n.add 100 //@godef("add",Add__0)
29+
n.add "hello" //@godef("add",Add__1)
30+
}
31+
32+
func _() {
33+
a.demo //@godef("demo",a_demo__0)
34+
a.demo 100 //@godef("demo",a_demo__1)
35+
a.demo 100, 200 //@godef("demo",a_demo__2)
36+
a.demo "hello" //@godef("demo",a_demo__3)
37+
}
38+
39+
func _() {
40+
var n a.N
41+
n.add 100 //@godef("add",a_add__0)
42+
n.add "hello" //@godef("add",a_add__1)
43+
}
44+
45+
func _() {
46+
b.gopDemo //@godef("gopDemo",b_gopdemo)
47+
b.demo //@godef("demo",b_demo__0)
48+
b.demo 100 //@godef("demo",b_demo__1)
49+
b.demo 100, 200 //@godef("demo",b_demo__2)
50+
b.demo "hello" //@godef("demo",b_demo__3)
51+
}
52+
53+
func _() {
54+
var n b.N
55+
n.add 100 //@godef("add",b_add__0)
56+
n.add "hello" //@godef("add",b_add__1)
57+
}

‎gopls/internal/goxls/testdata/overload/overload.gop.golden renamed to ‎gopls/internal/goxls/testdata/overload/godef.gop.golden

+18-24
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@ func a.Demo__3(s ...string)
6666
```
6767

6868
[`a.Demo__3` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/a#Demo__3)
69+
-- addFloat-hoverdef --
70+
```go
71+
func addFloat(n1 float64, n2 float64, n3 float64) float64
72+
```
73+
-- addInt-hoverdef --
74+
```go
75+
func addInt(n1 int, n2 int) int
76+
```
77+
-- addString-hoverdef --
78+
```go
79+
func addString(s ...string) string
80+
```
6981
-- b_add__0-hoverdef --
7082
```go
7183
func (*b.N).Add__0(a int)
@@ -108,33 +120,15 @@ func b.GopDemo()
108120
```
109121

110122
[`b.GopDemo` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/b#GopDemo)
111-
-- pkg_add__0-hoverdef --
123+
-- m_addFloat-hoverdef --
112124
```go
113-
func (*pkg.N).Add__0(a int)
125+
func (*M).addFloat(n1 float64, n2 float64, n3 float64) float64
114126
```
115-
116-
[`(pkg.N).Add__0` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#N.Add__0)
117-
-- pkg_add__1-hoverdef --
127+
-- m_addInt-hoverdef --
118128
```go
119-
func (*pkg.N).Add__1(a ...string)
129+
func (*M).addInt(n1 int, n2 int) int
120130
```
121-
122-
[`(pkg.N).Add__1` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#N.Add__1)
123-
-- pkg_demo__0-hoverdef --
131+
-- m_addString-hoverdef --
124132
```go
125-
func pkg.Demo__0()
133+
func (*M).addString(s ...string) string
126134
```
127-
128-
[`pkg.Demo__0` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#Demo__0)
129-
-- pkg_demo__1-hoverdef --
130-
```go
131-
func pkg.Demo__1(n int) int
132-
```
133-
134-
[`pkg.Demo__1` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#Demo__1)
135-
-- pkg_demo__3-hoverdef --
136-
```go
137-
func pkg.Demo__3(s ...string)
138-
```
139-
140-
[`pkg.Demo__3` on pkg.go.dev](https://pkg.go.dev/golang.org/lsptests/overload/pkg#Demo__3)

‎gopls/internal/goxls/testdata/overload/gop_autogen.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gopls/internal/goxls/testdata/overload/overload.gop

+39-29
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,42 @@
11
import (
2-
"golang.org/lsptests/overload/a"
3-
"golang.org/lsptests/overload/b"
2+
"strings"
43
)
54

6-
Demo //@godef("Demo",Demo__0)
7-
Demo 100 //@godef("Demo",Demo__1)
8-
Demo 100, 200 //@godef("Demo",Demo__2)
9-
Demo "hello" //@godef("Demo",Demo__3)
10-
11-
var n N
12-
n.add 100 //@godef("add",Add__0)
13-
n.add "hello" //@godef("add",Add__1)
14-
15-
a.demo //@godef("demo",a_demo__0)
16-
a.demo 100 //@godef("demo",a_demo__1)
17-
a.demo 100, 200 //@godef("demo",a_demo__2)
18-
a.demo "hello" //@godef("demo",a_demo__3)
19-
20-
var n1 a.N
21-
n1.add 100 //@godef("add",a_add__0)
22-
n1.add "hello" //@godef("add",a_add__1)
23-
24-
b.gopDemo //@godef("gopDemo",b_gopdemo)
25-
b.demo //@godef("demo",b_demo__0)
26-
b.demo 100 //@godef("demo",b_demo__1)
27-
b.demo 100, 200 //@godef("demo",b_demo__2)
28-
b.demo "hello" //@godef("demo",b_demo__3)
29-
30-
var n2 b.N
31-
n2.add 100 //@godef("add",b_add__0)
32-
n2.add "hello" //@godef("add",b_add__1)
5+
func addInt(n1, n2 int) int { //@addInt
6+
return n1 + n2
7+
}
8+
9+
func addFloat(n1, n2, n3 float64) float64 { //@addFloat
10+
return n1 + n2 + n3
11+
}
12+
13+
func addString(s ...string) string { //@addString
14+
return strings.Join(s, "")
15+
}
16+
17+
func add = (
18+
addInt
19+
addFloat
20+
addString
21+
)
22+
23+
type M struct {
24+
}
25+
26+
func (m *M) addInt(n1, n2 int) int { //@mark(m_addInt,"addInt")
27+
return n1 + n2
28+
}
29+
30+
func (m *M) addFloat(n1, n2, n3 float64) float64 { //@mark(m_addFloat,"addFloat")
31+
return n1 + n2 + n3
32+
}
33+
34+
func (m *M) addString(s ...string) string { //@mark(m_addString,"addString")
35+
return strings.Join(s, "")
36+
}
37+
38+
func (M).add = (
39+
(M).addInt
40+
(M).addFloat
41+
(M).addString
42+
)

‎gopls/internal/goxls/testdata/overload/signature.gop

+20-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,29 @@
11
func _() {
2-
Demo(100) //@signature_overload("100", "Demo__1(n int) int", 1, 0)
2+
Demo(100) //@signature_overload("100", "Demo__1(n int) int", 1, 0)
33
Demo(100, 200) //@signature_overload("100", "Demo__2(n1 int, n2 int)", 2, 0)
44
Demo(100, 200) //@signature_overload("200", "Demo__2(n1 int, n2 int)", 2, 1)
55
}
66

77
func _() {
8-
Demo 100 //@signature_overload("100", "Demo__1(n int) int", 1, 0)
8+
Demo 100 //@signature_overload("100", "Demo__1(n int) int", 1, 0)
99
Demo 100, 200 //@signature_overload("100", "Demo__2(n1 int, n2 int)", 2, 0)
1010
Demo 100, 200 //@signature_overload("200", "Demo__2(n1 int, n2 int)", 2, 1)
1111
}
12+
13+
func _() {
14+
add(100, 200) //@signature_overload("100", "addInt(n1 int, n2 int) int", 0, 0)
15+
add(100, 200) //@signature_overload("200", "addInt(n1 int, n2 int) int", 0, 1)
16+
add(100, 200, 300) //@signature_overload("100", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 0)
17+
add(100, 200, 300) //@signature_overload(", 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 1)
18+
add(100, 200, 300) //@signature_overload(" 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
19+
add(100, 200, 300) //@signature_overload(")", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
20+
}
21+
22+
func _() {
23+
add 100, 200 //@signature_overload("100", "addInt(n1 int, n2 int) int", 0, 0)
24+
add 100, 200 //@signature_overload("200", "addInt(n1 int, n2 int) int", 0, 1)
25+
add 100, 200, 300 //@signature_overload("100", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 0)
26+
add 100, 200, 300 //@signature_overload(", 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 1)
27+
add 100, 200, 300 //@signature_overload(" 3", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
28+
add 100, 200, 300 //@signature_overload(" //", "addFloat(n1 float64, n2 float64, n3 float64) float64", 1, 2)
29+
}

‎gopls/internal/goxls/testdata/summary.txt.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FoldingRangesCount = 0
1313
SemanticTokenCount = 0
1414
SuggestedFixCount = 0
1515
MethodExtractionCount = 0
16-
DefinitionsCount = 23
16+
DefinitionsCount = 29
1717
TypeDefinitionsCount = 1
1818
HighlightsCount = 0
1919
InlayHintsCount = 0

‎gopls/internal/goxls/testdata/summary_go1.18.txt.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FoldingRangesCount = 0
1313
SemanticTokenCount = 0
1414
SuggestedFixCount = 0
1515
MethodExtractionCount = 0
16-
DefinitionsCount = 23
16+
DefinitionsCount = 29
1717
TypeDefinitionsCount = 1
1818
HighlightsCount = 0
1919
InlayHintsCount = 0

‎gopls/internal/goxls/testdata/summary_go1.21.txt.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FoldingRangesCount = 0
1313
SemanticTokenCount = 0
1414
SuggestedFixCount = 0
1515
MethodExtractionCount = 0
16-
DefinitionsCount = 23
16+
DefinitionsCount = 29
1717
TypeDefinitionsCount = 1
1818
HighlightsCount = 0
1919
InlayHintsCount = 0

0 commit comments

Comments
 (0)