diff --git a/lib/lexer.js b/lib/lexer.js index 0ced9550..4764bf64 100644 --- a/lib/lexer.js +++ b/lib/lexer.js @@ -48,7 +48,7 @@ } forcedIdentifier = colon || (prev = last(this.tokens)) && (((_ref2 = prev[0]) === '.' || _ref2 === '?.' || _ref2 === '::') || !prev.spaced && prev[0] === '@'); tag = 'IDENTIFIER'; - if (__indexOf.call(JS_KEYWORDS, id) >= 0 || !forcedIdentifier && __indexOf.call(COFFEE_KEYWORDS, id) >= 0) { + if (!forcedIdentifier && (__indexOf.call(JS_KEYWORDS, id) >= 0 || __indexOf.call(COFFEE_KEYWORDS, id) >= 0)) { tag = id.toUpperCase(); if (tag === 'WHEN' && (_ref3 = this.tag(), __indexOf.call(LINE_BREAK, _ref3) >= 0)) { tag = 'LEADING_WHEN'; diff --git a/src/lexer.coffee b/src/lexer.coffee index a168e8bf..acc79598 100644 --- a/src/lexer.coffee +++ b/src/lexer.coffee @@ -84,8 +84,7 @@ exports.Lexer = class Lexer not prev.spaced and prev[0] is '@') tag = 'IDENTIFIER' - if id in JS_KEYWORDS or - not forcedIdentifier and id in COFFEE_KEYWORDS + if not forcedIdentifier and (id in JS_KEYWORDS or id in COFFEE_KEYWORDS) tag = id.toUpperCase() if tag is 'WHEN' and @tag() in LINE_BREAK tag = 'LEADING_WHEN'