Skip to content

Commit d9dfdea

Browse files
committed
Revert "Fix formatting issues"
This reverts commit f65c172.
1 parent f65c172 commit d9dfdea

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

src/NodeApi.DotNetHost/JSMarshaller.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ public Expression<JSCallback> BuildFromJSConstructorExpression(ConstructorInfo c
475475

476476
ParameterExpression resultVariable = Expression.Variable(
477477
constructor.DeclaringType!, "__result");
478-
variables = [.. argVariables.Append(resultVariable)];
478+
variables = new List<ParameterExpression>(argVariables.Append(resultVariable));
479479
statements.Add(Expression.Assign(resultVariable,
480480
Expression.New(constructor, argVariables)));
481481

src/NodeApi.Generator/ExpressionExtensions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ private static string ToCS(
5959
(variables is null ? FormatType(lambda.ReturnType) + " " + lambda.Name + "(" +
6060
string.Join(", ", lambda.Parameters.Select((p) => p.ToCS())) + ")\n" :
6161
"(" + string.Join(", ", lambda.Parameters.Select((p) => p.ToCS())) + ") =>\n") +
62-
ToCS(lambda.Body, path, [.. (variables ?? Enumerable.Empty<string>()).Union(
63-
lambda.Parameters.Select((p) => p.Name!))]),
62+
ToCS(lambda.Body, path, new HashSet<string>(
63+
(variables ?? Enumerable.Empty<string>()).Union(
64+
lambda.Parameters.Select((p) => p.Name!)))),
6465

6566
ParameterExpression parameter =>
6667
(parameter.IsByRef && parameter.Name?.StartsWith(OutParameterPrefix) == true) ?
@@ -284,7 +285,7 @@ private static string FormatStatement(
284285
if (assignment.Left is ParameterExpression variable &&
285286
!variables.Contains(variable.Name!))
286287
{
287-
variables = [.. variables.Union(new[] { variable.Name! })];
288+
variables = new HashSet<string>(variables.Union(new[] { variable.Name! }));
288289
s += FormatType(variable.Type) + " " + s;
289290
}
290291
}

src/NodeApi.Generator/TypeDefinitionsGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ private static IEnumerable<string> MergeSystemReferenceAssemblies(
333333

334334
private static Version InferReferenceAssemblyVersionFromPath(string assemblyPath)
335335
{
336-
List<string> pathParts = assemblyPath.Split(
336+
var pathParts = assemblyPath.Split(
337337
Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar).ToList();
338338

339339
// Infer the version from a system reference assembly path such as
@@ -1230,7 +1230,7 @@ private void BeginNamespace(ref SourceBuilder s, Type type)
12301230
return;
12311231
}
12321232

1233-
List<string> namespaceParts = [.. type.Namespace?.Split('.') ?? Enumerable.Empty<string>()];
1233+
List<string> namespaceParts = new(type.Namespace?.Split('.') ?? Enumerable.Empty<string>());
12341234

12351235
int namespacePartsCount = namespaceParts.Count;
12361236
Type? declaringType = type.DeclaringType;

src/NodeApi/Runtime/TracingJSRuntime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private string Format(napi_env env, napi_value value)
178178
valueString = $" {GetValueString(env, functionName)}()";
179179
}
180180
break;
181-
}
181+
};
182182

183183
return $"{value.Handle:X16} {valueType.ToString().Substring(5)}{valueString}";
184184
}

0 commit comments

Comments
 (0)