From 1e1a7d2584073c59a4788062feecd869f1b5213c Mon Sep 17 00:00:00 2001
From: Ravi Chande <rchande@microsoft.com>
Date: Thu, 5 Jan 2017 09:36:26 -0800
Subject: [PATCH] Include the non-special type names for special types in cref
 completion

---
 .../CrefCompletionProviderTests.cs            | 17 +++++++
 .../CrefCompletionProvider.cs                 | 46 +++++++++++++++++--
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/CrefCompletionProviderTests.cs b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/CrefCompletionProviderTests.cs
index a43bfcc0be4..3c4c59b3c06 100644
--- a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/CrefCompletionProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/CrefCompletionProviderTests.cs
@@ -443,5 +443,22 @@ class C
                 Assert.True(called);
             }
         }
+
+        [WorkItem(16060, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/16060")]
+        [Fact, Trait(Traits.Feature, Traits.Features.Completion)]
+        public async Task SpecialTypeNames()
+        {
+            var text = @"
+using System;
+/// <see cref=""$$""/>
+class C 
+{ 
+    public void foo(int x) { }
+}
+";
+
+            await VerifyItemExistsAsync(text, "uint");
+            await VerifyItemExistsAsync(text, "UInt32");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs
index 259bb80804a..e2a25c8c7d1 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs
@@ -42,6 +42,16 @@ internal sealed class CrefCompletionProvider : AbstractCrefCompletionProvider
                     SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
                     SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
 
+        public static readonly SymbolDisplayFormat SpecialTypeCrefFormat =
+            new SymbolDisplayFormat(
+                globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+                typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameOnly,
+                propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+                genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+                parameterOptions: SymbolDisplayParameterOptions.None,
+                miscellaneousOptions:
+                    SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers);
+
         private readonly Action<SyntaxNode> _testSpeculativeNodeCallbackOpt;
 
         public CrefCompletionProvider(Action<SyntaxNode> testSpeculativeNodeCallbackOpt = null)
@@ -251,8 +261,11 @@ private static TextSpan GetCompletionItemSpan(SourceText text, int position)
             {
                 foreach (var symbol in symbols)
                 {
-                    builder.Clear();
                     yield return CreateItem(workspace, semanticModel, symbol, token, position, builder, options);
+                    if (TryCreateSpecialTypeItem(workspace, semanticModel, symbol, token, position, builder, options, out var item))
+                    {
+                        yield return item;
+                    }
                 }
             }
             finally
@@ -261,20 +274,42 @@ private static TextSpan GetCompletionItemSpan(SourceText text, int position)
             }
         }
 
+        private bool TryCreateSpecialTypeItem(
+            Workspace workspace, SemanticModel semanticModel, ISymbol symbol, SyntaxToken token, int position, StringBuilder builder, 
+            ImmutableDictionary<string, string> options, out CompletionItem item)
+        {
+            var typeSymbol = symbol as ITypeSymbol;
+            if (typeSymbol.IsSpecialType())
+            {
+                item = CreateItem(workspace, semanticModel, symbol, token, position, builder, options, SpecialTypeCrefFormat);
+                return true;
+            }
+
+            item = null;
+            return false;
+        }
+
         private CompletionItem CreateItem(
             Workspace workspace, SemanticModel semanticModel, ISymbol symbol, SyntaxToken token, int position, StringBuilder builder, ImmutableDictionary<string, string> options)
         {
+            return CreateItem(workspace, semanticModel, symbol, token, position, builder, options, CrefFormat);
+        }
+
+        private CompletionItem CreateItem(
+            Workspace workspace, SemanticModel semanticModel, ISymbol symbol, SyntaxToken token, int position, StringBuilder builder, ImmutableDictionary<string, string> options,
+            SymbolDisplayFormat unqualifiedCrefFormat)
+        {
+            builder.Clear();
             if (symbol is INamespaceOrTypeSymbol && token.IsKind(SyntaxKind.DotToken))
             {
                 // Handle qualified namespace and type names.
-
                 builder.Append(symbol.ToDisplayString(QualifiedCrefFormat));
             }
             else
             {
                 // Handle unqualified namespace and type names, or member names.
 
-                builder.Append(symbol.ToMinimalDisplayString(semanticModel, token.SpanStart, CrefFormat));
+                builder.Append(symbol.ToMinimalDisplayString(semanticModel, token.SpanStart, unqualifiedCrefFormat));
 
                 var parameters = symbol.GetParameters();
                 if (!parameters.IsDefaultOrEmpty)
@@ -308,6 +343,11 @@ private static TextSpan GetCompletionItemSpan(SourceText text, int position)
                 }
             }
 
+            return CreateItemFromBuilder(symbol, position, builder, options);
+        }
+
+        private CompletionItem CreateItemFromBuilder(ISymbol symbol, int position, StringBuilder builder, ImmutableDictionary<string, string> options)
+        {
             var symbolText = builder.ToString();
 
             var insertionText = builder
-- 
GitLab