In ActiveScript modes now are uses the short names of error categories

Taritsyn · Taritsyn · commit 81a6ca82efbe · 2017-08-10T17:45:49.000+03:00
diff --git a/NuGet/MsieJavaScriptEngine.nuspec b/NuGet/MsieJavaScriptEngine.nuspec
@@ -12,8 +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>1. Now during the rethrowing of exceptions are preserved the full call stack trace;
-2. Reduced a number of delegate-wrappers.</releaseNotes>
+		<releaseNotes>In ActiveScript modes now are uses the short names of error categories.</releaseNotes>
 		<copyright>Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>
diff --git a/NuGet/readme.txt b/NuGet/readme.txt
@@ -21,9 +21,7 @@
    =============
    RELEASE NOTES
    =============
-   1. Now during the rethrowing of exceptions are preserved the full call stack
-      trace;
-   2. Reduced a number of delegate-wrappers.
+   In ActiveScript modes now are uses the short names of error categories.
 
    ============
    PROJECT SITE
diff --git a/src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.ScriptSite.cs b/src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.ScriptSite.cs
@@ -44,7 +44,8 @@ private string GetErrorDetails(IActiveScriptError error)
 				EXCEPINFO excepInfo;
 				error.GetExceptionInfo(out excepInfo);
 
-				string errorDetails = excepInfo.bstrDescription;
+				string errorDetails = string.Format("{0}: {1}",
+					_jsEngine.ShortenErrorCategoryName(excepInfo.bstrSource), excepInfo.bstrDescription);
 				if (_jsEngine._processDebugManagerWrapper != null)
 				{
 					string errorLocation = GetErrorLocation(error);
diff --git a/src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs b/src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs
@@ -85,6 +85,11 @@ internal abstract partial class ActiveScriptJsEngineBase : InnerJsEngineBase
 		/// </summary>
 		private uint _nextSourceContext = 1;
 
+		/// <summary>
+		/// Prefix of error category name
+		/// </summary>
+		private string _errorCategoryNamePrefix;
+
 
 		/// <summary>
 		/// Constructs an instance of the Active Script engine
@@ -106,12 +111,14 @@ protected ActiveScriptJsEngineBase(JsEngineMode engineMode, bool enableDebugging
 				clsid = ClassId.Chakra;
 				lowerIeVersion = "9";
 				languageVersion = ScriptLanguageVersion.EcmaScript5;
+				_errorCategoryNamePrefix = "JavaScript ";
 			}
 			else if (_engineMode == JsEngineMode.Classic)
 			{
 				clsid = ClassId.Classic;
 				lowerIeVersion = "6";
 				languageVersion = ScriptLanguageVersion.None;
+				_errorCategoryNamePrefix = "Microsoft JScript ";
 			}
 			else
 			{
@@ -254,7 +261,7 @@ private JsRuntimeException ConvertActiveScriptExceptionToJsRuntimeException(
 				activeScriptException)
 			{
 				ErrorCode = activeScriptException.ErrorCode.ToString(CultureInfo.InvariantCulture),
-				Category = activeScriptException.Subcategory,
+				Category = ShortenErrorCategoryName(activeScriptException.Subcategory),
 				LineNumber = (int)activeScriptException.LineNumber,
 				ColumnNumber = activeScriptException.ColumnNumber,
 				SourceFragment = activeScriptException.SourceError,
@@ -264,6 +271,33 @@ private JsRuntimeException ConvertActiveScriptExceptionToJsRuntimeException(
 			return jsEngineException;
 		}
 
+		/// <summary>
+		/// Shortens a name of error category
+		/// </summary>
+		/// <param name="categoryName">Name of error category</param>
+		/// <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;
+		}
+
 		/// <summary>
 		/// Starts debugging
 		/// </summary>

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ private string GetErrorDetails(IActiveScriptError error)`
`44`	`44`	`EXCEPINFO excepInfo;`
`45`	`45`	`error.GetExceptionInfo(out excepInfo);`
`46`	`46`
`47`		`- string errorDetails = excepInfo.bstrDescription;`
	`47`	`+ string errorDetails = string.Format("{0}: {1}",`
	`48`	`+ _jsEngine.ShortenErrorCategoryName(excepInfo.bstrSource), excepInfo.bstrDescription);`
`48`	`49`	`if (_jsEngine._processDebugManagerWrapper != null)`
`49`	`50`	`{`
`50`	`51`	`string errorLocation = GetErrorLocation(error);`