Consistent impl

Author: CyrusNajmabadi

src/Features/CSharp/Portable/Completion/CompletionProviders/AwaitCompletionProvider.cs

@@ -96,14 +96,8 @@ protected override int GetSpanStart(SyntaxNode declaration)
                 // In cases like Task.$$ semanticModel.GetTypeInfo returns Task, but
                 // we don't want to suggest await here. We look up the symbol of the "Task" part
                 // and return null if it is a NamedType.
-                if (memberAccessExpression.IsKind(SyntaxKind.IdentifierName))
-                {
-                    var symbol = semanticModel.GetSymbolInfo(memberAccessExpression, cancellationToken).Symbol;
-                    if (symbol is ITypeSymbol)
-                        return null;
-                }
-
-                return semanticModel.GetTypeInfo(memberAccessExpression, cancellationToken).Type;
+                var symbol = semanticModel.GetSymbolInfo(memberAccessExpression, cancellationToken).Symbol;
+                return symbol is ITypeSymbol ? null : semanticModel.GetTypeInfo(memberAccessExpression, cancellationToken).Type;
             }
             else if (potentialAwaitableExpression is ExpressionSyntax expression &&
                      expression.ShouldNameExpressionBeTreatedAsExpressionInsteadOfType(semanticModel, out _, out var container))

src/Features/VisualBasic/Portable/Completion/CompletionProviders/AwaitCompletionProvider.vb

@@ -47,19 +47,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
 
         Protected Overrides Function GetTypeSymbolOfExpression(semanticModel As SemanticModel, potentialAwaitableExpression As SyntaxNode, cancellationToken As CancellationToken) As ITypeSymbol
             Dim memberAccessExpression = TryCast(potentialAwaitableExpression, MemberAccessExpressionSyntax)?.Expression
-            If memberAccessExpression IsNot Nothing Then
-                Dim symbolInfo = semanticModel.GetSymbolInfo(memberAccessExpression.WalkDownParentheses(), cancellationToken)
-                Dim symbol = symbolInfo.Symbol
-                If TypeOf symbol Is ITypeSymbol Then ' e.g. Task.$$
-                    Return Nothing
-                End If
-
-                Return If(symbol?.GetSymbolType(),
-                    If(symbol?.GetMemberType(),
-                    semanticModel.GetTypeInfo(memberAccessExpression, cancellationToken).Type))
+            If memberAccessExpression Is Nothing Then
+                Return Nothing
             End If
 
-            Return Nothing
+            Dim symbol = semanticModel.GetSymbolInfo(memberAccessExpression.WalkDownParentheses(), cancellationToken).Symbol
+            Return If(TypeOf symbol Is ITypeSymbol, Nothing, semanticModel.GetTypeInfo(memberAccessExpression, cancellationToken).Type)
         End Function
 
         Protected Overrides Function GetExpressionToPlaceAwaitInFrontOf(syntaxTree As SyntaxTree, position As Integer, cancellationToken As CancellationToken) As SyntaxNode
@@ -69,13 +62,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
             End If
 
             Dim memberAccess = TryCast(dotToken.Value.Parent, MemberAccessExpressionSyntax)
-            If memberAccess IsNot Nothing Then
-                If memberAccess.Expression.GetParentConditionalAccessExpression() Is Nothing Then
-                    Return memberAccess
-                End If
+            If memberAccess Is Nothing Then
+                Return Nothing
+            End If
+
+            If memberAccess.Expression.GetParentConditionalAccessExpression() IsNot Nothing Then
+                Return Nothing
             End If
 
-            Return Nothing
+            Return memberAccess
         End Function
 
         Protected Overrides Function GetDotTokenLeftOfPosition(syntaxTree As SyntaxTree, position As Integer, cancellationToken As CancellationToken) As SyntaxToken?