In JavaScriptEngineSwitcher.ChakraCore the compilation error messages now contains a information about the error location

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec

@@ -20,7 +20,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</description>
 		<summary>JavaScriptEngineSwitcher.ChakraCore contains adapter `ChakraCoreJsEngine` (wrapper for the ChakraCore).</summary>
-		<releaseNotes>ChakraCore was updated to version 1.7.0.</releaseNotes>
+		<releaseNotes>Compilation error messages now contains a information about the error location.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>

NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,7 +30,7 @@
    =============
    RELEASE NOTES
    =============
-   ChakraCore was updated to version 1.7.0.
+   Compilation error messages now contains a information about the error location.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Text;
 
 using JavaScriptEngineSwitcher.Core;
 using JavaScriptEngineSwitcher.Core.Utilities;
@@ -844,6 +845,7 @@ private static HostException ConvertScriptExceptionToHostException(ScriptExcepti
 			}
 			else
 			{
+				string documentName = string.Empty;
 				int lineNumber = 0;
 				int columnNumber = 0;
 				string sourceFragment = string.Empty;
@@ -858,20 +860,11 @@ private static HostException ConvertScriptExceptionToHostException(ScriptExcepti
 					{
 						JsValue errorValue = metadataValue.GetProperty("exception");
 
-						JsPropertyId stackPropertyId = JsPropertyId.FromString("stack");
-						if (errorValue.HasProperty(stackPropertyId))
+						JsPropertyId urlPropertyId = JsPropertyId.FromString("url");
+						if (metadataValue.HasProperty(urlPropertyId))
 						{
-							JsValue stackPropertyValue = errorValue.GetProperty(stackPropertyId);
-							message = stackPropertyValue.ConvertToString().ToString();
-						}
-						else
-						{
-							JsValue messagePropertyValue = errorValue.GetProperty("message");
-							string scriptMessage = messagePropertyValue.ConvertToString().ToString();
-							if (!string.IsNullOrWhiteSpace(scriptMessage))
-							{
-								message = string.Format("{0}: {1}", message.TrimEnd('.'), scriptMessage);
-							}
+							JsValue urlPropertyValue = metadataValue.GetProperty(urlPropertyId);
+							documentName = urlPropertyValue.ConvertToString().ToString();
 						}
 
 						JsPropertyId linePropertyId = JsPropertyId.FromString("line");
@@ -894,6 +887,20 @@ private static HostException ConvertScriptExceptionToHostException(ScriptExcepti
 							JsValue sourcePropertyValue = metadataValue.GetProperty(sourcePropertyId);
 							sourceFragment = sourcePropertyValue.ConvertToString().ToString();
 						}
+
+						JsPropertyId stackPropertyId = JsPropertyId.FromString("stack");
+						if (errorValue.HasProperty(stackPropertyId))
+						{
+							JsValue stackPropertyValue = errorValue.GetProperty(stackPropertyId);
+							message = stackPropertyValue.ConvertToString().ToString();
+						}
+						else
+						{
+							JsValue messagePropertyValue = errorValue.GetProperty("message");
+							string scriptMessage = messagePropertyValue.ConvertToString().ToString();
+							message = GenerateErrorMessageWithLocation(message.TrimEnd('.'), scriptMessage,
+								documentName, lineNumber, columnNumber);
+						}
 					}
 				}
 				else if (scriptException is JsUsageException)
@@ -923,6 +930,44 @@ private static HostException ConvertScriptExceptionToHostException(ScriptExcepti
 			return hostException;
 		}
 
+		/// <summary>
+		/// Generates a error message with location
+		/// </summary>
+		/// <param name="category">Error category</param>
+		/// <param name="message">Error message</param>
+		/// <param name="documentName">Document name</param>
+		/// <param name="lineNumber">Line number</param>
+		/// <param name="columnNumber">Column number</param>
+		/// <returns>Error message with location</returns>
+		private static string GenerateErrorMessageWithLocation(string category, string message,
+			string documentName, int lineNumber, int columnNumber)
+		{
+			var messageBuilder = new StringBuilder();
+			if (!string.IsNullOrWhiteSpace(category))
+			{
+				messageBuilder.AppendFormat("{0}: ", category);
+			}
+			messageBuilder.Append(message);
+			if (!string.IsNullOrWhiteSpace(documentName))
+			{
+				messageBuilder.AppendLine();
+				messageBuilder.AppendFormat("   at {0}", documentName);
+				if (lineNumber > 0)
+				{
+					messageBuilder.AppendFormat(":{0}", lineNumber);
+					if (columnNumber > 0)
+					{
+						messageBuilder.AppendFormat(":{0}", columnNumber);
+					}
+				}
+			}
+
+			string errorMessage = messageBuilder.ToString();
+			messageBuilder.Clear();
+
+			return errorMessage;
+		}
+
 		#endregion
 
 		#region JsEngineBase overrides