From f65c1725742519eedbc647a08cb79997d94e3b3b Mon Sep 17 00:00:00 2001
From: Vladimir Morozov <vmorozov@microsoft.com>
Date: Sun, 16 Feb 2025 13:16:53 -0800
Subject: [PATCH] Fix formatting issues

---
 src/NodeApi.DotNetHost/JSMarshaller.cs            | 2 +-
 src/NodeApi.Generator/ExpressionExtensions.cs     | 7 +++----
 src/NodeApi.Generator/TypeDefinitionsGenerator.cs | 4 ++--
 src/NodeApi/Runtime/TracingJSRuntime.cs           | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/NodeApi.DotNetHost/JSMarshaller.cs b/src/NodeApi.DotNetHost/JSMarshaller.cs
index baa2122b..aa8ec644 100644
--- a/src/NodeApi.DotNetHost/JSMarshaller.cs
+++ b/src/NodeApi.DotNetHost/JSMarshaller.cs
@@ -475,7 +475,7 @@ public Expression<JSCallback> BuildFromJSConstructorExpression(ConstructorInfo c
 
         ParameterExpression resultVariable = Expression.Variable(
             constructor.DeclaringType!, "__result");
-        variables = new List<ParameterExpression>(argVariables.Append(resultVariable));
+        variables = [.. argVariables.Append(resultVariable)];
         statements.Add(Expression.Assign(resultVariable,
             Expression.New(constructor, argVariables)));
 
diff --git a/src/NodeApi.Generator/ExpressionExtensions.cs b/src/NodeApi.Generator/ExpressionExtensions.cs
index 32d9aaf8..96fa26f3 100644
--- a/src/NodeApi.Generator/ExpressionExtensions.cs
+++ b/src/NodeApi.Generator/ExpressionExtensions.cs
@@ -59,9 +59,8 @@ private static string ToCS(
                 (variables is null ? FormatType(lambda.ReturnType) + " " + lambda.Name + "(" +
                   string.Join(", ", lambda.Parameters.Select((p) => p.ToCS())) + ")\n" :
                 "(" + string.Join(", ", lambda.Parameters.Select((p) => p.ToCS())) + ") =>\n") +
-                ToCS(lambda.Body, path, new HashSet<string>(
-                    (variables ?? Enumerable.Empty<string>()).Union(
-                        lambda.Parameters.Select((p) => p.Name!)))),
+                ToCS(lambda.Body, path, [.. (variables ?? Enumerable.Empty<string>()).Union(
+                        lambda.Parameters.Select((p) => p.Name!))]),
 
             ParameterExpression parameter =>
                 (parameter.IsByRef && parameter.Name?.StartsWith(OutParameterPrefix) == true) ?
@@ -285,7 +284,7 @@ private static string FormatStatement(
             if (assignment.Left is ParameterExpression variable &&
                 !variables.Contains(variable.Name!))
             {
-                variables = new HashSet<string>(variables.Union(new[] { variable.Name! }));
+                variables = [.. variables.Union(new[] { variable.Name! })];
                 s += FormatType(variable.Type) + " " + s;
             }
         }
diff --git a/src/NodeApi.Generator/TypeDefinitionsGenerator.cs b/src/NodeApi.Generator/TypeDefinitionsGenerator.cs
index f0c32532..80e4405d 100644
--- a/src/NodeApi.Generator/TypeDefinitionsGenerator.cs
+++ b/src/NodeApi.Generator/TypeDefinitionsGenerator.cs
@@ -333,7 +333,7 @@ private static IEnumerable<string> MergeSystemReferenceAssemblies(
 
     private static Version InferReferenceAssemblyVersionFromPath(string assemblyPath)
     {
-        var pathParts = assemblyPath.Split(
+        List<string> pathParts = assemblyPath.Split(
             Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar).ToList();
 
         // Infer the version from a system reference assembly path such as
@@ -1230,7 +1230,7 @@ private void BeginNamespace(ref SourceBuilder s, Type type)
             return;
         }
 
-        List<string> namespaceParts = new(type.Namespace?.Split('.') ?? Enumerable.Empty<string>());
+        List<string> namespaceParts = [.. type.Namespace?.Split('.') ?? Enumerable.Empty<string>()];
 
         int namespacePartsCount = namespaceParts.Count;
         Type? declaringType = type.DeclaringType;
diff --git a/src/NodeApi/Runtime/TracingJSRuntime.cs b/src/NodeApi/Runtime/TracingJSRuntime.cs
index 27aa2534..e78de8df 100644
--- a/src/NodeApi/Runtime/TracingJSRuntime.cs
+++ b/src/NodeApi/Runtime/TracingJSRuntime.cs
@@ -178,7 +178,7 @@ private string Format(napi_env env, napi_value value)
                         valueString = $" {GetValueString(env, functionName)}()";
                     }
                     break;
-            };
+            }
 
             return $"{value.Handle:X16} {valueType.ToString().Substring(5)}{valueString}";
         }