Skip to content

Commit 1a8bea9

Browse files
Use immutable types in signature help (#80322)
1 parent 2374b68 commit 1a8bea9

File tree

57 files changed

+638
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+638
-969
lines changed

src/EditorFeatures/CSharpTest/SignatureHelp/AttributeSignatureHelpProviderTests.cs

Lines changed: 21 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ internal override Type GetSignatureHelpProviderType()
2626
[Fact]
2727
public async Task TestInvocationWithoutParameters()
2828
{
29-
var expectedOrderedItems = new List<SignatureHelpTestItem>
30-
{
31-
new("SomethingAttribute()", string.Empty, null, currentParameterIndex: 0)
32-
};
33-
3429
await TestAsync("""
3530
class SomethingAttribute : System.Attribute
3631
{
@@ -40,17 +35,13 @@ class SomethingAttribute : System.Attribute
4035
class D
4136
{
4237
}
43-
""", expectedOrderedItems);
38+
""",
39+
[new("SomethingAttribute()", string.Empty, null, currentParameterIndex: 0)]);
4440
}
4541

4642
[Fact]
4743
public async Task TestInvocationWithoutParametersMethodXmlComments()
4844
{
49-
var expectedOrderedItems = new List<SignatureHelpTestItem>
50-
{
51-
new("SomethingAttribute()", "Summary For Attribute", null, currentParameterIndex: 0)
52-
};
53-
5445
await TestAsync("""
5546
class SomethingAttribute : System.Attribute
5647
{
@@ -62,18 +53,13 @@ public SomethingAttribute() { }
6253
class D
6354
{
6455
}
65-
""", expectedOrderedItems);
56+
""",
57+
[new("SomethingAttribute()", "Summary For Attribute", null, currentParameterIndex: 0)]);
6658
}
6759

6860
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/25830")]
6961
public async Task PickCorrectOverload_PickInt()
7062
{
71-
var expectedOrderedItems = new List<SignatureHelpTestItem>
72-
{
73-
new("SomethingAttribute(int i)", currentParameterIndex: 0, isSelected: true),
74-
new("SomethingAttribute(string i)", currentParameterIndex: 0),
75-
};
76-
7763
await TestAsync("""
7864
class SomethingAttribute : System.Attribute
7965
{
@@ -83,18 +69,14 @@ class SomethingAttribute : System.Attribute
8369
}
8470
[[|Something(i: 1$$|])]
8571
class D { }
86-
""", expectedOrderedItems);
72+
""", [
73+
new("SomethingAttribute(int i)", currentParameterIndex: 0, isSelected: true),
74+
new("SomethingAttribute(string i)", currentParameterIndex: 0)]);
8775
}
8876

8977
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/25830")]
9078
public async Task PickCorrectOverload_PickString()
9179
{
92-
var expectedOrderedItems = new List<SignatureHelpTestItem>
93-
{
94-
new("SomethingAttribute(int i)", currentParameterIndex: 0),
95-
new("SomethingAttribute(string i)", currentParameterIndex: 0, isSelected: true),
96-
};
97-
9880
await TestAsync("""
9981
class SomethingAttribute : System.Attribute
10082
{
@@ -104,17 +86,14 @@ class SomethingAttribute : System.Attribute
10486
}
10587
[[|Something(i: null$$|])]
10688
class D { }
107-
""", expectedOrderedItems);
89+
""", [
90+
new("SomethingAttribute(int i)", currentParameterIndex: 0),
91+
new("SomethingAttribute(string i)", currentParameterIndex: 0, isSelected: true)]);
10892
}
10993

11094
[Fact]
11195
public async Task TestInvocationWithParametersOn1()
11296
{
113-
var expectedOrderedItems = new List<SignatureHelpTestItem>
114-
{
115-
new("SomethingAttribute(int someInteger, string someString)", string.Empty, string.Empty, currentParameterIndex: 0)
116-
};
117-
11897
await TestAsync("""
11998
class SomethingAttribute : System.Attribute
12099
{
@@ -125,17 +104,13 @@ public SomethingAttribute(int someInteger, string someString) { }
125104
class D
126105
{
127106
}
128-
""", expectedOrderedItems);
107+
""",
108+
[new("SomethingAttribute(int someInteger, string someString)", string.Empty, string.Empty, currentParameterIndex: 0)]);
129109
}
130110

131111
[Fact]
132112
public async Task TestInvocationWithParametersXmlCommentsOn1()
133113
{
134-
var expectedOrderedItems = new List<SignatureHelpTestItem>
135-
{
136-
new("SomethingAttribute(int someInteger, string someString)", "Summary For Attribute", "Param someInteger", currentParameterIndex: 0)
137-
};
138-
139114
await TestAsync("""
140115
class SomethingAttribute : System.Attribute
141116
{
@@ -151,17 +126,13 @@ public SomethingAttribute(int someInteger, string someString) { }
151126
|]class D
152127
{
153128
}
154-
""", expectedOrderedItems);
129+
""",
130+
[new("SomethingAttribute(int someInteger, string someString)", "Summary For Attribute", "Param someInteger", currentParameterIndex: 0)]);
155131
}
156132

157133
[Fact]
158134
public async Task TestInvocationWithParametersOn2()
159135
{
160-
var expectedOrderedItems = new List<SignatureHelpTestItem>
161-
{
162-
new("SomethingAttribute(int someInteger, string someString)", string.Empty, string.Empty, currentParameterIndex: 1)
163-
};
164-
165136
await TestAsync("""
166137
class SomethingAttribute : System.Attribute
167138
{
@@ -172,17 +143,13 @@ public SomethingAttribute(int someInteger, string someString) { }
172143
class D
173144
{
174145
}
175-
""", expectedOrderedItems);
146+
""",
147+
[new("SomethingAttribute(int someInteger, string someString)", string.Empty, string.Empty, currentParameterIndex: 1)]);
176148
}
177149

178150
[Fact]
179151
public async Task TestInvocationWithParametersXmlComentsOn2()
180152
{
181-
var expectedOrderedItems = new List<SignatureHelpTestItem>
182-
{
183-
new("SomethingAttribute(int someInteger, string someString)", "Summary For Attribute", "Param someString", currentParameterIndex: 1)
184-
};
185-
186153
await TestAsync("""
187154
class SomethingAttribute : System.Attribute
188155
{
@@ -198,17 +165,13 @@ public SomethingAttribute(int someInteger, string someString) { }
198165
|]class D
199166
{
200167
}
201-
""", expectedOrderedItems);
168+
""",
169+
[new("SomethingAttribute(int someInteger, string someString)", "Summary For Attribute", "Param someString", currentParameterIndex: 1)]);
202170
}
203171

204172
[Fact]
205173
public async Task TestInvocationWithClosingParen()
206174
{
207-
var expectedOrderedItems = new List<SignatureHelpTestItem>
208-
{
209-
new("SomethingAttribute()", string.Empty, null, currentParameterIndex: 0)
210-
};
211-
212175
await TestAsync("""
213176
class SomethingAttribute : System.Attribute
214177
{ }
@@ -217,7 +180,8 @@ class SomethingAttribute : System.Attribute
217180
class D
218181
{
219182
}
220-
""", expectedOrderedItems);
183+
""",
184+
[new("SomethingAttribute()", string.Empty, null, currentParameterIndex: 0)]);
221185
}
222186

223187
[Fact]
@@ -997,7 +961,6 @@ public Task InvokedWithNoToken()
997961
[Fact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1081535")]
998962
public async Task TestInvocationWithBadParameterList()
999963
{
1000-
var expectedOrderedItems = new List<SignatureHelpTestItem>();
1001964
await TestAsync("""
1002965
class SomethingAttribute : System.Attribute
1003966
{
@@ -1007,6 +970,6 @@ class SomethingAttribute : System.Attribute
1007970
class D
1008971
{
1009972
}
1010-
""", expectedOrderedItems);
973+
""", []);
1011974
}
1012975
}

0 commit comments

Comments
 (0)