1 files changed, 35 insertions, 48 deletions
diff --git a/lua/lexers/coffeescript.lua b/lua/lexers/coffeescript.lua
index 737c10b..be4be45 100644
--- a/lua/lexers/coffeescript.lua
+++ b/lua/lexers/coffeescript.lua
@@ -1,62 +1,49 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- CoffeeScript LPeg lexer.
 
-local l = require('lexer')
-local token, word_match = l.token, l.word_match
+local lexer = require('lexer')
+local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local M = {_NAME = 'coffeescript'}
+local lex = lexer.new('coffeescript', {fold_by_indentation = true})
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local block_comment = '###' * (l.any - '###')^0 * P('###')^-1
-local line_comment = '#' * l.nonnewline_esc^0
-local comment = token(l.COMMENT, block_comment + line_comment)
-
--- Strings.
-local sq_str = l.delimited_range("'")
-local dq_str = l.delimited_range('"')
-local regex_str = #P('/') * l.last_char_includes('+-*%<>!=^&|?~:;,([{') *
-                  l.delimited_range('/', true) * S('igm')^0
-local string = token(l.STRING, sq_str + dq_str) + token(l.REGEX, regex_str)
-
--- Numbers.
-local number = token(l.NUMBER, l.float + l.integer)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'all', 'and', 'bind', 'break', 'by', 'case', 'catch', 'class', 'const',
-  'continue', 'default', 'delete', 'do', 'each', 'else', 'enum', 'export',
-  'extends', 'false', 'for', 'finally', 'function', 'if', 'import', 'in',
-  'instanceof', 'is', 'isnt', 'let', 'loop', 'native', 'new', 'no', 'not', 'of',
-  'off', 'on', 'or', 'return', 'super', 'switch', 'then', 'this', 'throw',
-  'true', 'try', 'typeof', 'unless', 'until', 'var', 'void', 'with', 'when',
-  'while', 'yes'
-})
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'all', 'and', 'bind', 'break', 'by', 'case', 'catch', 'class', 'const', 'continue', 'default',
+  'delete', 'do', 'each', 'else', 'enum', 'export', 'extends', 'false', 'finally', 'for',
+  'function', 'if', 'import', 'in', 'instanceof', 'is', 'isnt', 'let', 'loop', 'native', 'new',
+  'no', 'not', 'of', 'off', 'on', 'or', 'return', 'super', 'switch', 'then', 'this', 'throw',
+  'true', 'try', 'typeof', 'unless', 'until', 'var', 'void', 'when', 'while', 'with', 'yes'
+}))
 
 -- Fields: object properties and methods.
-local field = token(l.FUNCTION, '.' * (S('_$') + l.alpha) *
-                                (S('_$') + l.alnum)^0)
+lex:add_rule('field',
+  token(lexer.FUNCTION, '.' * (S('_$') + lexer.alpha) * (S('_$') + lexer.alnum)^0))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
+
+-- Strings.
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
+local string = token(lexer.STRING, sq_str + dq_str)
+local regex_str =
+  #P('/') * lexer.last_char_includes('+-*%<>!=^&|?~:;,([{') * lexer.range('/', true) * S('igm')^0
+local regex = token(lexer.REGEX, regex_str)
+lex:add_rule('string', string + regex)
+
+-- Comments.
+local block_comment = lexer.range('###')
+local line_comment = lexer.to_eol('#', true)
+lex:add_rule('comment', token(lexer.COMMENT, block_comment + line_comment))
+
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Operators.
-local operator = token(l.OPERATOR, S('+-/*%<>!=^&|?~:;,.()[]{}'))
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'field', field},
-  {'identifier', identifier},
-  {'comment', comment},
-  {'number', number},
-  {'string', string},
-  {'operator', operator},
-}
-
-M._FOLDBYINDENTATION = true
-
-return M
+lex:add_rule('operator', token(lexer.OPERATOR, S('+-/*%<>!=^&|?~:;,.()[]{}')))
+
+return lex