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, 46 insertions, 99 deletions

diff --git a/lua/lexers/pkgbuild.lua b/lua/lexers/pkgbuild.lua
index f08f114..eae3703 100644
--- a/lua/lexers/pkgbuild.lua
+++ b/lua/lexers/pkgbuild.lua
@@ -1,131 +1,78 @@
--- Copyright 2006-2013 gwash. See LICENSE.
+-- Copyright 2006-2022 gwash. See LICENSE.
 -- Archlinux PKGBUILD 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 = 'pkgbuild'}
+local lex = lexer.new('pkgbuild')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Comments.
-local comment = token(l.COMMENT, '#' * l.nonnewline^0)
+lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#')))
 
 -- Strings.
-local sq_str = l.delimited_range("'", false, true)
-local dq_str = l.delimited_range('"')
-local ex_str = l.delimited_range('`')
+local sq_str = lexer.range("'", false, false)
+local dq_str = lexer.range('"')
+local ex_str = lexer.range('`')
 local heredoc = '<<' * P(function(input, index)
-  local s, e, _, delimiter =
-    input:find('(["\']?)([%a_][%w_]*)%1[\n\r\f;]+', index)
+  local s, e, _, delimiter = input:find('(["\']?)([%a_][%w_]*)%1[\n\r\f;]+', index)
   if s == index and delimiter then
-    local _, e = input:find('[\n\r\f]+'..delimiter, e)
+    e = select(2, input:find('[\n\r\f]+' .. delimiter, e))
     return e and e + 1 or #input + 1
   end
 end)
-local string = token(l.STRING, sq_str + dq_str + ex_str + heredoc)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + ex_str + heredoc))
 
 -- Numbers.
-local number = token(l.NUMBER, l.float + l.integer)
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match({
-  'patch', 'cd', 'make', 'patch', 'mkdir', 'cp', 'sed', 'install', 'rm',
-  'if', 'then', 'elif', 'else', 'fi', 'case', 'in', 'esac', 'while', 'for',
-  'do', 'done', 'continue', 'local', 'return', 'git', 'svn', 'co', 'clone',
-  'gconf-merge-schema', 'msg', 'echo', 'ln',
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'patch', 'cd', 'make', 'patch', 'mkdir', 'cp', 'sed', 'install', 'rm', 'if', 'then', 'elif',
+  'else', 'fi', 'case', 'in', 'esac', 'while', 'for', 'do', 'done', 'continue', 'local', 'return',
+  'git', 'svn', 'co', 'clone', 'gconf-merge-schema', 'msg', 'echo', 'ln',
   -- Operators.
-  '-a', '-b', '-c', '-d', '-e', '-f', '-g', '-h', '-k', '-p', '-r', '-s', '-t',
-  '-u', '-w', '-x', '-O', '-G', '-L', '-S', '-N', '-nt', '-ot', '-ef', '-o',
-  '-z', '-n', '-eq', '-ne', '-lt', '-le', '-gt', '-ge', '-Np', '-i'
-}, '-'))
+  '-a', '-b', '-c', '-d', '-e', '-f', '-g', '-h', '-k', '-p', '-r', '-s', '-t', '-u', '-w', '-x',
+  '-O', '-G', '-L', '-S', '-N', '-nt', '-ot', '-ef', '-o', '-z', '-n', '-eq', '-ne', '-lt', '-le',
+  '-gt', '-ge', '-Np', '-i'
+}))
 
 -- Functions.
-local func = token(l.FUNCTION, word_match{
-  'build',
-  'check',
-  'package',
-  'pkgver',
-  'prepare'
-} * '()')
+lex:add_rule('function',
+  token(lexer.FUNCTION, word_match('build check package pkgver prepare') * '()'))
 
 -- Constants.
-local constants = {
-  -- We do *not* list pkgver, srcdir and startdir here.
+lex:add_rule('constant', token(lexer.CONSTANT, word_match{
+  -- We do *not* list pkgver srcdir and startdir here.
   -- These are defined by makepkg but user should not alter them.
-  'arch',
-  'backup',
-  'changelog',
-  'epoch',
-  'groups',
-  'install',
-  'license',
-  'noextract',
-  'options',
-  'pkgbase',
-  'pkgdesc',
-  'pkgname',
-  'pkgrel',
-  'pkgver',
-  'url',
-  'validpgpkeys'
-}
-local arch_specific = {
-  'checkdepends',
-  'conflicts',
-  'depends',
-  'makedepends',
-  'md5sums',
-  'optdepends',
-  'provides',
-  'replaces',
-  'sha1sums',
-  'sha256sums',
-  'sha384sums',
-  'sha512sums',
-  'source'
-}
-for _, field in ipairs(arch_specific) do
-  for _,arch in ipairs({ '', 'i686', 'x86_64' }) do
-    table.insert(constants, field..(arch ~= '' and '_'..arch or ''))
-  end
-end
-local constant = token(l.CONSTANT, word_match(constants))
+  'arch', 'backup', 'changelog', 'checkdepends', 'conflicts', 'depends', 'epoch', 'groups',
+  'install', 'license', 'makedepends', 'md5sums', 'noextract', 'optdepends', 'options', 'pkgbase',
+  'pkgdesc', 'pkgname', 'pkgrel', 'pkgver', 'provides', 'replaces', 'sha1sums', 'sha256sums',
+  'sha384sums', 'sha512sums', 'source', 'url', 'validpgpkeys'
+}))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Variables.
-local variable = token(l.VARIABLE,
-                       '$' * (S('!#?*@$') +
-                       l.delimited_range('()', true, true) +
-                       l.delimited_range('[]', true, true) +
-                       l.delimited_range('{}', true, true) +
-                       l.delimited_range('`', true, true) +
-                       l.digit^1 + l.word))
+local symbol = S('!#?*@$')
+local parens = lexer.range('(', ')', true)
+local brackets = lexer.range('[', ']', true)
+local braces = lexer.range('{', '}', true)
+local backticks = lexer.range('`', true, false)
+local number = lexer.dec_num
+lex:add_rule('variable', token(lexer.VARIABLE, '$' *
+  (symbol + parens + brackets + braces + backticks + number + lexer.word)))
 
 -- Operators.
-local operator = token(l.OPERATOR, S('=!<>+-/*^~.,:;?()[]{}'))
-
-M._rules = {
-  {'whitespace', ws},
-  {'comment', comment},
-  {'string', string},
-  {'number', number},
-  {'keyword', keyword},
-  {'function', func},
-  {'constant', constant},
-  {'identifier', identifier},
-  {'variable', variable},
-  {'operator', operator},
-}
+lex:add_rule('operator', token(lexer.OPERATOR, S('=!<>+-/*^~.,:;?()[]{}')))
 
-M._foldsymbols = {
-  _patterns = {'[%(%){}]', '#'},
-  [l.OPERATOR] = {['('] = 1, [')'] = -1, ['{'] = 1, ['}'] = -1},
-  [l.COMMENT] = {['#'] = l.fold_line_comments('#')}
-}
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '(', ')')
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('#'))
 
-return M
+return lex