In JavaScriptEngineSwitcher.Node was made a small refactoring

Author: Taritsyn

src/JavaScriptEngineSwitcher.Node/Helpers/NodeJsErrorHelpers.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 
@@ -16,6 +17,11 @@ internal static class NodeJsErrorHelpers
 	{
 		#region Error location
 
+		/// <summary>
+		/// Name of file, which identifies the generated function call
+		/// </summary>
+		private const string GeneratedFunctionCallDocumentName = "JavaScriptEngineSwitcher.Node.Resources.generated-function-call.js";
+
 		/// <summary>
 		/// Pattern for working with document names with coordinates
 		/// </summary>
@@ -127,6 +133,48 @@ public static int GetColumnCountFromLine(string textLine)
 			return columnCount;
 		}
 
+		/// <summary>
+		/// Filters a error location items
+		/// </summary>
+		/// <param name="errorLocationItems">An array of <see cref="ErrorLocationItem"/> instances</param>
+		public static ErrorLocationItem[] FilterErrorLocationItems(ErrorLocationItem[] errorLocationItems)
+		{
+			int itemCount = errorLocationItems.Length;
+			if (itemCount == 0)
+			{
+				return errorLocationItems;
+			}
+
+			int itemIndex = 0;
+
+			while (itemIndex < itemCount)
+			{
+				ErrorLocationItem item = errorLocationItems[itemIndex];
+				string documentName = item.DocumentName;
+				string functionName = item.FunctionName;
+
+				if (documentName == "node:vm"
+					|| documentName == "vm.js"
+					|| documentName == GeneratedFunctionCallDocumentName
+					|| (documentName == "anonymous" && functionName == "callFunction"))
+				{
+					break;
+				}
+
+				itemIndex++;
+			}
+
+			if (itemIndex == itemCount)
+			{
+				return errorLocationItems;
+			}
+
+			var processedErrorLocationItems = new ErrorLocationItem[itemIndex];
+			Array.Copy(errorLocationItems, processedErrorLocationItems, itemIndex);
+
+			return processedErrorLocationItems;
+		}
+
 		#endregion
 	}
 }

src/JavaScriptEngineSwitcher.Node/NodeJsEngine.cs

@@ -34,11 +34,6 @@ public sealed class NodeJsEngine : JsEngineBase
 		/// </summary>
 		private const string ENGINE_HELPERS_RESOURCE_NAME = "JavaScriptEngineSwitcher.Node.Resources.engine-helpers.js";
 
-		/// <summary>
-		/// Name of file, which identifies the generated function call
-		/// </summary>
-		private const string GENERATED_FUNCTION_CALL_FILE_NAME = "JavaScriptEngineSwitcher.Node.Resources.generated-function-call.js";
-
 		/// <summary>
 		/// Name of JS engine
 		/// </summary>
@@ -305,7 +300,7 @@ private WrapperException WrapInvocationException(InvocationException originalExc
 					{
 						string errorLocation = message.Substring(messageWithTypeLength);
 						errorLocationItems = NodeJsErrorHelpers.ParseErrorLocation(errorLocation);
-						errorLocationItems = FilterErrorLocationItems(errorLocationItems);
+						errorLocationItems = NodeJsErrorHelpers.FilterErrorLocationItems(errorLocationItems);
 
 						if (errorLocationItems.Length > 0)
 						{
@@ -350,41 +345,6 @@ private WrapperException WrapInvocationException(InvocationException originalExc
 			return wrapperException;
 		}
 
-		/// <summary>
-		/// Filters a error location items
-		/// </summary>
-		/// <param name="errorLocationItems">An array of <see cref="ErrorLocationItem"/> instances</param>
-		private static ErrorLocationItem[] FilterErrorLocationItems(ErrorLocationItem[] errorLocationItems)
-		{
-			if (errorLocationItems.Length == 0)
-			{
-				return errorLocationItems;
-			}
-
-			int excessErrorLocationItemIndex = 0;
-
-			foreach (ErrorLocationItem item in errorLocationItems)
-			{
-				string documentName = item.DocumentName;
-				string functionName = item.FunctionName;
-
-				if (documentName == "node:vm"
-					|| documentName == "vm.js"
-					|| documentName == GENERATED_FUNCTION_CALL_FILE_NAME
-					|| (documentName == "anonymous" && functionName == "callFunction"))
-				{
-					break;
-				}
-
-				excessErrorLocationItemIndex++;
-			}
-
-			var processedErrorLocationItems = new ErrorLocationItem[excessErrorLocationItemIndex];
-			Array.Copy(errorLocationItems, processedErrorLocationItems, excessErrorLocationItemIndex);
-
-			return processedErrorLocationItems;
-		}
-
 		#endregion
 
 		#endregion