Restructured

Author: FlorianRappl

src/AngleSharp.Js.Tests/ComponentTests.cs

@@ -1,5 +1,6 @@
 namespace AngleSharp.Js.Tests
 {
+    using AngleSharp.Scripting;
     using AngleSharp.Xml;
     using NUnit.Framework;
     using System;

src/AngleSharp.Js.Tests/FireEventTests.cs

@@ -2,6 +2,7 @@ namespace AngleSharp.Js.Tests
 {
     using AngleSharp.Dom;
     using AngleSharp.Dom.Events;
+    using AngleSharp.Scripting;
     using NUnit.Framework;
     using System.Threading.Tasks;
 

src/AngleSharp.Js.Tests/InteractionTests.cs

@@ -1,6 +1,7 @@
 namespace AngleSharp.Js.Tests
 {
     using AngleSharp.Dom;
+    using AngleSharp.Scripting;
     using Jint.Runtime;
     using NUnit.Framework;
     using System;

src/AngleSharp.Js/PrototypeCache.cs src/AngleSharp.Js/Cache/PrototypeCache.cssrc/AngleSharp.Js/PrototypeCache.cs renamed to src/AngleSharp.Js/Cache/PrototypeCache.cs

@@ -1,7 +1,8 @@
-namespace AngleSharp.Js
+namespace AngleSharp.Js.Dom
 {
     using AngleSharp.Dom;
     using AngleSharp.Html.Dom;
+    using AngleSharp.Scripting;
     using Jint.Native;
     using Jint.Native.Function;
     using System;
@@ -98,22 +99,20 @@ private void RegisterEventCallback<TElement>(String eventName)
                     var engine = _service.GetOrCreateInstance(document);
                     var jint = engine.Jint;
                     jint.EnterExecutionContext(engine.Lexicals, engine.Variables, engine.Window);
-                    var instance = jint.Function.Construct(new JsValue[] { "event", value }) as FunctionInstance;
+                    var instance = jint.Function.Construct(new JsValue[] { "event", value });
                     jint.LeaveExecutionContext();
 
-                    if (instance != null)
+                    if (instance is FunctionInstance functor)
                     {
-                        element.AddEventListener(eventName, instance.ToListener(engine));
+                        element.AddEventListener(eventName, functor.ToListener(engine));
                     }
                 }
             });
         }
 
         void IAttributeObserver.NotifyChange(IElement host, String name, String value)
         {
-            var observer = default(Action<IElement, String>);
-
-            if (_observers.TryGetValue(name, out observer))
+            if (_observers.TryGetValue(name, out var observer))
             {
                 observer.Invoke(host, value);
             }

src/AngleSharp.Js/ReferenceCache.cs src/AngleSharp.Js/Cache/ReferenceCache.cssrc/AngleSharp.Js/ReferenceCache.cs renamed to src/AngleSharp.Js/Cache/ReferenceCache.cs

@@ -2,9 +2,9 @@ namespace AngleSharp.Js
 {
     using AngleSharp.Dom;
     using AngleSharp.Dom.Events;
-    using Jint.Runtime;
     using Jint.Native;
     using Jint.Native.Function;
+    using Jint.Runtime;
     using System;
     using System.Linq;
     using System.Linq.Expressions;
@@ -17,40 +17,35 @@ static class DomDelegates
 
         public static Delegate ToDelegate(this Type type, FunctionInstance function, EngineInstance engine)
         {
-            if (type == typeof(DomEventHandler))
+            if (type != typeof(DomEventHandler))
             {
-                return function.ToListener(engine);
+                var method = typeof(DomDelegates).GetRuntimeMethod("ToCallback", ToCallbackSignature).MakeGenericMethod(type);
+                return method.Invoke(null, new Object[] { function, engine }) as Delegate;
             }
 
-            var method = typeof(DomDelegates).GetRuntimeMethod("ToCallback", ToCallbackSignature).MakeGenericMethod(type);
-            return method.Invoke(null, new Object[] { function, engine }) as Delegate;
+            return function.ToListener(engine);
         }
 
-        public static DomEventHandler ToListener(this FunctionInstance function, EngineInstance engine)
+        public static DomEventHandler ToListener(this FunctionInstance function, EngineInstance engine) => (obj, ev) =>
         {
-            return (obj, ev) =>
-            {
-                var objAsJs = obj.ToJsValue(engine);
-                var evAsJs = ev.ToJsValue(engine);
+            var objAsJs = obj.ToJsValue(engine);
+            var evAsJs = ev.ToJsValue(engine);
 
-                try
-                {
-                    function.Call(objAsJs, new[] { evAsJs });
-                }
-                catch (JavaScriptException jsException)
-                {
-                    var window = (IWindow) engine.Window.Value;
-                    window.Fire<ErrorEvent>(
-                        e => e.Init(null, jsException.LineNumber, jsException.Column, jsException));
-                }
-            };
-        }
+            try
+            {
+                function.Call(objAsJs, new[] { evAsJs });
+            }
+            catch (JavaScriptException jsException)
+            {
+                var window = (IWindow)engine.Window.Value;
+                window.Fire<ErrorEvent>(e => e.Init(null, jsException.LineNumber, jsException.Column, jsException));
+            }
+        };
 
         public static T ToCallback<T>(this FunctionInstance function, EngineInstance engine)
         {
-            var type = typeof(T);
-            var methodInfo = type.GetRuntimeMethods().First(m => m.Name == "Invoke");
-            var convert = typeof(Extensions).GetRuntimeMethod("ToJsValue", ToJsValueSignature);
+            var methodInfo = typeof(T).GetRuntimeMethods().First(m => m.Name == "Invoke");
+            var convert = typeof(EngineExtensions).GetRuntimeMethod("ToJsValue", ToJsValueSignature);
             var mps = methodInfo.GetParameters();
             var parameters = new ParameterExpression[mps.Length];