1 files changed, 27 insertions, 48 deletions
diff --git a/lua/lexers/elm.lua b/lua/lexers/elm.lua
index 796fc93..d48e1e3 100644
--- a/lua/lexers/elm.lua
+++ b/lua/lexers/elm.lua
@@ -1,64 +1,43 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2020-2022 Mitchell. See LICENSE.
 -- Elm LPeg lexer
--- Modified by Alex Suraci.
 -- Adapted from Haskell LPeg lexer by Karl Schultheisz.
 
-local l = require('lexer')
-local token, word_match = l.token, l.word_match
-local P, R, S = lpeg.P, lpeg.R, lpeg.S
+local lexer = require('lexer')
+local token, word_match = lexer.token, lexer.word_match
+local P, S = lpeg.P, lpeg.S
 
-local M = {_NAME = 'elm'}
+local lex = lexer.new('elm', {fold_by_indentation = true})
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
--- Comments.
-local line_comment = '--' * l.nonnewline_esc^0
-local block_comment = '{-' * (l.any - '-}')^0 * P('-}')^-1
-local comment = token(l.COMMENT, line_comment + block_comment)
+-- Keywords.
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match(
+  'if then else case of let in module import as exposing type alias port')))
+
+-- Types & type constructors.
+local word = (lexer.alnum + S("._'#"))^0
+local op = lexer.punct - S('()[]{}')
+lex:add_rule('type', token(lexer.TYPE, lexer.upper * word + ':' * (op^1 - ':')))
+
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, (lexer.alpha + '_') * word))
 
 -- Strings.
-local string = token(l.STRING, l.delimited_range('"'))
+lex:add_rule('string', token(lexer.STRING, lexer.range('"')))
 
 -- Chars.
-local char = token(l.STRING, l.delimited_range("'", true))
-
--- Numbers.
-local number = token(l.NUMBER, l.float + l.integer)
+lex:add_rule('character', token(lexer.STRING, lexer.range("'", true)))
 
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-	'if', 'then', 'else',
-	'case', 'of',
-	'let', 'in',
-	'module', 'import', 'as', 'exposing',
-	'type', 'alias',
-	'port',
-})
+-- Comments.
+local line_comment = lexer.to_eol('--', true)
+local block_comment = lexer.range('{-', '-}', false, false, true)
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
--- Identifiers.
-local word = (l.alnum + S("._'#"))^0
-local identifier = token(l.IDENTIFIER, (l.alpha + '_') * word)
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Operators.
-local op = l.punct - S('()[]{}')
-local operator = token(l.OPERATOR, op)
-
--- Types & type constructors.
-local constructor = token(l.TYPE, (l.upper * word) + (P(":") * (op^1 - P(":"))))
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', constructor},
-  {'identifier', identifier},
-  {'string', string},
-  {'char', char},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
-
-M._FOLDBYINDENTATION = true
+lex:add_rule('operator', token(lexer.OPERATOR, op))
 
-return M
+return lex