Merge pull request #1621 from filipw/bugfix/suppressions

fixed default diagnostic suppressions for script project system
OmniSharp · Oct 8, 2019 · 1027f85 · 1027f85
2 parents b010270 + 4d2ba41
commit 1027f85
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/OmniSharp.Roslyn/Utilities/CompilationOptionsHelper.cs b/src/OmniSharp.Roslyn/Utilities/CompilationOptionsHelper.cs
@@ -35,5 +35,21 @@ public static ImmutableDictionary<string, ReportDiagnostic> GetDefaultSuppressed
 
             return suppressedDiagnostics.ToImmutableDictionary();
         }
+
+        public static ImmutableDictionary<string, ReportDiagnostic> GetDefaultSuppressedDiagnosticOptions(Dictionary<string, ReportDiagnostic> otherDiagnostics)
+        {
+            if (otherDiagnostics == null || !otherDiagnostics.Any()) return GetDefaultSuppressedDiagnosticOptions();
+
+            var combinedDiagnostics = GetDefaultSuppressedDiagnosticOptions();
+            foreach (var diagnostic in otherDiagnostics)
+            {
+                if (!combinedDiagnostics.ContainsKey(diagnostic.Key))
+                {
+                    combinedDiagnostics.Add(diagnostic.Key, diagnostic.Value);
+                }
+            }
+
+            return combinedDiagnostics.ToImmutableDictionary();
+        }
     }
 }
diff --git a/src/OmniSharp.Script/ScriptProjectProvider.cs b/src/OmniSharp.Script/ScriptProjectProvider.cs
@@ -98,12 +98,9 @@ private CSharpCompilationOptions CreateCompilationOptions()
                 .WithMetadataReferenceResolver(CreateMetadataReferenceResolver())
                 .WithSourceReferenceResolver(ScriptSourceResolver.Default)
                 .WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default)
-                .WithSpecificDiagnosticOptions(CompilationOptionsHelper.GetDefaultSuppressedDiagnosticOptions());
-
-            if (_scriptOptions.IsNugetEnabled())
-            {
-                compilationOptions = compilationOptions.WithSpecificDiagnosticOptions(_scriptOptions.NullableDiagnostics);
-            }
+                .WithSpecificDiagnosticOptions(!_scriptOptions.IsNugetEnabled()
+                    ? CompilationOptionsHelper.GetDefaultSuppressedDiagnosticOptions()
+                    : CompilationOptionsHelper.GetDefaultSuppressedDiagnosticOptions(_scriptOptions.NullableDiagnostics)); // for .NET Core 3.0 dotnet-script use extra nullable diagnostics
 
             var topLevelBinderFlagsProperty = typeof(CSharpCompilationOptions).GetProperty(TopLevelBinderFlagsProperty, BindingFlags.Instance | BindingFlags.NonPublic);
             var binderFlagsType = typeof(CSharpCompilationOptions).GetTypeInfo().Assembly.GetType(BinderFlagsType);