Skip to content

Commit 1d5fb38

Browse files
committed
Fixed a minor errors
1 parent f2a55ed commit 1d5fb38

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

NuGet/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.10.3).</description>
1414
<summary>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine version 2.10.3).</summary>
1515
<releaseNotes>1. Added support of .NET Core 1.0.4;
16-
2. Now script error contains a full stack trace.</releaseNotes>
16+
2. Now script error contains a error location.</releaseNotes>
1717
<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1818
<language>en-US</language>
1919
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript Jint</tags>

NuGet/JavaScriptEngineSwitcher.Jint/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
RELEASE NOTES
1919
=============
2020
1. Added support of .NET Core 1.0.4;
21-
2. Now script error contains a full stack trace.
21+
2. Now script error contains a error location.
2222

2323
=============
2424
DOCUMENTATION

src/JavaScriptEngineSwitcher.Core/JsEngineBase.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@ public virtual void ExecuteFile(string path, Encoding encoding = null)
194194
{
195195
VerifyNotDisposed();
196196

197+
if (path == null)
198+
{
199+
throw new ArgumentNullException(
200+
"path", string.Format(Strings.Common_ArgumentIsNull, "path"));
201+
}
202+
197203
if (string.IsNullOrWhiteSpace(path))
198204
{
199205
throw new ArgumentException(

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private JsRuntimeException ConvertParserExceptionToJsRuntimeException(
144144
int lineNumber = jsParserException.LineNumber;
145145
int columnNumber = jsParserException.Column;
146146
string message = !string.IsNullOrWhiteSpace(description) ?
147-
GenerateErorrMessageWithStackTrace(category, description, jsParserException.Source,
147+
GenerateErrorMessageWithLocation(category, description, jsParserException.Source,
148148
lineNumber, columnNumber)
149149
:
150150
jsParserException.Message
@@ -180,7 +180,7 @@ private JsRuntimeException ConvertJavaScriptExceptionToJsRuntimeException(
180180
category = categoryPropertyValue.AsString();
181181
}
182182

183-
message = GenerateErorrMessageWithStackTrace(category, message,
183+
message = GenerateErrorMessageWithLocation(category, message,
184184
jsException.Location.Source, lineNumber, columnNumber);
185185
}
186186

@@ -195,7 +195,7 @@ private JsRuntimeException ConvertJavaScriptExceptionToJsRuntimeException(
195195
return jsRuntimeException;
196196
}
197197

198-
private static string GenerateErorrMessageWithStackTrace(string category, string message,
198+
private static string GenerateErrorMessageWithLocation(string category, string message,
199199
string documentName, int lineNumber, int columnNumber)
200200
{
201201
var messageBuilder = new StringBuilder();

src/JavaScriptEngineSwitcher.Msie/MsieSettings.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public sealed class MsieSettings
77
{
88
/// <summary>
99
/// Gets or sets a flag for whether to enable script debugging features
10-
/// (only works in the <code>ChakraIeJsRt</code> and <code>ChakraEdgeJsRt</code> modes)
1110
/// </summary>
1211
public bool EnableDebugging
1312
{

0 commit comments

Comments
 (0)