Code changes to keep NET 8 analyzers happy (#1685)

Jint/Engine.Modules.cs

@@ -49,7 +49,7 @@ internal ModuleRecord LoadModule(string? referencingModuleLocation, string speci
             return module;
         }
 
-        private CyclicModuleRecord LoadFromBuilder(string specifier, ModuleBuilder moduleBuilder, ResolvedSpecifier moduleResolution)
+        private BuilderModuleRecord LoadFromBuilder(string specifier, ModuleBuilder moduleBuilder, ResolvedSpecifier moduleResolution)
         {
             var parsedModule = moduleBuilder.Parse();
             var module = new BuilderModuleRecord(this, Realm, parsedModule, null, false);
@@ -59,7 +59,7 @@ private CyclicModuleRecord LoadFromBuilder(string specifier, ModuleBuilder modul
             return module;
         }
 
-        private CyclicModuleRecord LoaderFromModuleLoader(ResolvedSpecifier moduleResolution)
+        private SourceTextModuleRecord LoaderFromModuleLoader(ResolvedSpecifier moduleResolution)
         {
             var parsedModule = ModuleLoader.LoadModule(this, moduleResolution);
             var module = new SourceTextModuleRecord(this, Realm, parsedModule, moduleResolution.Uri?.LocalPath, false);

Jint/Extensions/Polyfills.cs

@@ -0,0 +1,12 @@
+namespace Jint;
+
+internal static class Polyfills
+{
+#if NETFRAMEWORK || NETSTANDARD2_0
+    internal static bool Contains(this string source, char c) => source.IndexOf(c) != -1;
+#endif
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+    internal static bool StartsWith(this string source, char c) => source.Length > 0 && source[0] == c;
+#endif
+}

Jint/Native/Array/ArrayConstructor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of constructor methods return JsValue
+
 using System.Collections;
 using Jint.Collections;
 using Jint.Native.Function;

Jint/Native/Array/ArrayPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using System.Linq;
 using Jint.Collections;
 using Jint.Native.Iterator;

Jint/Native/ArrayBuffer/ArrayBufferPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Native.Symbol;

Jint/Native/Boolean/BooleanPrototype.cs

@@ -52,7 +52,7 @@ private JsValue ValueOf(JsValue thisObject, JsValue[] arguments)
             return Undefined;
         }
 
-        private JsValue ToBooleanString(JsValue thisObject, JsValue[] arguments)
+        private JsString ToBooleanString(JsValue thisObject, JsValue[] arguments)
         {
             var b = ValueOf(thisObject, Arguments.Empty);
             return ((JsBoolean) b)._value ? JsString.TrueString : JsString.FalseString;

Jint/Native/DataView/DataViewPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.ArrayBuffer;
 using Jint.Native.Object;

Jint/Native/Date/DateConstructor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of constructor methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Function;
 using Jint.Native.Object;

Jint/Native/Date/DatePrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

Jint/Native/Date/MimeKit.cs

@@ -1,4 +1,5 @@
 #nullable disable
+#pragma warning disable CA1510
 
 namespace Jint.Native.Date;
 

Jint/Native/Function/FunctionConstructor.cs

@@ -67,7 +67,7 @@ internal FunctionInstance InstantiateFunctionObject(
         /// <summary>
         /// https://tc39.es/ecma262/#sec-runtime-semantics-instantiateasyncfunctionobject
         /// </summary>
-        private FunctionInstance InstantiateAsyncFunctionObject(
+        private ScriptFunctionInstance InstantiateAsyncFunctionObject(
             JintFunctionDefinition functionDeclaration,
             EnvironmentRecord env,
             PrivateEnvironmentRecord? privateEnv)
@@ -87,7 +87,7 @@ private FunctionInstance InstantiateAsyncFunctionObject(
         /// <summary>
         /// https://tc39.es/ecma262/#sec-runtime-semantics-instantiateordinaryfunctionobject
         /// </summary>
-        private FunctionInstance InstantiateOrdinaryFunctionObject(
+        private ScriptFunctionInstance InstantiateOrdinaryFunctionObject(
             JintFunctionDefinition functionDeclaration,
             EnvironmentRecord env,
             PrivateEnvironmentRecord? privateEnv)
@@ -108,7 +108,7 @@ private FunctionInstance InstantiateOrdinaryFunctionObject(
         /// <summary>
         /// https://tc39.es/ecma262/#sec-runtime-semantics-instantiategeneratorfunctionobject
         /// </summary>
-        private FunctionInstance InstantiateGeneratorFunctionObject(
+        private ScriptFunctionInstance InstantiateGeneratorFunctionObject(
             JintFunctionDefinition functionDeclaration,
             EnvironmentRecord scope,
             PrivateEnvironmentRecord? privateScope)

Jint/Native/Function/FunctionInstance.Dynamic.cs

@@ -115,7 +115,7 @@ internal FunctionInstance CreateDynamicFunction(
                         break;
                 }
 
-                if (p.IndexOf('/') != -1)
+                if (p.Contains('/'))
                 {
                     // ensure comments don't screw up things
                     functionExpression += "\n" + p + "\n";
@@ -127,7 +127,7 @@ internal FunctionInstance CreateDynamicFunction(
 
                 functionExpression += ")";
 
-                if (body.IndexOf('/') != -1)
+                if (body.Contains('/'))
                 {
                     // ensure comments don't screw up things
                     functionExpression += "{\n" + body + "\n}";

Jint/Native/Function/FunctionPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Array;
 using Jint.Native.Object;

Jint/Native/Global/GlobalObject.cs

@@ -320,7 +320,7 @@ private JsValue Encode(string uriString, string unescapedUriSet)
             for (var k = 0; k < strLen; k++)
             {
                 var c = uriString[k];
-                if (c is >= 'a' and <= 'z' || c is >= 'A' and <= 'Z' || c is >= '0' and <= '9' || unescapedUriSet.IndexOf(c) != -1)
+                if (c is >= 'a' and <= 'z' || c is >= 'A' and <= 'Z' || c is >= '0' and <= '9' || unescapedUriSet.Contains(c))
                 {
                     _stringBuilder.Append(c);
                 }
@@ -594,7 +594,7 @@ private static bool IsDigit(char c, int radix, out int result)
         /// </summary>
         public JsValue Escape(JsValue thisObject, JsValue[] arguments)
         {
-            const string WhiteList = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789@*_ + -./";
+            const string AllowList = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789@*_ + -./";
             var uriString = TypeConverter.ToString(arguments.At(0));
 
             var strLen = uriString.Length;
@@ -605,7 +605,7 @@ public JsValue Escape(JsValue thisObject, JsValue[] arguments)
             for (var k = 0; k < strLen; k++)
             {
                 var c = uriString[k];
-                if (WhiteList.IndexOf(c) != -1)
+                if (AllowList.Contains(c))
                 {
                     _stringBuilder.Append(c);
                 }

Jint/Native/Intl/IntlInstance.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Native.Symbol;

Jint/Native/Iterator/IteratorInstance.cs

@@ -27,7 +27,7 @@ public virtual void Close(CompletionType completion)
         /// <summary>
         /// https://tc39.es/ecma262/#sec-createiterresultobject
         /// </summary>
-        private ObjectInstance CreateIterResultObject(JsValue value, bool done)
+        private IteratorResult CreateIterResultObject(JsValue value, bool done)
         {
             return new IteratorResult(_engine, value, JsBoolean.Create(done));
         }

Jint/Native/Json/JsonParser.cs

@@ -506,7 +506,7 @@ public bool Match(char value)
             return _lookahead.Type == Tokens.Punctuator && value == _lookahead.FirstCharacter;
         }
 
-        private ObjectInstance ParseJsonArray(ref State state)
+        private JsArray ParseJsonArray(ref State state)
         {
             if ((++state.CurrentDepth) > _maxDepth)
             {
@@ -603,7 +603,7 @@ when its full.
             return result ?? new JsArray(_engine, elements!.ToArray());
         }
 
-        private ObjectInstance ParseJsonObject(ref State state)
+        private JsObject ParseJsonObject(ref State state)
         {
             if ((++state.CurrentDepth) > _maxDepth)
             {

Jint/Native/Map/MapConstructor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of constructor methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Function;
 using Jint.Native.Iterator;

Jint/Native/Map/MapPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Native.Symbol;

Jint/Native/Object/ObjectConstructor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of constructor methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Iterator;
 using Jint.Runtime;

Jint/Native/Object/ObjectPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Array;
 using Jint.Native.Proxy;

Jint/Native/Promise/PromiseConstructor.cs

@@ -114,7 +114,7 @@ internal JsValue Resolve(JsValue thisObject, JsValue[] arguments)
             return PromiseResolve(thisObject, x);
         }
 
-        private JsValue WithResolvers(JsValue thisObject, JsValue[] arguments)
+        private JsObject WithResolvers(JsValue thisObject, JsValue[] arguments)
         {
             var promiseCapability = NewPromiseCapability(_engine, thisObject);
             var obj = OrdinaryObjectCreate(_engine, _engine.Realm.Intrinsics.Object.PrototypeObject);

Jint/Native/Promise/PromisePrototype.cs

@@ -118,7 +118,7 @@ private JsValue Finally(JsValue thisValue, JsValue[] arguments)
         }
 
         // https://tc39.es/ecma262/#sec-thenfinallyfunctions
-        private JsValue ThenFinallyFunctions(ICallable onFinally, IConstructor ctor) =>
+        private ClrFunctionInstance ThenFinallyFunctions(ICallable onFinally, IConstructor ctor) =>
             new ClrFunctionInstance(_engine, "", (_, args) =>
             {
                 var value = args.At(0);
@@ -137,7 +137,7 @@ private JsValue ThenFinallyFunctions(ICallable onFinally, IConstructor ctor) =>
             }, 1, PropertyFlag.Configurable);
 
         // https://tc39.es/ecma262/#sec-catchfinallyfunctions
-        private JsValue CatchFinallyFunctions(ICallable onFinally, IConstructor ctor) =>
+        private ClrFunctionInstance CatchFinallyFunctions(ICallable onFinally, IConstructor ctor) =>
             new ClrFunctionInstance(_engine, "", (_, args) =>
             {
                 var reason = args.At(0);

Jint/Native/Proxy/ProxyConstructor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of constructor methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Runtime;

Jint/Native/Reflect/ReflectInstance.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Function;
 using Jint.Native.Object;

Jint/Native/RegExp/RegExpConstructor.cs

@@ -92,7 +92,7 @@ public override ObjectInstance Construct(JsValue[] arguments, JsValue newTarget)
             return RegExpInitialize(r, p, f);
         }
 
-        private ObjectInstance RegExpInitialize(JsRegExp r, JsValue pattern, JsValue flags)
+        private JsRegExp RegExpInitialize(JsRegExp r, JsValue pattern, JsValue flags)
         {
             var p = pattern.IsUndefined() ? "" : TypeConverter.ToString(pattern);
             if (string.IsNullOrEmpty(p))

Jint/Native/RegExp/RegExpPrototype.cs

@@ -1,4 +1,6 @@
-using System.Text.RegularExpressions;
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
+using System.Text.RegularExpressions;
 using Jint.Collections;
 using Jint.Native.Number;
 using Jint.Native.Object;
@@ -139,17 +141,17 @@ private JsValue Replace(JsValue thisObject, JsValue[] arguments)
             {
                 var value = TypeConverter.ToString(replaceValue);
                 replaceValue = value;
-                mayHaveNamedCaptures = value.IndexOf('$') != -1;
+                mayHaveNamedCaptures = value.Contains('$');
             }
 
             var flags = TypeConverter.ToString(rx.Get(PropertyFlags));
-            var global = flags.IndexOf('g') != -1;
+            var global = flags.Contains('g');
 
             var fullUnicode = false;
 
             if (global)
             {
-                fullUnicode = flags.IndexOf('u') != -1;
+                fullUnicode = flags.Contains('u');
                 rx.Set(JsRegExp.PropertyLastIndex, 0, true);
             }
 
@@ -527,7 +529,7 @@ private JsValue Split(JsValue thisObject, JsValue[] arguments)
             return SplitSlow(s, splitter, unicodeMatching, lengthA, lim);
         }
 
-        private JsValue SplitSlow(string s, ObjectInstance splitter, bool unicodeMatching, uint lengthA, long lim)
+        private JsArray SplitSlow(string s, ObjectInstance splitter, bool unicodeMatching, uint lengthA, long lim)
         {
             var a = _realm.Intrinsics.Array.ArrayCreate(0);
             ulong previousStringIndex = 0;
@@ -684,13 +686,13 @@ private JsValue Match(JsValue thisObject, JsValue[] arguments)
 
             var s = TypeConverter.ToString(arguments.At(0));
             var flags = TypeConverter.ToString(rx.Get(PropertyFlags));
-            var global = flags.IndexOf('g') != -1;
+            var global = flags.Contains('g');
             if (!global)
             {
                 return RegExpExec(rx, s);
             }
 
-            var fullUnicode = flags.IndexOf('u') != -1;
+            var fullUnicode = flags.Contains('u');
             rx.Set(JsRegExp.PropertyLastIndex, JsNumber.PositiveZero, true);
 
             if (!fullUnicode

Jint/Native/Set/SetPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Native.Symbol;

Jint/Native/ShadowRealm/ShadowRealm.cs

@@ -210,7 +210,7 @@ private static JsValue GetWrappedValue(Realm throwerRealm, Realm callerRealm, Js
     /// <summary>
     /// https://tc39.es/proposal-shadowrealm/#sec-wrappedfunctioncreate
     /// </summary>
-    private static JsValue WrappedFunctionCreate(Realm throwerRealm, Realm callerRealm, ObjectInstance target)
+    private static WrappedFunction WrappedFunctionCreate(Realm throwerRealm, Realm callerRealm, ObjectInstance target)
     {
         var wrapped = new WrappedFunction(callerRealm.GlobalEnv._engine, callerRealm, target);
         try

Jint/Native/String/StringConstructor.cs

@@ -1,4 +1,6 @@
-using Jint.Collections;
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
+using Jint.Collections;
 using Jint.Native.Array;
 using Jint.Native.Function;
 using Jint.Native.Object;

Jint/Native/String/StringPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

Jint/Native/Symbol/SymbolConstructor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of constructor methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Function;
 using Jint.Native.Object;

Jint/Native/Symbol/SymbolPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Runtime;

Jint/Native/TypedArray/IntrinsicTypedArrayConstructor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of constructor methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Native.Symbol;

Jint/Native/TypedArray/IntrinsicTypedArrayPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using System.Linq;
 using Jint.Collections;
 using Jint.Native.Array;

Jint/Native/WeakMap/WeakMapPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Native.Symbol;

Jint/Native/WeakSet/WeakSetPrototype.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance -- most of prototype methods return JsValue
+
 using Jint.Collections;
 using Jint.Native.Object;
 using Jint.Native.Symbol;

Jint/Runtime/CallStack/JintCallStack.cs

@@ -63,8 +63,10 @@ public int Push(FunctionInstance functionInstance, JintExpression? expression, i
             if (_statistics is not null)
             {
 #pragma warning disable CA1854
+#pragma warning disable CA1864
                 if (_statistics.ContainsKey(item))
 #pragma warning restore CA1854
+#pragma warning restore CA1864
                 {
                     return ++_statistics[item];
                 }