Mercurial > vim
view runtime/indent/nginx.vim @ 34611:1790ce961c7d
runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Commit: https://github.com/vim/vim/commit/35e6f4ca27c8115c606f265e4b09e11db01c970d
Author: dkearns <dougkearns@gmail.com>
Date: Fri Mar 22 06:41:10 2024 +1100
runtime(vim): Update base-syntax, improve function definition highlighting (https://github.com/vim/vim/issues/14203)
Improve function definition highlighting.
- Match bang and function modifiers - abort etc.
- Only match valid scope modifiers.
- Match listing commands.
- Don't match ex commands in function names.
- Split function syntax groups into :func and :def subgroups.
- Match Vim9-script parameter and return types.
- Limit legacy-script and Vim9-script comments to :func and :def
definitions, respectively.
Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 21 Mar 2024 20:45:04 +0100 |
parents | 7d68a90cbf5c |
children |
line wrap: on
line source
" Vim indent file " Language: nginx.conf " Maintainer: Chris Aumann <me@chr4.org> " Last Change: 2022 Dec 01 " Only load this indent file when no other was loaded. if exists('b:did_indent') finish endif let b:did_indent = 1 setlocal indentexpr=GetNginxIndent() setlocal indentkeys=0{,0},0#,!^F,o,O let b:undo_indent = 'setl inde< indk<' " Only define the function once. if exists('*GetNginxIndent') finish endif function GetNginxIndent() abort let plnum = s:PrevNotAsBlank(v:lnum - 1) " Hit the start of the file, use zero indent. if plnum == 0 return 0 endif let ind = indent(plnum) " Add a 'shiftwidth' after '{' if s:AsEndWith(getline(plnum), '{') let ind = ind + shiftwidth() end " Subtract a 'shiftwidth' on '}' " This is the part that requires 'indentkeys'. if getline(v:lnum) =~ '^\s*}' let ind = ind - shiftwidth() endif let pplnum = s:PrevNotAsBlank(plnum - 1) if s:IsLineContinuation(plnum) if !s:IsLineContinuation(pplnum) let ind = ind + shiftwidth() end else if s:IsLineContinuation(pplnum) let ind = ind - shiftwidth() end endif return ind endfunction " Find the first line at or above {lnum} that is non-blank and not a comment. function s:PrevNotAsBlank(lnum) abort let lnum = prevnonblank(a:lnum) while lnum > 0 if getline(lnum) !~ '^\s*#' break endif let lnum = prevnonblank(lnum - 1) endwhile return lnum endfunction " Check whether {line} ends with {pat}, ignoring trailing comments. function s:AsEndWith(line, pat) abort return a:line =~ a:pat . '\m\s*\%(#.*\)\?$' endfunction function s:IsLineContinuation(lnum) abort return a:lnum > 0 && !s:AsEndWith(getline(a:lnum), '[;{}]') endfunction