Now during debugging in ActiveScript modes the script error contains a error location

Author: Taritsyn

NuGet/MsieJavaScriptEngine.nuspec

@@ -15,7 +15,8 @@
 		<releaseNotes>1. Added support of .NET Core 1.0.4;
 2. In JsRT modes now script error contains a full stack trace;
 3. In `MsieJsEngine` class was added overloaded versions of the `Evaluate`, `Evaluate&lt;T&gt;` and `Execute` methods, which take the document name as second parameter;
-4. Now all modes support the possibility to debug in Visual Studio by adding the `debugger` statement to script code.</releaseNotes>
+4. Now all modes support the possibility to debug in Visual Studio by adding the `debugger` statement to script code;
+5. Now during debugging in ActiveScript modes the script error contains a error location.</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>

NuGet/readme.txt

@@ -27,7 +27,9 @@
       `Evaluate<T>` and `Execute` methods, which take the document name as second
       parameter;
    4. Now all modes support the possibility to debug in Visual Studio by adding the
-      `debugger` statement to script code.
+      `debugger` statement to script code;
+   5. Now during debugging in ActiveScript modes the script error contains a error
+      location.
 
    ============
    PROJECT SITE

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptException.cs

@@ -149,9 +149,8 @@ private ActiveScriptException(SerializationInfo info, StreamingContext context)
 		}
 
 
-		internal static ActiveScriptException Create(IActiveScriptError error)
+		internal static ActiveScriptException Create(string message, IActiveScriptError error)
 		{
-			string message = string.Empty;
 			int errorCode = 0;
 			short errorWCode = 0;
 			uint sourceContext = 0;
@@ -186,7 +185,6 @@ internal static ActiveScriptException Create(IActiveScriptError error)
 				EXCEPINFO excepInfo;
 				error.GetExceptionInfo(out excepInfo);
 
-				message = excepInfo.bstrDescription;
 				subcategory = excepInfo.bstrSource;
 				errorCode = excepInfo.scode;
 				errorWCode = excepInfo.wCode;

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.ScriptSite.cs

@@ -34,6 +34,56 @@ public ScriptSite(ActiveScriptJsEngineBase jsEngine)
 				_jsEngine = jsEngine;
 			}
 
+			/// <summary>
+			/// Gets a error details
+			/// </summary>
+			/// <param name="error">Instance of Active Script error</param>
+			/// <returns>Error details</returns>
+			private string GetErrorDetails(IActiveScriptError error)
+			{
+				EXCEPINFO excepInfo;
+				error.GetExceptionInfo(out excepInfo);
+
+				string errorDetails = excepInfo.bstrDescription;
+				if (_jsEngine._processDebugManagerWrapper != null)
+				{
+					string errorLocation = GetErrorLocation(error);
+					if (!string.IsNullOrWhiteSpace(errorLocation))
+					{
+						errorDetails += Environment.NewLine + errorLocation;
+					}
+				}
+
+				return errorDetails;
+			}
+
+			/// <summary>
+			/// Gets a error location
+			/// </summary>
+			/// <param name="error">Instance of Active Script error</param>
+			/// <returns>Error location</returns>
+			private string GetErrorLocation(IActiveScriptError error)
+			{
+				string errorLocation = string.Empty;
+				uint sourceContext;
+				uint lineNumber;
+				int columnNumber;
+
+				error.GetSourcePosition(out sourceContext, out lineNumber, out columnNumber);
+				++lineNumber;
+				++columnNumber;
+
+				DebugDocument document;
+				if (_jsEngine._debugDocuments.TryGetValue(new UIntPtr(sourceContext), out document))
+				{
+					string documentName;
+					document.GetName(DocumentNameType.Title, out documentName);
+
+					errorLocation = string.Format("   at ({0}:{1}:{2})", documentName, lineNumber, columnNumber);
+				}
+
+				return errorLocation;
+			}
 
 			#region IActiveScriptSite implementation
 
@@ -75,7 +125,7 @@ public void OnStateChange(ScriptState state)
 
 			public void OnScriptError(IActiveScriptError error)
 			{
-				_jsEngine._lastException = ActiveScriptException.Create(error);
+				_jsEngine._lastException = ActiveScriptException.Create(GetErrorDetails(error), error);
 			}
 
 			public void OnEnterScript()
@@ -96,9 +146,10 @@ public void GetRootApplicationNode(out IDebugApplicationNode node)
 			public void OnScriptErrorDebug(IActiveScriptErrorDebug errorDebug, out bool enterDebugger,
 				out bool callOnScriptErrorWhenContinuing)
 			{
-				if (errorDebug != null)
+				var error = errorDebug as IActiveScriptError;
+				if (error != null)
 				{
-					_jsEngine._lastException = ActiveScriptException.Create((IActiveScriptError)errorDebug);
+					_jsEngine._lastException = ActiveScriptException.Create(GetErrorDetails(error), error);
 				}
 
 				enterDebugger = true;

src/MsieJavaScriptEngine/ActiveScript/Debugging/DebugDocument.cs

@@ -203,7 +203,7 @@ public void GetPositionOfLine(uint lineNumber, out uint position)
 			position = 0;
 			int lineCount = _lines.Count;
 
-			if (lineNumber == 0 || lineNumber >= lineCount)
+			if (lineNumber == 0 || lineNumber > lineCount)
 			{
 				throw new ArgumentOutOfRangeException("lineNumber");
 			}

src/MsieJavaScriptEngine/MsieJsEngine.cs

@@ -349,6 +349,12 @@ public void ExecuteFile(string path, Encoding encoding = null)
 		{
 			VerifyNotDisposed();
 
+			if (path == null)
+			{
+				throw new ArgumentNullException(
+					"path", string.Format(CommonStrings.Common_ArgumentIsNull, "path"));
+			}
+
 			if (string.IsNullOrWhiteSpace(path))
 			{
 				throw new ArgumentException(
@@ -392,7 +398,11 @@ public void ExecuteResource(string resourceName, Type type)
 					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
 			}
 
-			string code = Utils.GetResourceAsString(resourceName, type);
+			Assembly assembly = type.GetTypeInfo().Assembly;
+			string nameSpace = type.Namespace;
+			string resourceFullName = nameSpace != null ? nameSpace + "." + resourceName : resourceName;
+
+			string code = Utils.GetResourceAsString(resourceFullName, assembly);
 			Execute(code, resourceName);
 		}
 

src/MsieJavaScriptEngine/Utilities/UniqueDocumentNameManager.cs

@@ -1,6 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 
+using MsieJavaScriptEngine.Resources;
+
 namespace MsieJavaScriptEngine.Utilities
 {
 	/// <summary>
@@ -30,6 +33,18 @@ internal sealed class UniqueDocumentNameManager
 		/// <param name="defaultName">Default document name</param>
 		public UniqueDocumentNameManager(string defaultName)
 		{
+			if (defaultName == null)
+			{
+				throw new ArgumentNullException(
+					"defaultName", string.Format(CommonStrings.Common_ArgumentIsNull, "defaultName"));
+			}
+
+			if (string.IsNullOrWhiteSpace(defaultName))
+			{
+				throw new ArgumentException(
+					string.Format(CommonStrings.Common_ArgumentIsEmpty, "defaultName"), "defaultName");
+			}
+
 			_defaultName = defaultName;
 		}