1 files changed, 55 insertions, 47 deletions

diff --git a/lua/lexers/javascript.lua b/lua/lexers/javascript.lua
index d94baed..e5cce7e 100644
--- a/lua/lexers/javascript.lua
+++ b/lua/lexers/javascript.lua
@@ -1,17 +1,56 @@
--- Copyright 2006-2022 Mitchell. See LICENSE.
+-- Copyright 2006-2024 Mitchell. See LICENSE.
 -- JavaScript LPeg lexer.
 
-local lexer = require('lexer')
-local token, word_match = lexer.token, lexer.word_match
-local P, S = lpeg.P, lpeg.S
+local lexer = lexer
+local P, S, B = lpeg.P, lpeg.S, lpeg.B
 
-local lex = lexer.new('javascript')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
-lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+lex:add_rule('keyword', lex:tag(lexer.KEYWORD, lex:word_match(lexer.KEYWORD)))
+
+-- Types.
+lex:add_rule('type', lex:tag(lexer.TYPE, lex:word_match(lexer.TYPE)))
+
+-- Functions.
+local builtin_func = -B('.') *
+  lex:tag(lexer.FUNCTION_BUILTIN, lex:word_match(lexer.FUNCTION_BUILTIN))
+local func = lex:tag(lexer.FUNCTION, lexer.word)
+local method = B('.') * lex:tag(lexer.FUNCTION_METHOD, lexer.word)
+lex:add_rule('function', (builtin_func + method + func) * #(lexer.space^0 * '('))
+
+-- Constants.
+lex:add_rule('constant', lex:tag(lexer.CONSTANT_BUILTIN, lex:word_match(lexer.CONSTANT_BUILTIN)))
+
+-- Identifiers.
+lex:add_rule('identifier', lex:tag(lexer.IDENTIFIER, lexer.word))
+
+-- Comments.
+local line_comment = lexer.to_eol('//', true)
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', lex:tag(lexer.COMMENT, line_comment + block_comment))
+
+-- Strings.
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
+local bq_str = lexer.range('`')
+local string = lex:tag(lexer.STRING, sq_str + dq_str + bq_str)
+local regex_str = lexer.after_set('+-*%^!=&|?:;,([{<>', lexer.range('/', true) * S('igm')^0)
+local regex = lex:tag(lexer.REGEX, regex_str)
+lex:add_rule('string', string + regex)
+
+-- Numbers.
+lex:add_rule('number', lex:tag(lexer.NUMBER, lexer.number))
+
+-- Operators.
+lex:add_rule('operator', lex:tag(lexer.OPERATOR, S('+-/*%^!=&|?:;,.()[]{}<>')))
+
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, '/*', '*/')
+
+-- Word lists.
+lex:set_word_list(lexer.KEYWORD, {
   'abstract', 'async', 'await', 'boolean', 'break', 'byte', 'case', 'catch', 'char', 'class',
   'const', 'continue', 'debugger', 'default', 'delete', 'do', 'double', 'else', 'enum', 'export',
   'extends', 'false', 'final', 'finally', 'float', 'for', 'function', 'get', 'goto', 'if',
@@ -19,10 +58,9 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
   'null', 'of', 'package', 'private', 'protected', 'public', 'return', 'set', 'short', 'static',
   'super', 'switch', 'synchronized', 'this', 'throw', 'throws', 'transient', 'true', 'try',
   'typeof', 'var', 'void', 'volatile', 'while', 'with', 'yield'
-}))
+})
 
--- Types.
-lex:add_rule('type', token(lexer.TYPE, word_match{
+lex:set_word_list(lexer.TYPE, {
   -- Fundamental objects.
   'Object', 'Function', 'Boolean', 'Symbol',
   -- Error Objects.
@@ -46,45 +84,15 @@ lex:add_rule('type', token(lexer.TYPE, word_match{
   'Reflect', 'Proxy',
   -- Other.
   'Intl', 'WebAssembly'
-}))
+})
 
--- Functions.
-lex:add_rule('function', token(lexer.FUNCTION, word_match{
+lex:set_word_list(lexer.FUNCTION_BUILTIN, {
   'eval', 'isFinite', 'isNaN', 'parseFloat', 'parseInt', 'decodeURI', 'decodeURIComponent',
   'encodeURI', 'encodeURIComponent'
-}))
+})
 
--- Constants.
-lex:add_rule('constant',
-  token(lexer.CONSTANT, word_match('Infinity NaN undefined globalThis arguments')))
+lex:set_word_list(lexer.CONSTANT_BUILTIN, 'Infinity NaN undefined globalThis arguments')
 
--- Identifiers.
-lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
-
--- Comments.
-local line_comment = lexer.to_eol('//', true)
-local block_comment = lexer.range('/*', '*/')
-lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
-
--- Strings.
-local sq_str = lexer.range("'")
-local dq_str = lexer.range('"')
-local bq_str = lexer.range('`')
-local string = token(lexer.STRING, sq_str + dq_str + bq_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)
-
--- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, lexer.number))
-
--- Operators.
-lex:add_rule('operator', token(lexer.OPERATOR, S('+-/*%^!=&|?:;,.()[]{}<>')))
-
--- Fold points.
-lex:add_fold_point(lexer.OPERATOR, '{', '}')
-lex:add_fold_point(lexer.COMMENT, '/*', '*/')
-lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('//'))
+lexer.property['scintillua.comment'] = '//'
 
 return lex