Upgrade Roslyn

ssaattww · Oct 7, 2020 · 9344ddc · 9344ddc
1 parent 2d72143
commit 9344ddc
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 32 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,8 +7,8 @@
     <Deterministic>True</Deterministic>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <EditorPackageVersion>1.2.0</EditorPackageVersion>
-    <RoslynPackageVersion>3.7.0-4.final</RoslynPackageVersion>
-    <RoslynAssemblyVersion>3.7.0.0</RoslynAssemblyVersion>
+    <RoslynPackageVersion>3.8.0-3.final</RoslynPackageVersion>
+    <RoslynAssemblyVersion>3.8.0.0</RoslynAssemblyVersion>
     <AvaloniaVersion>0.9.11</AvaloniaVersion>
     <LangVersion>8.0</LangVersion>
     <Nullable>Enable</Nullable>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.302"
+    "version": "3.1.402"
   }
-}
+}
diff --git a/src/RoslynPad.Editor.Shared/SnippetManager.cs b/src/RoslynPad.Editor.Shared/SnippetManager.cs
@@ -37,10 +37,9 @@ public SnippetManager()
 
         public IEnumerable<CodeSnippet> Snippets => DefaultSnippets.Values;
 
-        public CodeSnippet FindSnippet(string name)
+        public CodeSnippet? FindSnippet(string name)
         {
-            CodeSnippet snippet;
-            DefaultSnippets.TryGetValue(name, out snippet);
+            DefaultSnippets.TryGetValue(name, out var snippet);
             return snippet;
         }
 

diff --git a/src/RoslynPad.Roslyn/CachedScriptMetadataResolver.cs b/src/RoslynPad.Roslyn/CachedScriptMetadataResolver.cs
@@ -31,15 +31,15 @@ public CachedScriptMetadataResolver(string workingDirectory, bool useCache = fal
 
         public override bool ResolveMissingAssemblies => _inner.ResolveMissingAssemblies;
 
-        public override PortableExecutableReference ResolveMissingAssembly(MetadataReference definition, AssemblyIdentity referenceIdentity)
+        public override PortableExecutableReference? ResolveMissingAssembly(MetadataReference definition, AssemblyIdentity referenceIdentity)
         {
             if (_cache == null)
             {
                 return _inner.ResolveMissingAssembly(definition, referenceIdentity);
             }
 
             return _cache.GetOrAdd(referenceIdentity.ToString(),
-                _ => ImmutableArray.Create(_inner.ResolveMissingAssembly(definition, referenceIdentity))).FirstOrDefault();
+                _ => ImmutableArray.Create(_inner.ResolveMissingAssembly(definition, referenceIdentity)!)).FirstOrDefault();
         }
 
         public override ImmutableArray<PortableExecutableReference> ResolveReference(string reference, string? baseFilePath, MetadataReferenceProperties properties)
@@ -69,4 +69,4 @@ public override ImmutableArray<PortableExecutableReference> ResolveReference(str
             return result;
         }
     }
-}
+}
diff --git a/src/RoslynPad.Roslyn/CodeFixes/CodeFixService.cs b/src/RoslynPad.Roslyn/CodeFixes/CodeFixService.cs
@@ -290,7 +290,7 @@ private async Task AppendFixesAsync(
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    if (hasAnySharedFixer && fixerMap.Value.TryGetValue(diagnosticId, out var workspaceFixers))
+                    if (hasAnySharedFixer && fixerMap!.Value.TryGetValue(diagnosticId, out var workspaceFixers))
                     {
                         allFixers.AddRange(workspaceFixers);
                     }
@@ -513,14 +513,14 @@ private async Task<bool> ContainsAnyFixAsync(
 
                 if (hasAnyProjectFixer)
                 {
-                    allFixers = allFixers.AddRange(projectFixers);
+                    allFixers = allFixers.AddRange(projectFixers!);
                 }
 
                 var dx = await diagnostic.ToDiagnosticAsync(document.Project, cancellationToken).ConfigureAwait(false);
 
                 if (hasConfigurationFixer)
                 {
-                    foreach (var lazyConfigurationProvider in lazyConfigurationProviders.Value)
+                    foreach (var lazyConfigurationProvider in lazyConfigurationProviders!.Value)
                     {
                         if (lazyConfigurationProvider.IsFixableDiagnostic(dx))
                         {
@@ -550,24 +550,8 @@ private async Task<bool> ContainsAnyFixAsync(
                 foreach (var fixer in allFixers)
                 {
                     await extensionManager.PerformActionAsync(fixer, () => fixer.RegisterCodeFixesAsync(context) ?? Task.CompletedTask).ConfigureAwait(false);
-                    foreach (var fix in fixes)
-                    {
-                        if (!fix.Action.PerformFinalApplicabilityCheck)
-                        {
-                            return true;
-                        }
-
-                        // Have to see if this fix is still applicable.  Jump to the foreground thread
-                        // to make that check.
-                        cancellationToken.ThrowIfCancellationRequested();
-
-                        var applicable = fix.Action.IsApplicable(document.Project.Solution.Workspace);
-
-                        if (applicable)
-                        {
-                            return true;
-                        }
-                    }
+                    if (fixes.Count > 0)
+                        return true;
                 }
 
                 return false;

diff --git a/src/RoslynPad.Roslyn/QuickInfo/QuickInfoProvider.cs b/src/RoslynPad.Roslyn/QuickInfo/QuickInfoProvider.cs
@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.DocumentationComments;
+using Microsoft.CodeAnalysis.ExternalAccess.Pythia.Api;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;

diff --git a/src/RoslynPad.Roslyn/RoslynPad.Roslyn.csproj b/src/RoslynPad.Roslyn/RoslynPad.Roslyn.csproj
@@ -15,5 +15,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslynPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynPackageVersion)" />
+    <PackageReference Include="System.Reflection.Metadata" Version="5.0.0-preview.8.20407.11" />
+    <PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.8.20407.11" />
   </ItemGroup>
 </Project>
diff --git a/src/RoslynPad/RoslynPad.csproj b/src/RoslynPad/RoslynPad.csproj
@@ -25,7 +25,6 @@
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.6" />
     <PackageReference Include="Mono.Cecil" Version="0.10.1" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.7.0" />
   </ItemGroup>