Resync the lexers with Scintillua

- Resync the lexers with Scintillua

- Update the lexer readme

- Update `zenburn` theme to fix some highlighting issues

- lexers: redirect print function to vis:info()

- Fix support for custom style names

- As per error message "lexer.delimited_range() is deprecated, use lexer.range()".

- Remove remaining `lexer.delimited_range()` call

- Set syntax to `nil` if the file type has no matching lexer

- Updated Go lexer for Go 1.18.

- lexers/dsv: convert to new lexer format

  (cherry picked from commit 9edbc3cd9ea1d7142b1305840432a3d2739e755a)

- lexers/gemini: disable legacy gemini lexer

  This reverts commit 468f9ee1b027a7ce98b1a249fa1af5888feeb989.

  It is in legacy format and of questionable quality. Ideally it
  should be contributed upstream from where it will eventually
  trickle down to us.

- lexers/git-rebase: convert to new lexer format

  (cherry picked from commit 4000a4cc9ac4a4c2869dfae772b977a82aee8d8c)

- lexers/strace: convert to new lexer format

  (cherry picked from commit e420451320d97eb164f5629c1bcfab0b595be29d)

- lexers/typescript: add new upstream lexer revision 28e2b60

  (cherry picked from commit 7326e6deecdaa75fa94ae9ebdb653f9f907b33f2)

- use `package.searchpath` instead of a local `searchpath` function

- Restore `filetype: support filetype detection via hashbang`

- Remove redundant comment

- Restore gemini lexer

1 files changed, 67 insertions, 89 deletions

diff --git a/lua/lexers/xtend.lua b/lua/lexers/xtend.lua
index e761979..c22d079 100644
--- a/lua/lexers/xtend.lua
+++ b/lua/lexers/xtend.lua
@@ -1,112 +1,90 @@
--- Copyright (c) 2014-2017 Piotr Orzechowski [drzewo.org]. See LICENSE.
+-- Copyright (c) 2014-2022 Piotr Orzechowski [drzewo.org]. See LICENSE.
 -- Xtend LPeg lexer.
 
-local l = require('lexer')
-local token, word_match = l.token, l.word_match
-local P, R, S = lpeg.P, lpeg.R, lpeg.S
+local lexer = require('lexer')
+local token, word_match = lexer.token, lexer.word_match
+local P, S = lpeg.P, lpeg.S
 
-local M = {_NAME = 'xtend'}
+local lex = lexer.new('xtend')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+local ws = token(lexer.WHITESPACE, lexer.space^1)
+lex:add_rule('whitespace', ws)
 
--- Comments.
-local line_comment = '//' * l.nonnewline_esc^0
-local block_comment = '/*' * (l.any - '*/')^0 * P('*/')^-1
-local comment = token(l.COMMENT, line_comment + block_comment)
+-- Classes.
+lex:add_rule('class', token(lexer.KEYWORD, 'class') * ws^1 * token(lexer.CLASS, lexer.word))
 
--- Strings.
-local sq_str = l.delimited_range("'", true)
-local dq_str = l.delimited_range('"', true)
-local string = token(l.STRING, sq_str + dq_str)
+-- Keywords.
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  -- General.
+  'abstract', 'annotation', 'as', 'case', 'catch', 'class', 'create', 'def', 'default', 'dispatch',
+  'do', 'else', 'enum', 'extends', 'extension', 'final', 'finally', 'for', 'if', 'implements',
+  'import', 'interface', 'instanceof', 'it', 'new', 'override', 'package', 'private', 'protected',
+  'public', 'return', 'self', 'static', 'super', 'switch', 'synchronized', 'this', 'throw',
+  'throws', 'try', 'typeof', 'val', 'var', 'while',
+  -- Templates.
+  'AFTER', 'BEFORE', 'ENDFOR', 'ENDIF', 'FOR', 'IF', 'SEPARATOR',
+  -- Literals.
+  'true', 'false', 'null'
+}))
+
+-- Types.
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'boolean', 'byte', 'char', 'double', 'float', 'int', 'long', 'short', 'void', 'Boolean', 'Byte',
+  'Character', 'Double', 'Float', 'Integer', 'Long', 'Short', 'String'
+}))
+
+-- Functions.
+lex:add_rule('function', token(lexer.FUNCTION, lexer.word) * #P('('))
+
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Templates.
-local templ_str = "'''" * (l.any - P("'''"))^0 * P("'''")^-1
-local template = token('template', templ_str, true)
+lex:add_rule('template', token('template', lexer.range("'''")))
+lex:add_style('template', lexer.styles.embedded)
+
+-- Strings.
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"', true)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
+
+-- Comments.
+local line_comment = lexer.to_eol('//', true)
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
 -- Numbers.
 local small_suff = S('lL')
-local med_suff = P(S('bB') * S('iI'))
-local large_suff = S('dD') + S('fF') + P(S('bB') * S('dD'))
-local exp = S('eE') * l.digit^1
+local med_suff = S('bB') * S('iI')
+local large_suff = S('dD') + S('fF') + S('bB') * S('dD')
+local exp = S('eE') * lexer.digit^1
 
-local dec_inf = ('_' * l.digit^1)^0
-local hex_inf = ('_' * l.xdigit^1)^0
-local float_pref = l.digit^1 * '.' * l.digit^1
+local dec_inf = ('_' * lexer.digit^1)^0
+local hex_inf = ('_' * lexer.xdigit^1)^0
+local float_pref = lexer.digit^1 * '.' * lexer.digit^1
 local float_suff = exp^-1 * med_suff^-1 * large_suff^-1
 
-local dec = l.digit * dec_inf * (small_suff^-1 + float_suff)
-local hex = l.hex_num * hex_inf * P('#' * (small_suff + med_suff))^-1
+local dec = lexer.digit * dec_inf * (small_suff^-1 + float_suff)
+local hex = lexer.hex_num * hex_inf * P('#' * (small_suff + med_suff))^-1
 local float = float_pref * dec_inf * float_suff
 
-local number = token(l.NUMBER, float + hex + dec)
-
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  -- General.
-  'abstract', 'annotation', 'as', 'case', 'catch', 'class', 'create', 'def',
-  'default', 'dispatch', 'do', 'else', 'enum', 'extends', 'extension', 'final',
-  'finally', 'for', 'if', 'implements', 'import', 'interface', 'instanceof',
-  'it', 'new', 'override', 'package', 'private', 'protected', 'public',
-  'return', 'self', 'static', 'super', 'switch', 'synchronized', 'this',
-  'throw', 'throws', 'try', 'typeof', 'val', 'var', 'while',
-  -- Templates.
-  -- 'AFTER', 'BEFORE', 'ENDFOR', 'ENDIF', 'FOR', 'IF', 'SEPARATOR',
-  -- Literals.
-  'true', 'false', 'null'
-})
+lex:add_rule('number', token(lexer.NUMBER, float + hex + dec))
 
--- Types.
-local type = token(l.TYPE, word_match{
-  'boolean', 'byte', 'char', 'double', 'float', 'int', 'long', 'short', 'void',
-  'Boolean', 'Byte', 'Character', 'Double', 'Float', 'Integer', 'Long', 'Short',
-  'String'
-})
-
--- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+-- Annotations.
+lex:add_rule('annotation', token('annotation', '@' * lexer.word))
+lex:add_style('annotation', lexer.styles.preprocessor)
 
 -- Operators.
-local operator = token(l.OPERATOR, S('+-/*%<>!=^&|?~:;.()[]{}#'))
+lex:add_rule('operator', token(lexer.OPERATOR, S('+-/*%<>!=^&|?~:;.()[]{}#')))
 
--- Annotations.
-local annotation = token('annotation', '@' * l.word)
+-- Error.
+lex:add_rule('error', token(lexer.ERROR, lexer.any))
 
--- Functions.
-local func = token(l.FUNCTION, l.word) * #P('(')
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, '/*', '*/')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('//'))
+lex:add_fold_point(lexer.KEYWORD, lexer.fold_consecutive_lines('import'))
 
--- Classes.
-local class = token(l.KEYWORD, P('class')) * ws^1 * token(l.CLASS, l.word)
-
--- Rules.
-M._rules = {
-  {'whitespace', ws},
-  {'class', class},
-  {'keyword', keyword},
-  {'type', type},
-  {'function', func},
-  {'identifier', identifier},
-  {'template', template},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'annotation', annotation},
-  {'operator', operator},
-  {'error', token(l.ERROR, l.any)},
-}
-
--- Token styles.
-M._tokenstyles = {
-  annotation = l.STYLE_PREPROCESSOR,
-  template = l.STYLE_EMBEDDED
-}
-
--- Folding.
-M._foldsymbols = {
-  _patterns = {'[{}]', '/%*', '%*/', '//', 'import'},
-  [l.OPERATOR] = {['{'] = 1, ['}'] = -1},
-  [l.COMMENT] = {['/*'] = 1, ['*/'] = -1, ['//'] = l.fold_line_comments('//')},
-  [l.KEYWORD] = {['import'] = l.fold_line_comments('import')}
-}
-
-return M
+return lex