mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-31 04:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41003 from zeertzjq/vim-f88e719

Browse Source 
vim-patch: runtime file updates
This commit is contained in:
zeertzjq
2026-07-27 06:47:21 +08:00
committed by GitHub
parent c57818bb43 1c83e43f27
commit 7f8175dc48
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/autoload/python.vim
View File

@@ -20,10 +20,12 @@ let g:python_indent = extend(get(g:, 'python_indent', {}), #{
let s:maxoff = 50 " maximum number of lines to look backwards for ()
function s:SearchBracket(fromlnum, flags)
" VIM_INDENT_TEST_TRACE_START
return searchpairpos('[[({]', '', '[])}]', a:flags,
\ {-> synstack('.', col('.'))
\ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\)$'}) >= 0},
\ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\|Bytes\)$'}) >= 0},
\ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
" VIM_INDENT_TEST_TRACE_END python#s:SearchBracket
endfunction
" See if the specified line is already user-dedented from the expected value.

6
runtime/indent/html.vim
View File

@@ -1,7 +1,7 @@
" Vim indent script for HTML
" Maintainer: The Vim Project <https://github.com/vim/vim>
" Original Author: Andy Wokula <anwoku@yahoo.de>
" Last Change: 2023 Aug 13
" Last Change: 2025 Apr 13
" Version: 1.0 "{{{
" Description: HTML indent script with cached state for faster indenting on a
" range of lines.
@@ -868,7 +868,9 @@ func HtmlIndent_FindTagStart(lnum)
let idx = match(getline(a:lnum), '\S>\s*$')
if idx > 0
call cursor(a:lnum, idx)
" VIM_INDENT_TEST_TRACE_START
let lnum = searchpair('<\w', '' , '\S>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
" VIM_INDENT_TEST_TRACE_END HtmlIndent_FindTagStart
if lnum > 0
return [lnum, 1]
endif
@@ -903,7 +905,9 @@ func HtmlIndent_FindTagEnd()
call search('--\zs>')
elseif s:get_tag('/' . tagname) != 0
" tag with a closing tag, find matching "</tag>"
" VIM_INDENT_TEST_TRACE_START
call searchpair('<' . tagname, '', '</' . tagname . '\zs>', 'W', '', line('.') + b:html_indent_line_limit)
" VIM_INDENT_TEST_TRACE_END HtmlIndent_FindTagEnd
else
" self-closing tag, find the ">"
call search('\S\zs>')

4
runtime/indent/javascript.vim
View File

@@ -2,7 +2,7 @@
" Language: Javascript
" Maintainer: Chris Paul ( https://github.com/bounceme )
" URL: https://github.com/pangloss/vim-javascript
" Last Change: December 4, 2017
" Last Change: 2025 Apr 13
" Only load this indent file when no other was loaded.
if exists('b:did_indent')
@@ -69,7 +69,9 @@ let s:rel = has('reltime')
" searchpair() wrapper
if s:rel
function s:GetPair(start,end,flags,skip)
" VIM_INDENT_TEST_TRACE_START
return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1,a:skip ==# 's:SkipFunc()' ? 2000 : 200)
" VIM_INDENT_TEST_TRACE_END s:GetPair
endfunction
else
function s:GetPair(start,end,flags,skip)

2
runtime/syntax/python.vim
View File

@@ -6,6 +6,7 @@
" 2025 Dec 03 by Vim Project: highlight t-strings #18679
" 2026 Jan 26 by Vim Project: highlight constants #18922
" 2026 Mar 11 by Vim Project: fix number performance #19630
" 2026 May 27 by Vim Project: highlight `lazy` soft keyword (PEP 810) #20342
" Credits: Neil Schemenauer <nas@python.ca>
" Dmitry Vasiliev
" Rob B
@@ -120,6 +121,7 @@ syn keyword pythonAsync async await
" for more on this.
syn match pythonConditional "^\s*\zscase\%(\s\+.*:.*$\)\@="
syn match pythonConditional "^\s*\zsmatch\%(\s\+.*:\s*\%(#.*\)\=$\)\@="
syn match pythonInclude "^\s*\zslazy\ze\s\+\%(from\|import\)\>"
syn match pythonStatement "\<type\ze\s\+\h\w*" nextgroup=pythonType skipwhite
" These names are special by convention. While they aren't real keywords,