1 files changed, 36 insertions, 58 deletions

diff --git a/lua/lexers/django.lua b/lua/lexers/django.lua
index a671006..2147853 100644
--- a/lua/lexers/django.lua
+++ b/lua/lexers/django.lua
@@ -1,77 +1,55 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Django LPeg lexer.
 
-local l = require('lexer')
-local token, word_match = l.token, l.word_match
-local P, R, S, V = lpeg.P, lpeg.R, lpeg.S, lpeg.V
+local lexer = require('lexer')
+local token, word_match = lexer.token, lexer.word_match
+local P, S = lpeg.P, lpeg.S
 
-local M = {_NAME = 'django'}
+local lex = lexer.new('django')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local comment = token(l.COMMENT, '{#' * (l.any - l.newline - '#}')^0 *
-                                 P('#}')^-1)
-
--- Strings.
-local string = token(l.STRING, l.delimited_range('"', false, true))
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'as', 'block', 'blocktrans', 'by', 'endblock', 'endblocktrans', 'comment',
-  'endcomment', 'cycle', 'date', 'debug', 'else', 'extends', 'filter',
-  'endfilter', 'firstof', 'for', 'endfor', 'if', 'endif', 'ifchanged',
-  'endifchanged', 'ifnotequal', 'endifnotequal', 'in', 'load', 'not', 'now',
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'as', 'block', 'blocktrans', 'by', 'endblock', 'endblocktrans', 'comment', 'endcomment', 'cycle',
+  'date', 'debug', 'else', 'extends', 'filter', 'endfilter', 'firstof', 'for', 'endfor', 'if',
+  'endif', 'ifchanged', 'endifchanged', 'ifnotequal', 'endifnotequal', 'in', 'load', 'not', 'now',
   'or', 'parsed', 'regroup', 'ssi', 'trans', 'with', 'widthratio'
-})
+}))
 
 -- Functions.
-local func = token(l.FUNCTION, word_match{
-  'add', 'addslashes', 'capfirst', 'center', 'cut', 'date', 'default',
-  'dictsort', 'dictsortreversed', 'divisibleby', 'escape', 'filesizeformat',
-  'first', 'fix_ampersands', 'floatformat', 'get_digit', 'join', 'length',
-  'length_is', 'linebreaks', 'linebreaksbr', 'linenumbers', 'ljust', 'lower',
-  'make_list', 'phone2numeric', 'pluralize', 'pprint', 'random', 'removetags',
-  'rjust', 'slice', 'slugify', 'stringformat', 'striptags', 'time', 'timesince',
-  'title', 'truncatewords', 'unordered_list', 'upper', 'urlencode', 'urlize',
-  'urlizetrunc', 'wordcount', 'wordwrap', 'yesno',
-})
+lex:add_rule('function', token(lexer.FUNCTION, word_match{
+  'add', 'addslashes', 'capfirst', 'center', 'cut', 'date', 'default', 'dictsort',
+  'dictsortreversed', 'divisibleby', 'escape', 'filesizeformat', 'first', 'fix_ampersands',
+  'floatformat', 'get_digit', 'join', 'length', 'length_is', 'linebreaks', 'linebreaksbr',
+  'linenumbers', 'ljust', 'lower', 'make_list', 'phone2numeric', 'pluralize', 'pprint', 'random',
+  'removetags', 'rjust', 'slice', 'slugify', 'stringformat', 'striptags', 'time', 'timesince',
+  'title', 'truncatewords', 'unordered_list', 'upper', 'urlencode', 'urlize', 'urlizetrunc',
+  'wordcount', 'wordwrap', 'yesno'
+}))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
-
--- Operators.
-local operator = token(l.OPERATOR, S(':,.|'))
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'function', func},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'operator', operator},
-}
+-- Strings.
+lex:add_rule('string', token(lexer.STRING, lexer.range('"', false, false)))
 
--- Embedded in HTML.
-local html = l.load('html')
+-- Operators.
+lex:add_rule('operator', token(lexer.OPERATOR, S(':,.|')))
 
--- Embedded Django.
+-- Embed Django in HTML.
+local html = lexer.load('html')
+local html_comment = lexer.range('<!--', '-->')
+local django_comment = lexer.range('{#', '#}', true)
+html:modify_rule('comment', token(lexer.COMMENT, html_comment + django_comment))
 local django_start_rule = token('django_tag', '{' * S('{%'))
 local django_end_rule = token('django_tag', S('%}') * '}')
-l.embed_lexer(html, M, django_start_rule, django_end_rule)
--- Modify HTML patterns to embed Django.
-html._RULES['comment'] = html._RULES['comment'] + comment
-
-M._tokenstyles = {
-  django_tag = l.STYLE_EMBEDDED
-}
+html:embed(lex, django_start_rule, django_end_rule)
+lex:add_style('django_tag', lexer.styles.embedded)
 
-local _foldsymbols = html._foldsymbols
-_foldsymbols._patterns[#_foldsymbols._patterns + 1] = '{[%%{]'
-_foldsymbols._patterns[#_foldsymbols._patterns + 1] = '[%%}]}'
-_foldsymbols.django_tag = {['{{'] = 1, ['}}'] = -1, ['{%'] = 1, ['%}'] = -1}
-M._foldsymbols = _foldsymbols
+-- Fold points.
+lex:add_fold_point('django_tag', '{{', '}}')
+lex:add_fold_point('django_tag', '{%', '%}')
 
-return M
+return lex