Fixed a minor errors

Author: Taritsyn

NuGet/MsieJavaScriptEngine.nuspec

@@ -12,7 +12,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee), Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host) and jsrt-dotnet (http://github.com/robpaveza/jsrt-dotnet).</description>
 		<summary>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
-		<releaseNotes>In JsRT modes during calling of the `CollectGarbage` method is no longer performed blocking.</releaseNotes>
+		<releaseNotes>Fixed a minor errors.</releaseNotes>
 		<copyright>Copyright (c) 2012-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>

NuGet/readme.txt

@@ -21,8 +21,7 @@
    =============
    RELEASE NOTES
    =============
-   In JsRT modes during calling of the `CollectGarbage` method is no longer
-   performed blocking.
+   Fixed a minor errors.
 
    ============
    PROJECT SITE

src/MsieJavaScriptEngine.Net4/MsieJavaScriptEngine.Net40.csproj

@@ -54,6 +54,9 @@
     <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptJsEngineBase.ScriptSite.cs">
       <Link>ActiveScript\ActiveScriptJsEngineBase.ScriptSite.cs</Link>
     </Compile>
+    <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptJsErrorHelpers.cs">
+      <Link>ActiveScript\ActiveScriptJsErrorHelpers.cs</Link>
+    </Compile>
     <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptWrapper32.cs">
       <Link>ActiveScript\ActiveScriptWrapper32.cs</Link>
     </Compile>
@@ -498,6 +501,9 @@
     <Compile Include="..\MsieJavaScriptEngine\Utilities\StringBuilderExtensions.cs">
       <Link>Utilities\StringBuilderExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\MsieJavaScriptEngine\Utilities\StringExtensions.cs">
+      <Link>Utilities\StringExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\MsieJavaScriptEngine\Utilities\TypeConverter.cs">
       <Link>Utilities\TypeConverter.cs</Link>
     </Compile>

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.ScriptSite.cs

@@ -52,7 +52,7 @@ private ActiveScriptException CreateActiveScriptException(IActiveScriptError err
 
 				int hResult = exceptionInfo.scode;
 				int errorCode = HResultHelpers.GetCode(hResult);
-				bool isSyntaxError = IsSyntaxError(hResult);
+				bool isSyntaxError = ActiveScriptJsErrorHelpers.IsSyntaxError(hResult);
 				string category = exceptionInfo.bstrSource;
 				string description = exceptionInfo.bstrDescription;
 				string helpLink = string.Empty;
@@ -97,24 +97,6 @@ private ActiveScriptException CreateActiveScriptException(IActiveScriptError err
 				return activeScriptException;
 			}
 
-			/// <summary>
-			/// Checks whether the specified HRESULT value is syntax error
-			/// </summary>
-			/// <param name="hResult">The HRESULT value</param>
-			/// <returns>Result of check (true - is syntax error; false - is not syntax error)</returns>
-			private static bool IsSyntaxError(int hResult)
-			{
-				bool isSyntaxError = false;
-
-				if (HResultHelpers.GetFacility(hResult) == HResultHelpers.FACILITY_CONTROL)
-				{
-					int errorCode = HResultHelpers.GetCode(hResult);
-					isSyntaxError = errorCode >= 1002 && errorCode <= 1035;
-				}
-
-				return isSyntaxError;
-			}
-
 			/// <summary>
 			/// Gets a error details
 			/// </summary>
@@ -241,10 +223,8 @@ private bool TryWriteStackTrace(StringBuilder buffer)
 						string description;
 						stackFrame.GetDescriptionString(true, out description);
 
-						if (string.Equals(description, "JScript global code", StringComparison.Ordinal))
-						{
-							description = "Global code";
-						}
+						description = ActiveScriptJsErrorHelpers.ShortenErrorItemName(
+							description, "JScript ");
 
 						IDebugCodeContext codeContext;
 						stackFrame.GetCodeContext(out codeContext);

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -19,16 +19,6 @@ namespace MsieJavaScriptEngine.ActiveScript
 	/// </summary>
 	internal abstract partial class ActiveScriptJsEngineBase : InnerJsEngineBase
 	{
-		/// <summary>
-		/// Name of resource, which contains a ECMAScript 5 Polyfill
-		/// </summary>
-		private const string ES5_POLYFILL_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.ES5.min.js";
-
-		/// <summary>
-		/// Name of resource, which contains a JSON2 library
-		/// </summary>
-		private const string JSON2_LIBRARY_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.json2.min.js";
-
 		/// <summary>
 		/// Instance of Active Script wrapper
 		/// </summary>
@@ -96,10 +86,7 @@ internal abstract partial class ActiveScriptJsEngineBase : InnerJsEngineBase
 		/// </summary>
 		/// <param name="engineMode">JS engine mode</param>
 		/// <param name="enableDebugging">Flag for whether to enable script debugging features</param>
-		/// <param name="useEcmaScript5Polyfill">Flag for whether to use the ECMAScript 5 Polyfill</param>
-		/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
-		protected ActiveScriptJsEngineBase(JsEngineMode engineMode, bool enableDebugging,
-			bool useEcmaScript5Polyfill, bool useJson2Library)
+		protected ActiveScriptJsEngineBase(JsEngineMode engineMode, bool enableDebugging)
 			: base(engineMode)
 		{
 			string lowerIeVersion;
@@ -119,36 +106,41 @@ protected ActiveScriptJsEngineBase(JsEngineMode engineMode, bool enableDebugging
 				throw new NotSupportedException();
 			}
 
-			_dispatcher.Invoke(() =>
+			try
 			{
-				try
+				_dispatcher.Invoke(() =>
 				{
 					_activeScriptWrapper = Utils.Is64BitProcess() ?
 						(IActiveScriptWrapper)new ActiveScriptWrapper64(engineMode, enableDebugging)
 						:
 						new ActiveScriptWrapper32(engineMode, enableDebugging)
 						;
-				}
-				catch (Exception e)
-				{
-					throw new JsEngineLoadException(
-						string.Format(CommonStrings.Runtime_IeJsEngineNotLoaded,
-							_engineModeName, lowerIeVersion, e.Message), _engineModeName);
-				}
-
-				if (enableDebugging)
-				{
-					StartDebugging();
-				}
 
-				_activeScriptWrapper.SetScriptSite(new ScriptSite(this));
-				_activeScriptWrapper.InitNew();
-				_activeScriptWrapper.SetScriptState(ScriptState.Started);
+					if (enableDebugging)
+					{
+						StartDebugging();
+					}
 
-				InitScriptDispatch();
-			});
+					_activeScriptWrapper.SetScriptSite(new ScriptSite(this));
+					_activeScriptWrapper.InitNew();
+					_activeScriptWrapper.SetScriptState(ScriptState.Started);
 
-			LoadResources(useEcmaScript5Polyfill, useJson2Library);
+					_dispatch = WrapScriptDispatch(_activeScriptWrapper.GetScriptDispatch());
+				});
+			}
+			catch (Exception e)
+			{
+				throw new JsEngineLoadException(
+					string.Format(CommonStrings.Runtime_IeJsEngineNotLoaded,
+						_engineModeName, lowerIeVersion, e.Message), _engineModeName);
+			}
+			finally
+			{
+				if (_dispatch == null)
+				{
+					Dispose();
+				}
+			}
 		}
 
 		/// <summary>
@@ -276,24 +268,7 @@ private JsRuntimeException ConvertActiveScriptExceptionToJsRuntimeException(
 		/// <returns>Short name of error category</returns>
 		private string ShortenErrorCategoryName(string categoryName)
 		{
-			if (categoryName == null)
-			{
-				throw new ArgumentNullException("categoryName");
-			}
-
-			string shortCategoryName = categoryName;
-			if (categoryName.StartsWith(_errorCategoryNamePrefix, StringComparison.Ordinal))
-			{
-				shortCategoryName = categoryName.Substring(_errorCategoryNamePrefix.Length);
-				if (shortCategoryName.Length > 0)
-				{
-					char[] chars = shortCategoryName.ToCharArray();
-					chars[0] = char.ToUpperInvariant(chars[0]);
-					shortCategoryName = new string(chars);
-				}
-			}
-
-			return shortCategoryName;
+			return ActiveScriptJsErrorHelpers.ShortenErrorItemName(categoryName, _errorCategoryNamePrefix);
 		}
 
 		/// <summary>
@@ -319,27 +294,21 @@ private void StartDebugging()
 			}
 		}
 
-		/// <summary>
-		/// Initializes a script dispatch
-		/// </summary>
-		private void InitScriptDispatch()
+		private static IExpando WrapScriptDispatch(object dispatch)
 		{
-			IExpando dispatch = null;
-			object obj;
-
-			_activeScriptWrapper.GetScriptDispatch(null, out obj);
-
-			if (obj != null && obj.GetType().IsCOMObject)
+			IExpando wrappedDispatch = null;
+			if (dispatch != null && dispatch.GetType().IsCOMObject)
 			{
-				dispatch = obj as IExpando;
+				wrappedDispatch = dispatch as IExpando;
 			}
 
-			if (dispatch == null)
+			if (wrappedDispatch == null)
 			{
-				throw new InvalidOperationException(NetFrameworkStrings.Runtime_ActiveScriptDispatcherNotInitialized);
+				throw new InvalidOperationException(
+					NetFrameworkStrings.Runtime_ActiveScriptDispatcherNotInitialized);
 			}
 
-			_dispatch = dispatch;
+			return wrappedDispatch;
 		}
 
 		/// <summary>
@@ -536,55 +505,6 @@ private void InnerCollectGarbage(ScriptGCType type)
 			_activeScriptWrapper.CollectGarbage(type);
 		}
 
-		/// <summary>
-		/// Loads a resources
-		/// </summary>
-		/// <param name="useEcmaScript5Polyfill">Flag for whether to use the ECMAScript 5 Polyfill</param>
-		/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
-		private void LoadResources(bool useEcmaScript5Polyfill, bool useJson2Library)
-		{
-			Assembly assembly = GetType().GetTypeInfo().Assembly;
-
-			if (useEcmaScript5Polyfill)
-			{
-				ExecuteResource(ES5_POLYFILL_RESOURCE_NAME, assembly);
-			}
-
-			if (useJson2Library)
-			{
-				ExecuteResource(JSON2_LIBRARY_RESOURCE_NAME, assembly);
-			}
-		}
-
-		/// <summary>
-		/// Executes a code from embedded JS-resource
-		/// </summary>
-		/// <param name="resourceName">The case-sensitive resource name</param>
-		/// <param name="assembly">The assembly, which contains the embedded resource</param>
-		private void ExecuteResource(string resourceName, Assembly assembly)
-		{
-			if (resourceName == null)
-			{
-				throw new ArgumentNullException(
-					"resourceName", string.Format(CommonStrings.Common_ArgumentIsNull, "resourceName"));
-			}
-
-			if (assembly == null)
-			{
-				throw new ArgumentNullException(
-					"assembly", string.Format(CommonStrings.Common_ArgumentIsNull, "assembly"));
-			}
-
-			if (string.IsNullOrWhiteSpace(resourceName))
-			{
-				throw new ArgumentException(
-					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
-			}
-
-			string code = Utils.GetResourceAsString(resourceName, assembly);
-			Execute(code, resourceName);
-		}
-
 		#region IInnerJsEngine implementation
 
 		public override string Mode

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsErrorHelpers.cs

@@ -0,0 +1,69 @@
+#if !NETSTANDARD1_3
+using System;
+
+using MsieJavaScriptEngine.Utilities;
+
+using HResultHelpers = MsieJavaScriptEngine.Helpers.ComHelpers.HResult;
+
+namespace MsieJavaScriptEngine.ActiveScript
+{
+	/// <summary>
+	/// Active Script error helpers
+	/// </summary>
+	internal static class ActiveScriptJsErrorHelpers
+	{
+		/// <summary>
+		/// Checks whether the specified HRESULT value is syntax error
+		/// </summary>
+		/// <param name="hResult">The HRESULT value</param>
+		/// <returns>Result of check (true - is syntax error; false - is not syntax error)</returns>
+		public static bool IsSyntaxError(int hResult)
+		{
+			bool isSyntaxError = false;
+
+			if (HResultHelpers.GetFacility(hResult) == HResultHelpers.FACILITY_CONTROL)
+			{
+				int errorCode = HResultHelpers.GetCode(hResult);
+				isSyntaxError = errorCode >= 1002 && errorCode <= 1035;
+			}
+
+			return isSyntaxError;
+		}
+
+		/// <summary>
+		/// Shortens a name of error item
+		/// </summary>
+		/// <param name="itemName">Name of error item</param>
+		/// <param name="prefix">Prefix</param>
+		/// <returns>Short name of error item</returns>
+		public static string ShortenErrorItemName(string itemName, string prefix)
+		{
+			if (itemName == null)
+			{
+				throw new ArgumentNullException("itemName");
+			}
+
+			if (prefix == null)
+			{
+				throw new ArgumentNullException("prefix");
+			}
+
+			int itemNameLength = itemName.Length;
+			if (itemNameLength == 0 || prefix.Length == 0)
+			{
+				return itemName;
+			}
+
+			string shortItemName = itemName.TrimStart(prefix);
+			int shortItemNameLength = shortItemName.Length;
+
+			if (shortItemNameLength > 0 && shortItemNameLength < itemNameLength)
+			{
+				shortItemName = shortItemName.CapitalizeFirstLetter();
+			}
+
+			return shortItemName;
+		}
+	}
+}
+#endif