GetSourceFragmentFromCode and GetSourceFragmentFromLine methods of JsErrorHelpers class were replaced by the GetTextFragment and GetTextFragmentFromLine methods of TextHelpers class

Author: Taritsyn

build/nuget-metadata.props

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<Title>$(Product)</Title>
 		<Authors>Andrey Taritsyn</Authors>
-		<PackageLicenseUrl>https://github.com/Taritsyn/JavaScriptEngineSwitcher/blob/master/LICENSE</PackageLicenseUrl>
+		<PackageLicense>https://github.com/Taritsyn/JavaScriptEngineSwitcher/blob/master/LICENSE</PackageLicense>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<PackageProjectUrl>https://github.com/Taritsyn/JavaScriptEngineSwitcher</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Taritsyn/JavaScriptEngineSwitcher</RepositoryUrl>

global.json

@@ -1,5 +1,5 @@
 {
 	"sdk": {
-		"version": "2.1.403"
+		"version": "2.1.500"
 	}
 }

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

@@ -17,6 +17,7 @@
 using ErrorLocationItem = JavaScriptEngineSwitcher.Core.Helpers.ErrorLocationItem;
 using CoreErrorHelpers = JavaScriptEngineSwitcher.Core.Helpers.JsErrorHelpers;
 using CoreStrings = JavaScriptEngineSwitcher.Core.Resources.Strings;
+using TextHelpers = JavaScriptEngineSwitcher.Core.Helpers.TextHelpers;
 using WrapperCompilationException = JavaScriptEngineSwitcher.Core.JsCompilationException;
 using WrapperEngineException = JavaScriptEngineSwitcher.Core.JsEngineException;
 using WrapperEngineLoadException = JavaScriptEngineSwitcher.Core.JsEngineLoadException;
@@ -1006,7 +1007,7 @@ private static WrapperException WrapJsException(OriginalException originalExcept
 						{
 							JsValue sourcePropertyValue = metadataValue.GetProperty(sourcePropertyId);
 							sourceLine = sourcePropertyValue.ConvertToString().ToString();
-							sourceFragment = CoreErrorHelpers.GetSourceFragmentFromLine(sourceLine, columnNumber);
+							sourceFragment = TextHelpers.GetTextFragmentFromLine(sourceLine, columnNumber);
 						}
 
 						JsPropertyId stackPropertyId = JsPropertyId.FromString("stack");

src/JavaScriptEngineSwitcher.Core/Extensions/StringExtensions.cs

@@ -79,5 +79,39 @@ public static string[] SplitToLines(this string source)
 
 			return result;
 		}
+
+		/// <summary>
+		/// Gets a character at the specified index from the string.
+		/// A return value indicates whether the receiving succeeded.
+		/// </summary>
+		/// <param name="source">The source string</param>
+		/// <param name="index">The zero-based index of the character</param>
+		/// <param name="result">When this method returns, contains the character from the string,
+		/// if the receiving succeeded, or null character if the receiving failed.
+		/// The receiving fails if the index out of bounds.</param>
+		/// <returns>true if the character was received successfully; otherwise, false</returns>
+		internal static bool TryGetChar(this string source, int index, out char result)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			bool isSuccess;
+			int length = source.Length;
+
+			if (length > 0 && index >= 0 && index < length)
+			{
+				result = source[index];
+				isSuccess = true;
+			}
+			else
+			{
+				result = '\0';
+				isSuccess = false;
+			}
+
+			return isSuccess;
+		}
 	}
 }

src/JavaScriptEngineSwitcher.Core/Helpers/JsErrorHelpers.cs

@@ -537,202 +537,6 @@ public static JsEngineLoadException WrapEngineLoadException(Exception exception,
 
 		#endregion
 
-		#region Misc
-
-		/// <summary>
-		/// Gets a fragment from the source code
-		/// </summary>
-		/// <param name="sourceCode">Source code</param>
-		/// <param name="lineNumber">Line number</param>
-		/// <param name="columnNumber">Column number</param>
-		/// <param name="maxFragmentLength">Maximum length of the source fragment</param>
-		public static string GetSourceFragmentFromCode(string sourceCode, int lineNumber, int columnNumber,
-			int maxFragmentLength = 100)
-		{
-			if (lineNumber <= 0 || string.IsNullOrEmpty(sourceCode))
-			{
-				return string.Empty;
-			}
-
-			int lineStartPosition;
-			int lineLength;
-			GetPositionOfLine(sourceCode, lineNumber, out lineStartPosition, out lineLength);
-
-			string fragment = GetSourceFragment(sourceCode, lineStartPosition, lineLength, columnNumber,
-				maxFragmentLength);
-
-			return fragment;
-		}
-
-		/// <summary>
-		/// Gets a fragment from the source line
-		/// </summary>
-		/// <param name="sourceLine">Content of the source line</param>
-		/// <param name="columnNumber">Column number</param>
-		/// <param name="maxFragmentLength">Maximum length of the source fragment</param>
-		public static string GetSourceFragmentFromLine(string sourceLine, int columnNumber,
-			int maxFragmentLength = 100)
-		{
-			if (string.IsNullOrEmpty(sourceLine))
-			{
-				return string.Empty;
-			}
-
-			int lineStartPosition = 0;
-			int lineLength = sourceLine.Length;
-			string fragment = GetSourceFragment(sourceLine, lineStartPosition, lineLength,
-				columnNumber, maxFragmentLength);
-
-			return fragment;
-		}
-
-		private static string GetSourceFragment(string source, int position, int length,
-			int columnNumber, int maxFragmentLength)
-		{
-			if (length == 0)
-			{
-				return string.Empty;
-			}
-
-			string fragment;
-
-			if (length > maxFragmentLength)
-			{
-				const string ellipsisSymbol = "…";
-				string startPart = string.Empty;
-				string endPart = string.Empty;
-
-				var leftOffset = (int)Math.Floor((double)maxFragmentLength / 2);
-				int fragmentStartPosition = columnNumber - leftOffset - 1;
-				if (fragmentStartPosition > position)
-				{
-					if (length - fragmentStartPosition < maxFragmentLength)
-					{
-						fragmentStartPosition = length - maxFragmentLength;
-					}
-				}
-				else
-				{
-					fragmentStartPosition = position;
-				}
-				int fragmentLength = maxFragmentLength;
-
-				if (fragmentStartPosition > position)
-				{
-					startPart = ellipsisSymbol;
-				}
-				if (fragmentStartPosition + fragmentLength < length)
-				{
-					endPart = ellipsisSymbol;
-				}
-
-				StringBuilder fragmentBuilder = StringBuilderPool.GetBuilder();
-				if (startPart.Length > 0)
-				{
-					fragmentBuilder.Append(startPart);
-				}
-				fragmentBuilder.Append(source.Substring(fragmentStartPosition, fragmentLength));
-				if (endPart.Length > 0)
-				{
-					fragmentBuilder.Append(endPart);
-				}
-
-				fragment = fragmentBuilder.ToString();
-				StringBuilderPool.ReleaseBuilder(fragmentBuilder);
-			}
-			else
-			{
-				fragment = position > 0 || length < source.Length ?
-					source.Substring(position, length) : source;
-			}
-
-			return fragment;
-		}
-
-		private static void GetPositionOfLine(string sourceCode, int lineNumber, out int position, out int length)
-		{
-			int currentLineNumber = 0;
-			position = 0;
-			length = 0;
-
-			int sourceCodeLength = sourceCode.Length;
-			if (sourceCodeLength > 0)
-			{
-				int currentPosition;
-				int currentLength;
-				int sourceCodeEndPosition = sourceCodeLength - 1;
-				int lineBreakPosition = int.MinValue;
-				int lineBreakLength = 0;
-
-				do
-				{
-					currentLineNumber++;
-					currentPosition = lineBreakPosition == int.MinValue ? 0 : lineBreakPosition + lineBreakLength;
-					currentLength = sourceCodeEndPosition - currentPosition + 1;
-
-					FindLineBreak(sourceCode, currentPosition, currentLength,
-						out lineBreakPosition, out lineBreakLength);
-
-					if (currentLineNumber == lineNumber)
-					{
-						if (lineBreakPosition != 0)
-						{
-							position = currentPosition;
-							int endPosition = lineBreakPosition != -1 ?
-								lineBreakPosition - 1 : sourceCodeEndPosition;
-							length = endPosition - position + 1;
-						}
-						break;
-					}
-				}
-				while (lineBreakPosition != -1 && lineBreakPosition <= sourceCodeEndPosition);
-			}
-		}
-
-		/// <summary>
-		/// Finds a line break
-		/// </summary>
-		/// <param name="sourceCode">Source code</param>
-		/// <param name="startPosition">Position in the input string that defines the leftmost
-		/// position to be searched</param>
-		/// <param name="lineBreakPosition">Position of line break</param>
-		/// <param name="lineBreakLength">Length of line break</param>
-		private static void FindLineBreak(string sourceCode, int startPosition,
-			out int lineBreakPosition, out int lineBreakLength)
-		{
-			int length = sourceCode.Length - startPosition;
-
-			FindLineBreak(sourceCode, startPosition, length,
-				out lineBreakPosition, out lineBreakLength);
-		}
-
-		/// <summary>
-		/// Finds a line break
-		/// </summary>
-		/// <param name="sourceCode">Source code</param>
-		/// <param name="startPosition">Position in the input string that defines the leftmost
-		/// position to be searched</param>
-		/// <param name="length">Number of characters in the substring to include in the search</param>
-		/// <param name="lineBreakPosition">Position of line break</param>
-		/// <param name="lineBreakLength">Length of line break</param>
-		private static void FindLineBreak(string sourceCode, int startPosition, int length,
-			out int lineBreakPosition, out int lineBreakLength)
-		{
-			Match lineBreakMatch = _lineBreakRegex.Match(sourceCode, startPosition, length);
-			if (lineBreakMatch.Success)
-			{
-				lineBreakPosition = lineBreakMatch.Index;
-				lineBreakLength = lineBreakMatch.Length;
-			}
-			else
-			{
-				lineBreakPosition = -1;
-				lineBreakLength = 0;
-			}
-		}
-
-		#endregion
-
 		#region Obsolete methods
 
 		/// <summary>