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/rhtml.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lua/lexers/rhtml.lua') diff --git a/lua/lexers/rhtml.lua b/lua/lexers/rhtml.lua index 16c7706..c738dd9 100644 --- a/lua/lexers/rhtml.lua +++ b/lua/lexers/rhtml.lua @@ -1,20 +1,20 @@ --- Copyright 2006-2022 Mitchell. See LICENSE. +-- Copyright 2006-2024 Mitchell. See LICENSE. -- RHTML 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('rhtml', {inherit = lexer.load('html')}) +local lex = lexer.new(..., {inherit = lexer.load('html')}) -- Embedded Ruby. local ruby = lexer.load('rails') -local ruby_start_rule = token('rhtml_tag', '<%' * P('=')^-1) -local ruby_end_rule = token('rhtml_tag', '%>') +local ruby_start_rule = lex:tag(lexer.PREPROCESSOR, '<%' * P('=')^-1) +local ruby_end_rule = lex:tag(lexer.PREPROCESSOR, '%>') lex:embed(ruby, ruby_start_rule, ruby_end_rule) -lex:add_style('rhtml_tag', lexer.styles.embedded) -- Fold points. -lex:add_fold_point('rhtml_tag', '<%', '%>') +lex:add_fold_point(lexer.PREPROCESSOR, '<%', '%>') + +lexer.property['scintillua.comment'] = '' return lex -- cgit v1.2.3