Sync with vs-editor-core@71f71d5a

6 files changed, 21 insertions, 8 deletions

diff --git a/Directory.Build.props b/Directory.Build.props
index c7c4cbb..7065fcf 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <NuGetVersionRoslyn>3.2.0-beta4-19359-03</NuGetVersionRoslyn>
+    <NuGetVersionRoslyn>3.3.0-beta1-19360-03</NuGetVersionRoslyn>
     <NuGetVersionVSEditor Condition="$(NuGetVersionVSEditor) == ''">16.0.379-g4a55b0e4f2</NuGetVersionVSEditor>
   </PropertyGroup>
 
diff --git a/GitInfo.txt b/GitInfo.txt
index 04a373e..2bf50aa 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-0.16.0
+8.3.0
diff --git a/build/PackageVersions.targets b/build/PackageVersions.targets
index e3f20a1..50a8248 100644
--- a/build/PackageVersions.targets
+++ b/build/PackageVersions.targets
@@ -32,10 +32,10 @@
     <PackageReference Update="Serilog.Sinks.Console" Version="3.1.1"/>
 
     <!-- These specifically are needed by Roslyn but are not pulled in implicitly via NuGet -->
-    <PackageReference Update="ICSharpCode.Decompiler" Version="4.0.0.4285-beta1"/>
-    <PackageReference Update="Microsoft.ServiceHub.Client" Version="1.2.64"/>
+    <PackageReference Update="ICSharpCode.Decompiler" Version="4.0.0.4521"/>
+    <PackageReference Update="Microsoft.ServiceHub.Client" Version="1.3.23"/>
     <PackageReference Update="Mono.Cecil" Version="0.10.0"/>
     <PackageReference Update="stdole" Version="7.0.3301"/>
-    <PackageReference Update="SQLitePCLRaw.bundle_green" Version="1.1.11"/>
+    <PackageReference Update="SQLitePCLRaw.bundle_green" Version="1.1.2"/>
   </ItemGroup>
 </Project>
diff --git a/build/Project.targets b/build/Project.targets
index 33baaba..1889d00 100644
--- a/build/Project.targets
+++ b/build/Project.targets
@@ -1,6 +1,11 @@
 <Project>
   <Import Project="PackageVersions.targets"/>
 
+  <PropertyGroup>
+    <IsPackable Condition="'$(PushToPublicFeed)' != 'true'">false</IsPackable>
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
+
   <Target Name="DumpPaths">
     <Message Text="RepoRootPath: $(RepoRootPath)"/>
     <Message Text="RepoObjPath: $(RepoObjPath)"/>
diff --git a/src/Editor/Language/Impl/Language/AsyncCompletion/AsyncCompletionSession.cs b/src/Editor/Language/Impl/Language/AsyncCompletion/AsyncCompletionSession.cs
index 09662e7..0a13199 100644
--- a/src/Editor/Language/Impl/Language/AsyncCompletion/AsyncCompletionSession.cs
+++ b/src/Editor/Language/Impl/Language/AsyncCompletion/AsyncCompletionSession.cs
@@ -641,10 +641,18 @@ namespace Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion.Implement
                 StringComparison.OrdinalIgnoreCase);
 
         public bool CanToggleFilter(string accessKey)
-            => _computation
-                .RecentModel
+        {
+            var recentModel = _computation?.RecentModel;
+
+            if (recentModel == null ||
+                recentModel.Uninitialized ||
+                recentModel.Filters.IsDefaultOrEmpty)
+                return false;
+
+            return recentModel
                 .Filters
                 .Any(filter => CheckFilterAccessKey(filter, accessKey));
+        }
 
         public void ToggleFilter(string accessKey)
         {
diff --git a/src/Editor/Text/Def/Extras/Find/IFindPresenter.cs b/src/Editor/Text/Def/Extras/Find/IFindPresenter.cs
index 9cd3ef3..a399c43 100644
--- a/src/Editor/Text/Def/Extras/Find/IFindPresenter.cs
+++ b/src/Editor/Text/Def/Extras/Find/IFindPresenter.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.Text.Find
     /// </summary>
     public interface IFindPresenter
     {
-        void ShowFind(bool usePreviousTerm = false);
+        void ShowFind(bool usePreviousTerm = false, bool takeFocus = true);
         void ShowReplace();
         void Hide();
         bool IsVisible { get; }