diff options
| -rw-r--r-- | .config/nvim/init.lua | 4 | ||||
| -rw-r--r-- | .config/nvim/lua/leaf/fold.lua | 7 | ||||
| -rw-r--r-- | .config/nvim/syntax/leaf.vim | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 3795917..ab70725 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -706,7 +706,7 @@ vimrc.remap('n', 'TW', 'Tw') -- Open *scratch* buffer {{{2 -local extension_mapping = { +local EXTENSION_MAPPING = { bash = 'sh', haskell = 'hs', javascript = 'js', @@ -723,7 +723,7 @@ local function make_scratch_buffer_name(ft) if ft == '' then ft = 'txt' end - local ext = extension_mapping[ft] or ft + local ext = EXTENSION_MAPPING[ft] or ft return my_env.scratch_dir .. '/' .. F.strftime('%Y-%m', now), F.strftime('%d-%H%M%S'), ext end diff --git a/.config/nvim/lua/leaf/fold.lua b/.config/nvim/lua/leaf/fold.lua index 6f8a0b5..0221dda 100644 --- a/.config/nvim/lua/leaf/fold.lua +++ b/.config/nvim/lua/leaf/fold.lua @@ -11,12 +11,13 @@ end function M.foldexpr() - local current_line_indent = F.indent(V.lnum) + local lnum = V.lnum + local current_line_indent = F.indent(lnum) local task_level = math.floor(current_line_indent / F.shiftwidth()) - if V.lnum == F.line('$') then + if lnum == F.line('$') then return task_level end - local next_line_indent = F.indent(V.lnum + 1) + local next_line_indent = F.indent(lnum + 1) if current_line_indent < next_line_indent then return ('>%d'):format(task_level + 1) else diff --git a/.config/nvim/syntax/leaf.vim b/.config/nvim/syntax/leaf.vim index d8112fd..ea86de4 100644 --- a/.config/nvim/syntax/leaf.vim +++ b/.config/nvim/syntax/leaf.vim @@ -9,17 +9,19 @@ syn match leafCheckboxTodo /\[ \]/ syn match leafCheckboxDone /\[x\]/ syn match leafCheckboxCanceled /\[-\]/ syn region leafComment start="# " end="$" +syn match leafTag /@\w\+/ +syn match leafProperty /\<\%(DEADLINE\|SCHEDULED\|ARCHIVED\): / syn match leafTimestamp /<\d\d\d\d-\d\d-\d\d\%( [月火水木金土日]\)\?\%( \d\d:\d\d\)\?>/ syn match leafTimestamp /<\d\d\d\d-\d\d-\d\d\%( [月火水木金土日]\)\?\%( \d\d:\d\d\)\?>--<\d\d\d\d-\d\d-\d\d\%( [月火水木金土日]\)\?\%( \d\d:\d\d\)\?>/ -syn match leafTag /@\w\+/ hi default link leafCheckboxTodo Special hi default link leafCheckboxDone Comment hi default link leafCheckboxCanceled Comment hi default link leafComment Comment -hi default link leafTimestamp Identifier hi default link leafTag String +hi default link leafProperty Identifier +hi default link leafTimestamp Identifier let b:current_syntax = 'leaf' |