Don't exclude events for NameOf context

dotnet · Sep 15, 2020 · 58a97af · 58a97af
1 parent 898c689
commit 58a97af
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationServiceRunner.vb b/...Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationServiceRunner.vb
@@ -341,11 +341,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Recommendations
         End Function
 
         ''' <summary>
-        ''' In MemberAccessExpression Contexts, filter out event symbols, except inside AddRemoveHandler Statements
+        ''' In MemberAccessExpression Contexts, filter out event symbols (except for NameOf context), except inside AddRemoveHandler Statements
         ''' Also, filter out any implicitly declared members generated by event declaration or property declaration
         ''' </summary>
-        Private Shared Function FilterEventsAndGeneratedSymbols(node As MemberAccessExpressionSyntax, s As ISymbol) As Boolean
-            If s.Kind = SymbolKind.Event Then
+        Private Function FilterEventsAndGeneratedSymbols(node As MemberAccessExpressionSyntax, s As ISymbol) As Boolean
+            If s.Kind = SymbolKind.Event AndAlso Not _context.IsNameOfContext Then
                 Return node IsNot Nothing AndAlso node.GetAncestor(Of AddRemoveHandlerStatementSyntax) IsNot Nothing
             ElseIf s.Kind = SymbolKind.Field AndAlso s.IsImplicitlyDeclared Then
                 Dim associatedSymbol = DirectCast(s, IFieldSymbol).AssociatedSymbol