Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use NameOf instead of explicit string literals. #1879

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -320,7 +320,7 @@ Public Module VerificationHelpers
<Extension()>
Public Function FindNodeOrTokenByKind(tree As SyntaxTree, kind As SyntaxKind, Optional occurrence As Integer = 1) As SyntaxNodeOrToken
If Not occurrence > 0 Then
Throw New ArgumentException("Specified value must be greater than zero.", "occurrence")
Throw New ArgumentException("Specified value must be greater than zero.", NameOf(occurrence))
End If
Dim foundNode As SyntaxNodeOrToken = Nothing
If TryFindNodeOrToken(tree.GetRoot(), kind, occurrence, foundNode) Then
Expand Down
Expand Up @@ -22,7 +22,7 @@ Public MustInherit Class SemanticModelTestBase : Inherits BasicTestBase

Private Function GetAncestor(Of T As VisualBasicSyntaxNode)(node As VisualBasicSyntaxNode) As T
If node Is Nothing Then
Throw New ArgumentNullException("node")
Throw New ArgumentNullException(NameOf(node))
End If

Dim parent = node.Parent
Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/VisualBasic/Portable/Binding/Binder_Symbols.vb
Expand Up @@ -192,10 +192,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Dim isProperties As Boolean = (GetType(TMember) Is GetType(PropertySymbol))
Dim isMethods As Boolean = (GetType(TMember) Is GetType(MethodSymbol))
If Not (isProperties OrElse isMethods) Then
Throw New ArgumentException("Must resolve overloads on PropertySymbol or MethodSymbol", "TMember")
Throw New ArgumentException("Must resolve overloads on PropertySymbol or MethodSymbol", NameOf(TMember))
End If
If isProperties And Not typeArguments.IsEmpty Then
Throw New ArgumentException(VBResources.PropertiesCanNotHaveTypeArguments, "typeArguments")
Throw New ArgumentException(VBResources.PropertiesCanNotHaveTypeArguments, NameOf(typeArguments))
End If

Dim boundArguments As ImmutableArray(Of BoundExpression) = Nothing
Expand Down
Expand Up @@ -545,7 +545,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic

Public Overrides Function GetDeclaredSymbol(identifierSyntax As ModifiedIdentifierSyntax, Optional cancellationToken As CancellationToken = Nothing) As ISymbol
If identifierSyntax Is Nothing Then
Throw New ArgumentNullException("identifierSyntax")
Throw New ArgumentNullException(NameOf(identifierSyntax))
End If
If Not IsInTree(identifierSyntax) Then
Throw New ArgumentException(VBResources.IdentifierSyntaxNotWithinSyntaxTree)
Expand Down Expand Up @@ -579,7 +579,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic

Public Overrides Function GetDeclaredSymbol(anonymousObjectCreationExpressionSyntax As AnonymousObjectCreationExpressionSyntax, Optional cancellationToken As CancellationToken = Nothing) As INamedTypeSymbol
If anonymousObjectCreationExpressionSyntax Is Nothing Then
Throw New ArgumentNullException("anonymousObjectCreationExpressionSyntax")
Throw New ArgumentNullException(NameOf(anonymousObjectCreationExpressionSyntax))
End If
If Not IsInTree(anonymousObjectCreationExpressionSyntax) Then
Throw New ArgumentException(VBResources.AnonymousObjectCreationExpressionSyntaxNotWithinTree)
Expand All @@ -595,7 +595,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic

Public Overrides Function GetDeclaredSymbol(fieldInitializerSyntax As FieldInitializerSyntax, Optional cancellationToken As System.Threading.CancellationToken = Nothing) As IPropertySymbol
If fieldInitializerSyntax Is Nothing Then
Throw New ArgumentNullException("fieldInitializerSyntax")
Throw New ArgumentNullException(NameOf(fieldInitializerSyntax))
End If
If Not IsInTree(fieldInitializerSyntax) Then
Throw New ArgumentException(VBResources.FieldInitializerSyntaxNotWithinSyntaxTree)
Expand Down Expand Up @@ -630,7 +630,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic

Public Overrides Function GetDeclaredSymbol(rangeVariableSyntax As CollectionRangeVariableSyntax, Optional cancellationToken As CancellationToken = Nothing) As IRangeVariableSymbol
If rangeVariableSyntax Is Nothing Then
Throw New ArgumentNullException("rangeVariableSyntax")
Throw New ArgumentNullException(NameOf(rangeVariableSyntax))
End If
If Not IsInTree(rangeVariableSyntax) Then
Throw New ArgumentException(VBResources.IdentifierSyntaxNotWithinSyntaxTree)
Expand All @@ -651,7 +651,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic

Public Overrides Function GetDeclaredSymbol(rangeVariableSyntax As ExpressionRangeVariableSyntax, Optional cancellationToken As CancellationToken = Nothing) As IRangeVariableSymbol
If rangeVariableSyntax Is Nothing Then
Throw New ArgumentNullException("rangeVariableSyntax")
Throw New ArgumentNullException(NameOf(rangeVariableSyntax))
End If
If Not IsInTree(rangeVariableSyntax) Then
Throw New ArgumentException(VBResources.IdentifierSyntaxNotWithinSyntaxTree)
Expand All @@ -668,7 +668,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic

Public Overrides Function GetDeclaredSymbol(rangeVariableSyntax As AggregationRangeVariableSyntax, Optional cancellationToken As CancellationToken = Nothing) As IRangeVariableSymbol
If rangeVariableSyntax Is Nothing Then
Throw New ArgumentNullException("rangeVariableSyntax")
Throw New ArgumentNullException(NameOf(rangeVariableSyntax))
End If
If Not IsInTree(rangeVariableSyntax) Then
Throw New ArgumentException(VBResources.IdentifierSyntaxNotWithinSyntaxTree)
Expand Down
Expand Up @@ -74,7 +74,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Optional cancellationToken As CancellationToken = Nothing
) As CollectionRangeVariableSymbolInfo
If variableSyntax Is Nothing Then
Throw New ArgumentNullException("variableSyntax")
Throw New ArgumentNullException(NameOf(variableSyntax))
End If
If Not IsInTree(variableSyntax) Then
Throw New ArgumentException(VBResources.VariableSyntaxNotWithinSyntaxTree)
Expand All @@ -93,7 +93,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Optional cancellationToken As CancellationToken = Nothing
) As AggregateClauseSymbolInfo
If aggregateSyntax Is Nothing Then
Throw New ArgumentNullException("aggregateSyntax")
Throw New ArgumentNullException(NameOf(aggregateSyntax))
End If
If Not IsInTree(aggregateSyntax) Then
Throw New ArgumentException(VBResources.AggregateSyntaxNotWithinSyntaxTree)
Expand Down