Merge pull request #2413 from rchande/CrefCompletion2

Don't recommend type keywords in cref type args

src/EditorFeatures/CSharpTest/Recommendations/BoolKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/ByteKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/CharKeywordRecommenderTests.cs

@@ -652,5 +652,16 @@ static void Main(string[] args)
 ";
             VerifyKeyword(markup);
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/DecimalKeywordRecommenderTests.cs

@@ -601,5 +601,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/DoubleKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/FloatKeywordRecommenderTests.cs

@@ -573,5 +573,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/IntKeywordRecommenderTests.cs

@@ -669,5 +669,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/LongKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/ObjectKeywordRecommenderTests.cs

@@ -607,5 +607,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/SByteKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/ShortKeywordRecommenderTests.cs

@@ -593,5 +593,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/StringKeywordRecommenderTests.cs

@@ -649,5 +649,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/UIntKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/ULongKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/EditorFeatures/CSharpTest/Recommendations/UShortKeywordRecommenderTests.cs

@@ -600,5 +600,16 @@ public void NotAfterAsyncAsType()
         {
             VerifyAbsence(@"class c { async async $$ }");
         }
+
+        [WorkItem(1468, "https://github.com/dotnet/roslyn/issues/1468")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public void NotInCrefTypeParameter()
+        {
+            VerifyAbsence(@"
+using System;
+/// <see cref=""List{$$}"" />
+class C { }
+");
+        }
     }
 }

src/Features/CSharp/Completion/KeywordRecommenders/BoolKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||
                 context.IsFixedVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/ByteKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -24,7 +26,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/CharKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||
                 context.IsFixedVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/DecimalKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||
                 context.IsFixedVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/DoubleKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||
                 context.IsFixedVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/FloatKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||
                 context.IsFixedVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/IntKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/LongKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/ObjectKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||
                 context.IsParameterTypeContext ||

src/Features/CSharp/Completion/KeywordRecommenders/SByteKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/ShortKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) || 
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/StringKeywordRecommender.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||
                 context.IsParameterTypeContext ||

src/Features/CSharp/Completion/KeywordRecommenders/UIntKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/ULongKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||

src/Features/CSharp/Completion/KeywordRecommenders/UShortKeywordRecommender.cs

@@ -3,7 +3,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
 {
@@ -23,7 +25,7 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
                 context.IsStatementContext ||
                 context.IsGlobalStatementContext ||
                 context.IsObjectCreationTypeContext ||
-                context.IsGenericTypeArgumentContext ||
+                (context.IsGenericTypeArgumentContext && !context.TargetToken.Parent.HasAncestor<XmlCrefAttributeSyntax>()) ||
                 context.IsEnumBaseListContext ||
                 context.IsIsOrAsTypeContext ||
                 context.IsLocalVariableDeclarationContext ||