Update to latest

3 files changed, 16 insertions, 5 deletions

diff --git a/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs b/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs
index 5bc15d4..8039af2 100644
--- a/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs
+++ b/src/Language/Impl/Language/Completion/AsyncCompletionSession.cs
@@ -389,6 +389,14 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
             _telemetryData.ComputationStopwatch.Stop();
             _telemetryData.RecordInitialModel(_telemetryData.ComputationStopwatch.ElapsedMilliseconds, _completionSources.Keys, initialCompletionItems.Length, _completionService);
 
+#if DEBUG
+            Debug.WriteLine("Completion session got data.");
+            Debug.WriteLine("Sources: " + String.Join(", ", _completionSources.Select(n => n.Key.GetType())));
+            Debug.WriteLine("Service: " + _completionService.GetType());
+            Debug.WriteLine("Filters: " + String.Join(", ", availableFilters.Select(n => n.Filter.DisplayText)));
+            Debug.WriteLine("Spans: " + String.Join(", ", spans.Select(n => n.ToString())));
+#endif
+
             _telemetryData.ComputationStopwatch.Restart();
             var sortedList = await _guardedOperations.CallExtensionPointAsync(
                 errorSource: _completionService,
@@ -630,12 +638,17 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
 
         public ImmutableArray<CompletionItem> GetVisibleItems(CancellationToken token)
         {
-            throw new NotImplementedException();
+            // TODO: Consider returning array of CompletionItemWithHighlight so that we don't do linq here
+            return _computation.RecentModel.PresentedItems.Select(n => n.CompletionItem).ToImmutableArray();
         }
 
         public CompletionItem GetSelectedItem(CancellationToken token)
         {
-            throw new NotImplementedException();
+            var model = _computation.RecentModel;
+            if (model.SelectSuggestionMode)
+                return model.SuggestionModeItem;
+            else
+                return model.PresentedItems[model.SelectedIndex].CompletionItem;
         }
 
         private class TelemetryData
diff --git a/src/Language/Impl/Language/Completion/CompletionModel.cs b/src/Language/Impl/Language/Completion/CompletionModel.cs
index cda2d2e..fbb4ebd 100644
--- a/src/Language/Impl/Language/Completion/CompletionModel.cs
+++ b/src/Language/Impl/Language/Completion/CompletionModel.cs
@@ -347,7 +347,6 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
         /// </summary>
         public void Enqueue(Func<TModel, CancellationToken, Task<TModel>> transformation, Func<TModel, Task> updateUI)
         {
-            System.Diagnostics.Debug.WriteLine($"Enqueue runs on thread {Thread.CurrentThread.ManagedThreadId}");
             // This method is based on Roslyn's ModelComputation.ChainTaskAndNotifyControllerWhenFinished
             var nextTask = _lastTask.ContinueWith(t => transformation(t.Result, _token), _computationTaskScheduler).Unwrap();
             _lastTask = nextTask;
@@ -378,7 +377,6 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
 
         private void OnModelUpdated(TModel result)
         {
-            System.Diagnostics.Debug.WriteLine($"OnModelUpdated runs on thread {Thread.CurrentThread.ManagedThreadId}");
             RecentModel = result;
         }
 
diff --git a/src/Microsoft.VisualStudio.Text.Implementation.csproj b/src/Microsoft.VisualStudio.Text.Implementation.csproj
index 07eb38d..f6b7220 100644
--- a/src/Microsoft.VisualStudio.Text.Implementation.csproj
+++ b/src/Microsoft.VisualStudio.Text.Implementation.csproj
@@ -5,7 +5,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
-    <Version>15.0.15-pre</Version>
+    <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>