Simplify

Author: Julien Couvreur

src/Compilers/Core/Portable/Compilation/DeterministicKey.cs

@@ -62,44 +62,11 @@ public static string GetDeterministicKey(
             ImmutableArray<ResourceDescription> resources = default,
             DeterministicKeyOptions options = DeterministicKeyOptions.Default,
             CancellationToken cancellationToken = default)
-        {
-            return GetDeterministicKey(
-                compilationOptions,
-                syntaxTrees.SelectAsArray(static t => SyntaxTreeKey.Create(t)),
-                references,
-                publicKey,
-                additionalTexts,
-                analyzers,
-                generators,
-                pathMap,
-                emitOptions,
-                sourceLinkText,
-                ruleSetFilePath,
-                resources,
-                options,
-                cancellationToken);
-        }
-
-        public static string GetDeterministicKey(
-            CompilationOptions compilationOptions,
-            ImmutableArray<SyntaxTreeKey> syntaxTrees,
-            ImmutableArray<MetadataReference> references,
-            ImmutableArray<byte> publicKey,
-            ImmutableArray<AdditionalText> additionalTexts = default,
-            ImmutableArray<DiagnosticAnalyzer> analyzers = default,
-            ImmutableArray<ISourceGenerator> generators = default,
-            ImmutableArray<KeyValuePair<string, string>> pathMap = default,
-            EmitOptions? emitOptions = null,
-            SourceText? sourceLinkText = null,
-            string? ruleSetFilePath = null,
-            ImmutableArray<ResourceDescription> resources = default,
-            DeterministicKeyOptions options = DeterministicKeyOptions.Default,
-            CancellationToken cancellationToken = default)
         {
             var keyBuilder = compilationOptions.CreateDeterministicKeyBuilder();
             return keyBuilder.GetKey(
                 compilationOptions,
-                syntaxTrees,
+                syntaxTrees.SelectAsArray(static t => SyntaxTreeKey.Create(t)),
                 references,
                 publicKey,
                 additionalTexts,

src/Compilers/Core/Portable/Compilation/DeterministicKeyBuilder.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Globalization;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -153,6 +153,10 @@ internal string GetKey(
             DeterministicKeyOptions options,
             CancellationToken cancellationToken)
         {
+            Debug.Assert(!syntaxTrees.IsDefault);
+            Debug.Assert(!references.IsDefault);
+            Debug.Assert(!publicKey.IsDefault);
+
             additionalTexts = additionalTexts.NullToEmpty();
             analyzers = analyzers.NullToEmpty();
             generators = generators.NullToEmpty();

src/Compilers/Core/RebuildTest/CSharpDeterministicKeyBuilderTests.cs

@@ -599,12 +599,12 @@ public void SourceLink()
             var compilation = CSharpTestBase.CreateCompilation(syntaxTree, options: Options);
 
             var sourceLinkContent = """
-                {
-                  "documents": {
-                    "/*": "https://raw.githubusercontent.com/test/repo/*"
-                  }
-                }
-                """;
+{
+  "documents": {
+    "/*": "https://raw.githubusercontent.com/test/repo/*"
+  }
+}
+""";
             var sourceLinkText = SourceText.From(sourceLinkContent, Encoding.UTF8, SourceHashAlgorithm.Sha256);
             var sourceLinkChecksum = GetChecksum(sourceLinkText);
 
@@ -614,12 +614,13 @@ public void SourceLink()
                 sourceLinkText: sourceLinkText,
                 options: DeterministicKeyOptions.IgnoreToolVersions);
 
-            var expected = $@"
-""sourceLink"": {{
-  ""checksum"": ""{sourceLinkChecksum}"",
-  ""checksumAlgorithm"": ""Sha256"",
-  ""encodingName"": ""Unicode (UTF-8)""
-}}";
+            var expected = $$"""
+"sourceLink": {
+  "checksum": "{{sourceLinkChecksum}}",
+  "checksumAlgorithm": "Sha256",
+  "encodingName": "Unicode (UTF-8)"
+}
+""";
             AssertJsonSection(expected, key, "emitOptions.sourceLink");
         }
 
@@ -637,8 +638,9 @@ public void RuleSet()
                 ruleSetFilePath: ruleSetPath,
                 options: DeterministicKeyOptions.IgnoreToolVersions);
 
-            var expected = @$"
-""ruleSetPath"": ""{ruleSetPath}""";
+            var expected = $"""
+"ruleSetPath": "{ruleSetPath}"
+""";
             AssertJsonSection(expected, key, "compilation.options.ruleSetPath");
         }
 
@@ -666,21 +668,22 @@ public void Resources()
                 isPublic: true);
 
             var key = compilation.GetDeterministicKey(
-                resources: ImmutableArray.Create(resource),
+                resources: [resource],
                 options: DeterministicKeyOptions.IgnoreToolVersions);
 
-            var expected = $@"
-""resources"": [
-  {{
-    ""resourceName"": ""TestResource"",
-    ""fileName"": null,
-    ""isPublic"": true,
-    ""isEmbedded"": true,
-    ""content"": {{
-      ""checksum"": ""{resourceChecksum}""
-    }}
-  }}
-]";
+            var expected = $$"""
+"resources": [
+  {
+    "resourceName": "TestResource",
+    "fileName": null,
+    "isPublic": true,
+    "isEmbedded": true,
+    "content": {
+      "checksum": "{{resourceChecksum}}"
+    }
+  }
+]
+""";
             AssertJsonSection(expected, key, "resources");
         }
     }