Implementation of new editor completion API

build/Targets/Packages.props

@@ -77,10 +77,10 @@
     <MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.0.26730-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
     <MicrosoftVisualStudioComponentModelHostVersion>15.0.26730-alpha</MicrosoftVisualStudioComponentModelHostVersion>
     <MicrosoftVisualStudioCompositionVersion>15.5.23</MicrosoftVisualStudioCompositionVersion>
-    <MicrosoftVisualStudioCoreUtilityVersion>15.8.238-preview</MicrosoftVisualStudioCoreUtilityVersion>
     <MicrosoftVisualStudioDebuggerEngineVersion>15.0.27309-vsucorediag</MicrosoftVisualStudioDebuggerEngineVersion>
     <MicrosoftVisualStudioDebuggerMetadataVersion>15.0.27309-vsucorediag</MicrosoftVisualStudioDebuggerMetadataVersion>
     <MicrosoftVisualStudioDebuggerUIInterfacesVersion>15.0.27309-vsucorediag</MicrosoftVisualStudioDebuggerUIInterfacesVersion>
+    <MicrosoftVisualStudioCoreUtilityVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioCoreUtilityVersion>
     <MicrosoftVisualStudioDebuggerInterop100Version>10.0.30319</MicrosoftVisualStudioDebuggerInterop100Version>
     <MicrosoftVisualStudioDesignerInterfacesVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesVersion>
     <MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>15.0.26730-alpha</MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>
@@ -91,11 +91,12 @@
     <MicrosoftVisualStudioImagingInterop140DesignTimeVersion>15.0.25726-Preview5</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
     <MicrosoftVisualStudioInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioInteractiveWindowVersion>
     <MicrosoftVisualStudioLanguageCallHierarchyVersion>15.3.1710.203</MicrosoftVisualStudioLanguageCallHierarchyVersion>
-    <MicrosoftVisualStudioLanguageIntellisenseVersion>15.8.238-preview</MicrosoftVisualStudioLanguageIntellisenseVersion>
-    <MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>15.8.238-preview</MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>
-    <MicrosoftVisualStudioLanguageStandardClassificationVersion>15.8.238-preview</MicrosoftVisualStudioLanguageStandardClassificationVersion>
+    <MicrosoftVisualStudioLanguageVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioLanguageVersion>
+    <MicrosoftVisualStudioLanguageIntellisenseVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioLanguageIntellisenseVersion>
+    <MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>15.7.153-preview-g7d0635149a</MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>
+    <MicrosoftVisualStudioLanguageStandardClassificationVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioLanguageStandardClassificationVersion>
     <MicrosoftVisualStudioOLEInteropVersion>7.10.6070</MicrosoftVisualStudioOLEInteropVersion>
-    <MicrosoftVisualStudioPlatformVSEditorVersion>15.8.238-preview</MicrosoftVisualStudioPlatformVSEditorVersion>
+    <MicrosoftVisualStudioPlatformVSEditorVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioPlatformVSEditorVersion>
     <MicrosoftVisualStudioProgressionCodeSchemaVersion>15.0.26730-alpha</MicrosoftVisualStudioProgressionCodeSchemaVersion>
     <MicrosoftVisualStudioProgressionCommonVersion>15.0.26730-alpha</MicrosoftVisualStudioProgressionCommonVersion>
     <MicrosoftVisualStudioProgressionInterfacesVersion>15.0.26730-alpha</MicrosoftVisualStudioProgressionInterfacesVersion>
@@ -122,11 +123,11 @@
     <MicrosoftVisualStudioShellInterop90Version>9.0.30729</MicrosoftVisualStudioShellInterop90Version>
     <MicrosoftVisualStudioTelemetryVersion>15.0.26730-alpha</MicrosoftVisualStudioTelemetryVersion>
     <MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
-    <MicrosoftVisualStudioTextDataVersion>15.8.238-preview</MicrosoftVisualStudioTextDataVersion>
-    <MicrosoftVisualStudioTextInternalVersion>15.8.238-preview</MicrosoftVisualStudioTextInternalVersion>
-    <MicrosoftVisualStudioTextLogicVersion>15.8.238-preview</MicrosoftVisualStudioTextLogicVersion>
-    <MicrosoftVisualStudioTextUIVersion>15.8.238-preview</MicrosoftVisualStudioTextUIVersion>
-    <MicrosoftVisualStudioTextUIWpfVersion>15.8.238-preview</MicrosoftVisualStudioTextUIWpfVersion>
+    <MicrosoftVisualStudioTextDataVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioTextDataVersion>
+    <MicrosoftVisualStudioTextInternalVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioTextInternalVersion>
+    <MicrosoftVisualStudioTextLogicVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioTextLogicVersion>
+    <MicrosoftVisualStudioTextUIVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioTextUIVersion>
+    <MicrosoftVisualStudioTextUIWpfVersion>15.8.386-preview-g596ac9ac8e</MicrosoftVisualStudioTextUIWpfVersion>
     <MicrosoftVisualStudioTextManagerInteropVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropVersion>
     <MicrosoftVisualStudioTextManagerInterop100Version>10.0.30319</MicrosoftVisualStudioTextManagerInterop100Version>
     <MicrosoftVisualStudioTextManagerInterop120Version>12.0.30110</MicrosoftVisualStudioTextManagerInterop120Version>

build/Targets/Versions.props

@@ -19,7 +19,8 @@
     <!-- The release moniker for our packages.  Developers should use "dev" and official builds pick the branch
          moniker listed below -->
     <RoslynNuGetMoniker Condition="'$(RoslynNuGetMoniker)' == ''">dev</RoslynNuGetMoniker>
-    <RoslynNuGetMoniker Condition="'$(OfficialBuild)' == 'true'">beta7</RoslynNuGetMoniker> 
+
+    <RoslynNuGetMoniker Condition="'$(OfficialBuild)' == 'true'">asynccompletion</RoslynNuGetMoniker> 
 
     <!-- This is the base of the NuGet versioning for prerelease packages -->
     <NuGetPreReleaseVersion>$(RoslynFileVersionBase)-$(RoslynNuGetMoniker)</NuGetPreReleaseVersion>

src/EditorFeatures/Core.Wpf/Completion/Presentation/CompletionPresenterSession.cs

@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Roslyn.Utilities;
+using RoslynCompletion = Microsoft.CodeAnalysis.Completion;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.Presentation
 {
@@ -72,9 +73,9 @@ public CompletionPresenterSession(
 
         public void PresentItems(
             ITrackingSpan triggerSpan,
-            IList<CompletionItem> completionItems,
-            CompletionItem selectedItem,
-            CompletionItem suggestionModeItem,
+            IList<RoslynCompletion.CompletionItem> completionItems,
+            RoslynCompletion.CompletionItem selectedItem,
+            RoslynCompletion.CompletionItem suggestionModeItem,
             bool suggestionMode,
             bool isSoftSelected,
             ImmutableArray<CompletionItemFilter> completionItemFilters,
@@ -142,7 +143,7 @@ private void OnEditorSessionDismissed()
             this.Dismissed?.Invoke(this, new EventArgs());
         }
 
-        internal void OnCompletionItemCommitted(CompletionItem completionItem)
+        internal void OnCompletionItemCommitted(RoslynCompletion.CompletionItem completionItem)
         {
             AssertIsForeground();
             this.ItemCommitted?.Invoke(this, new CompletionItemEventArgs(completionItem));

src/EditorFeatures/Core.Wpf/Completion/Presentation/CustomCommitCompletion.cs

@@ -11,20 +11,20 @@
 using Microsoft.VisualStudio.Imaging.Interop;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Roslyn.Utilities;
-using CompletionItem = Microsoft.CodeAnalysis.Completion.CompletionItem;
+using RoslynCompletion = Microsoft.CodeAnalysis.Completion;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.Presentation
 {
     internal sealed class CustomCommitCompletion : Completion3, ICustomCommit
     {
         private const string s_glyphCompletionWarning = "GlyphCompletionWarning";
         private readonly CompletionPresenterSession _completionPresenterSession;
-        internal readonly CompletionItem CompletionItem;
+        internal readonly RoslynCompletion.CompletionItem CompletionItem;
         private readonly ImageMoniker _imageMoniker;
 
         public CustomCommitCompletion(
             CompletionPresenterSession completionPresenterSession,
-            CompletionItem completionItem)
+            RoslynCompletion.CompletionItem completionItem)
         {
             // PERF: Note that the base class contains a constructor taking the displayText string
             // but we're intentionally NOT using that here because it allocates a private CompletionState

src/EditorFeatures/Core.Wpf/Completion/Presentation/RoslynCompletionSet.cs

@@ -13,6 +13,7 @@
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
+using RoslynCompletion = Microsoft.CodeAnalysis.Completion;
 using VSCompletion = Microsoft.VisualStudio.Language.Intellisense.Completion;
 using CompletionItem = Microsoft.CodeAnalysis.Completion.CompletionItem;
 
@@ -31,8 +32,8 @@ internal class RoslynCompletionSet : CompletionSet2
         protected readonly CompletionPresenterSession CompletionPresenterSession;
         private CompletionHelper _completionHelper;
 
-        protected Dictionary<CompletionItem, VSCompletion> CompletionItemMap;
-        protected CompletionItem SuggestionModeItem;
+        protected Dictionary<RoslynCompletion.CompletionItem, VSCompletion> CompletionItemMap;
+        protected RoslynCompletion.CompletionItem SuggestionModeItem;
 
         private readonly Dictionary<string, string> _displayTextToBoldingTextMap = new Dictionary<string, string>();
 
@@ -87,9 +88,9 @@ public override void Recalculate()
         }
 
         public void SetCompletionItems(
-            IList<CompletionItem> completionItems,
-            CompletionItem selectedItem,
-            CompletionItem suggestionModeItem,
+            IList<RoslynCompletion.CompletionItem> completionItems,
+            RoslynCompletion.CompletionItem selectedItem,
+            RoslynCompletion.CompletionItem suggestionModeItem,
             bool suggestionMode,
             bool isSoftSelected,
             ImmutableArray<CompletionItemFilter> completionItemFilters,
@@ -106,7 +107,7 @@ public void SetCompletionItems(
             }
 
             // Initialize the completion map to a reasonable default initial size (+1 for the builder)
-            CompletionItemMap = CompletionItemMap ?? new Dictionary<CompletionItem, VSCompletion>(completionItems.Count + 1);
+            CompletionItemMap = CompletionItemMap ?? new Dictionary<RoslynCompletion.CompletionItem, VSCompletion>(completionItems.Count + 1);
             FilterText = filterText;
             SuggestionModeItem = suggestionModeItem;
 
@@ -127,8 +128,8 @@ public void SetCompletionItems(
         }
 
         private void CreateCompletionListBuilder(
-            CompletionItem selectedItem,
-            CompletionItem suggestionModeItem,
+            RoslynCompletion.CompletionItem selectedItem,
+            RoslynCompletion.CompletionItem suggestionModeItem,
             bool suggestionMode)
         {
             try
@@ -153,7 +154,7 @@ private void CreateCompletionListBuilder(
             }
         }
 
-        private void CreateNormalCompletionListItems(IList<CompletionItem> completionItems)
+        private void CreateNormalCompletionListItems(IList<RoslynCompletion.CompletionItem> completionItems)
         {
             try
             {
@@ -172,7 +173,7 @@ private void CreateNormalCompletionListItems(IList<CompletionItem> completionIte
             }
         }
 
-        private VSCompletion GetVSCompletion(CompletionItem item, string displayText = null)
+        private VSCompletion GetVSCompletion(RoslynCompletion.CompletionItem item, string displayText = null)
         {
             if (!CompletionItemMap.TryGetValue(item, out var value))
             {
@@ -185,7 +186,7 @@ private VSCompletion GetVSCompletion(CompletionItem item, string displayText = n
             return value;
         }
 
-        public CompletionItem GetCompletionItem(VSCompletion completion)
+        public RoslynCompletion.CompletionItem GetCompletionItem(VSCompletion completion)
         {
             // Linear search is ok since this is only called by the user manually selecting 
             // an item.  Creating a reverse mapping uses too much memory and affects GCs.

src/EditorFeatures/Core.Wpf/EditorFeatures.Wpf.csproj

@@ -2,6 +2,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <NoWarn>$(NoWarn);0618</NoWarn>
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <OutputType>Library</OutputType>

src/EditorFeatures/Core.Wpf/GlyphExtensions.cs

@@ -1,4 +1,6 @@
-using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using System;
+using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.VisualStudio.Imaging;
 using Microsoft.VisualStudio.Imaging.Interop;
 
 namespace Microsoft.CodeAnalysis.Editor.Wpf

src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameService.cs

@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Text.Shared.Extensions;
 using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
@@ -23,20 +24,22 @@ internal class InlineRenameService : IInlineRenameService
         private readonly IAsynchronousOperationListener _asyncListener;
         private readonly IEnumerable<IRefactorNotifyService> _refactorNotifyServices;
         private readonly ITextBufferFactoryService _textBufferFactoryService;
-
+        private readonly IFeatureServiceFactory _featureServiceFactory;
         private InlineRenameSession _activeRenameSession;
 
         [ImportingConstructor]
         public InlineRenameService(
             IWaitIndicator waitIndicator,
             ITextBufferAssociatedViewService textBufferAssociatedViewService,
             ITextBufferFactoryService textBufferFactoryService,
+            IFeatureServiceFactory featureServiceFactory,
             [ImportMany] IEnumerable<IRefactorNotifyService> refactorNotifyServices,
             IAsynchronousOperationListenerProvider listenerProvider)
         {
             _waitIndicator = waitIndicator;
             _textBufferAssociatedViewService = textBufferAssociatedViewService;
             _textBufferFactoryService = textBufferFactoryService;
+            _featureServiceFactory = featureServiceFactory;
             _refactorNotifyServices = refactorNotifyServices;
             _asyncListener = listenerProvider.GetListener(FeatureAttribute.Rename);
         }
@@ -67,6 +70,7 @@ public InlineRenameSessionInfo StartInlineSession(
                 _waitIndicator,
                 _textBufferAssociatedViewService,
                 _textBufferFactoryService,
+                _featureServiceFactory,
                 _refactorNotifyServices,
                 _asyncListener);
 

src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.cs

@@ -23,17 +23,20 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
-    internal partial class InlineRenameSession : ForegroundThreadAffinitizedObject, IInlineRenameSession
+    internal partial class InlineRenameSession : ForegroundThreadAffinitizedObject, IInlineRenameSession, IFeatureController
     {
         private readonly Workspace _workspace;
         private readonly InlineRenameService _renameService;
         private readonly IWaitIndicator _waitIndicator;
         private readonly ITextBufferAssociatedViewService _textBufferAssociatedViewService;
         private readonly ITextBufferFactoryService _textBufferFactoryService;
+        private readonly IFeatureService _featureService;
+        private readonly IFeatureDisableToken _completionDisabledToken;
         private readonly IEnumerable<IRefactorNotifyService> _refactorNotifyServices;
         private readonly IDebuggingWorkspaceService _debuggingWorkspaceService;
         private readonly IAsynchronousOperationListener _asyncListener;
@@ -98,6 +101,7 @@ public InlineRenameSession(
             IWaitIndicator waitIndicator,
             ITextBufferAssociatedViewService textBufferAssociatedViewService,
             ITextBufferFactoryService textBufferFactoryService,
+            IFeatureServiceFactory featureServiceFactory,
             IEnumerable<IRefactorNotifyService> refactorNotifyServices,
             IAsynchronousOperationListener asyncListener) : base(assertIsForeground: true)
         {
@@ -119,6 +123,10 @@ public InlineRenameSession(
             _textBufferAssociatedViewService = textBufferAssociatedViewService;
             _textBufferAssociatedViewService.SubjectBuffersConnected += OnSubjectBuffersConnected;
 
+            // Disable completion when an inline rename session starts
+            _featureService = featureServiceFactory.GlobalFeatureService;
+            _completionDisabledToken = _featureService.Disable(PredefinedEditorFeatureNames.InteractivePopup, this);
+
             _renameService = renameService;
             _waitIndicator = waitIndicator;
             _refactorNotifyServices = refactorNotifyServices;
@@ -317,6 +325,9 @@ private void Dismiss(bool rollbackTemporaryEdits)
             _workspace.WorkspaceChanged -= OnWorkspaceChanged;
             _textBufferAssociatedViewService.SubjectBuffersConnected -= OnSubjectBuffersConnected;
 
+            // Reenable completion now that the inline rename session is done
+            _completionDisabledToken.Dispose();
+
             foreach (var textBuffer in _openTextBuffers.Keys)
             {
                 var document = textBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();

src/EditorFeatures/Core/CommandHandlers/IntelliSenseCommandHandler.cs

@@ -3,6 +3,7 @@
 using System;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.Utilities;
 using VSCommanding = Microsoft.VisualStudio.Commanding;
 
@@ -12,6 +13,7 @@ namespace Microsoft.CodeAnalysis.Editor.CommandHandlers
     [Export(typeof(VSCommanding.ICommandHandler))]
     [ContentType(ContentTypeNames.RoslynContentType)]
     [Name(PredefinedCommandHandlerNames.IntelliSense)]
+    [Order(After = PredefinedCompletionNames.CompletionCommandHandler)]
     internal sealed class IntelliSenseCommandHandler : AbstractIntelliSenseCommandHandler
     {
         [ImportingConstructor]

src/EditorFeatures/Core/CommandHandlers/SignatureHelpCommandHandler.cs

@@ -14,6 +14,7 @@
 using Microsoft.CodeAnalysis.SignatureHelp;
 using Microsoft.VisualStudio.Commanding;
 using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.Text.Editor.Commanding;
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 using Microsoft.VisualStudio.Utilities;
@@ -26,6 +27,7 @@ namespace Microsoft.CodeAnalysis.Editor.CommandHandlers
     [ContentType(ContentTypeNames.RoslynContentType)]
     [Name(PredefinedCommandHandlerNames.SignatureHelp)]
     [Order(Before = PredefinedCommandHandlerNames.Completion)]
+    [Order(After = PredefinedCompletionNames.CompletionCommandHandler)]
     internal class SignatureHelpCommandHandler :
         ForegroundThreadAffinitizedObject,
         IChainedCommandHandler<TypeCharCommandArgs>,

src/EditorFeatures/Core/EditorFeatures.csproj

@@ -2,6 +2,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <NoWarn>$(NoWarn);0618</NoWarn>
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <OutputType>Library</OutputType>