adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update runtime files

Browse Source
This commit is contained in:
Bram Moolenaar
2020-05-07 18:56:00 +02:00
parent 6115481053
commit 2cfb4a2a72
10 changed files with 106 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 8.2. Last change: 2020 Apr 10 *options.txt* For Vim version 8.2. Last change: 2020 May 03
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

31
runtime/doc/todo.txt
View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 8.2. Last change: 2020 Apr 30 *todo.txt* For Vim version 8.2. Last change: 2020 May 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -39,22 +39,22 @@ browser use: https://github.com/vim/vim/issues/1234
-------------------- Known bugs and current work ----------------------- -------------------- Known bugs and current work -----------------------
Vim9 script: Vim9 script:
Big changes, need design: Big changes, may need design:
- Make closures work: - Make closures work:
Grab the part of the stack that has the arguments and local vars. - call closure from not compiled context
Pass a pointer and offset to the closure where this stack fragment is (frame - Create closure in a loop. Need to make a list of them.
pointer). - Having constant expr evaluation separate does not scale.
When a closure disappears at end of the function - nothing to do. First parse the expression, then simplify, then generate code.
When a closure remains at end of the function: copy frame, attach to closure.
- At the vim9 script level: Allow using a function that is defined later. - At the vim9 script level: Allow using a function that is defined later.
Requires compiling functions only when the whole script has been sourced. Requires compiling functions only when the whole script has been sourced.
Like Javascript "hoisting", but only at the script level: Like Javascript "hoisting", but only at the script level:
0. If script was sourced before, clear all script-local functions and
variables. (variables still to be implemented)
1. Discovery phase: Read the file to find all functions, variable 1. Discovery phase: Read the file to find all functions, variable
declarations and imports If a variable has a constant expression we get declarations and imports If a variable has a constant expression we get
the type, otherwise it will be "any". Follow imports recursively. the type, otherwise it will be "any". Follow imports recursively.
2. Compilation phase: compile :def function bodies, using declared types 2. Compilation phase: compile :def function bodies, using declared types
3. Execution phase: Execute imports when encountered. (skip over functions) 3. Execution phase: Execute imports when encountered. (skip over functions)
- When sourcing a script again, also delete script-local variables.
Making everything work: Making everything work:
- Test that a script-local function in Vim9 script cannot be deleted. - Test that a script-local function in Vim9 script cannot be deleted.
- Test that a function defined inside a :def function is local to that - Test that a function defined inside a :def function is local to that
@ -80,10 +80,6 @@ Making everything work:
- eval_expr() in ex_cexpr() - eval_expr() in ex_cexpr()
- eval_expr() call in dbg_parsearg() and debuggy_find() - eval_expr() call in dbg_parsearg() and debuggy_find()
New syntax and functionality: New syntax and functionality:
- define function and create funcref in one step:
let ref = def(arg: type): rettype
body
enddef
Improve error checking: Improve error checking:
- "echo Func()" is an error if Func() does not return anything. - "echo Func()" is an error if Func() does not return anything.
Also: Also:
@ -118,6 +114,10 @@ Further improvements:
- compile options that are an expression, e.g. "expr:" in 'spellsuggest', - compile options that are an expression, e.g. "expr:" in 'spellsuggest',
'foldexpr', 'foldtext', 'printexpr', 'diffexpr', 'patchexpr', 'charconvert', 'foldexpr', 'foldtext', 'printexpr', 'diffexpr', 'patchexpr', 'charconvert',
'balloonexpr', 'includeexpr', 'indentexpr', 'formatexpr'. 'balloonexpr', 'includeexpr', 'indentexpr', 'formatexpr'.
- Make inline function work, to be used as a funcref:
let ref = def(arg: type): rettype
body
enddef
- compile get_lambda_tv() in popup_add_timeout() - compile get_lambda_tv() in popup_add_timeout()
- compile "skip" argument of searchpair() - compile "skip" argument of searchpair()
- compile "expr" and "call" expression of a channel in channel_exe_cmd()? - compile "expr" and "call" expression of a channel in channel_exe_cmd()?
@ -254,9 +254,14 @@ Patch for the Haiku port: #5961
Patch to add Turkish manual. (Emir Sarı, #5641) Patch to add Turkish manual. (Emir Sarı, #5641)
Patch to add getmarklist() (Yegappan, #6032)
Patch to support different color for undercurl in cterm. Patch to support different color for undercurl in cterm.
(Timur Celik, #6011) (Timur Celik, #6011)
When SIGTSTP is ignored, don't let CTRL-Z suspend Vim? (Kurtis Rader, #5990)
Fixed by patch #6026. Makes tests fail...
Patch to support cindent option to handle pragmas differently. Patch to support cindent option to handle pragmas differently.
(Max Rumpf, #5468) (Max Rumpf, #5468)
@ -356,8 +361,6 @@ unlisted. (#4478)
Patch to include reduce() function. (#5481) Patch to include reduce() function. (#5481)
When SIGTSTP is ignored, don't let CTRL-Z suspend Vim? (Kurtis Rader, #5990)
Statusline highlighting error, off by one. (#5599) Statusline highlighting error, off by one. (#5599)
Enable 'termbidi' if $VTE_VERSION >= 5703 ? Enable 'termbidi' if $VTE_VERSION >= 5703 ?

56
runtime/doc/vim9.txt
View File

@ -1,4 +1,4 @@
*vim9.txt* For Vim version 8.2. Last change: 2020 Apr 30 *vim9.txt* For Vim version 8.2. Last change: 2020 May 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -125,10 +125,56 @@ The result is that functions and variables without a namespace can always be
found in the script, either defined there or imported. Global functions and found in the script, either defined there or imported. Global functions and
variables could be defined anywhere (good luck finding where!). variables could be defined anywhere (good luck finding where!).
Global functions can be defined and deleted at nearly any time. In Vim9 Global functions can be still be defined and deleted at nearly any time. In
script script-local functions are defined once when the script is sourced and Vim9 script script-local functions are defined once when the script is sourced
cannot be deleted. Except that when the same script is sourced again all and cannot be deleted.
existing script-local functions and variables are deleted.
Four phases when loading a Vim9 script ~
In legacy script the functions are created when encountered, but parsed only
when used. This allows for defining functions in any order and having them
call each other: >
func One()
call Two()
endfunc
func Two()
if cond
call One() " recursive call
endif
endfunc
call One()
In Vim9 script the functions are compiled. If using the same functions as the
above example it is not possible to compile function One without knowing that
function Two exists. Or this would require a runtime check, which is slow and
does not allow for compile time type checking.
When sourcing a Vim9 script this happens in four phases:
1. Cleanup: If the script was sourced before all script-local variables,
imports and functions are deleted.
2. Discovery: The script is read and encountered functions, imports and
variables are recognized. The type is parsed. Variable initializers that
are a constant are evaluated, this can give the type of the variable.
3. Compilation: Functions are compiled. The script-local functions, imports
and variables from the discovery phase are recognized and types are
checked.
4. Execution: the commands in the script are executed. Functions are skipped
over. Variable initializers are evaluated, unless they are a constant.
The result is that items defined at the script level can be used anywhere in
the script. This allows for putting the main function at the top: >
def Main()
SubOne()
SubTwo()
enddef
def SubOne()
...
def SubTwo()
...
Note that script-local variables should either have a type defined or have a
constant initializer. Otherwise an error is given for the type being unknown.
Variable declarations with :let and :const ~ Variable declarations with :let and :const ~

2
runtime/filetype.vim
View File

@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2020 Apr 29 " Last Change: 2020 May 07
" Listen very carefully, I will say this only once " Listen very carefully, I will say this only once
if exists("did_load_filetypes") if exists("did_load_filetypes")

13
runtime/ftplugin/dosbatch.vim
View File

@ -1,7 +1,7 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: MS-DOS .bat files " Language: MS-DOS .bat files
" Maintainer: Mike Williams <mrw@eandem.co.uk> " Maintainer: Mike Williams <mrw@eandem.co.uk>
" Last Change: 14th April 2019 " Last Change: 7th May 2020
" Only do this when not done yet for this buffer " Only do this when not done yet for this buffer
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
@ -19,12 +19,21 @@ setlocal comments=b:rem,b:@rem,b:REM,b:@REM,:::
setlocal commentstring=::\ %s setlocal commentstring=::\ %s
setlocal formatoptions-=t formatoptions+=rol setlocal formatoptions-=t formatoptions+=rol
" Lookup DOS keywords using Windows command help.
if executable('help.exe')
if has('terminal')
setlocal keywordprg=:term\ help.exe
else
setlocal keywordprg=help.exe
endif
endif
" Define patterns for the browse file filter " Define patterns for the browse file filter
if has("gui_win32") && !exists("b:browsefilter") if has("gui_win32") && !exists("b:browsefilter")
let b:browsefilter = "DOS Batch Files (*.bat, *.cmd)\t*.bat;*.cmd\nAll Files (*.*)\t*.*\n" let b:browsefilter = "DOS Batch Files (*.bat, *.cmd)\t*.bat;*.cmd\nAll Files (*.*)\t*.*\n"
endif endif
let b:undo_ftplugin = "setlocal comments< formatoptions<" let b:undo_ftplugin = "setlocal comments< formatoptions< keywordprg<"
\ . "| unlet! b:browsefiler" \ . "| unlet! b:browsefiler"
let &cpo = s:cpo_save let &cpo = s:cpo_save

6
runtime/ftplugin/man.vim
View File

@ -1,8 +1,8 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: man " Language: man
" Maintainer: Jason Franklin <vim@justemail.net> " Maintainer: Jason Franklin <vim@justemail.net>
" Previous Maintainer: SungHyun Nam <goweol@gmail.com> " Maintainer: SungHyun Nam <goweol@gmail.com>
" Last Change: 2020 Apr 30 " Last Change: 2020 May 07
" To make the ":Man" command available before editing a manual page, source " To make the ":Man" command available before editing a manual page, source
" this script from your startup vimrc file. " this script from your startup vimrc file.
@ -206,7 +206,7 @@ func <SID>GetPage(cmdmods, ...)
endif endif
let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat' let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
let env_cmd .= ' GROFF_NO_SGR=1' let env_cmd .= ' GROFF_NO_SGR=1'
let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' 2>/dev/null | col -b' let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
silent exec "r !" . man_cmd silent exec "r !" . man_cmd
if unsetwidth if unsetwidth

6
runtime/plugin/gzip.vim
View File

@ -20,7 +20,7 @@ augroup gzip
" "
" Set binary mode before reading the file. " Set binary mode before reading the file.
" Use "gzip -d", gunzip isn't always available. " Use "gzip -d", gunzip isn't always available.
autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz,*.zst setlocal bin autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz,*.zst,*.br setlocal bin
autocmd BufReadPost,FileReadPost *.gz call gzip#read("gzip -dn") autocmd BufReadPost,FileReadPost *.gz call gzip#read("gzip -dn")
autocmd BufReadPost,FileReadPost *.bz2 call gzip#read("bzip2 -d") autocmd BufReadPost,FileReadPost *.bz2 call gzip#read("bzip2 -d")
autocmd BufReadPost,FileReadPost *.Z call gzip#read("uncompress") autocmd BufReadPost,FileReadPost *.Z call gzip#read("uncompress")
@ -28,6 +28,7 @@ augroup gzip
autocmd BufReadPost,FileReadPost *.xz call gzip#read("xz -d") autocmd BufReadPost,FileReadPost *.xz call gzip#read("xz -d")
autocmd BufReadPost,FileReadPost *.lz call gzip#read("lzip -d") autocmd BufReadPost,FileReadPost *.lz call gzip#read("lzip -d")
autocmd BufReadPost,FileReadPost *.zst call gzip#read("zstd -d --rm") autocmd BufReadPost,FileReadPost *.zst call gzip#read("zstd -d --rm")
autocmd BufReadPost,FileReadPost *.br call gzip#read("brotli -d --rm")
autocmd BufWritePost,FileWritePost *.gz call gzip#write("gzip") autocmd BufWritePost,FileWritePost *.gz call gzip#write("gzip")
autocmd BufWritePost,FileWritePost *.bz2 call gzip#write("bzip2") autocmd BufWritePost,FileWritePost *.bz2 call gzip#write("bzip2")
autocmd BufWritePost,FileWritePost *.Z call gzip#write("compress -f") autocmd BufWritePost,FileWritePost *.Z call gzip#write("compress -f")
@ -35,6 +36,7 @@ augroup gzip
autocmd BufWritePost,FileWritePost *.xz call gzip#write("xz -z") autocmd BufWritePost,FileWritePost *.xz call gzip#write("xz -z")
autocmd BufWritePost,FileWritePost *.lz call gzip#write("lzip") autocmd BufWritePost,FileWritePost *.lz call gzip#write("lzip")
autocmd BufWritePost,FileWritePost *.zst call gzip#write("zstd --rm") autocmd BufWritePost,FileWritePost *.zst call gzip#write("zstd --rm")
autocmd BufWritePost,FileWritePost *.br call gzip#write("brotli --rm")
autocmd FileAppendPre *.gz call gzip#appre("gzip -dn") autocmd FileAppendPre *.gz call gzip#appre("gzip -dn")
autocmd FileAppendPre *.bz2 call gzip#appre("bzip2 -d") autocmd FileAppendPre *.bz2 call gzip#appre("bzip2 -d")
autocmd FileAppendPre *.Z call gzip#appre("uncompress") autocmd FileAppendPre *.Z call gzip#appre("uncompress")
@ -42,6 +44,7 @@ augroup gzip
autocmd FileAppendPre *.xz call gzip#appre("xz -d") autocmd FileAppendPre *.xz call gzip#appre("xz -d")
autocmd FileAppendPre *.lz call gzip#appre("lzip -d") autocmd FileAppendPre *.lz call gzip#appre("lzip -d")
autocmd FileAppendPre *.zst call gzip#appre("zstd -d --rm") autocmd FileAppendPre *.zst call gzip#appre("zstd -d --rm")
autocmd FileAppendPre *.br call gzip#appre("brotli -d --rm")
autocmd FileAppendPost *.gz call gzip#write("gzip") autocmd FileAppendPost *.gz call gzip#write("gzip")
autocmd FileAppendPost *.bz2 call gzip#write("bzip2") autocmd FileAppendPost *.bz2 call gzip#write("bzip2")
autocmd FileAppendPost *.Z call gzip#write("compress -f") autocmd FileAppendPost *.Z call gzip#write("compress -f")
@ -49,4 +52,5 @@ augroup gzip
autocmd FileAppendPost *.xz call gzip#write("xz -z") autocmd FileAppendPost *.xz call gzip#write("xz -z")
autocmd FileAppendPost *.lz call gzip#write("lzip") autocmd FileAppendPost *.lz call gzip#write("lzip")
autocmd FileAppendPost *.zst call gzip#write("zstd --rm") autocmd FileAppendPost *.zst call gzip#write("zstd --rm")
autocmd FileAppendPost *.br call gzip#write("brotli --rm")
augroup END augroup END

22
runtime/syntax/asciidoc.vim
View File

@ -1,13 +1,15 @@
" Vim syntax file " Vim syntax file
" Language: AsciiDoc " Language: AsciiDoc
" Author: Stuart Rackham <srackham@gmail.com> (inspired by Felix " Maintainer: @aerostitch on GitHub (tag me in your issue in the
" Obenhuber's original asciidoc.vim script). " github/vim/vim repository and I'll answer when available)
" URL: http://asciidoc.org/ " Original author: Stuart Rackham <srackham@gmail.com> (inspired by Felix
" Licence: GPL (http://www.gnu.org) " Obenhuber's original asciidoc.vim script).
" Remarks: Vim 6 or greater " URL: http://asciidoc.org/
" Last Update: 2014 Aug 29 (see Issue 240) " Licence: GPL (http://www.gnu.org)
" Remarks: Vim 6 or greater
" Last Update: 2020 May 03 (see Issue 240)
" Limitations: " Limitations:
" "
" - Nested quoted text formatting is highlighted according to the outer " - Nested quoted text formatting is highlighted according to the outer
" format. " format.
" - If a closing Example Block delimiter may be mistaken for a title " - If a closing Example Block delimiter may be mistaken for a title
@ -23,9 +25,7 @@ if exists("b:current_syntax")
finish finish
endif endif
syn clear " Use the default syntax syncing.
syn sync fromstart
syn sync linebreaks=100
" Run :help syn-priority to review syntax matching priority. " Run :help syn-priority to review syntax matching priority.
syn keyword asciidocToDo TODO FIXME CHECK TEST XXX ZZZ DEPRECATED syn keyword asciidocToDo TODO FIXME CHECK TEST XXX ZZZ DEPRECATED

4
runtime/syntax/make.vim
View File

@ -3,7 +3,7 @@
" Maintainer: Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name>, <https://github.com/rohieb> " Maintainer: Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name>, <https://github.com/rohieb>
" Previous Maintainer: Claudio Fleiner <claudio@fleiner.com> " Previous Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: https://github.com/vim/vim/blob/master/runtime/syntax/make.vim " URL: https://github.com/vim/vim/blob/master/runtime/syntax/make.vim
" Last Change: 2020 Mar 04 " Last Change: 2020 May 03
" quit when a syntax file was already loaded " quit when a syntax file was already loaded
if exists("b:current_syntax") if exists("b:current_syntax")
@ -73,7 +73,7 @@ syn match makePreCondit "^ *\(ifn\=\(eq\|def\)\>\|else\(\s\+ifn\=\(eq\|def\)\)\=
syn match makeInclude "^ *[-s]\=include\s.*$" syn match makeInclude "^ *[-s]\=include\s.*$"
syn match makeStatement "^ *vpath" syn match makeStatement "^ *vpath"
syn match makeExport "^ *\(export\|unexport\)\>" syn match makeExport "^ *\(export\|unexport\)\>"
syn match makeOverride "^ *override" syn match makeOverride "^ *override\>"
" Statements / Functions (GNU make) " Statements / Functions (GNU make)
syn match makeStatement contained "(\(abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|file\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|guile\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|subst\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1 syn match makeStatement contained "(\(abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|file\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|guile\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|subst\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1

7
runtime/syntax/masm.vim
View File

@ -2,8 +2,7 @@
" Language: Microsoft Macro Assembler (80x86) " Language: Microsoft Macro Assembler (80x86)
" Orig Author: Rob Brady <robb@datatone.com> " Orig Author: Rob Brady <robb@datatone.com>
" Maintainer: Wu Yongwei <wuyongwei@gmail.com> " Maintainer: Wu Yongwei <wuyongwei@gmail.com>
" Last Change: $Date: 2013/11/13 11:49:24 $ " Last Change: 2020-05-07 17:04:10 +0800
" $Revision: 1.48 $
" Quit when a syntax file was already loaded " Quit when a syntax file was already loaded
if exists("b:current_syntax") if exists("b:current_syntax")
@ -13,10 +12,12 @@ endif
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
setlocal iskeyword=@,48-57,_,36,60,62,63,@-@
syn case ignore syn case ignore
syn match masmIdentifier "[@a-z_$?][@a-z0-9_$?]*" syn match masmIdentifier "[@a-z_$?][@a-z0-9_$?<>]*"
syn match masmLabel "^\s*[@a-z_$?][@a-z0-9_$?]*:"he=e-1 syn match masmLabel "^\s*[@a-z_$?][@a-z0-9_$?]*:"he=e-1
syn match masmDecimal "[-+]\?\d\+[dt]\?" syn match masmDecimal "[-+]\?\d\+[dt]\?"