Skip to content

Commit 323230e

Browse files
lahmalahma
authored
Enforce code style on build and fix issues (#2074)
1 parent c57a4a8 commit 323230e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+286
-277
lines changed

‎Jint/Collections/DictionarySlim.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public void Clear()
7575
public bool ContainsKey(TKey key)
7676
{
7777
Entry[] entries = _entries;
78-
for (int i = _buckets[key.GetHashCode() & (_buckets.Length-1)] - 1;
79-
(uint)i < (uint)entries.Length; i = entries[i].next)
78+
for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
79+
(uint) i < (uint) entries.Length; i = entries[i].next)
8080
{
8181
if (key.Equals(entries[i].key))
8282
return true;
@@ -89,7 +89,7 @@ public bool TryGetValue(TKey key, out TValue value)
8989
{
9090
Entry[] entries = _entries;
9191
for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
92-
(uint)i < (uint)entries.Length; i = entries[i].next)
92+
(uint) i < (uint) entries.Length; i = entries[i].next)
9393
{
9494
if (key.Equals(entries[i].key))
9595
{
@@ -152,7 +152,7 @@ public ref TValue GetOrAddValueRef(TKey key)
152152
Entry[] entries = _entries;
153153
int bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
154154
for (int i = _buckets[bucketIndex] - 1;
155-
(uint)i < (uint)entries.Length; i = entries[i].next)
155+
(uint) i < (uint) entries.Length; i = entries[i].next)
156156
{
157157
if (key.Equals(entries[i].key))
158158
return ref entries[i].value;
@@ -200,7 +200,7 @@ private Entry[] Resize()
200200
Debug.Assert(_entries.Length == _count || _entries.Length == 1); // We only copy _count, so if it's longer we will miss some
201201
int count = _count;
202202
int newSize = _entries.Length * 2;
203-
if ((uint)newSize > (uint)int.MaxValue) // uint cast handles overflow
203+
if ((uint) newSize > int.MaxValue) // uint cast handles overflow
204204
throw new InvalidOperationException("Capacity Overflow");
205205

206206
var entries = new Entry[newSize];

‎Jint/Collections/StringDictionarySlim.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public override ref TValue GetValueRefOrNullRef(Key key)
127127
Entry[] entries = _entries;
128128
int bucketIndex = key.HashCode & (_buckets.Length - 1);
129129
for (int i = _buckets[bucketIndex] - 1;
130-
(uint)i < (uint)entries.Length; i = entries[i].next)
130+
(uint) i < (uint) entries.Length; i = entries[i].next)
131131
{
132132
if (key.Name == entries[i].key.Name)
133133
{
@@ -154,7 +154,7 @@ public override ref TValue GetValueRefOrAddDefault(Key key, out bool exists)
154154
Entry[] entries = _entries;
155155
int bucketIndex = key.HashCode & (_buckets.Length - 1);
156156
for (int i = _buckets[bucketIndex] - 1;
157-
(uint)i < (uint)entries.Length; i = entries[i].next)
157+
(uint) i < (uint) entries.Length; i = entries[i].next)
158158
{
159159
if (key.Name == entries[i].key.Name)
160160
{
@@ -172,7 +172,7 @@ public bool TryAdd(Key key, TValue value)
172172
Entry[] entries = _entries;
173173
int bucketIndex = key.HashCode & (_buckets.Length - 1);
174174
for (int i = _buckets[bucketIndex] - 1;
175-
(uint)i < (uint)entries.Length; i = entries[i].next)
175+
(uint) i < (uint) entries.Length; i = entries[i].next)
176176
{
177177
if (key.Name == entries[i].key.Name)
178178
{
@@ -226,7 +226,7 @@ private Entry[] Resize()
226226
Debug.Assert(_entries.Length == _count || _entries.Length == 1); // We only copy _count, so if it's longer we will miss some
227227
int count = _count;
228228
int newSize = _entries.Length * 2;
229-
if ((uint)newSize > (uint)int.MaxValue) // uint cast handles overflow
229+
if ((uint) newSize > int.MaxValue) // uint cast handles overflow
230230
throw new InvalidOperationException("Capacity Overflow");
231231

232232
var entries = new Entry[newSize];

‎Jint/Engine.Modules.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private static void LinkModule(string specifier, Module module)
148148
private JsValue EvaluateModule(string specifier, Module module)
149149
{
150150
var ownsContext = _engine._activeEvaluationContext is null;
151-
_engine. _activeEvaluationContext ??= new EvaluationContext(_engine);
151+
_engine._activeEvaluationContext ??= new EvaluationContext(_engine);
152152
JsValue evaluationResult;
153153
try
154154
{

‎Jint/Engine.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public sealed partial class Engine : IDisposable
5252
internal readonly bool _isDebugMode;
5353
internal readonly bool _isStrict;
5454

55-
private bool _customResolver;
55+
private readonly bool _customResolver;
5656
internal readonly IReferenceResolver _referenceResolver;
5757

5858
internal readonly ReferencePool _referencePool;
@@ -1608,7 +1608,7 @@ public void Dispose()
16081608
}
16091609

16101610
#if SUPPORTS_WEAK_TABLE_CLEAR
1611-
_objectWrapperCache.Clear();
1611+
_objectWrapperCache.Clear();
16121612
#else
16131613
// we can expect that reflection is OK as we've been generating object wrappers already
16141614
var clearMethod = _objectWrapperCache.GetType().GetMethod("Clear", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);

‎Jint/Extensions/Character.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal static class Character
1010
public const string AsciiWordCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
1111

1212
[MethodImpl(MethodImplOptions.AggressiveInlining)]
13-
public static bool IsInRange(this char c, ushort min, ushort max) => (uint)(c - min) <= (uint)(max - min);
13+
public static bool IsInRange(this char c, ushort min, ushort max) => (uint) (c - min) <= (uint) (max - min);
1414

1515
[MethodImpl(MethodImplOptions.AggressiveInlining)]
1616
public static bool IsOctalDigit(this char c) => c.IsInRange('0', '7');

‎Jint/Extensions/Hash.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal static class Hash
1515
/// The offset bias value used in the FNV-1a algorithm
1616
/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
1717
/// </summary>
18-
private const int FnvOffsetBias = unchecked((int)2166136261);
18+
private const int FnvOffsetBias = unchecked((int) 2166136261);
1919

2020
/// <summary>
2121
/// The generative factor used in the FNV-1a algorithm
@@ -53,10 +53,10 @@ internal static int GetFNVHashCode(System.Text.StringBuilder text)
5353
int hashCode = FnvOffsetBias;
5454

5555
#if NETCOREAPP3_1_OR_GREATER
56-
foreach (var chunk in text.GetChunks())
57-
{
58-
hashCode = CombineFNVHash(hashCode, chunk.Span);
59-
}
56+
foreach (var chunk in text.GetChunks())
57+
{
58+
hashCode = CombineFNVHash(hashCode, chunk.Span);
59+
}
6060
#else
6161
// StringBuilder.GetChunks is not available in this target framework. Since there is no other direct access
6262
// to the underlying storage spans of StringBuilder, we fall back to using slower per-character operations.

‎Jint/Extensions/WebEncoders.cs

+33-33
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,16 @@ public static string Base64UrlEncode(byte[] input, int offset, int count, bool o
136136
#if NETCOREAPP
137137
return Base64UrlEncode(input.AsSpan(offset, count), omitPadding);
138138
#else
139-
// Special-case empty input
140-
if (count == 0)
141-
{
142-
return string.Empty;
143-
}
139+
// Special-case empty input
140+
if (count == 0)
141+
{
142+
return string.Empty;
143+
}
144144

145-
var buffer = new char[GetArraySizeRequiredToEncode(count)];
146-
var numBase64Chars = Base64UrlEncode(input, offset, buffer, outputOffset: 0, count: count, omitPadding);
145+
var buffer = new char[GetArraySizeRequiredToEncode(count)];
146+
var numBase64Chars = Base64UrlEncode(input, offset, buffer, outputOffset: 0, count: count, omitPadding);
147147

148-
return new string(buffer, startIndex: 0, length: numBase64Chars);
148+
return new string(buffer, startIndex: 0, length: numBase64Chars);
149149
#endif
150150
}
151151

@@ -193,37 +193,37 @@ public static int Base64UrlEncode(byte[] input, int offset, char[] output, int o
193193
#if NETCOREAPP
194194
return Base64UrlEncode(input.AsSpan(offset, count), output.AsSpan(outputOffset), omitPadding);
195195
#else
196-
// Special-case empty input.
197-
if (count == 0)
198-
{
199-
return 0;
200-
}
196+
// Special-case empty input.
197+
if (count == 0)
198+
{
199+
return 0;
200+
}
201201

202-
// Use base64url encoding with no padding characters. See RFC 4648, Sec. 5.
202+
// Use base64url encoding with no padding characters. See RFC 4648, Sec. 5.
203203

204-
// Start with default Base64 encoding.
205-
var numBase64Chars = Convert.ToBase64CharArray(input, offset, count, output, outputOffset);
204+
// Start with default Base64 encoding.
205+
var numBase64Chars = Convert.ToBase64CharArray(input, offset, count, output, outputOffset);
206206

207-
// Fix up '+' -> '-' and '/' -> '_'. Drop padding characters.
208-
for (var i = outputOffset; i - outputOffset < numBase64Chars; i++)
207+
// Fix up '+' -> '-' and '/' -> '_'. Drop padding characters.
208+
for (var i = outputOffset; i - outputOffset < numBase64Chars; i++)
209+
{
210+
var ch = output[i];
211+
if (ch == '+')
212+
{
213+
output[i] = '-';
214+
}
215+
else if (ch == '/')
209216
{
210-
var ch = output[i];
211-
if (ch == '+')
212-
{
213-
output[i] = '-';
214-
}
215-
else if (ch == '/')
216-
{
217-
output[i] = '_';
218-
}
219-
else if (omitPadding && ch == '=')
220-
{
221-
// We've reached a padding character; truncate the remainder.
222-
return i - outputOffset;
223-
}
217+
output[i] = '_';
224218
}
219+
else if (omitPadding && ch == '=')
220+
{
221+
// We've reached a padding character; truncate the remainder.
222+
return i - outputOffset;
223+
}
224+
}
225225

226-
return numBase64Chars;
226+
return numBase64Chars;
227227
#endif
228228
}
229229

‎Jint/HoistingScope.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void Visit(Node node, Node? parent)
174174
var childType = childNode.Type;
175175
if (childType == NodeType.VariableDeclaration)
176176
{
177-
var variableDeclaration = (VariableDeclaration)childNode;
177+
var variableDeclaration = (VariableDeclaration) childNode;
178178
if (variableDeclaration.Kind == VariableDeclarationKind.Var)
179179
{
180180
_variableDeclarations ??= [];
@@ -217,7 +217,7 @@ public void Visit(Node node, Node? parent)
217217
if (parent is null || (node.Type != NodeType.BlockStatement && node.Type != NodeType.SwitchCase))
218218
{
219219
_functions ??= [];
220-
_functions.Add((FunctionDeclaration)childNode);
220+
_functions.Add((FunctionDeclaration) childNode);
221221
}
222222
}
223223
else if (childType == NodeType.ClassDeclaration && parent is null or AstModule)

‎Jint/Jint.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<EnableNETAnalyzers>true</EnableNETAnalyzers>
1414
<AnalysisLevel>latest-Recommended</AnalysisLevel>
15-
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
15+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1616

1717
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1818
<PackageReadmeFile>README.md</PackageReadmeFile>

‎Jint/Native/Array/ArrayConstructor.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected override void Initialize()
4242

4343
var symbols = new SymbolDictionary(1)
4444
{
45-
[GlobalSymbolRegistry.Species] = new GetSetPropertyDescriptor(get: new ClrFunction(Engine, "get [Symbol.species]", Species, 0, PropertyFlag.Configurable), set: Undefined,PropertyFlag.Configurable),
45+
[GlobalSymbolRegistry.Species] = new GetSetPropertyDescriptor(get: new ClrFunction(Engine, "get [Symbol.species]", Species, 0, PropertyFlag.Configurable), set: Undefined, PropertyFlag.Configurable),
4646
};
4747
SetSymbols(symbols);
4848
}
@@ -202,7 +202,7 @@ private JsValue Of(JsValue thisObject, JsCallArguments arguments)
202202
// faster for real arrays
203203
for (uint k = 0; k < arguments.Length; k++)
204204
{
205-
var kValue = arguments[(int)k];
205+
var kValue = arguments[(int) k];
206206
ai.SetIndexValue(k, kValue, updateLength: k == arguments.Length - 1);
207207
}
208208
}
@@ -211,7 +211,7 @@ private JsValue Of(JsValue thisObject, JsCallArguments arguments)
211211
// slower version
212212
for (uint k = 0; k < arguments.Length; k++)
213213
{
214-
var kValue = arguments[(int)k];
214+
var kValue = arguments[(int) k];
215215
var key = JsString.Create(k);
216216
a.CreateDataPropertyOrThrow(key, kValue);
217217
}

‎Jint/Native/Array/ArrayIteratorPrototype.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal IteratorInstance Construct(ObjectInstance array, ArrayIteratorType kind
4747
}
4848

4949
IteratorInstance instance = array is JsArray jsArray
50-
? new ArrayIterator(Engine, jsArray, kind) { _prototype = this }
50+
? new ArrayIterator(Engine, jsArray, kind) { _prototype = this }
5151
: new ArrayLikeIterator(Engine, array, kind) { _prototype = this };
5252

5353
return instance;

‎Jint/Native/Array/ArrayOperations.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ public override void SetLength(ulong length)
602602

603603
public override void EnsureCapacity(ulong capacity)
604604
{
605-
_target.EnsureCapacity((int)capacity);
605+
_target.EnsureCapacity((int) capacity);
606606
}
607607

608608
public override JsValue Get(ulong index) => index < (ulong) _target.Length ? ReadValue((int) index) : JsValue.Undefined;
@@ -631,7 +631,7 @@ public override void CreateDataPropertyOrThrow(ulong index, JsValue value)
631631

632632
public override void Set(ulong index, JsValue value, bool updateLength = false, bool throwOnError = true)
633633
{
634-
_target.SetAt((int)index, value);
634+
_target.SetAt((int) index, value);
635635
}
636636

637637
public override void DeletePropertyOrThrow(ulong index)

‎Jint/Native/Array/ArrayPrototype.cs

+8-6
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected override void Initialize()
6969
["reduce"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "reduce", prototype.Reduce, 1, PropertyFlag.Configurable), PropertyFlags),
7070
["reduceRight"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "reduceRight", prototype.ReduceRight, 1, PropertyFlag.Configurable), PropertyFlags),
7171
["reverse"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "reverse", prototype.Reverse, 0, PropertyFlag.Configurable), PropertyFlags),
72-
["shift"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "shift",prototype. Shift, 0, PropertyFlag.Configurable), PropertyFlags),
72+
["shift"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "shift", prototype.Shift, 0, PropertyFlag.Configurable), PropertyFlags),
7373
["slice"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "slice", prototype.Slice, 2, PropertyFlag.Configurable), PropertyFlags),
7474
["some"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "some", prototype.Some, 1, PropertyFlag.Configurable), PropertyFlags),
7575
["sort"] = new LazyPropertyDescriptor<ArrayPrototype>(this, static prototype => new ClrFunction(prototype._engine, "sort", prototype.Sort, 1, PropertyFlag.Configurable), PropertyFlags),
@@ -1093,11 +1093,13 @@ private JsValue Sort(JsValue thisObject, JsCallArguments arguments)
10931093
ordered = items.OrderBy(x => x, comparer);
10941094
}
10951095
#else
1096-
#if NET8_0_OR_GREATER
1097-
ordered = items.Order(comparer);
1098-
#else
1099-
ordered = items.OrderBy(x => x, comparer);
1100-
#endif
1096+
1097+
#if NET8_0_OR_GREATER
1098+
ordered = items.Order(comparer);
1099+
#else
1100+
ordered = items.OrderBy(x => x, comparer);
1101+
#endif
1102+
11011103
#endif
11021104
uint j = 0;
11031105
foreach (var item in ordered)

‎Jint/Native/ArrayBuffer/ArrayBufferConstructor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected override void Initialize()
4040

4141
var symbols = new SymbolDictionary(1)
4242
{
43-
[GlobalSymbolRegistry.Species] = new GetSetPropertyDescriptor(get: new ClrFunction(Engine, "get [Symbol.species]", Species, 0, lengthFlags), set: Undefined,PropertyFlag.Configurable),
43+
[GlobalSymbolRegistry.Species] = new GetSetPropertyDescriptor(get: new ClrFunction(Engine, "get [Symbol.species]", Species, 0, lengthFlags), set: Undefined, PropertyFlag.Configurable),
4444
};
4545
SetSymbols(symbols);
4646
}

‎Jint/Native/Date/DateConstructor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static JsValue Utc(JsValue thisObject, JsCallArguments arguments)
8787
var yInteger = TypeConverter.ToInteger(y);
8888
if (!double.IsNaN(y) && 0 <= yInteger && yInteger <= 99)
8989
{
90-
y = yInteger + 1900;
90+
y = yInteger + 1900;
9191
}
9292

9393
var finalDate = DatePrototype.MakeDate(

0 commit comments

Comments
 (0)