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/asp.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lua/lexers/asp.lua') diff --git a/lua/lexers/asp.lua b/lua/lexers/asp.lua index a16f4b6..b604a9b 100644 --- a/lua/lexers/asp.lua +++ b/lua/lexers/asp.lua @@ -1,31 +1,31 @@ --- Copyright 2006-2022 Mitchell. See LICENSE. +-- Copyright 2006-2024 Mitchell. See LICENSE. -- ASP 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 html = lexer.load('html') -local lex = lexer.new('asp', {inherit = html}) -- proxy for HTML +local lex = lexer.new(..., {inherit = html}) -- proxy for HTML -- Embedded VB. local vb = lexer.load('vb') -local vb_start_rule = token('asp_tag', '<%' * P('=')^-1) -local vb_end_rule = token('asp_tag', '%>') +local vb_start_rule = lex:tag(lexer.PREPROCESSOR, '<%' * P('=')^-1) +local vb_end_rule = lex:tag(lexer.PREPROCESSOR, '%>') lex:embed(vb, vb_start_rule, vb_end_rule) -lex:add_style('asp_tag', lexer.styles.embedded) -- Embedded VBScript. local vbs = lexer.load('vb', 'vbscript') -local script_element = word_match('script', true) -local vbs_start_rule = #(P('<') * script_element * (P(function(input, index) +local script_element = lexer.word_match('script', true) +local vbs_start_rule = #('<' * script_element * (P(function(input, index) if input:find('^%s+language%s*=%s*(["\'])vbscript%1', index) or - input:find('^%s+type%s*=%s*(["\'])text/vbscript%1', index) then return index end + input:find('^%s+type%s*=%s*(["\'])text/vbscript%1', index) then return true end end) + '>')) * html.embed_start_tag -- +local vbs_end_rule = #('') * html.embed_end_tag -- lex:embed(vbs, vbs_start_rule, vbs_end_rule) -- Fold points. -lex:add_fold_point('asp_tag', '<%', '%>') +lex:add_fold_point(lexer.PREPROCESSOR, '<%', '%>') + +lexer.property['scintillua.comment'] = '' return lex -- cgit v1.2.3