8755fc679e
This commit makes several improvements to the Lua indentation logic. - Don't indent if the keyword is inside a string or comment - Indent inside "do end" - Indent inside "repeat until" - Indent after a line ending with "{" or "(" - More accurate un-indentation for the "end" keyword For the last point, previously we tried to match the indentation of the starting keyword of the block. However, sometimes this guessed wrong and produced the wrong indentation, as the following example shows. The new logic is to indent the "end" by one less level than the contents of the block. while true do if false then end end -- This was incorrectly matched with the "if"
139 lines
5.7 KiB
Plaintext
139 lines
5.7 KiB
Plaintext
# http://lua.org
|
|
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
|
|
|
|
# Detection
|
|
# ‾‾‾‾‾‾‾‾‾
|
|
|
|
hook global BufCreate .*[.](lua|rockspec) %{
|
|
set-option buffer filetype lua
|
|
}
|
|
|
|
# Initialization
|
|
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
|
|
|
|
hook global WinSetOption filetype=lua %{
|
|
require-module lua
|
|
|
|
hook window ModeChange pop:insert:.* -group lua-trim-indent lua-trim-indent
|
|
hook window InsertChar .* -group lua-indent lua-indent-on-char
|
|
hook window InsertChar \n -group lua-indent lua-indent-on-new-line
|
|
hook window InsertChar \n -group lua-insert lua-insert-on-new-line
|
|
|
|
alias window alt lua-alternative-file
|
|
|
|
hook -once -always window WinSetOption filetype=.* %{
|
|
remove-hooks window lua-.+
|
|
unalias window alt lua-alternative-file
|
|
}
|
|
}
|
|
|
|
hook -group lua-highlight global WinSetOption filetype=lua %{
|
|
add-highlighter window/lua ref lua
|
|
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/lua }
|
|
}
|
|
|
|
|
|
provide-module lua %§
|
|
|
|
# Highlighters
|
|
# ‾‾‾‾‾‾‾‾‾‾‾‾
|
|
|
|
add-highlighter shared/lua regions
|
|
add-highlighter shared/lua/code default-region group
|
|
add-highlighter shared/lua/raw_string region -match-capture '\[(=*)\[' '\](=*)\]' fill string
|
|
add-highlighter shared/lua/raw_comment region -match-capture '--\[(=*)\[' '\](=*)\]' fill comment
|
|
add-highlighter shared/lua/double_string region '"' (?<!\\)(?:\\\\)*" fill string
|
|
add-highlighter shared/lua/single_string region "'" (?<!\\)(?:\\\\)*' fill string
|
|
add-highlighter shared/lua/comment region '--' $ fill comment
|
|
|
|
add-highlighter shared/lua/code/function_declaration regex \b(?:function\h+)(?:\w+\h*\.\h*)*([a-zA-Z_]\w*)\( 1:function
|
|
add-highlighter shared/lua/code/function_call regex \b([a-zA-Z_]\w*)\h*(?=[\(\{]) 1:function
|
|
add-highlighter shared/lua/code/keyword regex \b(break|do|else|elseif|end|for|function|goto|if|in|local|repeat|return|then|until|while)\b 0:keyword
|
|
add-highlighter shared/lua/code/value regex \b(false|nil|true|[0-9]+(:?\.[0-9])?(:?[eE]-?[0-9]+)?|0x[0-9a-fA-F])\b 0:value
|
|
add-highlighter shared/lua/code/symbolic_operator regex (\+|-|\*|/|%|\^|==?|~=|<=?|>=?|\.\.|\.\.\.|#) 0:operator
|
|
add-highlighter shared/lua/code/keyword_operator regex \b(and|or|not)\b 0:operator
|
|
add-highlighter shared/lua/code/module regex \b(_G|_ENV)\b 0:module
|
|
add-highlighter shared/lua/code/attribute regex \B(<[a-zA-Z_]\w*>)\B 0:attribute
|
|
|
|
# Commands
|
|
# ‾‾‾‾‾‾‾‾
|
|
|
|
define-command lua-alternative-file -docstring 'Jump to the alternate file (implementation ↔ test)' %{ evaluate-commands %sh{
|
|
case $kak_buffile in
|
|
*spec/*_spec.lua)
|
|
altfile=$(eval printf %s\\n $(printf %s\\n $kak_buffile | sed s+spec/+'*'/+';'s/_spec//))
|
|
[ ! -f $altfile ] && echo "fail 'implementation file not found'" && exit
|
|
;;
|
|
*.lua)
|
|
altfile=""
|
|
altdir=""
|
|
path=$kak_buffile
|
|
dirs=$(while [ $path ]; do printf %s\\n $path; path=${path%/*}; done | tail -n +2)
|
|
for dir in $dirs; do
|
|
altdir=$dir/spec
|
|
if [ -d $altdir ]; then
|
|
altfile=$altdir/$(realpath $kak_buffile --relative-to $dir | sed s+[^/]'*'/++';'s/.lua$/_spec.lua/)
|
|
break
|
|
fi
|
|
done
|
|
[ ! -d "$altdir" ] && echo "fail 'spec/ not found'" && exit
|
|
;;
|
|
*)
|
|
echo "fail 'alternative file not found'" && exit
|
|
;;
|
|
esac
|
|
printf %s\\n "edit $altfile"
|
|
}}
|
|
|
|
define-command -hidden lua-trim-indent %[
|
|
# remove trailing whitespaces
|
|
try %[ execute-keys -draft -itersel <a-x> s \h+$ <ret> d ]
|
|
]
|
|
|
|
define-command -hidden lua-indent-on-char %[
|
|
evaluate-commands -no-hooks -draft -itersel %[
|
|
# unindent middle and end structures
|
|
try %[ execute-keys -draft \
|
|
<a-h><a-k>^\h*(\b(end|else|elseif|until)\b|[)}])$<ret> \
|
|
:lua-indent-on-new-line<ret> \
|
|
<a-lt>
|
|
]
|
|
]
|
|
]
|
|
|
|
define-command -hidden lua-indent-on-new-line %[
|
|
evaluate-commands -no-hooks -draft -itersel %[
|
|
# remove trailing white spaces from previous line
|
|
try %[ execute-keys -draft k : lua-trim-indent <ret> ]
|
|
# preserve previous non-empty line indent
|
|
try %[ execute-keys -draft <space>gh<a-?>^[^\n]+$<ret>s\A|.\z<ret>)<a-&> ]
|
|
# add one indentation level if the previous line is not a comment and:
|
|
# - starts with a block keyword that is not closed on the same line,
|
|
# - or contains an unclosed function expression,
|
|
# - or ends with an enclosed '(' or '{'
|
|
try %[ execute-keys -draft \
|
|
<space> K<a-x> \
|
|
<a-K>\A\h*--<ret> \
|
|
<a-K>\A[^\n]*\b(end|until)\b<ret> \
|
|
<a-k>\A(\h*\b(do|else|elseif|for|function|if|repeat|while)\b|[^\n]*[({]$|[^\n]*\bfunction\b\h*[(])<ret> \
|
|
<a-:><semicolon><a-gt>
|
|
]
|
|
]
|
|
]
|
|
|
|
define-command -hidden lua-insert-on-new-line %[
|
|
evaluate-commands -no-hooks -draft -itersel %[
|
|
# copy -- comment prefix and following white spaces
|
|
try %[ execute-keys -draft k<a-x>s^\h*\K--\h*<ret> y gh j <a-x><semicolon> P ]
|
|
# wisely add end structure
|
|
evaluate-commands -save-regs x %[
|
|
try %[ execute-keys -draft k<a-x>s^\h+<ret>"xy ] catch %[ reg x '' ] # Save previous line indent in register x
|
|
try %[ execute-keys -draft k<a-x> <a-k>^<c-r>x\b[^\n]*(do|for|function|if|while)<ret><a-K>\bend\b<ret> J}iJ<a-x> <a-K>^<c-r>x(else|end|elseif)$<ret> # Validate previous line and that it is not closed yet
|
|
execute-keys -draft o<c-r>xend<esc> # auto insert end
|
|
execute-keys -draft k<a-x><a-k>\(function\b<ret>jjA)<esc> ] # auto insert ) for anonymous function
|
|
]
|
|
]
|
|
]
|
|
|
|
§
|