Merge branch 'roslyn' of github.com:mono/monodevelop into roslyn

1 files changed, 14 insertions, 2 deletions

diff --git a/main/src/addins/CSharpBinding/Util/ExpressionSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/ExpressionSyntaxExtensions.cs
index fbc41e9d7d..e916ed1e00 100644
--- a/main/src/addins/CSharpBinding/Util/ExpressionSyntaxExtensions.cs
+++ b/main/src/addins/CSharpBinding/Util/ExpressionSyntaxExtensions.cs
@@ -121,12 +121,24 @@ namespace ICSharpCode.NRefactory6.CSharp
 		public static bool IsMemberAccessExpressionName(this ExpressionSyntax expression)
 		{
 			return (expression.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) && ((MemberAccessExpressionSyntax)expression.Parent).Name == expression) ||
-				(expression.IsParentKind(SyntaxKind.MemberBindingExpression) && expression.Parent.Parent.IsParentKind(SyntaxKind.ConditionalAccessExpression) && ((MemberBindingExpressionSyntax)expression.Parent).Name == expression);
+				(IsMemberBindingExpressionName(expression));
 		}
 
 		public static bool IsAnyMemberAccessExpressionName(this ExpressionSyntax expression)
 		{
-			return expression != null && expression.Parent is MemberAccessExpressionSyntax && ((MemberAccessExpressionSyntax)expression.Parent).Name == expression;
+			if (expression == null)
+			{
+				return false;
+			}
+
+			return expression == (expression.Parent as MemberAccessExpressionSyntax)?.Name ||
+				expression.IsMemberBindingExpressionName();
+		}
+
+		private static bool IsMemberBindingExpressionName(this ExpressionSyntax expression)
+		{
+			return expression.IsParentKind(SyntaxKind.MemberBindingExpression) &&
+				((MemberBindingExpressionSyntax)expression.Parent).Name == expression;
 		}
 
 		public static bool IsRightSideOfQualifiedName(this ExpressionSyntax expression)