Skip to content

Commit c57a4a8

Browse files
authored
Use collection expressions (#2073)
1 parent f1a8010 commit c57a4a8

19 files changed

+63
-63
lines changed

Jint.Benchmark/DictionaryBenchmark.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Jint.Benchmark;
77
public class DictionaryBenchmark
88
{
99
private static readonly string[] _keys =
10-
{
10+
[
1111
"some",
1212
"key and",
1313
"another",
@@ -20,7 +20,7 @@ public class DictionaryBenchmark
2020
"asdadsasa",
2121
"23323232323",
2222
"asdadsada sa213"
23-
};
23+
];
2424

2525
[Params(0, 2, 3, 5, 8, 9, 10)]
2626
public int N { get; set; }

Jint.Benchmark/UncacheableExpressionsBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ private void CreateEngine(string script)
103103
engine = new Engine(InitializeEngine);
104104
engine.Execute(script);
105105
engine.Execute(targetObject);
106-
targetJsObject = new[] { engine.GetValue("d") };
106+
targetJsObject = [engine.GetValue("d")];
107107
}
108108
}

Jint.Tests/Runtime/ArrayTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public void Shift()
346346
public void ShouldBeAbleToInitFromArray()
347347
{
348348
var engine = new Engine();
349-
var propertyDescriptors = new JsArray(engine, new JsValue[] { 1 }).GetOwnProperties().ToArray();
349+
var propertyDescriptors = new JsArray(engine, [1]).GetOwnProperties().ToArray();
350350
Assert.Equal(2, propertyDescriptors.Length);
351351
Assert.Equal("0", propertyDescriptors[0].Key);
352352
Assert.Equal(1, propertyDescriptors[0].Value.Value);

Jint.Tests/Runtime/Domain/Dimensional.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class Dimensional : IComparable<Dimensional>, IEquatable<Dimensional>
44
{
5-
private readonly MeasureUnit[] PossibleMeasureUnits = new MeasureUnit[] { new MeasureUnit("Mass", "kg", 1.0), new MeasureUnit("Mass", "gr", 0.001), new MeasureUnit("Count", "piece", 1.0) };
5+
private readonly MeasureUnit[] PossibleMeasureUnits = [new MeasureUnit("Mass", "kg", 1.0), new MeasureUnit("Mass", "gr", 0.001), new MeasureUnit("Count", "piece", 1.0)];
66

77
public MeasureUnit MeasureUnit { get; private set; }
88

Jint.Tests/Runtime/Domain/IntegerIndexer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class IntegerIndexer
66

77
public IntegerIndexer()
88
{
9-
data = new[] {123, 0, 0, 0, 0};
9+
data = [123, 0, 0, 0, 0];
1010
}
1111

1212
public int this[int i]

Jint.Tests/Runtime/EngineTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,12 +1187,12 @@ public static System.Collections.Generic.IEnumerable<object[]> TestDates
11871187
{
11881188
get
11891189
{
1190-
yield return new object[] { new DateTime(2000, 1, 1) };
1191-
yield return new object[] { new DateTime(2000, 1, 1, 0, 15, 15, 15) };
1192-
yield return new object[] { new DateTime(2000, 6, 1, 0, 15, 15, 15) };
1193-
yield return new object[] { new DateTime(1900, 1, 1) };
1194-
yield return new object[] { new DateTime(1900, 1, 1, 0, 15, 15, 15) };
1195-
yield return new object[] { new DateTime(1900, 6, 1, 0, 15, 15, 15) };
1190+
yield return [new DateTime(2000, 1, 1)];
1191+
yield return [new DateTime(2000, 1, 1, 0, 15, 15, 15)];
1192+
yield return [new DateTime(2000, 6, 1, 0, 15, 15, 15)];
1193+
yield return [new DateTime(1900, 1, 1)];
1194+
yield return [new DateTime(1900, 1, 1, 0, 15, 15, 15)];
1195+
yield return [new DateTime(1900, 6, 1, 0, 15, 15, 15)];
11961196
}
11971197
}
11981198

Jint.Tests/Runtime/ExtensionMethods/CustomStringExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public static ExpandoObject DeserializeObject(this string json)
2222

2323
public static string[] Split(this string value, string split, StringSplitOptions options)
2424
{
25-
return Array.Empty<string>();
25+
return [];
2626
}
2727

2828
public static string[] Split(this string value, int position)
2929
{
3030
var first = value.Substring(0, position);
3131
var second = value.Substring(position);
32-
return new string[] { first, second };
32+
return [first, second];
3333
}
3434
}

Jint.Tests/Runtime/FunctionTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function test() {
8484
engine
8585
.SetValue("testFunction", new ClrFunction(engine, "testFunction", (thisValue, args) =>
8686
{
87-
return engine.Invoke(thisValue, "then", new[] { JsValue.Undefined, args.At(0) });
87+
return engine.Invoke(thisValue, "then", [JsValue.Undefined, args.At(0)]);
8888
}))
8989
.SetValue("assertEqual", new Action<object, object>((a, b) => Assert.Equal(b, a)))
9090
.Execute(Script);
@@ -142,10 +142,10 @@ void addListener(Func<JsValue, JsValue[], JsValue> callback)
142142

143143
Assert.Equal(5, engine.Evaluate("a"));
144144

145-
ev(null, new JsValue[0]);
145+
ev(null, []);
146146
Assert.Equal(10, engine.Evaluate("a"));
147147

148-
ev(null, new JsValue[] { 20 });
148+
ev(null, [20]);
149149
Assert.Equal(30, engine.Evaluate("a"));
150150
}
151151

@@ -174,10 +174,10 @@ void addListener(Func<JsValue, JsValue[], JsValue> callback)
174174

175175
Assert.Equal(5, engine.Evaluate("a"));
176176

177-
ev(null, new JsValue[0]);
177+
ev(null, []);
178178
Assert.Equal(10, engine.Evaluate("a"));
179179

180-
ev(null, new JsValue[] { 20 });
180+
ev(null, [20]);
181181
Assert.Equal(30, engine.Evaluate("a"));
182182
}
183183

@@ -196,11 +196,11 @@ void addListener(Func<JsValue, JsValue[], JsValue> callback)
196196

197197
engine.Execute(@"addListener(Boolean)");
198198

199-
Assert.Equal(true, ev(JsValue.Undefined, new JsValue[] { "test" }));
200-
Assert.Equal(true, ev(JsValue.Undefined, new JsValue[] { 5 }));
201-
Assert.Equal(false, ev(JsValue.Undefined, new JsValue[] { false }));
202-
Assert.Equal(false, ev(JsValue.Undefined, new JsValue[] { 0}));
203-
Assert.Equal(false, ev(JsValue.Undefined, new JsValue[] { JsValue.Undefined }));
199+
Assert.Equal(true, ev(JsValue.Undefined, ["test"]));
200+
Assert.Equal(true, ev(JsValue.Undefined, [5]));
201+
Assert.Equal(false, ev(JsValue.Undefined, [false]));
202+
Assert.Equal(false, ev(JsValue.Undefined, [0]));
203+
Assert.Equal(false, ev(JsValue.Undefined, [JsValue.Undefined]));
204204
}
205205

206206
[Fact]

Jint.Tests/Runtime/InteropTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2813,7 +2813,7 @@ public void CanCheckIfCallable()
28132813
var result = engine.GetValue("f");
28142814
Assert.True(result.IsCallable);
28152815

2816-
Assert.True(result.Call(Array.Empty<JsValue>()).AsBoolean());
2816+
Assert.True(result.Call([]).AsBoolean());
28172817
Assert.True(result.Call().AsBoolean());
28182818
}
28192819

@@ -3422,7 +3422,7 @@ public Strings(string[] strings)
34223422

34233423
public class Utils
34243424
{
3425-
public IStringCollection GetStrings() => new Strings(new[] { "a", "b", "c" });
3425+
public IStringCollection GetStrings() => new Strings(["a", "b", "c"]);
34263426
}
34273427

34283428
[Fact]
@@ -3722,7 +3722,7 @@ public class Lion : Animal
37223722
public class Zoo
37233723
{
37243724
public Animal king { get => (new Animal[] { new Lion() })[0]; }
3725-
public Animal[] animals { get => new Animal[] { new Lion(), new Elephant() }; }
3725+
public Animal[] animals { get => [new Lion(), new Elephant()]; }
37263726
}
37273727

37283728
[Fact]

Jint.Tests/Runtime/JsonSerializerTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void JsonStringOutputIsIndentedWhenSpacerDefined()
5959
JsObject instance = new JsObject(engine);
6060
instance["a"] = "b";
6161
instance["b"] = 2;
62-
instance["c"] = new JsArray(engine, new JsValue[] { new JsNumber(4), new JsNumber(5), new JsNumber(6) });
62+
instance["c"] = new JsArray(engine, [new JsNumber(4), new JsNumber(5), new JsNumber(6)]);
6363
instance["d"] = true;
6464

6565
string actual = serializer.Serialize(instance, JsValue.Undefined, new JsNumber(2)).ToString();
@@ -75,7 +75,7 @@ public void JsonStringOutputIsCompactWithoutSpacer()
7575
JsObject instance = new JsObject(engine);
7676
instance["a"] = "b";
7777
instance["b"] = 2;
78-
instance["c"] = new JsArray(engine, new JsValue[] { new JsNumber(4), new JsNumber(5), new JsNumber(6) });
78+
instance["c"] = new JsArray(engine, [new JsNumber(4), new JsNumber(5), new JsNumber(6)]);
7979
instance["d"] = true;
8080

8181
string actual = serializer.Serialize(instance, JsValue.Undefined, JsValue.Undefined).ToString();
@@ -88,7 +88,7 @@ public void ArrayWithUndefinedWillBeNull()
8888
using var engine = new Engine();
8989
var serializer = new JsonSerializer(engine);
9090

91-
JsArray array = new JsArray(engine, new JsValue[] { JsValue.Undefined, new JsNumber(42) });
91+
JsArray array = new JsArray(engine, [JsValue.Undefined, new JsNumber(42)]);
9292
string actual = serializer.Serialize(array, JsValue.Undefined, JsValue.Undefined).ToString();
9393
Assert.Equal("[null,42]", actual);
9494
}
@@ -125,7 +125,7 @@ public void InfinityAndNaNGetsSerializedAsNull()
125125
{
126126
using var engine = new Engine();
127127
var serializer = new JsonSerializer(engine);
128-
JsArray array = new JsArray(engine, new JsValue[] { JsNumber.DoubleNegativeInfinity, JsNumber.DoublePositiveInfinity, JsNumber.DoubleNaN });
128+
JsArray array = new JsArray(engine, [JsNumber.DoubleNegativeInfinity, JsNumber.DoublePositiveInfinity, JsNumber.DoubleNaN]);
129129
string actual = serializer.Serialize(array, JsValue.Undefined, JsValue.Undefined).ToString();
130130
Assert.Equal("[null,null,null]", actual);
131131
}
@@ -139,7 +139,7 @@ public void ArrayAsReplacedDictatesPropertiesToSerializer()
139139
JsObject instance = new JsObject(engine);
140140
instance["a"] = 21;
141141
instance["b"] = 42;
142-
JsValue replacer = new JsArray(engine, new JsValue[] { new JsString("b"), new JsString("z") });
142+
JsValue replacer = new JsArray(engine, [new JsString("b"), new JsString("z")]);
143143
string actual = serializer.Serialize(instance, replacer, JsValue.Undefined).ToString();
144144
Assert.Equal("{\"b\":42}", actual);
145145
}

0 commit comments

Comments
 (0)