vis
a vi-like editor based on Plan 9's structural regular expressions
git clone https://9o.is/git/vis.git
commit 400ee3c42e8924f78075491cd3d692f3e9f01e62 parent 5fad5b367fc1aec7f6fdd470a19daa5ca63eba67 Author: Marc André Tanner <mat@brain-dump.org> Date: Thu, 19 Jan 2017 20:54:01 +0100 lexer: sync with scintillua changeset 582 rev d70a5ee43d38 Diffstat:
106 files changed, 131 insertions(+), 119 deletions(-)
diff --git a/lua/lexers/actionscript.lua b/lua/lexers/actionscript.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Actionscript LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/ada.lua b/lua/lexers/ada.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Ada LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/ansi_c.lua b/lua/lexers/ansi_c.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- C LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/antlr.lua b/lua/lexers/antlr.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- ANTLR LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/apdl.lua b/lua/lexers/apdl.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- APDL LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/apl.lua b/lua/lexers/apl.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 David B. Lamkins <david@lamkins.net>. See LICENSE. +-- Copyright 2015-2017 David B. Lamkins <david@lamkins.net>. See LICENSE. -- APL LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/applescript.lua b/lua/lexers/applescript.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Applescript LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/asm.lua b/lua/lexers/asm.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- NASM Assembly LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/asp.lua b/lua/lexers/asp.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- ASP LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/autoit.lua b/lua/lexers/autoit.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- AutoIt LPeg lexer. -- Contributed by Jeff Stone. diff --git a/lua/lexers/awk.lua b/lua/lexers/awk.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- AWK LPeg lexer. -- Modified by Wolfgang Seeberg 2012, 2013. diff --git a/lua/lexers/bash.lua b/lua/lexers/bash.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Shell LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/batch.lua b/lua/lexers/batch.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Batch LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/bibtex.lua b/lua/lexers/bibtex.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Bibtex LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/boo.lua b/lua/lexers/boo.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Boo LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/caml.lua b/lua/lexers/caml.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- OCaml LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/cmake.lua b/lua/lexers/cmake.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- CMake LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/coffeescript.lua b/lua/lexers/coffeescript.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- CoffeeScript LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/container.lua b/lua/lexers/container.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Container LPeg lexer. -- This is SciTE's plain text lexer. diff --git a/lua/lexers/cpp.lua b/lua/lexers/cpp.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- C++ LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/crystal.lua b/lua/lexers/crystal.lua @@ -1,5 +1,5 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. --- Copyright 2016 Michel Martens. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2017 Michel Martens. -- Crystal LPeg lexer (based on Ruby). local l = require('lexer') diff --git a/lua/lexers/csharp.lua b/lua/lexers/csharp.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- C# LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/css.lua b/lua/lexers/css.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- CSS LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/cuda.lua b/lua/lexers/cuda.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- CUDA LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/desktop.lua b/lua/lexers/desktop.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Desktop Entry LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/diff.lua b/lua/lexers/diff.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Diff LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/django.lua b/lua/lexers/django.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Django LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/dmd.lua b/lua/lexers/dmd.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- D LPeg lexer. -- Heavily modified by Brian Schott (@Hackerpilot on Github). diff --git a/lua/lexers/dockerfile.lua b/lua/lexers/dockerfile.lua @@ -1,4 +1,4 @@ --- Copyright 2016 Alejandro Baez (https://keybase.io/baez). See LICENSE. +-- Copyright 2017 Alejandro Baez (https://keybase.io/baez). See LICENSE. -- Dockerfile LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/eiffel.lua b/lua/lexers/eiffel.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Eiffel LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/elixir.lua b/lua/lexers/elixir.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2015-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Contributed by Richard Philips. -- Elixer LPeg lexer. diff --git a/lua/lexers/erlang.lua b/lua/lexers/erlang.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Erlang LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/faust.lua b/lua/lexers/faust.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 David B. Lamkins <david@lamkins.net>. See LICENSE. +-- Copyright 2015-2017 David B. Lamkins <david@lamkins.net>. See LICENSE. -- Faust LPeg lexer, see http://faust.grame.fr/ local l = require('lexer') diff --git a/lua/lexers/fish.lua b/lua/lexers/fish.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 Jason Schindler. See LICENSE. +-- Copyright 2015-2017 Jason Schindler. See LICENSE. -- Fish (http://fishshell.com/) script LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/forth.lua b/lua/lexers/forth.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Forth LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/fortran.lua b/lua/lexers/fortran.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Fortran LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/fsharp.lua b/lua/lexers/fsharp.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- F# LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/gap.lua b/lua/lexers/gap.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Gap LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/gettext.lua b/lua/lexers/gettext.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Gettext LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/gherkin.lua b/lua/lexers/gherkin.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 Jason Schindler. See LICENSE. +-- Copyright 2015-2017 Jason Schindler. See LICENSE. -- Gherkin (https://github.com/cucumber/cucumber/wiki/Gherkin) LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/glsl.lua b/lua/lexers/glsl.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- GLSL LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/gnuplot.lua b/lua/lexers/gnuplot.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Gnuplot LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/go.lua b/lua/lexers/go.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Go LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/groovy.lua b/lua/lexers/groovy.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Groovy LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/gtkrc.lua b/lua/lexers/gtkrc.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Gtkrc LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/haskell.lua b/lua/lexers/haskell.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Haskell LPeg lexer. -- Modified by Alex Suraci. diff --git a/lua/lexers/html.lua b/lua/lexers/html.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- HTML LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/icon.lua b/lua/lexers/icon.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- LPeg lexer for the Icon programming language. -- http://www.cs.arizona.edu/icon -- Contributed by Carl Sturtivant. diff --git a/lua/lexers/idl.lua b/lua/lexers/idl.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- IDL LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/ini.lua b/lua/lexers/ini.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Ini LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/io_lang.lua b/lua/lexers/io_lang.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Io LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/java.lua b/lua/lexers/java.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Java LPeg lexer. -- Modified by Brian Schott. diff --git a/lua/lexers/javascript.lua b/lua/lexers/javascript.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- JavaScript LPeg lexer. local l = require('lexer') @@ -32,9 +32,9 @@ local keyword = token(l.KEYWORD, word_match{ 'abstract', 'boolean', 'break', 'byte', 'case', 'catch', 'char', 'class', 'const', 'continue', 'debugger', 'default', 'delete', 'do', 'double', 'else', 'enum', 'export', 'extends', 'false', 'final', 'finally', 'float', 'for', - 'function', 'goto', 'if', 'implements', 'import', 'in', 'instanceof', 'int', - 'interface', 'let', 'long', 'native', 'new', 'null', 'of', 'package', - 'private', 'protected', 'public', 'return', 'short', 'static', 'super', + 'function', 'get', 'goto', 'if', 'implements', 'import', 'in', 'instanceof', + 'int', 'interface', 'let', 'long', 'native', 'new', 'null', 'of', 'package', + 'private', 'protected', 'public', 'return', 'set', 'short', 'static', 'super', 'switch', 'synchronized', 'this', 'throw', 'throws', 'transient', 'true', 'try', 'typeof', 'var', 'void', 'volatile', 'while', 'with', 'yield' }) diff --git a/lua/lexers/jsp.lua b/lua/lexers/jsp.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- JSP LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/latex.lua b/lua/lexers/latex.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Latex LPeg lexer. -- Modified by Brian Schott. -- Modified by Robert Gieseke. diff --git a/lua/lexers/ledger.lua b/lua/lexers/ledger.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 Charles Lehner. See LICENSE. +-- Copyright 2015-2017 Charles Lehner. See LICENSE. -- ledger journal LPeg lexer, see http://www.ledger-cli.org/ local l = require('lexer') diff --git a/lua/lexers/lexer.lua b/lua/lexers/lexer.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. local M = {} @@ -566,13 +566,14 @@ local M = {} -- `_foldsymbols` table must have a `_patterns` field that contains a list of -- [Lua patterns][] that match fold points. If the lexer encounters text that -- matches one of those patterns, the lexer looks up the matched text in its --- token's table to determine whether or not the text is a fold point. In the --- example above, the first Lua pattern matches any '{' or '}' characters. When --- the lexer comes across one of those characters, it checks if the match is an --- `lexer.OPERATOR` token. If so, the lexer identifies the match as a fold --- point. The same idea applies for the other patterns. (The '%' is in the other --- patterns because '\*' is a special character in Lua patterns that needs --- escaping.) How do you specify fold keywords? Here is an example for Lua: +-- token's table in order to determine whether or not the text is a fold point. +-- In the example above, the first Lua pattern matches any '{' or '}' +-- characters. When the lexer comes across one of those characters, it checks if +-- the match is an `lexer.OPERATOR` token. If so, the lexer identifies the match +-- as a fold point. The same idea applies for the other patterns. (The '%' is in +-- the other patterns because '\*' is a special character in Lua patterns that +-- needs escaping.) How do you specify fold keywords? Here is an example for +-- Lua: -- -- M._foldsymbols = { -- [l.KEYWORD] = { @@ -586,6 +587,10 @@ local M = {} -- `lexer.KEYWORD` token and in the associated list of fold points, the lexer -- identifies the word as a fold point. -- +-- If your lexer has case-insensitive keywords as fold points, simply add a +-- `_case_insensitive = true` option to the `_foldsymbols` table and specify +-- keywords in lower case. +-- -- If your lexer needs to do some additional processing to determine if a match -- is a fold point, assign a function that returns an integer. Returning `1` or -- `-1` indicates the match is a fold point. Returning `0` indicates it is not. @@ -785,6 +790,8 @@ local M = {} -- @field STYLE_CALLTIP (string) -- The style used by call tips if [`buffer.call_tip_use_style`]() is set. -- Only the font name, size, and color attributes are used. +-- @field STYLE_FOLDDISPLAYTEXT (string) +-- The style used for fold display text. -- @field any (pattern) -- A pattern that matches any single character. -- @field ascii (pattern) @@ -1002,7 +1009,7 @@ end -- Predefined styles. local predefined = { 'default', 'linenumber', 'bracelight', 'bracebad', 'controlchar', - 'indentguide', 'calltip' + 'indentguide', 'calltip', 'folddisplaytext' } for i = 1, #predefined do local name, upper_name = predefined[i], string_upper(predefined[i]) @@ -1182,12 +1189,14 @@ function M.fold(lexer, text, start_pos, start_line, start_level) local fold_zero_sum_lines = M.property_int['fold.on.zero.sum.lines'] > 0 local fold_symbols = lexer._foldsymbols local fold_symbols_patterns = fold_symbols._patterns + local fold_symbols_case_insensitive = fold_symbols._case_insensitive local style_at, fold_level = M.style_at, M.fold_level local line_num, prev_level = start_line, start_level local current_level = prev_level for i = 1, #lines do local pos, line = lines[i][1], lines[i][2] if line ~= '' then + if fold_symbols_case_insensitive then line = line:lower() end local level_decreased = false for j = 1, #fold_symbols_patterns do for s, match in line:gmatch(fold_symbols_patterns[j]) do @@ -1605,11 +1614,14 @@ local function line_from_position(pos) end -- point and a value of `-1` indicates an ending fold point. Values can also -- be functions that return `1`, `-1`, or `0` (indicating no fold point) for -- keys which need additional processing. --- There is also a required `_pattern` key whose value is a table containing +-- There is also a required `_patterns` key whose value is a table containing -- Lua pattern strings that match all fold points (the string keys contained -- in token name table values). When the lexer encounters text that matches -- one of those patterns, the matched text is looked up in its token's table -- to determine whether or not it is a fold point. +-- There is also an optional `_case_insensitive` option that indicates whether +-- or not fold point keys are case-insensitive. If `true`, fold point keys +-- should be in lower case. -- @field _fold If this function exists in the lexer, it is called for folding -- the document instead of using `_foldsymbols` or indentation. -- @field _lexer The parent lexer object whose rules should be used. This field diff --git a/lua/lexers/lisp.lua b/lua/lexers/lisp.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Lisp LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/lua.lua b/lua/lexers/lua.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Lua LPeg lexer. -- Original written by Peter Odding, 2007/04/04. diff --git a/lua/lexers/makefile.lua b/lua/lexers/makefile.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Makefile LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/man.lua b/lua/lexers/man.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 David B. Lamkins <david@lamkins.net>. See LICENSE. +-- Copyright 2015-2017 David B. Lamkins <david@lamkins.net>. See LICENSE. -- man/roff LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/markdown.lua b/lua/lexers/markdown.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Markdown LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/moonscript.lua b/lua/lexers/moonscript.lua @@ -1,4 +1,4 @@ --- Copyright 2016 Alejandro Baez (https://keybase.io/baez). See LICENSE. +-- Copyright 2017 Alejandro Baez (https://keybase.io/baez). See LICENSE. -- Moonscript LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/nemerle.lua b/lua/lexers/nemerle.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Nemerle LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/nim.lua b/lua/lexers/nim.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Nim LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/null.lua b/lua/lexers/null.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Null LPeg lexer. local M = {_NAME = 'null'} diff --git a/lua/lexers/objective_c.lua b/lua/lexers/objective_c.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Objective C LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/pascal.lua b/lua/lexers/pascal.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Pascal LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/perl.lua b/lua/lexers/perl.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Perl LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/php.lua b/lua/lexers/php.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- PHP LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/pico8.lua b/lua/lexers/pico8.lua @@ -1,4 +1,4 @@ --- Copyright 2016 Alejandro Baez (https://keybase.io/baez). See LICENSE. +-- Copyright 2017 Alejandro Baez (https://keybase.io/baez). See LICENSE. -- PICO-8 Lexer. -- http://www.lexaloffle.com/pico-8.php diff --git a/lua/lexers/pike.lua b/lua/lexers/pike.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Pike LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/powershell.lua b/lua/lexers/powershell.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2015-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- PowerShell LPeg lexer. -- Contributed by Jeff Stone. diff --git a/lua/lexers/prolog.lua b/lua/lexers/prolog.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Prolog LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/props.lua b/lua/lexers/props.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Props LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/protobuf.lua b/lua/lexers/protobuf.lua @@ -1,4 +1,4 @@ --- Copyright 2016 David B. Lamkins <david@lamkins.net>. See LICENSE. +-- Copyright 2017 David B. Lamkins <david@lamkins.net>. See LICENSE. -- Protocol Buffer IDL LPeg lexer. -- <https://developers.google.com/protocol-buffers/> diff --git a/lua/lexers/ps.lua b/lua/lexers/ps.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Postscript LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/pure.lua b/lua/lexers/pure.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 David B. Lamkins <david@lamkins.net>. See LICENSE. +-- Copyright 2015-2017 David B. Lamkins <david@lamkins.net>. See LICENSE. -- pure LPeg lexer, see http://purelang.bitbucket.org/ local l = require('lexer') diff --git a/lua/lexers/python.lua b/lua/lexers/python.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Python LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/rails.lua b/lua/lexers/rails.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Ruby on Rails LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/rebol.lua b/lua/lexers/rebol.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Rebol LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/rest.lua b/lua/lexers/rest.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- reStructuredText LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/rexx.lua b/lua/lexers/rexx.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Rexx LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/rhtml.lua b/lua/lexers/rhtml.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- RHTML LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/rstats.lua b/lua/lexers/rstats.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- R LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/ruby.lua b/lua/lexers/ruby.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Ruby LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/rust.lua b/lua/lexers/rust.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 Alejandro Baez (https://keybase.io/baez). See LICENSE. +-- Copyright 2015-2017 Alejandro Baez (https://keybase.io/baez). See LICENSE. -- Rust LPeg lexer. local l = require("lexer") diff --git a/lua/lexers/scheme.lua b/lua/lexers/scheme.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Scheme LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/smalltalk.lua b/lua/lexers/smalltalk.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Smalltalk LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/snobol4.lua b/lua/lexers/snobol4.lua @@ -1,4 +1,4 @@ --- Copyright 2013-2016 Michael T. Richter. See LICENSE. +-- Copyright 2013-2017 Michael T. Richter. See LICENSE. -- SNOBOL4 lexer. -- This lexer works with classic SNOBOL4 as well as the CSNOBOL4 extensions. diff --git a/lua/lexers/sql.lua b/lua/lexers/sql.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- SQL LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/taskpaper.lua b/lua/lexers/taskpaper.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2016 Larry Hynes. See LICENSE. +-- Copyright (c) 2017 Larry Hynes. See LICENSE. -- Taskpaper LPeg lexer local l = require('lexer') diff --git a/lua/lexers/tcl.lua b/lua/lexers/tcl.lua @@ -1,4 +1,4 @@ --- Copyright 2014-2016 Joshua Krämer. See LICENSE. +-- Copyright 2014-2017 Joshua Krämer. See LICENSE. -- Tcl LPeg lexer. -- This lexer follows the TCL dodekalogue (http://wiki.tcl.tk/10259). -- It is based on the previous lexer by Mitchell. diff --git a/lua/lexers/tex.lua b/lua/lexers/tex.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Plain TeX LPeg lexer. -- Modified by Robert Gieseke. diff --git a/lua/lexers/texinfo.lua b/lua/lexers/texinfo.lua @@ -1,4 +1,4 @@ --- Copyright 2014-2016 stef@ailleurs.land. See LICENSE. +-- Copyright 2014-2017 stef@ailleurs.land. See LICENSE. -- Plain Texinfo version 5.2 LPeg lexer -- Freely inspired from Mitchell work and valuable help from him too ! diff --git a/lua/lexers/text.lua b/lua/lexers/text.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Text LPeg lexer. local M = {_NAME = 'text'} diff --git a/lua/lexers/toml.lua b/lua/lexers/toml.lua @@ -1,4 +1,4 @@ --- Copyright 2015-2016 Alejandro Baez (https://keybase.io/baez). See LICENSE. +-- Copyright 2015-2017 Alejandro Baez (https://keybase.io/baez). See LICENSE. -- TOML LPeg lexer. local l = require("lexer") diff --git a/lua/lexers/vala.lua b/lua/lexers/vala.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Vala LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/vb.lua b/lua/lexers/vb.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- VisualBasic LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/vbscript.lua b/lua/lexers/vbscript.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- VisualBasic LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/verilog.lua b/lua/lexers/verilog.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- Verilog LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/vhdl.lua b/lua/lexers/vhdl.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- VHDL LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/wsf.lua b/lua/lexers/wsf.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- WSF LPeg lexer (based on XML). -- Contributed by Jeff Stone. diff --git a/lua/lexers/xml.lua b/lua/lexers/xml.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- XML LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/xtend.lua b/lua/lexers/xtend.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2014-2016 Piotr Orzechowski [drzewo.org]. See LICENSE. +-- Copyright (c) 2014-2017 Piotr Orzechowski [drzewo.org]. See LICENSE. -- Xtend LPeg lexer. local l = require('lexer') diff --git a/lua/lexers/yaml.lua b/lua/lexers/yaml.lua @@ -1,4 +1,4 @@ --- Copyright 2006-2016 Mitchell mitchell.att.foicica.com. See LICENSE. +-- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE. -- YAML LPeg lexer. -- It does not keep track of indentation perfectly.