From 4c4392d29df777ff702dfe99b4f3c23142976e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Fri, 11 Aug 2023 01:27:32 +0200 Subject: update lexers to orbitalquark/scintillua@b789dde Rather than cherry pick patches from after 6.2 we will just grab everything as is. --- lua/lexers/typescript.lua | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'lua/lexers/typescript.lua') diff --git a/lua/lexers/typescript.lua b/lua/lexers/typescript.lua index 414acf1..b1ee619 100644 --- a/lua/lexers/typescript.lua +++ b/lua/lexers/typescript.lua @@ -1,23 +1,18 @@ --- Copyright 2021-2022 Mitchell. See LICENSE. +-- Copyright 2021-2024 Mitchell. See LICENSE. -- TypeScript 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('typescript', {inherit = lexer.load('javascript')}) +local lex = lexer.new(..., {inherit = lexer.load('javascript')}) --- Whitespace -lex:modify_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1)) +-- Word lists. +lex:set_word_list(lexer.KEYWORD, 'abstract as constructor declare is module namespace require type', + true) --- Keywords. -lex:modify_rule('keyword', token(lexer.KEYWORD, word_match[[ - abstract as constructor declare is module namespace require type -]]) + lex:get_rule('keyword')) +lex:set_word_list(lexer.TYPE, 'boolean number bigint string unknown any void never symbol object', + true) --- Types. -lex:modify_rule('type', token(lexer.TYPE, word_match[[ - boolean number bigint string unknown any void never symbol object -]]) + lex:get_rule('type')) +lexer.property['scintillua.comment'] = '//' return lex -- cgit v1.2.3