lua: move non-core code out of vis.lua

The following structure is adapted:

 * visrc.lua entry point for all Lua code

 * vis.lua only implements the Lua part of the core API

 * vis-std.lua registers standard event handlers (e.g. syntax highlighting,
   statusbar handling, theme changes etc). It is sourced from vis.lua.

 * plugins/* non essential editor functionality, needs to be explicitly
   enabled by loading it from visrc.lua

5 files changed, 585 insertions, 591 deletions

diff --git a/lua/plugins/filetype.lua b/lua/plugins/filetype.lua
new file mode 100644
index 0000000..e308ac0
--- /dev/null
+++ b/lua/plugins/filetype.lua
@@ -0,0 +1,429 @@
+vis.ftdetect = {}
+
+vis.ftdetect.ignoresuffixes = {
+	"~", ".orig", ".bak", ".old", ".new"
+}
+
+vis.ftdetect.filetypes = {
+	actionscript = {
+		ext = { ".as", ".asc" },
+	},
+	ada = {
+		ext = { ".adb", ".ads" },
+	},
+	ansi_c = {
+		ext = { ".c", ".C", ".h" },
+	},
+	antlr = {
+		ext = { ".g", ".g4" },
+	},
+	apdl = {
+		ext = { ".ans", ".inp", ".mac" },
+	},
+	apl = {
+		ext = { ".apl" }
+	},
+	applescript = {
+		ext = { ".applescript" },
+	},
+	asm = {
+		ext = { ".asm", ".ASM", ".s", ".S" },
+	},
+	asp = {
+		ext = { ".asa", ".asp", ".hta" },
+	},
+	autoit = {
+		ext = { ".au3", ".a3x" },
+	},
+	awk = {
+		ext = { ".awk" },
+	},
+	bash = {
+		ext = { ".bash", ".csh", ".sh", ".zsh" },
+		mime = { "text/x-shellscript" },
+	},
+	batch = {
+		ext = { ".bat", ".cmd" },
+	},
+	bibtex = {
+		ext = { ".bib" },
+	},
+	boo = {
+		ext = { ".boo" },
+	},
+	caml = {
+		ext = { ".caml", ".ml", ".mli", ".mll", ".mly" },
+	},
+	chuck = {
+		ext = { ".ck" },
+	},
+	cmake = {
+		ext = { ".cmake", ".cmake.in", ".ctest", ".ctest.in" },
+	},
+	coffeescript = {
+		ext = { ".coffee" },
+	},
+	cpp = {
+		ext = { ".cpp", ".cxx", ".c++", ".cc", ".hh", ".hpp", ".hxx", ".h++" },
+	},
+	crystal = {
+		ext = { ".cr" },
+	},
+	csharp = {
+		ext = { ".cs" },
+	},
+	css = {
+		ext = { ".css" },
+	},
+	cuda = {
+		ext = { ".cu", ".cuh" },
+	},
+	dart = {
+		ext = { ".dart" },
+	},
+	desktop = {
+		ext = { ".desktop" },
+	},
+	diff = {
+		ext = { ".diff", ".patch" },
+	},
+	dmd = {
+		ext = { ".d", ".di" },
+	},
+	dockerfile = {
+		ext = { "Dockerfile" },
+	},
+	dot = {
+		ext = { ".dot" },
+	},
+	dsv = {
+		ext = { "group", "gshadow", "passwd", "shadow" },
+	},
+	eiffel = {
+		ext = { ".e", ".eif" },
+	},
+	elixir = {
+		ext = { ".ex", ".exs" },
+	},
+	erlang = {
+		ext = { ".erl", ".hrl" },
+	},
+	faust = {
+		ext = { ".dsp" },
+	},
+	fish = {
+		ext = { ".fish" },
+	},
+	forth = {
+		ext = { ".forth", ".frt", ".fs" },
+	},
+	fortran = {
+		ext = { ".f", ".for", ".ftn", ".fpp", ".f77", ".f90", ".f95", ".f03", ".f08" },
+	},
+	fsharp = {
+		ext = { ".fs" },
+	},
+	fstab = {
+		ext = { "fstab" },
+	},
+	gap = {
+		ext = { ".g", ".gd", ".gi", ".gap" },
+	},
+	gettext = {
+		ext = { ".po", ".pot" },
+	},
+	gherkin = {
+		ext = { ".feature" },
+	},
+	glsl = {
+		ext = { ".glslf", ".glslv" },
+	},
+	gnuplot = {
+		ext = { ".dem", ".plt" },
+	},
+	go = {
+		ext = { ".go" },
+	},
+	groovy = {
+		ext = { ".groovy", ".gvy" },
+	},
+	gtkrc = {
+		ext = { ".gtkrc" },
+	},
+	haskell = {
+		ext = { ".hs" },
+	},
+	html = {
+		ext = { ".htm", ".html", ".shtm", ".shtml", ".xhtml" },
+	},
+	icon = {
+		ext = { ".icn" },
+	},
+	idl = {
+		ext = { ".idl", ".odl" },
+	},
+	inform = {
+		ext = { ".inf", ".ni" },
+	},
+	ini = {
+		ext = { ".cfg", ".cnf", ".inf", ".ini", ".reg" },
+	},
+	io_lang = {
+		ext = { ".io" },
+	},
+	java = {
+		ext = { ".bsh", ".java" },
+	},
+	javascript = {
+		ext = { ".js", ".jsfl" },
+	},
+	json = {
+		ext = { ".json" },
+	},
+	jsp = {
+		ext = { ".jsp" },
+	},
+	latex = {
+		ext = { ".bbl", ".dtx", ".ins", ".ltx", ".tex", ".sty" },
+	},
+	ledger = {
+		ext = { ".ledger", ".journal" },
+	},
+	less = {
+		ext = { ".less" },
+	},
+	lilypond = {
+		ext = { ".lily", ".ly" },
+	},
+	lisp = {
+		ext = { ".cl", ".el", ".lisp", ".lsp" },
+	},
+	litcoffee = {
+		ext = { ".litcoffee" },
+	},
+	lua = {
+		ext = { ".lua" },
+	},
+	makefile = {
+		ext = { ".iface", ".mak", ".mk", "GNUmakefile", "makefile", "Makefile" },
+	},
+	man = {
+		ext = { ".1", ".2", ".3", ".4", ".5", ".6", ".7", ".8", ".9", ".1x", ".2x", ".3x", ".4x", ".5x", ".6x", ".7x", ".8x", ".9x" },
+	},
+	markdown = {
+		ext = { ".md", ".markdown" },
+	},
+	moonscript = {
+		ext = { ".moon" },
+	},
+	nemerle = {
+		ext = { ".n" },
+	},
+	networkd = {
+		ext = { ".link", ".network", ".netdev" },
+	},
+	nim = {
+		ext = { ".nim" },
+	},
+	nsis = {
+		ext = { ".nsh", ".nsi", ".nsis" },
+	},
+	objective_c = {
+		ext = { ".m", ".mm", ".objc" },
+	},
+	pascal = {
+		ext = { ".dpk", ".dpr", ".p", ".pas" },
+	},
+	perl = {
+		ext = { ".al", ".perl", ".pl", ".pm", ".pod" },
+	},
+	php = {
+		ext = { ".inc", ".php", ".php3", ".php4", ".phtml" },
+	},
+	pico8 = {
+		ext = { ".p8" },
+	},
+	pike = {
+		ext = { ".pike", ".pmod" },
+	},
+	pkgbuild = {
+		ext = { "PKGBUILD" },
+	},
+	powershell = {
+		ext = { ".ps1" },
+	},
+	prolog = {
+		ext = { ".prolog" },
+	},
+	props = {
+		ext = { ".props", ".properties" },
+	},
+	protobuf = {
+		ext = { ".proto" },
+	},
+	ps = {
+		ext = { ".eps", ".ps" },
+	},
+	pure = {
+		ext = { ".pure" },
+	},
+	python = {
+		ext = { ".sc", ".py", ".pyw" },
+	},
+	rebol = {
+		ext = { ".r", ".reb" },
+	},
+	rest = {
+		ext = { ".rst" },
+	},
+	rexx = {
+		ext = { ".orx", ".rex" },
+	},
+	rhtml = {
+		ext = { ".erb", ".rhtml" },
+	},
+	rstats = {
+		ext = { ".R", ".Rout", ".Rhistory", ".Rt", "Rout.save", "Rout.fail" },
+	},
+	ruby = {
+		ext = { ".Rakefile", ".rake", ".rb", ".rbw" },
+	},
+	rust = {
+		ext = { ".rs" },
+	},
+	sass = {
+		ext = { ".sass", ".scss" },
+	},
+	scala = {
+		ext = { ".scala" },
+	},
+	scheme = {
+		ext = { ".sch", ".scm" },
+	},
+	smalltalk = {
+		ext = { ".changes", ".st", ".sources" },
+	},
+	sml = {
+		ext = { ".sml", ".fun", ".sig" },
+	},
+	snobol4 = {
+		ext = { ".sno", ".SNO" },
+	},
+	sql= {
+		ext = { ".ddl", ".sql" },
+	},
+	systemd = {
+		ext = { ".automount", ".device", ".mount", ".path", ".scope", ".service", ".slice", ".socket", ".swap", ".target", ".timer" },
+	},
+	taskpaper = {
+		ext = { ".taskpaper" },
+	},
+	tcl = {
+		ext = { ".tcl", ".tk" },
+	},
+	texinfo = {
+		ext = { ".texi" },
+	},
+	toml = {
+		ext = { ".toml" },
+	},
+	vala = {
+		ext = { ".vala" }
+	},
+	vb = {
+		ext = { ".asa", ".bas", ".cls", ".ctl", ".dob", ".dsm", ".dsr", ".frm", ".pag", ".vb", ".vba", ".vbs" },
+	},
+	vcard = {
+		ext = { ".vcf", ".vcard" },
+	},
+	verilog = {
+		ext = { ".v", ".ver" },
+	},
+	vhdl = {
+		ext = { ".vh", ".vhd", ".vhdl" },
+	},
+	wsf = {
+		ext = { ".wsf" },
+	},
+	xml = {
+		ext = { ".dtd", ".svg", ".xml", ".xsd", ".xsl", ".xslt", ".xul" },
+	},
+	xtend = {
+		ext = {".xtend" },
+	},
+	yaml = {
+		ext = { ".yaml" },
+	},
+}
+
+vis.filetype_detect = function(win)
+	local name = win.file.name
+	-- remove ignored suffixes from filename
+	local sanitizedfn = name
+	if sanitizedfn ~= nil then
+		sanitizedfn = sanitizedfn:gsub('^.*/', '')
+		repeat
+			local changed = false
+			for _, pattern in pairs(vis.ftdetect.ignoresuffixes) do
+				if #sanitizedfn >= #pattern then
+					local s, e = sanitizedfn:find(pattern, -#pattern, true)
+					if e == #sanitizedfn then
+						sanitizedfn = sanitizedfn:sub(1, #sanitizedfn - #pattern)
+						changed = true
+					end
+				end
+			end
+		until not changed
+	end
+
+	-- detect filetype by filename ending with a configured extension
+	if sanitizedfn ~= nil then
+		for lang, ft in pairs(vis.ftdetect.filetypes) do
+			for _, pattern in pairs(ft.ext or {}) do
+				if #sanitizedfn >= #pattern then
+					local s, e = sanitizedfn:find(pattern, -#pattern, true)
+					if e == #sanitizedfn then
+						win.syntax = lang
+						return
+					end
+				end
+			end
+		end
+	end
+
+	-- run file(1) to determine mime type
+	if name ~= nil then
+		local file = io.popen(string.format("file -bL --mime-type -- '%s'", name:gsub("'", "'\\''")))
+		if file then
+			local mime = file:read('*all')
+			if mime then
+				mime = mime:gsub('%s*$', '')
+			end
+			if mime and #mime > 0 then
+				for lang, ft in pairs(vis.ftdetect.filetypes) do
+					for _, ft_mime in pairs(ft.mime or {}) do
+						if mime == ft_mime then
+							win.syntax = lang
+							return
+						end
+					end
+				end
+			end
+		end
+	end
+
+	-- pass first few bytes of file to custom file type detector functions
+	local file = win.file
+	local data = file:content(0, 256)
+	if data and #data > 0 then
+		for lang, ft in pairs(vis.ftdetect.filetypes) do
+			if type(ft.detect) == 'function' and ft.detect(file, data) then
+				win.syntax = lang
+				return
+			end
+		end
+	end
+
+	win.syntax = nil
+end
+
diff --git a/lua/plugins/textobject-lexer.lua b/lua/plugins/textobject-lexer.lua
new file mode 100644
index 0000000..a995083
--- /dev/null
+++ b/lua/plugins/textobject-lexer.lua
@@ -0,0 +1,34 @@
+-- text object matching a lexer token
+
+local MAX_CONTEXT = 32768
+
+vis:textobject_new("ii", function(win, pos)
+
+	if win.syntax == nil or not vis.lexers then
+		return pos, pos
+	end
+
+	local before, after = pos - MAX_CONTEXT, pos + MAX_CONTEXT
+	if before < 0 then
+		before = 0
+	end
+	-- TODO make sure we start at a line boundary?
+
+	local lexer = vis.lexers.load(win.syntax)
+	local data = win.file:content(before, after - before)
+	local tokens = lexer:lex(data)
+	local cur = before
+	-- print(before..", "..pos..", ".. after)
+
+	for i = 1, #tokens, 2 do
+		local name = tokens[i]
+		local token_next = before + tokens[i+1] - 1
+		-- print(name..": ["..cur..", "..token_next.."] pos: "..pos)
+		if cur <= pos and pos < token_next then
+			return cur, token_next
+		end
+		cur = token_next
+	end
+
+	return pos, pos
+end)
diff --git a/lua/vis-std.lua b/lua/vis-std.lua
new file mode 100644
index 0000000..d8a32ad
--- /dev/null
+++ b/lua/vis-std.lua
@@ -0,0 +1,119 @@
+-- standard vis event handlers
+
+vis.events.theme_change = function(name)
+	if name ~= nil then
+		local theme = 'themes/'..name
+		package.loaded[theme] = nil
+		require(theme)
+	end
+
+	if vis.lexers ~= nil then vis.lexers.lexers = {} end
+
+	for win in vis:windows() do
+		win.syntax = win.syntax;
+	end
+end
+
+vis.events.win_syntax = function(win, name)
+	local lexers = vis.lexers
+	if not lexers.load then return false end
+
+	win:style_define(win.STYLE_DEFAULT, lexers.STYLE_DEFAULT)
+	win:style_define(win.STYLE_CURSOR, lexers.STYLE_CURSOR)
+	win:style_define(win.STYLE_CURSOR_PRIMARY, lexers.STYLE_CURSOR_PRIMARY)
+	win:style_define(win.STYLE_CURSOR_LINE, lexers.STYLE_CURSOR_LINE)
+	win:style_define(win.STYLE_SELECTION, lexers.STYLE_SELECTION)
+	win:style_define(win.STYLE_LINENUMBER, lexers.STYLE_LINENUMBER)
+	win:style_define(win.STYLE_COLOR_COLUMN, lexers.STYLE_COLOR_COLUMN)
+
+	if name == nil then return true end
+
+	local lexer = lexers.load(name)
+	if not lexer then return false end
+
+	for token_name, id in pairs(lexer._TOKENSTYLES) do
+		local style = lexers['STYLE_'..string.upper(token_name)] or lexer._EXTRASTYLES[token_name]
+		win:style_define(id, style)
+	end
+
+	return true
+end
+
+vis.events.win_highlight = function(win, horizon_max)
+	if win.syntax == nil or vis.lexers == nil then return end
+	local lexer = vis.lexers.load(win.syntax)
+	if lexer == nil then return end
+
+	-- TODO: improve heuristic for initial style
+	local viewport = win.viewport
+	if not viewport then return end
+	local horizon = viewport.start < horizon_max and viewport.start or horizon_max
+	local view_start = viewport.start
+	local lex_start = viewport.start - horizon
+	local token_start = lex_start
+	viewport.start = token_start
+	local data = win.file:content(viewport)
+	local token_styles = lexer._TOKENSTYLES
+	local tokens = lexer:lex(data, 1)
+
+	for i = 1, #tokens, 2 do
+		local token_end = lex_start + tokens[i+1] - 1
+		if token_end >= view_start then
+			local name = tokens[i]
+			local style = token_styles[name]
+			if style ~= nil then
+				win:style(style, token_start, token_end)
+			end
+		end
+		token_start = token_end
+	end
+end
+
+local modes = {
+	[vis.MODE_NORMAL] = '',
+	[vis.MODE_OPERATOR_PENDING] = '',
+	[vis.MODE_VISUAL] = 'VISUAL',
+	[vis.MODE_VISUAL_LINE] = 'VISUAL-LINE',
+	[vis.MODE_INSERT] = 'INSERT',
+	[vis.MODE_REPLACE] = 'REPLACE',
+}
+
+vis.events.win_status = function(win)
+	local left_parts = {}
+	local right_parts = {}
+	local file = win.file
+	local cursor = win.cursor
+
+	local mode = modes[vis.mode]
+	if mode ~= '' and vis.win == win then
+		table.insert(left_parts, mode)
+	end
+
+	table.insert(left_parts, (file.name or '[No Name]') ..
+		(file.modified and ' [+]' or '') .. (vis.recording and ' @' or ''))
+
+	if file.newlines == "crlf" then
+		table.insert(right_parts, "␍␊")
+	end
+
+	if #win.cursors > 1 then
+		table.insert(right_parts, cursor.number..'/'..#win.cursors)
+	end
+
+	local size = file.size
+	table.insert(right_parts, (size == 0 and "0" or math.ceil(cursor.pos/size*100)).."%")
+
+	if not win.large then
+		local col = cursor.col
+		table.insert(right_parts, cursor.line..', '..col)
+		if size > 33554432 or col > 65536 then
+			win.large = true
+		end
+	end
+
+	local left = ' ' .. table.concat(left_parts, " » ") .. ' '
+	local right = ' ' .. table.concat(right_parts, " « ") .. ' '
+	win:status(left, right);
+end
+
+vis:command("set theme ".. (vis.ui.colors <= 16 and "default-16" or "default-256"))
diff --git a/lua/vis.lua b/lua/vis.lua
index 7d07b4b..5a4af8d 100644
--- a/lua/vis.lua
+++ b/lua/vis.lua
@@ -71,594 +71,4 @@ vis.textobject_new = function(vis, key, textobject)
 	return true
 end
 
-vis:textobject_new("ii", function(win, pos)
-
-	if win.syntax == nil then
-		return pos, pos
-	end
-
-	local before, after = pos - 4096, pos + 4096
-	if before < 0 then
-		before = 0
-	end
-	-- TODO make sure we start at a line boundary?
-
-	local lexer = vis.lexers.load(win.syntax)
-	local data = win.file:content(before, after - before)
-	local tokens = lexer:lex(data)
-	local cur = before
-	-- print(before..", "..pos..", ".. after)
-
-	for i = 1, #tokens, 2 do
-		local name = tokens[i]
-		local token_next = before + tokens[i+1] - 1
-		-- print(name..": ["..cur..", "..token_next.."] pos: "..pos)
-		if cur <= pos and pos < token_next then
-			return cur, token_next
-		end
-		cur = token_next
-	end
-
-	return pos, pos
-end)
-
-vis.ftdetect = {}
-
-vis.ftdetect.ignoresuffixes = {
-	"~", ".orig", ".bak", ".old", ".new"
-}
-
-vis.ftdetect.filetypes = {
-	actionscript = {
-		ext = { ".as", ".asc" },
-	},
-	ada = {
-		ext = { ".adb", ".ads" },
-	},
-	ansi_c = {
-		ext = { ".c", ".C", ".h" },
-	},
-	antlr = {
-		ext = { ".g", ".g4" },
-	},
-	apdl = {
-		ext = { ".ans", ".inp", ".mac" },
-	},
-	apl = {
-		ext = { ".apl" }
-	},
-	applescript = {
-		ext = { ".applescript" },
-	},
-	asm = {
-		ext = { ".asm", ".ASM", ".s", ".S" },
-	},
-	asp = {
-		ext = { ".asa", ".asp", ".hta" },
-	},
-	autoit = {
-		ext = { ".au3", ".a3x" },
-	},
-	awk = {
-		ext = { ".awk" },
-	},
-	bash = {
-		ext = { ".bash", ".csh", ".sh", ".zsh" },
-		mime = { "text/x-shellscript" },
-	},
-	batch = {
-		ext = { ".bat", ".cmd" },
-	},
-	bibtex = {
-		ext = { ".bib" },
-	},
-	boo = {
-		ext = { ".boo" },
-	},
-	caml = {
-		ext = { ".caml", ".ml", ".mli", ".mll", ".mly" },
-	},
-	chuck = {
-		ext = { ".ck" },
-	},
-	cmake = {
-		ext = { ".cmake", ".cmake.in", ".ctest", ".ctest.in" },
-	},
-	coffeescript = {
-		ext = { ".coffee" },
-	},
-	cpp = {
-		ext = { ".cpp", ".cxx", ".c++", ".cc", ".hh", ".hpp", ".hxx", ".h++" },
-	},
-	crystal = {
-		ext = { ".cr" },
-	},
-	csharp = {
-		ext = { ".cs" },
-	},
-	css = {
-		ext = { ".css" },
-	},
-	cuda = {
-		ext = { ".cu", ".cuh" },
-	},
-	dart = {
-		ext = { ".dart" },
-	},
-	desktop = {
-		ext = { ".desktop" },
-	},
-	diff = {
-		ext = { ".diff", ".patch" },
-	},
-	dmd = {
-		ext = { ".d", ".di" },
-	},
-	dockerfile = {
-		ext = { "Dockerfile" },
-	},
-	dot = {
-		ext = { ".dot" },
-	},
-	dsv = {
-		ext = { "group", "gshadow", "passwd", "shadow" },
-	},
-	eiffel = {
-		ext = { ".e", ".eif" },
-	},
-	elixir = {
-		ext = { ".ex", ".exs" },
-	},
-	erlang = {
-		ext = { ".erl", ".hrl" },
-	},
-	faust = {
-		ext = { ".dsp" },
-	},
-	fish = {
-		ext = { ".fish" },
-	},
-	forth = {
-		ext = { ".forth", ".frt", ".fs" },
-	},
-	fortran = {
-		ext = { ".f", ".for", ".ftn", ".fpp", ".f77", ".f90", ".f95", ".f03", ".f08" },
-	},
-	fsharp = {
-		ext = { ".fs" },
-	},
-	fstab = {
-		ext = { "fstab" },
-	},
-	gap = {
-		ext = { ".g", ".gd", ".gi", ".gap" },
-	},
-	gettext = {
-		ext = { ".po", ".pot" },
-	},
-	gherkin = {
-		ext = { ".feature" },
-	},
-	glsl = {
-		ext = { ".glslf", ".glslv" },
-	},
-	gnuplot = {
-		ext = { ".dem", ".plt" },
-	},
-	go = {
-		ext = { ".go" },
-	},
-	groovy = {
-		ext = { ".groovy", ".gvy" },
-	},
-	gtkrc = {
-		ext = { ".gtkrc" },
-	},
-	haskell = {
-		ext = { ".hs" },
-	},
-	html = {
-		ext = { ".htm", ".html", ".shtm", ".shtml", ".xhtml" },
-	},
-	icon = {
-		ext = { ".icn" },
-	},
-	idl = {
-		ext = { ".idl", ".odl" },
-	},
-	inform = {
-		ext = { ".inf", ".ni" },
-	},
-	ini = {
-		ext = { ".cfg", ".cnf", ".inf", ".ini", ".reg" },
-	},
-	io_lang = {
-		ext = { ".io" },
-	},
-	java = {
-		ext = { ".bsh", ".java" },
-	},
-	javascript = {
-		ext = { ".js", ".jsfl" },
-	},
-	json = {
-		ext = { ".json" },
-	},
-	jsp = {
-		ext = { ".jsp" },
-	},
-	latex = {
-		ext = { ".bbl", ".dtx", ".ins", ".ltx", ".tex", ".sty" },
-	},
-	ledger = {
-		ext = { ".ledger", ".journal" },
-	},
-	less = {
-		ext = { ".less" },
-	},
-	lilypond = {
-		ext = { ".lily", ".ly" },
-	},
-	lisp = {
-		ext = { ".cl", ".el", ".lisp", ".lsp" },
-	},
-	litcoffee = {
-		ext = { ".litcoffee" },
-	},
-	lua = {
-		ext = { ".lua" },
-	},
-	makefile = {
-		ext = { ".iface", ".mak", ".mk", "GNUmakefile", "makefile", "Makefile" },
-	},
-	man = {
-		ext = { ".1", ".2", ".3", ".4", ".5", ".6", ".7", ".8", ".9", ".1x", ".2x", ".3x", ".4x", ".5x", ".6x", ".7x", ".8x", ".9x" },
-	},
-	markdown = {
-		ext = { ".md", ".markdown" },
-	},
-	moonscript = {
-		ext = { ".moon" },
-	},
-	nemerle = {
-		ext = { ".n" },
-	},
-	networkd = {
-		ext = { ".link", ".network", ".netdev" },
-	},
-	nim = {
-		ext = { ".nim" },
-	},
-	nsis = {
-		ext = { ".nsh", ".nsi", ".nsis" },
-	},
-	objective_c = {
-		ext = { ".m", ".mm", ".objc" },
-	},
-	pascal = {
-		ext = { ".dpk", ".dpr", ".p", ".pas" },
-	},
-	perl = {
-		ext = { ".al", ".perl", ".pl", ".pm", ".pod" },
-	},
-	php = {
-		ext = { ".inc", ".php", ".php3", ".php4", ".phtml" },
-	},
-	pico8 = {
-		ext = { ".p8" },
-	},
-	pike = {
-		ext = { ".pike", ".pmod" },
-	},
-	pkgbuild = {
-		ext = { "PKGBUILD" },
-	},
-	powershell = {
-		ext = { ".ps1" },
-	},
-	prolog = {
-		ext = { ".prolog" },
-	},
-	props = {
-		ext = { ".props", ".properties" },
-	},
-	protobuf = {
-		ext = { ".proto" },
-	},
-	ps = {
-		ext = { ".eps", ".ps" },
-	},
-	pure = {
-		ext = { ".pure" },
-	},
-	python = {
-		ext = { ".sc", ".py", ".pyw" },
-	},
-	rebol = {
-		ext = { ".r", ".reb" },
-	},
-	rest = {
-		ext = { ".rst" },
-	},
-	rexx = {
-		ext = { ".orx", ".rex" },
-	},
-	rhtml = {
-		ext = { ".erb", ".rhtml" },
-	},
-	rstats = {
-		ext = { ".R", ".Rout", ".Rhistory", ".Rt", "Rout.save", "Rout.fail" },
-	},
-	ruby = {
-		ext = { ".Rakefile", ".rake", ".rb", ".rbw" },
-	},
-	rust = {
-		ext = { ".rs" },
-	},
-	sass = {
-		ext = { ".sass", ".scss" },
-	},
-	scala = {
-		ext = { ".scala" },
-	},
-	scheme = {
-		ext = { ".sch", ".scm" },
-	},
-	smalltalk = {
-		ext = { ".changes", ".st", ".sources" },
-	},
-	sml = {
-		ext = { ".sml", ".fun", ".sig" },
-	},
-	snobol4 = {
-		ext = { ".sno", ".SNO" },
-	},
-	sql= {
-		ext = { ".ddl", ".sql" },
-	},
-	systemd = {
-		ext = { ".automount", ".device", ".mount", ".path", ".scope", ".service", ".slice", ".socket", ".swap", ".target", ".timer" },
-	},
-	taskpaper = {
-		ext = { ".taskpaper" },
-	},
-	tcl = {
-		ext = { ".tcl", ".tk" },
-	},
-	texinfo = {
-		ext = { ".texi" },
-	},
-	toml = {
-		ext = { ".toml" },
-	},
-	vala = {
-		ext = { ".vala" }
-	},
-	vb = {
-		ext = { ".asa", ".bas", ".cls", ".ctl", ".dob", ".dsm", ".dsr", ".frm", ".pag", ".vb", ".vba", ".vbs" },
-	},
-	vcard = {
-		ext = { ".vcf", ".vcard" },
-	},
-	verilog = {
-		ext = { ".v", ".ver" },
-	},
-	vhdl = {
-		ext = { ".vh", ".vhd", ".vhdl" },
-	},
-	wsf = {
-		ext = { ".wsf" },
-	},
-	xml = {
-		ext = { ".dtd", ".svg", ".xml", ".xsd", ".xsl", ".xslt", ".xul" },
-	},
-	xtend = {
-		ext = {".xtend" },
-	},
-	yaml = {
-		ext = { ".yaml" },
-	},
-}
-
-vis.filetype_detect = function(win)
-	local name = win.file.name
-	-- remove ignored suffixes from filename
-	local sanitizedfn = name
-	if sanitizedfn ~= nil then
-		sanitizedfn = sanitizedfn:gsub('^.*/', '')
-		repeat
-			local changed = false
-			for _, pattern in pairs(vis.ftdetect.ignoresuffixes) do
-				if #sanitizedfn >= #pattern then
-					local s, e = sanitizedfn:find(pattern, -#pattern, true)
-					if e == #sanitizedfn then
-						sanitizedfn = sanitizedfn:sub(1, #sanitizedfn - #pattern)
-						changed = true
-					end
-				end
-			end
-		until not changed
-	end
-
-	-- detect filetype by filename ending with a configured extension
-	if sanitizedfn ~= nil then
-		for lang, ft in pairs(vis.ftdetect.filetypes) do
-			for _, pattern in pairs(ft.ext or {}) do
-				if #sanitizedfn >= #pattern then
-					local s, e = sanitizedfn:find(pattern, -#pattern, true)
-					if e == #sanitizedfn then
-						win.syntax = lang
-						return
-					end
-				end
-			end
-		end
-	end
-
-	-- run file(1) to determine mime type
-	if name ~= nil then
-		local file = io.popen(string.format("file -bL --mime-type -- '%s'", name:gsub("'", "'\\''")))
-		if file then
-			local mime = file:read('*all')
-			if mime then
-				mime = mime:gsub('%s*$', '')
-			end
-			if mime and #mime > 0 then
-				for lang, ft in pairs(vis.ftdetect.filetypes) do
-					for _, ft_mime in pairs(ft.mime or {}) do
-						if mime == ft_mime then
-							win.syntax = lang
-							return
-						end
-					end
-				end
-			end
-		end
-	end
-
-	-- pass first few bytes of file to custom file type detector functions
-	local file = win.file
-	local data = file:content(0, 256)
-	if data and #data > 0 then
-		for lang, ft in pairs(vis.ftdetect.filetypes) do
-			if type(ft.detect) == 'function' and ft.detect(file, data) then
-				win.syntax = lang
-				return
-			end
-		end
-	end
-
-	win.syntax = nil
-end
-
-vis.events.theme_change = function(name)
-	if name ~= nil then
-		local theme = 'themes/'..name
-		package.loaded[theme] = nil
-		require(theme)
-	end
-
-	if vis.lexers ~= nil then
-		vis.lexers.lexers = {}
-	end
-
-	for win in vis:windows() do
-		win.syntax = win.syntax;
-	end
-end
-
-vis.events.win_syntax = function(win, name)
-	local lexers = vis.lexers
-	if not lexers.load then
-		return false
-	end
-
-	win:style_define(win.STYLE_DEFAULT, lexers.STYLE_DEFAULT)
-	win:style_define(win.STYLE_CURSOR, lexers.STYLE_CURSOR)
-	win:style_define(win.STYLE_CURSOR_PRIMARY, lexers.STYLE_CURSOR_PRIMARY)
-	win:style_define(win.STYLE_CURSOR_LINE, lexers.STYLE_CURSOR_LINE)
-	win:style_define(win.STYLE_SELECTION, lexers.STYLE_SELECTION)
-	win:style_define(win.STYLE_LINENUMBER, lexers.STYLE_LINENUMBER)
-	win:style_define(win.STYLE_COLOR_COLUMN, lexers.STYLE_COLOR_COLUMN)
-
-	if name == nil then
-		return true
-	end
-
-	local lexer = lexers.load(name)
-	if not lexer then
-		return false
-	end
-
-	for token_name, id in pairs(lexer._TOKENSTYLES) do
-		local style = lexers['STYLE_'..string.upper(token_name)] or lexer._EXTRASTYLES[token_name]
-		win:style_define(id, style)
-	end
-
-	return true
-end
-
-vis.events.win_highlight = function(win, horizon_max)
-	if win.syntax == nil or vis.lexers == nil then
-		return
-	end
-	local lexer = vis.lexers.load(win.syntax)
-	if lexer == nil then
-		return
-	end
-
-	-- TODO: improve heuristic for initial style
-	local viewport = win.viewport
-	if not viewport then
-		return
-	end
-	local horizon = viewport.start < horizon_max and viewport.start or horizon_max
-	local view_start = viewport.start
-	local lex_start = viewport.start - horizon
-	local token_start = lex_start
-	viewport.start = token_start
-	local data = win.file:content(viewport)
-	local token_styles = lexer._TOKENSTYLES
-	local tokens = lexer:lex(data, 1)
-
-	for i = 1, #tokens, 2 do
-		local token_end = lex_start + tokens[i+1] - 1
-		if token_end >= view_start then
-			local name = tokens[i]
-			local style = token_styles[name]
-			if style ~= nil then
-				win:style(style, token_start, token_end)
-			end
-		end
-		token_start = token_end
-	end
-end
-
-local modes = {
-	[vis.MODE_NORMAL] = '',
-	[vis.MODE_OPERATOR_PENDING] = '',
-	[vis.MODE_VISUAL] = 'VISUAL',
-	[vis.MODE_VISUAL_LINE] = 'VISUAL-LINE',
-	[vis.MODE_INSERT] = 'INSERT',
-	[vis.MODE_REPLACE] = 'REPLACE',
-}
-
-vis.events.win_status = function(win)
-	local left_parts = {}
-	local right_parts = {}
-	local file = win.file
-	local cursor = win.cursor
-
-	local mode = modes[vis.mode]
-	if mode ~= '' and vis.win == win then
-		table.insert(left_parts, mode)
-	end
-
-	table.insert(left_parts, (file.name or '[No Name]') ..
-		(file.modified and ' [+]' or '') .. (vis.recording and ' @' or ''))
-
-	if file.newlines == "crlf" then
-		table.insert(right_parts, "␍␊")
-	end
-
-	if #win.cursors > 1 then
-		table.insert(right_parts, cursor.number..'/'..#win.cursors)
-	end
-
-	local size = file.size
-	table.insert(right_parts, (size == 0 and "0" or math.ceil(cursor.pos/size*100)).."%")
-
-	if not win.large then
-		local col = cursor.col
-		table.insert(right_parts, cursor.line..', '..col)
-		if size > 33554432 or col > 65536 then
-			win.large = true
-		end
-	end
-
-	local left = ' ' .. table.concat(left_parts, " » ") .. ' '
-	local right = ' ' .. table.concat(right_parts, " « ") .. ' '
-	win:status(left, right);
-end
-
-vis.events.theme_change((not vis.ui or vis.ui.colors <= 16) and "default-16" or "default-256")
+require('vis-std')
diff --git a/lua/visrc.lua b/lua/visrc.lua
index 95aa1c0..4c44f6a 100644
--- a/lua/visrc.lua
+++ b/lua/visrc.lua
@@ -1,5 +1,7 @@
 -- load standard vis module, providing parts of the Lua API
 require('vis')
+require('plugins/filetype')
+require('plugins/textobject-lexer')
 
 vis.events.start = function()
 	-- Your global configuration options e.g.