1 files changed, 13 insertions, 17 deletions
diff --git a/lua/lexers/toml.lua b/lua/lexers/toml.lua
index ed61958..29cd79d 100644
--- a/lua/lexers/toml.lua
+++ b/lua/lexers/toml.lua
@@ -1,31 +1,27 @@
--- Copyright 2015-2022 Alejandro Baez (https://keybase.io/baez). See LICENSE.
+-- Copyright 2015-2024 Alejandro Baez (https://keybase.io/baez). See LICENSE.
 -- TOML LPeg lexer.
 
-local lexer = require("lexer")
-local token, word_match = lexer.token, lexer.word_match
+local lexer = lexer
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('toml', {fold_by_indentation = true})
+local lex = lexer.new(..., {fold_by_indentation = true})
 
--- Whitespace
-lex:add_rule('whitespace', token(lexer.WHITESPACE, S(' \t')^1 + lexer.newline^1))
-
--- kewwords.
-lex:add_rule('keyword', token(lexer.KEYWORD, word_match('true false')))
+-- Keywords.
+lex:add_rule('keyword', lex:tag(lexer.KEYWORD, lexer.word_match('true false')))
 
 -- Identifiers.
-lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
+lex:add_rule('identifier', lex:tag(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
 local sq_str = lexer.range("'")
 local dq_str = lexer.range('"')
-lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
+lex:add_rule('string', lex:tag(lexer.STRING, sq_str + dq_str))
 
 -- Comments.
-lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#')))
+lex:add_rule('comment', lex:tag(lexer.COMMENT, lexer.to_eol('#')))
 
 -- Operators.
-lex:add_rule('operator', token(lexer.OPERATOR, S('=+-,.{}[]()')))
+lex:add_rule('operator', lex:tag(lexer.OPERATOR, S('=+-,.{}[]()')))
 
 -- Datetime.
 local year = lexer.digit * lexer.digit * lexer.digit * lexer.digit
@@ -37,12 +33,12 @@ local minutes = lexer.digit * lexer.digit
 local seconds = lexer.digit * lexer.digit
 local fraction = '.' * lexer.digit^0
 local time = hours * ':' * minutes * ':' * seconds * fraction^-1
-local T = S(' \t')^1 + S('tT')
 local zone = 'Z' + S(' \t')^0 * S('-+') * hours * (':' * minutes)^-1
-lex:add_rule('datetime', token('timestamp', date * (T * time * zone^-1)))
-lex:add_style('timestamp', lexer.styles.number)
+lex:add_rule('datetime', lex:tag(lexer.NUMBER .. '.timestamp', date * (S('tT \t') * time * zone^-1)))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, lexer.number))
+lex:add_rule('number', lex:tag(lexer.NUMBER, lexer.number))
+
+lexer.property['scintillua.comment'] = '#'
 
 return lex