@@ -2724,7 +2724,7 @@ module.exports.prototype = {
27242724 '\n' +
27252725 '\ndisallowSpaceBeforeBinaryOperators' +
27262726 '\ndisallowSpaceBeforePostfixUnaryOperators' +
2727- '\ndisallowSpacesInConditionalExpressions ' ,
2727+ '\ndisallowSpacesInConditionalExpression ' ,
27282728 1 ,
27292729 0
27302730 ) ;
@@ -3075,7 +3075,7 @@ module.exports.prototype = {
30753075 '\n' +
30763076 '\ndisallowSpaceAfterBinaryOperators' +
30773077 '\ndisallowSpaceAfterPrefixUnaryOperators' +
3078- '\ndisallowSpacesInConditionalExpressions ' ,
3078+ '\ndisallowSpacesInConditionalExpression ' ,
30793079 1 ,
30803080 0
30813081 ) ;
@@ -3388,7 +3388,9 @@ module.exports.prototype = {
33883388} , { "../utils" :80 , "assert" :81 } ] , 59 :[ function ( _dereq_ , module , exports ) {
33893389var assert = _dereq_ ( 'assert' ) ;
33903390var tokenHelper = _dereq_ ( '../token-helper' ) ;
3391- var allOperators = _dereq_ ( '../utils' ) . binaryOperators ;
3391+ var allOperators = _dereq_ ( '../../lib/utils' ) . binaryOperators . filter ( function ( operator ) {
3392+ return operator !== ',' ;
3393+ } ) ;
33923394
33933395module . exports = function ( ) { } ;
33943396
@@ -3485,7 +3487,7 @@ module.exports.prototype = {
34853487
34863488} ;
34873489
3488- } , { "../token-helper" : 78 , "../utils" : 80 , "assert" :81 } ] , 60 :[ function ( _dereq_ , module , exports ) {
3490+ } , { "../../lib/utils" : 80 , "../token-helper" : 78 , "assert" :81 } ] , 60 :[ function ( _dereq_ , module , exports ) {
34893491var assert = _dereq_ ( 'assert' ) ;
34903492
34913493module . exports = function ( ) { } ;
@@ -5097,7 +5099,7 @@ StringChecker.prototype = {
50975099 checkString : function ( str , filename ) {
50985100 filename = filename || 'input' ;
50995101 var tree ;
5100- str = str . replace ( / ^ # ! [ ^ \n ] + \n / , '\n' ) ;
5102+ str = str . replace ( / ^ # ! ? [ ^ \n ] + $ / gm , '\n' ) ;
51015103 try {
51025104 tree = esprima . parse ( str , { loc : true , range : true , comment : true , tokens : true } ) ;
51035105 } catch ( e ) {
@@ -10732,13 +10734,25 @@ module.exports={
1073210734 "|" , "^" , "&&" , "||" , "===" , "==" , ">=" ,
1073310735 "<=" , "<" , ">" , "!=" , "!=="
1073410736 ] ,
10737+ "requireSpacesInAnonymousFunctionExpression" : {
10738+ "beforeOpeningCurlyBrace" : true
10739+ } ,
10740+ "requireSpacesInNamedFunctionExpression" : {
10741+ "beforeOpeningCurlyBrace" : true
10742+ } ,
1073510743 "validateLineBreaks" : "LF" ,
1073610744
1073710745 "disallowKeywords" : [ "with" ] ,
1073810746 "disallowKeywordsOnNewLine" : [ "else" ] ,
1073910747 "disallowSpacesInFunctionExpression" : {
1074010748 "beforeOpeningRoundBrace" : true
1074110749 } ,
10750+ "disallowSpacesInNamedFunctionExpression" : {
10751+ "beforeOpeningRoundBrace" : true
10752+ } ,
10753+ "disallowSpacesInAnonymousFunctionExpression" : {
10754+ "beforeOpeningRoundBrace" : true
10755+ } ,
1074210756 "disallowSpaceAfterObjectKeys" : true ,
1074310757 "disallowSpaceAfterPrefixUnaryOperators" : true ,
1074410758 "disallowSpaceBeforePostfixUnaryOperators" : true ,
0 commit comments