Apply usage of NameOf across solution.

AdamSpeight2008 · Apr 9, 2015 · 6e05734 · 6e05734
1 parent 7950973
commit 6e05734
Show file tree

Hide file tree

Showing 26 changed files with 120 additions and 120 deletions.
diff --git a/src/Compilers/VisualBasic/Portable/Binding/Binder_Symbols.vb b/src/Compilers/VisualBasic/Portable/Binding/Binder_Symbols.vb
@@ -195,7 +195,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                 Throw New ArgumentException("Must resolve overloads on PropertySymbol or MethodSymbol", "TMember")
             End If
             If isProperties And Not typeArguments.IsEmpty Then
-                Throw New ArgumentException(VBResources.PropertiesCanNotHaveTypeArguments, "typeArguments")
+                Throw New ArgumentException(VBResources.PropertiesCanNotHaveTypeArguments, NameOf(members))
             End If
 
             Dim boundArguments As ImmutableArray(Of BoundExpression) = Nothing

diff --git a/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb b/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)

diff --git a/src/Compilers/VisualBasic/Portable/Compilation/QuerySymbolInfo.vb b/src/Compilers/VisualBasic/Portable/Compilation/QuerySymbolInfo.vb
@@ -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)
@@ -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)

diff --git a/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb b/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb
@@ -562,7 +562,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
 
         Friend Sub CheckSyntaxNode(node As VisualBasicSyntaxNode)
             If node Is Nothing Then
-                Throw New ArgumentNullException("node")
+                Throw New ArgumentNullException(NameOf(node))
             End If
 
             If Not IsInTree(node) Then
@@ -572,7 +572,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
 
         Private Sub CheckModelAndSyntaxNodeToSpeculate(node As VisualBasicSyntaxNode)
             If node Is Nothing Then
-                Throw New ArgumentNullException("node")
+                Throw New ArgumentNullException(NameOf(node))
             End If
 
             If Me.IsSpeculativeSemanticModel Then
@@ -750,7 +750,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                                                    bindingOption As SpeculativeBindingOption,
                                                    <Out> ByRef binder As Binder) As BoundNodeSummary
             If expression Is Nothing Then
-                Throw New ArgumentNullException("expression")
+                Throw New ArgumentNullException(NameOf(position))
             End If
 
             Dim standalone = SyntaxFactory.GetStandaloneExpression(expression)
@@ -833,7 +833,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         ''' </summary>
         Private Function GetSpeculativelyBoundAttributeSummary(position As Integer, attribute As AttributeSyntax, <Out> ByRef binder As Binder) As BoundNodeSummary
             If attribute Is Nothing Then
-                Throw New ArgumentNullException("attribute")
+                Throw New ArgumentNullException(NameOf(position))
             End If
 
             Dim bnode = GetSpeculativelyBoundAttribute(position, attribute, binder)
@@ -1827,7 +1827,7 @@ _Default:
                 Dim containingType = binder.ContainingType
                 Dim baseType = If(containingType Is Nothing, Nothing, containingType.BaseTypeNoUseSiteDiagnostics)
                 If baseType Is Nothing Then
-                    Throw New ArgumentException("position",
+                    Throw New ArgumentException(NameOf(position),
                             "Not a valid position for a call to LookupBaseMembers (must be in a type with a base type)")
                 End If
                 container = baseType
@@ -2058,10 +2058,10 @@ _Default:
             CheckPosition(position)
 
             If symbol Is Nothing Then
-                Throw New ArgumentNullException("symbol")
+                Throw New ArgumentNullException(NameOf(position))
             End If
 
-            Dim vbsymbol = symbol.EnsureVbSymbolOrNothing(Of symbol)("symbol")
+            Dim vbsymbol = symbol.EnsureVbSymbolOrNothing(Of symbol)(NameOf(position))
 
             Dim binder = Me.GetEnclosingBinder(position)
             If binder IsNot Nothing Then
@@ -2311,10 +2311,10 @@ _Default:
         ''' type), use Compilation.ClassifyConversion.</remarks>
         Public Shadows Function ClassifyConversion(position As Integer, expression As ExpressionSyntax, destination As ITypeSymbol) As Conversion
             If destination Is Nothing Then
-                Throw New ArgumentNullException("destination")
+                Throw New ArgumentNullException(NameOf(position))
             End If
 
-            Dim vbdestination = destination.EnsureVbSymbolOrNothing(Of TypeSymbol)("destination")
+            Dim vbdestination = destination.EnsureVbSymbolOrNothing(Of TypeSymbol)(NameOf(position))
 
             CheckPosition(position)
             Dim binder = Me.GetEnclosingBinder(position)
@@ -2343,7 +2343,7 @@ _Default:
         ''' <returns>The symbol that was declared, or Nothing if no such symbol exists.</returns>
         Public Overridable Overloads 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)
@@ -2387,7 +2387,7 @@ _Default:
         ''' if the field initializer was not part of an anonymous type creation.</returns>
         Public Overridable Overloads Function GetDeclaredSymbol(fieldInitializerSyntax As FieldInitializerSyntax, Optional cancellationToken As 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)
@@ -2403,7 +2403,7 @@ _Default:
         ''' <returns>The symbol that was declared, or Nothing if no such symbol exists.</returns>
         Public Overridable Overloads 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)
@@ -2419,7 +2419,7 @@ _Default:
         ''' <returns>The symbol that was declared, or Nothing if no such symbol exists.</returns>
         Public Overridable Overloads 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.RangeVariableSyntaxNotWithinSyntaxTree)
@@ -2435,7 +2435,7 @@ _Default:
         ''' <returns>The symbol that was declared, or Nothing if no such symbol exists.</returns>
         Public Overridable Overloads 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.RangeVariableSyntaxNotWithinSyntaxTree)
@@ -2451,7 +2451,7 @@ _Default:
         ''' <returns>The symbol that was declared, or Nothing if no such symbol exists.</returns>
         Public Overridable Overloads 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.RangeVariableSyntaxNotWithinSyntaxTree)
@@ -2467,7 +2467,7 @@ _Default:
         ''' <returns>The label symbol, or Nothing if no such symbol exists.</returns>
         Public Overridable Overloads Function GetDeclaredSymbol(declarationSyntax As LabelStatementSyntax, Optional cancellationToken As CancellationToken = Nothing) As ILabelSymbol
             If declarationSyntax Is Nothing Then
-                Throw New ArgumentNullException("declarationSyntax")
+                Throw New ArgumentNullException(NameOf(declarationSyntax))
             End If
             If Not IsInTree(declarationSyntax) Then
                 Throw New ArgumentException(VBResources.DeclarationSyntaxNotWithinSyntaxTree)
@@ -3025,7 +3025,7 @@ _Default:
 
         Private Function GetSymbolInfoForNode(node As SyntaxNode, Optional cancellationToken As CancellationToken = Nothing) As SymbolInfo
             If node Is Nothing Then
-                Throw New ArgumentNullException("node")
+                Throw New ArgumentNullException(NameOf(node))
             End If
 
             Dim expressionSyntax = TryCast(node, expressionSyntax)
@@ -3068,7 +3068,7 @@ _Default:
 
         Private Function GetTypeInfoForNode(node As SyntaxNode, Optional cancellationToken As CancellationToken = Nothing) As VisualBasicTypeInfo
             If node Is Nothing Then
-                Throw New ArgumentNullException("node")
+                Throw New ArgumentNullException(NameOf(node))
             End If
 
             Dim expressionSyntax = TryCast(node, expressionSyntax)
@@ -3086,7 +3086,7 @@ _Default:
 
         Private Function GetMemberGroupForNode(node As SyntaxNode, Optional cancellationToken As CancellationToken = Nothing) As ImmutableArray(Of ISymbol)
             If node Is Nothing Then
-                Throw New ArgumentNullException("node")
+                Throw New ArgumentNullException(NameOf(node))
             End If
 
             Dim expressionSyntax = TryCast(node, expressionSyntax)
@@ -3130,7 +3130,7 @@ _Default:
 
         Protected NotOverridable Overrides Function GetAliasInfoCore(node As SyntaxNode, Optional cancellationToken As CancellationToken = Nothing) As IAliasSymbol
             If node Is Nothing Then
-                Throw New ArgumentNullException("node")
+                Throw New ArgumentNullException(NameOf(node))
             End If
 
             Dim nameSyntax = TryCast(node, IdentifierNameSyntax)
@@ -3181,7 +3181,7 @@ _Default:
 
             Dim result = TryCast(container, NamespaceOrTypeSymbol)
             If result Is Nothing Then
-                Throw New ArgumentException(VBResources.NotAVbSymbol, "container")
+                Throw New ArgumentException(VBResources.NotAVbSymbol, NameOf(container))
             End If
             Return result
         End Function
@@ -3311,14 +3311,14 @@ _Default:
         End Function
 
         Protected NotOverridable Overrides Function AnalyzeDataFlowCore(firstStatement As SyntaxNode, lastStatement As SyntaxNode) As DataFlowAnalysis
-            Return Me.AnalyzeDataFlow(SafeCastArgument(Of StatementSyntax)(firstStatement, "firstStatement"),
-                                                SafeCastArgument(Of StatementSyntax)(lastStatement, "lastStatement"))
+            Return Me.AnalyzeDataFlow(SafeCastArgument(Of StatementSyntax)(firstStatement, NameOf(firstStatement)),
+                                                SafeCastArgument(Of StatementSyntax)(lastStatement, NameOf(firstStatement)))
         End Function
 
         Protected NotOverridable Overrides Function AnalyzeDataFlowCore(statementOrExpression As SyntaxNode) As DataFlowAnalysis
 
             If statementOrExpression Is Nothing Then
-                Throw New ArgumentNullException("statementOrExpression")
+                Throw New ArgumentNullException(NameOf(statementOrExpression))
             End If
 
             If TypeOf statementOrExpression Is ExecutableStatementSyntax Then
@@ -3337,12 +3337,12 @@ _Default:
         End Function
 
         Protected NotOverridable Overrides Function AnalyzeControlFlowCore(firstStatement As SyntaxNode, lastStatement As SyntaxNode) As ControlFlowAnalysis
-            Return Me.AnalyzeControlFlow(SafeCastArgument(Of StatementSyntax)(firstStatement, "firstStatement"),
-                                                   SafeCastArgument(Of StatementSyntax)(lastStatement, "lastStatement"))
+            Return Me.AnalyzeControlFlow(SafeCastArgument(Of StatementSyntax)(firstStatement, NameOf(firstStatement)),
+                                                   SafeCastArgument(Of StatementSyntax)(lastStatement, NameOf(firstStatement)))
         End Function
 
         Protected NotOverridable Overrides Function AnalyzeControlFlowCore(statement As SyntaxNode) As ControlFlowAnalysis
-            Return Me.AnalyzeControlFlow(SafeCastArgument(Of StatementSyntax)(statement, "statement"))
+            Return Me.AnalyzeControlFlow(SafeCastArgument(Of StatementSyntax)(statement, NameOf(statement)))
         End Function
 
         Private Shared Function SafeCastArgument(Of T As Class)(node As SyntaxNode, argName As String) As T
@@ -3359,7 +3359,7 @@ _Default:
         Protected NotOverridable Overrides Function GetConstantValueCore(node As SyntaxNode, Optional cancellationToken As CancellationToken = Nothing) As [Optional](Of Object)
 
             If node Is Nothing Then
-                Throw New ArgumentNullException("node")
+                Throw New ArgumentNullException(NameOf(node))
             End If
 
             If TypeOf node Is ExpressionSyntax Then
@@ -3374,7 +3374,7 @@ _Default:
         End Function
 
         Protected NotOverridable Overrides Function IsAccessibleCore(position As Integer, symbol As ISymbol) As Boolean
-            Return Me.IsAccessible(position, symbol.EnsureVbSymbolOrNothing(Of symbol)("symbol"))
+            Return Me.IsAccessible(position, symbol.EnsureVbSymbolOrNothing(Of symbol)(NameOf(position)))
         End Function
 
         Protected NotOverridable Overrides Function IsEventUsableAsFieldCore(position As Integer, symbol As IEventSymbol) As Boolean