File tree Expand file tree Collapse file tree 5 files changed +24
-20
lines changed
src/JavaScriptEngineSwitcher.Jint Expand file tree Collapse file tree 5 files changed +24
-20
lines changed Original file line number Diff line number Diff line change @@ -24,27 +24,31 @@ internal static class JintJsErrorHelpers
24
24
private const string WrapperAnonymousFunctionName = "Anonymous function" ;
25
25
private const string DelegateFunctionName = "delegate" ;
26
26
27
+ /// <summary>
28
+ /// Pattern for working with document names with coordinates
29
+ /// </summary>
30
+ private static readonly string DocumentNameWithCoordinatesPattern =
31
+ @"(?<documentName>" + CommonRegExps . DocumentNamePattern + @"):" +
32
+ @"(?<lineNumber>\d+)(?::(?<columnNumber>\d+))?" ;
33
+
27
34
/// <summary>
28
35
/// Regular expression for working with line of the script error location
29
36
/// </summary>
30
37
private static readonly Regex _errorLocationLineRegex =
31
- new Regex ( @"^[ ]{3 }at " +
38
+ new Regex ( @"^[ ]{4 }at " +
32
39
@"(?:" +
33
- @"(?:" +
34
- @"(?<functionName>" +
35
- @"[\w][\w ]*" +
36
- @"|" +
37
- CommonRegExps . JsFullNamePattern +
38
- @"|" +
39
- Regex . Escape ( OriginalAnonymousFunctionName ) +
40
- @") " +
41
- @"\((?:" + CommonRegExps . JsFullNamePattern + @"(?:, " + CommonRegExps . JsFullNamePattern + @")*)?\)" +
40
+ @"(?<functionName>" +
41
+ @"[\w][\w ]*" +
42
+ @"|" +
43
+ CommonRegExps . JsFullNamePattern +
42
44
@"|" +
43
- @"(?<functionName>" + Regex . Escape ( DelegateFunctionName ) + @")" +
45
+ Regex . Escape ( OriginalAnonymousFunctionName ) +
44
46
@") " +
45
- @")?" +
46
- @"(?<documentName>" + CommonRegExps . DocumentNamePattern + @"):" +
47
- @"(?<lineNumber>\d+)(?::(?<columnNumber>\d+))?$" ) ;
47
+ @"\(" + DocumentNameWithCoordinatesPattern + @"\)" +
48
+ @"|" +
49
+ DocumentNameWithCoordinatesPattern +
50
+ @")" +
51
+ "$" ) ;
48
52
49
53
/// <summary>
50
54
/// Regular expression for working with the syntax error message
Original file line number Diff line number Diff line change 22
22
<PackageIconFullPath >../../Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconFullPath >
23
23
<Description >JavaScriptEngineSwitcher.Jint contains a `JintJsEngine` adapter (wrapper for the Jint).</Description >
24
24
<PackageTags >$(PackageCommonTags);Jint</PackageTags >
25
- <PackageReleaseNotes >Jint was updated to version 4.2.2 .</PackageReleaseNotes >
25
+ <PackageReleaseNotes >Jint was updated to version 4.3.0 .</PackageReleaseNotes >
26
26
</PropertyGroup >
27
27
28
28
<ItemGroup >
29
- <PackageReference Include =" Jint" Version =" 4.2.2 " />
29
+ <PackageReference Include =" Jint" Version =" 4.3.0 " />
30
30
31
31
<ProjectReference Include =" ../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
32
32
</ItemGroup >
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ public sealed class JintJsEngine : JsEngineBase
51
51
/// <summary>
52
52
/// Version of original JS engine
53
53
/// </summary>
54
- private const string EngineVersion = "4.2.2 " ;
54
+ private const string EngineVersion = "4.3.0 " ;
55
55
56
56
/// <summary>
57
57
/// Jint JS engine
Original file line number Diff line number Diff line change 1
- JavaScriptEngineSwitcher.Jint contains a ` JintJsEngine ` adapter (wrapper for the [ Jint] ( http://github.com/sebastienros/jint ) version 4.2.2 ).
1
+ JavaScriptEngineSwitcher.Jint contains a ` JintJsEngine ` adapter (wrapper for the [ Jint] ( http://github.com/sebastienros/jint ) version 4.3.0 ).
Original file line number Diff line number Diff line change 12
12
DESCRIPTION
13
13
===========
14
14
JavaScriptEngineSwitcher.Jint contains a `JintJsEngine` adapter (wrapper for the
15
- Jint (http://github.com/sebastienros/jint) version 4.2.2 ).
15
+ Jint (http://github.com/sebastienros/jint) version 4.3.0 ).
16
16
17
17
=============
18
18
RELEASE NOTES
19
19
=============
20
- Jint was updated to version 4.2.2 .
20
+ Jint was updated to version 4.3.0 .
21
21
22
22
=============
23
23
DOCUMENTATION
You can’t perform that action at this time.
0 commit comments