@@ -44,26 +44,26 @@ module.exports.prototype = {
4444
4545 check : function ( file , errors ) {
4646 file . iterateNodesByType ( 'TemplateLiteral' , function ( node ) {
47- node . childElements
48- . filter ( function ( element ) {
49- return element . isToken && element . type === 'Punctuator' ;
50- } )
51- . forEach ( function ( element ) {
52- if ( element . value === '${' && element . nextSibling . isWhitespace ) {
53- errors . assert . noWhitespaceBetween ( {
54- token : element ,
55- nextToken : element . nextCodeToken ,
56- message : 'Illegal space after "${"'
57- } ) ;
58- }
59- if ( element . value === '}' && element . previousSibling . isWhitespace ) {
60- errors . assert . noWhitespaceBetween ( {
61- token : element . previousCodeToken ,
62- nextToken : element ,
63- message : 'Illegal space before "}"'
64- } ) ;
65- }
47+ var first = file . getFirstNodeToken ( node ) ;
48+ var nextFist = file . getNextToken ( first , { includeWhitespace : true } ) ;
49+ var last = file . getLastNodeToken ( node ) ;
50+ var prevLast = file . getPrevToken ( last , { includeWhitespace : true } ) ;
51+
52+ if ( nextFist . isWhitespace ) {
53+ errors . assert . noWhitespaceBetween ( {
54+ token : first ,
55+ nextToken : file . getNextToken ( first ) ,
56+ message : 'Illegal space after "${"'
57+ } ) ;
58+ }
59+
60+ if ( prevLast . isWhitespace ) {
61+ errors . assert . noWhitespaceBetween ( {
62+ token : file . getPrevToken ( last ) ,
63+ nextToken : last ,
64+ message : 'Illegal space before "}"'
6665 } ) ;
66+ }
6767 } ) ;
6868 }
6969} ;
0 commit comments