Merge pull request #7675 from brettfo/no-await-on-dynamic-quick-info

don't show `(Awaitable)` for dynamic objects

src/EditorFeatures/CSharp/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs

@@ -63,7 +63,7 @@ protected static IEnumerable<SymbolDisplayPart> GetSeparatorParts()
 
         protected IList<SymbolDisplayPart> GetAwaitableUsage(IMethodSymbol method, SemanticModel semanticModel, int position)
         {
-            if (method.IsAwaitable(semanticModel, position))
+            if (method.IsAwaitableNonDynamic(semanticModel, position))
             {
                 return method.ToAwaitableParts(SyntaxFacts.GetText(SyntaxKind.AwaitKeyword), "x", semanticModel, position);
             }

src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs

@@ -15,7 +15,7 @@ internal partial class GenericNameSignatureHelpProvider
         {
             var result = new List<SymbolDisplayPart>();
 
-            var awaitable = method.GetOriginalUnreducedDefinition().IsAwaitable(semanticModel, position);
+            var awaitable = method.GetOriginalUnreducedDefinition().IsAwaitableNonDynamic(semanticModel, position);
             var extension = method.GetOriginalUnreducedDefinition().IsExtensionMethod();
 
             if (awaitable && extension)

src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs

@@ -123,7 +123,7 @@ private bool IsHiddenBy(IMethodSymbol method1, IMethodSymbol method2)
         {
             var result = new List<SymbolDisplayPart>();
 
-            var awaitable = method.GetOriginalUnreducedDefinition().IsAwaitable(semanticModel, position);
+            var awaitable = method.GetOriginalUnreducedDefinition().IsAwaitableNonDynamic(semanticModel, position);
             var extension = method.GetOriginalUnreducedDefinition().IsExtensionMethod();
 
             if (awaitable && extension)

src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs

@@ -1266,6 +1266,23 @@ public void Calc()
                          TypeParameterMap($"\r\nTResult {FeaturesResources.Is} int"));
         }
 
+        [WorkItem(7100, "https://github.com/dotnet/roslyn/issues/7100")]
+        [Fact, Trait(Traits.Feature, Traits.Features.QuickInfo)]
+        public async Task TestDynamicIsntAwaitable()
+        {
+            var markup = @"
+class C
+{
+    dynamic D() { return null; }
+    void M()
+    {
+        D$$();
+    }
+}
+";
+            await TestAsync(markup, MainDescription("dynamic C.D()"));
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.QuickInfo)]
         public async Task TestStringLiteral()
         {

src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb

@@ -64,7 +64,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
         End Function
 
         Private Function GetAwaitableDescription(member As ISymbol, semanticModel As SemanticModel, position As Integer) As IList(Of SymbolDisplayPart)
-            If member.IsAwaitable(semanticModel, position) Then
+            If member.IsAwaitableNonDynamic(semanticModel, position) Then
                 Return member.ToAwaitableParts(SyntaxFacts.GetText(SyntaxKind.AwaitKeyword), "r", semanticModel, position)
             End If
 

src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb

@@ -1443,6 +1443,23 @@ End Class
                  MainDescription(description), Usage(doc))
         End Function
 
+        <WorkItem(7100, "https://github.com/dotnet/roslyn/issues/7100")>
+        <Fact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
+        Public Async Function TestObjectWithOptionStrictOffIsntAwaitable() As Task
+            Dim markup = "
+Option Strict Off
+Class C
+    Function D() As Object
+        Return Nothing
+    End Function
+    Sub M()
+        D$$()
+    End Sub
+End Class
+"
+            Await TestAsync(markup, MainDescription("Function C.D() As Object"))
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestObsoleteItem() As Task
             Await TestAsync(<Text><![CDATA[

src/Features/Core/Portable/LanguageServices/SymbolDisplayService/AbstractSymbolDisplayService.AbstractSymbolDescriptionBuilder.cs

@@ -317,7 +317,7 @@ private void AddDescriptionForDynamicType()
 
             private void AddDescriptionForNamedType(INamedTypeSymbol symbol)
             {
-                if (symbol.IsAwaitable(_semanticModel, _position))
+                if (symbol.IsAwaitableNonDynamic(_semanticModel, _position))
                 {
                     AddAwaitablePrefix();
                 }
@@ -480,8 +480,7 @@ private void AddDescriptionForRangeVariable(IRangeVariableSymbol symbol)
             private void AddDescriptionForMethod(IMethodSymbol method)
             {
                 // TODO : show duplicated member case
-                // TODO : a way to check whether it is a member call off dynamic type?
-                var awaitable = method.IsAwaitable(_semanticModel, _position);
+                var awaitable = method.IsAwaitableNonDynamic(_semanticModel, _position);
                 var extension = method.IsExtensionMethod || method.MethodKind == MethodKind.ReducedExtension;
                 if (awaitable && extension)
                 {

src/Workspaces/Core/Portable/Shared/Extensions/ISymbolExtensions.cs

@@ -875,11 +875,11 @@ public static DocumentationComment GetDocumentationComment(this ISymbol symbol,
         }
 
         /// <summary>
-        /// If the <paramref name="symbol"/> is a method symbol, returns True if the method's return type is "awaitable".
-        /// If the <paramref name="symbol"/> is a type symbol, returns True if that type is "awaitable".
+        /// If the <paramref name="symbol"/> is a method symbol, returns <see langword="true"/> if the method's return type is "awaitable", but not if it's <see langword="dynamic"/>.
+        /// If the <paramref name="symbol"/> is a type symbol, returns <see langword="true"/> if that type is "awaitable".
         /// An "awaitable" is any type that exposes a GetAwaiter method which returns a valid "awaiter". This GetAwaiter method may be an instance method or an extension method.
         /// </summary>
-        public static bool IsAwaitable(this ISymbol symbol, SemanticModel semanticModel, int position)
+        public static bool IsAwaitableNonDynamic(this ISymbol symbol, SemanticModel semanticModel, int position)
         {
             IMethodSymbol methodSymbol = symbol as IMethodSymbol;
             ITypeSymbol typeSymbol = null;
@@ -898,13 +898,6 @@ public static bool IsAwaitable(this ISymbol symbol, SemanticModel semanticModel,
                 {
                     return false;
                 }
-
-                // dynamic
-                if (methodSymbol.ReturnType.TypeKind == TypeKind.Dynamic &&
-                    methodSymbol.MethodKind != MethodKind.BuiltinOperator)
-                {
-                    return true;
-                }
             }
 
             // otherwise: needs valid GetAwaiter