Skip to content

Commit 7fa7591

Browse files
committed
Review feedback
1 parent 78a6a1d commit 7fa7591

17 files changed

+46
-166
lines changed

src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
6161

6262
' Create a provider that will return an empty state when queried the second time
6363
Dim slowProvider = New Mock(Of ISignatureHelpProvider)(MockBehavior.Strict)
64-
slowProvider.Setup(Function(p) p.TriggerCharacters.Contains(" "c)).Returns(True)
65-
slowProvider.Setup(Function(p) p.RetriggerCharacters.Contains(" "c)).Returns(True)
64+
slowProvider.Setup(Function(p) p.TriggerCharacters).Returns(ImmutableArray.Create(Of Char)(" "c))
65+
slowProvider.Setup(Function(p) p.RetriggerCharacters).Returns(ImmutableArray.Create(Of Char)(" "c))
6666
slowProvider.Setup(Function(p) p.GetItemsAsync(It.IsAny(Of Document), It.IsAny(Of Integer), It.IsAny(Of SignatureHelpTriggerInfo), options, It.IsAny(Of CancellationToken))) _
6767
.Returns(Task.FromResult(New SignatureHelpItems(CreateItems(2), TextSpan.FromBounds(0, 0), selectedItem:=0, semanticParameterIndex:=0, syntacticArgumentCount:=0, argumentName:=Nothing)))
6868
Dim controller = Await CreateController(CreateWorkspace(), provider:=slowProvider.Object, waitForPresentation:=True)

src/Features/VisualBasic/Portable/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
3636
token.IsChildToken(Of AddRemoveHandlerStatementSyntax)(Function(ce) ce.CommaToken)
3737
End Function
3838

39-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
40-
Get
41-
Return ImmutableArray.Create(" "c, ","c)
42-
End Get
43-
End Property
44-
45-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
46-
Get
47-
Return ImmutableArray(Of Char).Empty
48-
End Get
49-
End Property
39+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(" "c, ","c)
40+
41+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray(Of Char).Empty
5042

5143
Protected Overrides Function IsArgumentListToken(node As AddRemoveHandlerStatementSyntax, token As SyntaxToken) As Boolean
5244
Return True

src/Features/VisualBasic/Portable/SignatureHelp/AttributeSignatureHelpProvider.vb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
2424
Public Sub New()
2525
End Sub
2626

27-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
28-
Get
29-
Return ImmutableArray.Create("("c, ","c)
30-
End Get
31-
End Property
32-
33-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
34-
Get
35-
Return ImmutableArray.Create(")"c)
36-
End Get
37-
End Property
27+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("("c, ","c)
28+
29+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(")"c)
3830

3931
Private Function TryGetAttributeExpression(root As SyntaxNode, position As Integer, syntaxFacts As ISyntaxFactsService, triggerReason As SignatureHelpTriggerReason, cancellationToken As CancellationToken, ByRef attribute As AttributeSyntax) As Boolean
4032
If Not CommonSignatureHelpUtilities.TryGetSyntax(root, position, syntaxFacts, triggerReason, AddressOf IsTriggerToken, AddressOf IsArgumentListToken, cancellationToken, attribute) Then

src/Features/VisualBasic/Portable/SignatureHelp/CastExpressionSignatureHelpProvider.vb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
3838
token.IsChildToken(Of CastExpressionSyntax)(Function(ce) ce.CommaToken)
3939
End Function
4040

41-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
42-
Get
43-
Return ImmutableArray.Create("("c, ","c)
44-
End Get
45-
End Property
46-
47-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
48-
Get
49-
Return ImmutableArray.Create(")"c)
50-
End Get
51-
End Property
41+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("("c, ","c)
42+
43+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(")"c)
5244

5345
Protected Overrides Function IsArgumentListToken(node As CastExpressionSyntax, token As SyntaxToken) As Boolean
5446
Return node.Span.Contains(token.SpanStart) AndAlso

src/Features/VisualBasic/Portable/SignatureHelp/CollectionInitializerSignatureHelpProvider.vb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
2222
Public Sub New()
2323
End Sub
2424

25-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
26-
Get
27-
Return ImmutableArray.Create("{"c, ","c)
28-
End Get
29-
End Property
25+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("{"c, ","c)
3026

31-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
32-
Get
33-
Return ImmutableArray.Create("}"c)
34-
End Get
35-
End Property
27+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("}"c)
3628

3729
Private Function TryGetInitializerExpression(root As SyntaxNode, position As Integer, syntaxFacts As ISyntaxFactsService, triggerReason As SignatureHelpTriggerReason, cancellationToken As CancellationToken, <Out> ByRef expression As CollectionInitializerSyntax) As Boolean
3830
Return CommonSignatureHelpUtilities.TryGetSyntax(root, position, syntaxFacts, triggerReason, AddressOf IsTriggerToken, AddressOf IsInitializerExpressionToken, cancellationToken, expression) AndAlso

src/Features/VisualBasic/Portable/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
2525
token.Parent.Kind = Kind
2626
End Function
2727

28-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
29-
Get
30-
Return ImmutableArray.Create("("c, ","c)
31-
End Get
32-
End Property
28+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("("c, ","c)
3329

34-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
35-
Get
36-
Return ImmutableArray.Create(")"c)
37-
End Get
38-
End Property
30+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(")"c)
3931

4032
Protected Overrides Function IsArgumentListToken(node As T, token As SyntaxToken) As Boolean
4133
Return node.Span.Contains(token.SpanStart) AndAlso

src/Features/VisualBasic/Portable/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
2323
Public Sub New()
2424
End Sub
2525

26-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
27-
Get
28-
Return ImmutableArray.Create("("c)
29-
End Get
30-
End Property
31-
32-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
33-
Get
34-
Return ImmutableArray.Create(")"c)
35-
End Get
36-
End Property
26+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("("c)
27+
28+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(")"c)
3729

3830
Private Shared Function GetCurrentArgumentState(root As SyntaxNode, position As Integer, syntaxFacts As ISyntaxFactsService, currentSpan As TextSpan, cancellationToken As CancellationToken) As SignatureHelpState
3931
Dim functionAggregation As FunctionAggregationSyntax = Nothing

src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.vb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
2323
Public Sub New()
2424
End Sub
2525

26-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
27-
Get
28-
Return ImmutableArray.Create(" "c, ","c)
29-
End Get
30-
End Property
31-
32-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
33-
Get
34-
Return ImmutableArray.Create(")"c)
35-
End Get
36-
End Property
26+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(" "c, ","c)
27+
28+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(")"c)
3729

3830
Private Shared Function GetCurrentArgumentState(root As SyntaxNode, position As Integer, syntaxFacts As ISyntaxFactsService, currentSpan As TextSpan, cancellationToken As CancellationToken) As SignatureHelpState?
3931
Dim expression As GenericNameSyntax = Nothing

src/Features/VisualBasic/Portable/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
2828
Return token.IsChildToken(Of GetTypeExpressionSyntax)(Function(ce) ce.OpenParenToken)
2929
End Function
3030

31-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
32-
Get
33-
Return ImmutableArray.Create("("c)
34-
End Get
35-
End Property
36-
37-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
38-
Get
39-
Return ImmutableArray.Create(")"c)
40-
End Get
41-
End Property
31+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("("c)
32+
33+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(")"c)
4234

4335
Protected Overrides Function IsArgumentListToken(node As GetTypeExpressionSyntax, token As SyntaxToken) As Boolean
4436
Return node.GetTypeKeyword <> token AndAlso

src/Features/VisualBasic/Portable/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
2828
Return token.IsChildToken(Of GetXmlNamespaceExpressionSyntax)(Function(ce) ce.OpenParenToken)
2929
End Function
3030

31-
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char)
32-
Get
33-
Return ImmutableArray.Create("("c)
34-
End Get
35-
End Property
36-
37-
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char)
38-
Get
39-
Return ImmutableArray.Create(")"c)
40-
End Get
41-
End Property
31+
Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create("("c)
32+
33+
Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(")"c)
4234

4335
Protected Overrides Function IsArgumentListToken(node As GetXmlNamespaceExpressionSyntax, token As SyntaxToken) As Boolean
4436
Return node.GetXmlNamespaceKeyword <> token AndAlso

0 commit comments

Comments
 (0)