Update to editor 15.7.80-preview-g8bc2e9da81

7 files changed, 35 insertions, 12 deletions

diff --git a/src/Language/Impl/Language/Completion/AsyncCompletionBroker.cs b/src/Language/Impl/Language/Completion/AsyncCompletionBroker.cs
index 359037f..ac4186b 100644
--- a/src/Language/Impl/Language/Completion/AsyncCompletionBroker.cs
+++ b/src/Language/Impl/Language/Completion/AsyncCompletionBroker.cs
@@ -31,7 +31,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
         internal ITextStructureNavigatorSelectorService TextStructureNavigatorSelectorService { get; set; }
 
         [Import]
-        private JoinableTaskContext JtContext;
+        private JoinableTaskContext JoinableTaskContext;
 
         [Import]
         private IContentTypeRegistryService ContentTypeRegistryService;
@@ -108,7 +108,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
                 System.Diagnostics.Debug.Assert(uiFactory != null, $"No instance of {nameof(ICompletionPresenterProvider)} is loaded. Completion will work without the UI.");
                 firstRun = false;
             }
-            session = new AsyncCompletionSession(JtContext.Factory, uiFactory, sourcesWithLocations, service, this, view);
+            session = new AsyncCompletionSession(JoinableTaskContext.Factory, uiFactory, sourcesWithLocations, service, this, view);
             view.Properties.AddProperty(typeof(IAsyncCompletionSession), session);
             view.Closed += TextView_Closed;
 
diff --git a/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs b/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs
index 8039af2..cc8c55d 100644
--- a/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs
+++ b/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs
@@ -53,6 +53,8 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
 
         public ITextView TextView => _view;
 
+        public bool IsDismissed => _isDismissed;
+
         public AsyncCompletionSession(JoinableTaskFactory jtf, ICompletionPresenterProvider uiFactory,
             IDictionary<IAsyncCompletionItemSource, SnapshotPoint> completionSources,
             IAsyncCompletionService completionService, AsyncCompletionBroker broker, ITextView view)
@@ -493,9 +495,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
 
             _guardedOperations.RaiseEvent(this, ItemsUpdated, new CompletionItemsWithHighlightEventArgs(returnedItems));
 
-            // TODO: combine this chain into a single method:
-            return model.WithSnapshot(triggerLocation.Snapshot).WithUniqueItem(filteredCompletion.UniqueItem)
-                .WithSuggestionModeItem(suggestionModeItem).WithPresentedItems(returnedItems, filteredCompletion.SelectedItemIndex);
+            return model.WithSnapshotAndItems(triggerLocation.Snapshot, returnedItems, filteredCompletion.SelectedItemIndex, filteredCompletion.UniqueItem, suggestionModeItem);
         }
 
         /// <summary>
diff --git a/src/Language/Impl/Language/Completion/CompletionCommandHandlers.cs b/src/Language/Impl/Language/Completion/CompletionCommandHandlers.cs
index 28289b3..13a94bd 100644
--- a/src/Language/Impl/Language/Completion/CompletionCommandHandlers.cs
+++ b/src/Language/Impl/Language/Completion/CompletionCommandHandlers.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
     /// <summary>
     /// Reacts to the down arrow command and attempts to scroll the completion list.
     /// </summary>
-    [Name("CompletionCommandHandlers")]
+    [Name(KnownCompletionNames.CompletionCommandHandlers)]
     [ContentType("any")]
     [Export(typeof(ICommandHandler))]
     internal sealed class CompletionCommandHandlers :
diff --git a/src/Language/Impl/Language/Completion/CompletionModel.cs b/src/Language/Impl/Language/Completion/CompletionModel.cs
index fbb4ebd..9f0e3d6 100644
--- a/src/Language/Impl/Language/Completion/CompletionModel.cs
+++ b/src/Language/Impl/Language/Completion/CompletionModel.cs
@@ -313,6 +313,26 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
                 uniqueItem: UniqueItem
             );
         }
+
+        internal CompletionModel WithSnapshotAndItems(ITextSnapshot snapshot, ImmutableArray<CompletionItemWithHighlight> presentedItems, int selectedIndex, CompletionItem uniqueItem, CompletionItem suggestionModeItem)
+        {
+            return new CompletionModel(
+                initialItems: InitialItems,
+                sortedItems: SortedItems,
+                applicableSpan: ApplicableSpan,
+                initialTriggerReason: InitialTriggerReason,
+                snapshot: snapshot, // Updated
+                filters: Filters,
+                presentedItems: presentedItems, // Updated
+                useSoftSelection: UseSoftSelection,
+                useSuggestionMode: DisplaySuggestionMode,
+                suggestionModeDescription: SuggestionModeDescription,
+                selectedIndex: selectedIndex, // Updated
+                selectSuggestionMode: SelectSuggestionMode,
+                suggestionModeItem: suggestionModeItem, // Updated
+                uniqueItem: uniqueItem // Updated
+            );
+        }
     }
 
     sealed class ModelComputation<TModel>
diff --git a/src/Language/Impl/Language/Completion/DefaultCompletionService.cs b/src/Language/Impl/Language/Completion/DefaultCompletionService.cs
index 71f74d6..8d0d336 100644
--- a/src/Language/Impl/Language/Completion/DefaultCompletionService.cs
+++ b/src/Language/Impl/Language/Completion/DefaultCompletionService.cs
@@ -145,11 +145,11 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
 
     public class DebugCompletionItemSource : IAsyncCompletionItemSource
     {
-        private static readonly AccessibleImageId Icon1 = new AccessibleImageId(new Guid("{ae27a6b0-e345-4288-96df-5eaf394ee369}"), 666, "TODO: remove", "Icon description");
+        private static readonly AccessibleImageId Icon1 = new AccessibleImageId(new Guid("{ae27a6b0-e345-4288-96df-5eaf394ee369}"), 666, "Icon description");
         private static readonly CompletionFilter Filter1 = new CompletionFilter("Diagnostic", "d", Icon1);
-        private static readonly AccessibleImageId Icon2 = new AccessibleImageId(new Guid("{ae27a6b0-e345-4288-96df-5eaf394ee369}"), 2852, "TODO: remove", "Icon description");
+        private static readonly AccessibleImageId Icon2 = new AccessibleImageId(new Guid("{ae27a6b0-e345-4288-96df-5eaf394ee369}"), 2852, "Icon description");
         private static readonly CompletionFilter Filter2 = new CompletionFilter("Snippets", "s", Icon2);
-        private static readonly AccessibleImageId Icon3 = new AccessibleImageId(new Guid("{ae27a6b0-e345-4288-96df-5eaf394ee369}"), 473, "TODO: remove", "Icon description");
+        private static readonly AccessibleImageId Icon3 = new AccessibleImageId(new Guid("{ae27a6b0-e345-4288-96df-5eaf394ee369}"), 473, "Icon description");
         private static readonly CompletionFilter Filter3 = new CompletionFilter("Class", "c", Icon3);
         private static readonly ImmutableArray<CompletionFilter> FilterCollection1 = ImmutableArray.Create(Filter1);
         private static readonly ImmutableArray<CompletionFilter> FilterCollection2 = ImmutableArray.Create(Filter2);
diff --git a/src/Language/Impl/Language/Completion/ModernCompletionFeature.cs b/src/Language/Impl/Language/Completion/ModernCompletionFeature.cs
index 4a3f874..a5ed8cf 100644
--- a/src/Language/Impl/Language/Completion/ModernCompletionFeature.cs
+++ b/src/Language/Impl/Language/Completion/ModernCompletionFeature.cs
@@ -23,8 +23,11 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
                 return _treatmentFlightEnabled;
             }
 
+#if DEBUG
+            _treatmentFlightEnabled = true;
+#else
             _treatmentFlightEnabled = experimentationService.IsCachedFlightEnabled(TreatmentFlightName);
-            Debug.Assert(_treatmentFlightEnabled);
+#endif
             _initialized = true;
             return _treatmentFlightEnabled;
         }
diff --git a/src/Microsoft.VisualStudio.Text.Implementation.csproj b/src/Microsoft.VisualStudio.Text.Implementation.csproj
index f6b7220..1a7df80 100644
--- a/src/Microsoft.VisualStudio.Text.Implementation.csproj
+++ b/src/Microsoft.VisualStudio.Text.Implementation.csproj
@@ -7,8 +7,8 @@
     <DelaySign>false</DelaySign>
     <Version>15.0.16-pre</Version>
     <AssemblyVersion>15.0.0.0</AssemblyVersion>
-    <NuGetVersionEditor>15.6.391-preview-g3c4ef6e5fc</NuGetVersionEditor>
-    <NuGetVersionLanguage>15.6.391-preview-g3c4ef6e5fc</NuGetVersionLanguage>
+    <NuGetVersionEditor>15.7.80-preview-g8bc2e9da81</NuGetVersionEditor>
+    <NuGetVersionLanguage>15.7.80-preview-g8bc2e9da81</NuGetVersionLanguage>
   </PropertyGroup>
 
   <PropertyGroup>