File tree 1 file changed +20
-7
lines changed
javascript/firefox-driver/js
1 file changed +20
-7
lines changed Original file line number Diff line number Diff line change @@ -37,16 +37,29 @@ fxdriver.error.toJSON = function(ex) {
37
37
var stack = ex . stack . replace ( / \s * $ / , '' ) . split ( '\n' ) ;
38
38
39
39
for ( var frame = stack . shift ( ) ; frame ; frame = stack . shift ( ) ) {
40
- var match = frame . match ( / ^ ( [ a - z A - Z _ $ ] [ \w . / < ] * ) ? (?: \( .* \) ) ? @ ( .+ ) ? : ( \d * ) $ / ) ;
40
+ var methodName ;
41
+ var fileName ;
42
+ var lineNumber ;
43
+ var columnNumber ;
44
+
45
+ var match = frame . match ( / ( .* ) : ( \d + ) : ( \d + ) $ / ) ;
41
46
if ( match ) {
42
- stackFrames . push ( {
43
- 'methodName' : match [ 1 ] ,
44
- 'fileName' : match [ 2 ] ,
45
- 'lineNumber' : Number ( match [ 3 ] )
46
- } ) ;
47
+ frame = match [ 1 ] ;
48
+ lineNumber = Number ( match [ 2 ] ) ;
49
+ columnNumber = Number ( match [ 3 ] ) ;
47
50
} else {
48
- stackFrames . push ( { 'methodName' : frame } ) ;
51
+ match = frame . match ( / ( .* ) : ( \d + ) $ / ) ;
52
+ frame = match [ 1 ] ;
53
+ lineNumber = Number ( match [ 2 ] ) ;
49
54
}
55
+
56
+ match = frame . match ( / ^ ( [ a - z A - Z _ $ ] [ \w . / < $ ] * ) ? (?: \( .* \) ) ? @ ( .+ ) ? $ / ) ;
57
+ stackFrames . push ( {
58
+ 'methodName' : match [ 1 ] ,
59
+ 'fileName' : match [ 2 ] ,
60
+ 'lineNumber' : lineNumber ,
61
+ 'columnNumber' : columnNumber
62
+ } ) ;
50
63
}
51
64
}
52
65
You can’t perform that action at this time.
0 commit comments