IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:76db9e076318 (#21013)

Browse Source 
Update runtime files

76db9e0763

- `col()`'s example was changed to use `:echowin` so that the message can be
  seen with `showmode`. Use "\n" to force a hit-enter instead as `:echowin`
  isn't ported.
- Replace interpolated string usage in syntax/modula3.vim (not ported).
- Add a space after the `wincmd =` examples in `*CTRL-W_=*` so that the inlined
  code is highlighted properly when followed by a full stop.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Sean Dewar 2022-11-10 09:05:25 +00:00 committed by GitHub
parent 61d152779d
commit befae73044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 159 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/doc/builtin.txt
View File

@ -920,7 +920,8 @@ bufwinid({buf}) *bufwinid()*
echo "A window containing buffer 1 is " .. (bufwinid(1)) echo "A window containing buffer 1 is " .. (bufwinid(1))
< <
Only deals with the current tab page. Only deals with the current tab page. See |win_findbuf()| for
finding more.
Can also be used as a |method|: > Can also be used as a |method|: >
FindBuffer()->bufwinid() FindBuffer()->bufwinid()
@ -1204,7 +1205,7 @@ col({expr}) The result is a Number, which is the byte index of the column
column is one higher if the cursor is after the end of the column is one higher if the cursor is after the end of the
line. Also, when using a <Cmd> mapping the cursor isn't line. Also, when using a <Cmd> mapping the cursor isn't
moved, this can be used to obtain the column in Insert mode: > moved, this can be used to obtain the column in Insert mode: >
:imap <F2> <Cmd>echo col(".")<CR> :imap <F2> <Cmd>echo col(".").."\n"<CR>
< Can also be used as a |method|: > < Can also be used as a |method|: >
GetPos()->col() GetPos()->col()
@ -2291,7 +2292,7 @@ flatten({list} [, {maxdepth}]) *flatten()*
float2nr({expr}) *float2nr()* float2nr({expr}) *float2nr()*
Convert {expr} to a Number by omitting the part after the Convert {expr} to a Number by omitting the part after the
decimal point. decimal point.
{expr} must evaluate to a |Float| or a Number. {expr} must evaluate to a |Float| or a |Number|.
Returns 0 if {expr} is not a |Float| or a |Number|. Returns 0 if {expr} is not a |Float| or a |Number|.
When the value of {expr} is out of range for a |Number| the When the value of {expr} is out of range for a |Number| the
result is truncated to 0x7fffffff or -0x7fffffff (or when result is truncated to 0x7fffffff or -0x7fffffff (or when
@ -9034,6 +9035,7 @@ win_move_separator({nr}, {offset}) *win_move_separator()*
FALSE otherwise. FALSE otherwise.
This will fail for the rightmost window and a full-width This will fail for the rightmost window and a full-width
window, since it has no separator on the right. window, since it has no separator on the right.
Only works for the current tab page. *E1308*
Can also be used as a |method|: > Can also be used as a |method|: >
GetWinnr()->win_move_separator(offset) GetWinnr()->win_move_separator(offset)
@ -9048,6 +9050,7 @@ win_move_statusline({nr}, {offset}) *win_move_statusline()*
movement may be smaller than specified (e.g., as a consequence movement may be smaller than specified (e.g., as a consequence
of maintaining 'winminheight'). Returns TRUE if the window can of maintaining 'winminheight'). Returns TRUE if the window can
be found and FALSE otherwise. be found and FALSE otherwise.
Only works for the current tab page.
Can also be used as a |method|: > Can also be used as a |method|: >
GetWinnr()->win_move_statusline(offset) GetWinnr()->win_move_statusline(offset)

2
runtime/doc/cmdline.txt
View File

@ -758,7 +758,7 @@ always be swapped then.
Count and Range *N:* Count and Range *N:*
When giving a count before entering ":", this is translated into: When giving a count before entering ":", this is translated into: >
:.,.+(count - 1) :.,.+(count - 1)
In words: The "count" lines at and after the cursor. Example: To delete In words: The "count" lines at and after the cursor. Example: To delete
three lines: > three lines: >

2
runtime/doc/eval.txt
View File

@ -3177,7 +3177,7 @@ this pending exception or command is discarded.
For examples see |throw-catch| and |try-finally|. For examples see |throw-catch| and |try-finally|.
NESTING OF TRY CONDITIONALS *try-nesting* NESTING OF TRY CONDITIONALS *try-nesting*
Try conditionals can be nested arbitrarily. That is, a complete try Try conditionals can be nested arbitrarily. That is, a complete try
conditional can be put into the try block, a catch clause, or the finally conditional can be put into the try block, a catch clause, or the finally

2
runtime/doc/filetype.txt
View File

@ -534,7 +534,7 @@ used.
For example, to set the dialect to a default of "fblite" but still allow for For example, to set the dialect to a default of "fblite" but still allow for
any #lang directive overrides, use the following command: > any #lang directive overrides, use the following command: >
let g:freebasic_lang = "fblite" let g:freebasic_lang = "fblite"
GIT COMMIT *ft-gitcommit-plugin* GIT COMMIT *ft-gitcommit-plugin*

4
runtime/doc/pi_tar.txt
View File

@ -82,7 +82,7 @@ Copyright 2005-2017: *tar-copyright*
<.vimrc> file. <.vimrc> file.
Default Default
Variable Value Explanation Variable Value Explanation
*g:tar_browseoptions* "Ptf" used to get a list of contents *g:tar_browseoptions* "Ptf" used to get a list of contents
*g:tar_readoptions* "OPxf" used to extract a file from a tarball *g:tar_readoptions* "OPxf" used to extract a file from a tarball
*g:tar_cmd* "tar" the name of the tar program *g:tar_cmd* "tar" the name of the tar program
*g:tar_nomax* 0 if true, file window will not be maximized *g:tar_nomax* 0 if true, file window will not be maximized
@ -98,7 +98,7 @@ Copyright 2005-2017: *tar-copyright*
"-" "-"
Not all tar's support the "--" which is why Not all tar's support the "--" which is why
it isn't default. it isn't default.
*g:tar_writeoptions* "uf" used to update/replace a file *g:tar_writeoptions* "uf" used to update/replace a file
============================================================================== ==============================================================================

4
runtime/doc/spell.txt
View File

@ -992,8 +992,8 @@ Note: even when using "num" or "long" the number of flags available to
compounding and prefixes is limited to about 250. compounding and prefixes is limited to about 250.
AFFIXES AFFIXES *spell-PFX* *spell-SFX*
*spell-PFX* *spell-SFX*
The usual PFX (prefix) and SFX (suffix) lines are supported (see the Myspell The usual PFX (prefix) and SFX (suffix) lines are supported (see the Myspell
documentation or the Aspell manual: documentation or the Aspell manual:
http://aspell.net/man-html/Affix-Compression.html). http://aspell.net/man-html/Affix-Compression.html).

2
runtime/doc/usr_03.txt
View File

@ -224,7 +224,7 @@ you can see? This figure shows the three commands you can use:
+---------------------------+ +---------------------------+
Hints: "H" stands for Home, "M" for Middle and "L" for Last. Alternatively, Hints: "H" stands for Home, "M" for Middle and "L" for Last. Alternatively,
"H" for high, "M" for Middle and "L" for low. "H" for High, "M" for Middle and "L" for Low.
============================================================================== ==============================================================================
*03.6* Telling where you are *03.6* Telling where you are

6
runtime/doc/visual.txt
View File

@ -103,7 +103,7 @@ gn Search forward for the last used search pattern, like
E.g., "dgn" deletes the text of the next match. E.g., "dgn" deletes the text of the next match.
If Visual mode is active, extends the selection If Visual mode is active, extends the selection
until the end of the next match. until the end of the next match.
'wrapscan' applies 'wrapscan' applies.
Note: Unlike `n` the search direction does not depend Note: Unlike `n` the search direction does not depend
on the previous search command. on the previous search command.
@ -501,11 +501,11 @@ mode Vim automatically switches to Visual mode, so that the same behavior as
in Visual mode is effective. If you don't want this use |:xmap| or |:smap|. in Visual mode is effective. If you don't want this use |:xmap| or |:smap|.
One particular edge case: > One particular edge case: >
:vnoremap <C-K> <Esc> :vnoremap <C-K> <Esc>
This ends Visual mode when in Visual mode, but in Select mode it does not This ends Visual mode when in Visual mode, but in Select mode it does not
work, because Select mode is restored after executing the mapped keys. You work, because Select mode is restored after executing the mapped keys. You
need to use: > need to use: >
:snoremap <C-K> <Esc> :snoremap <C-K> <Esc>
< <
Users will expect printable characters to replace the selected area. Users will expect printable characters to replace the selected area.
Therefore avoid mapping printable characters in Select mode. Or use Therefore avoid mapping printable characters in Select mode. Or use

4
runtime/doc/windows.txt
View File

@ -537,9 +537,9 @@ CTRL-W = Make all windows (almost) equally high and wide, but use
Windows with 'winfixheight' set keep their height and windows Windows with 'winfixheight' set keep their height and windows
with 'winfixwidth' set keep their width. with 'winfixwidth' set keep their width.
To equalize only vertically (make window equally high) use To equalize only vertically (make window equally high) use
`vertical wincmd =` `vertical wincmd =` .
To equalize only horizontally (make window equally wide) use To equalize only horizontally (make window equally wide) use
`horizontal wincmd =` `horizontal wincmd =` .
:res[ize] -N *:res* *:resize* *CTRL-W_-* :res[ize] -N *:res* *:resize* *CTRL-W_-*
CTRL-W - Decrease current window height by N (default 1). CTRL-W - Decrease current window height by N (default 1).

21
runtime/syntax/cabal.vim
View File

@ -4,7 +4,9 @@
" Maintainer: Marcin Szamotulski <profunctor@pm.me> " Maintainer: Marcin Szamotulski <profunctor@pm.me>
" Previous Maintainer: Vincent Berthoux <twinside@gmail.com> " Previous Maintainer: Vincent Berthoux <twinside@gmail.com>
" File Types: .cabal " File Types: .cabal
" Last Change: 21 Nov 2020 " Last Change: 22 Oct 2022
" v1.6: Added support for foreign-libraries
" Added highlighting for various fields
" v1.5: Incorporated changes from " v1.5: Incorporated changes from
" https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim " https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim
" Use `syn keyword` instead of `syn match`. " Use `syn keyword` instead of `syn match`.
@ -61,13 +63,14 @@ syn keyword cabalCategory contained
\ test-suite \ test-suite
\ source-repository \ source-repository
\ flag \ flag
\ foreign-library
\ custom-setup \ custom-setup
\ common \ common
syn match cabalCategoryTitle contained /[^{]*\ze{\?/ syn match cabalCategoryTitle contained /[^{]*\ze{\?/
syn match cabalCategoryRegion syn match cabalCategoryRegion
\ contains=cabalCategory,cabalCategoryTitle \ contains=cabalCategory,cabalCategoryTitle
\ nextgroup=cabalCategory skipwhite \ nextgroup=cabalCategory skipwhite
\ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|custom-setup\|common\)\+\s*\%(.*$\|$\)/ \ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|foreign-library\|custom-setup\|common\)\+\s*\%(.*$\|$\)/
syn keyword cabalTruth true false syn keyword cabalTruth true false
" cabalStatementRegion which limits the scope of cabalStatement keywords, this " cabalStatementRegion which limits the scope of cabalStatement keywords, this
@ -77,6 +80,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
\ default-language \ default-language
\ default-extensions \ default-extensions
\ author \ author
\ autogen-includes
\ autogen-modules \ autogen-modules
\ asm-sources \ asm-sources
\ asm-options \ asm-options
@ -84,7 +88,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
\ bug-reports \ bug-reports
\ build-depends \ build-depends
\ build-tools \ build-tools
\ build-tools-depends \ build-tool-depends
\ build-type \ build-type
\ buildable \ buildable
\ c-sources \ c-sources
@ -95,6 +99,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
\ cmm-sources \ cmm-sources
\ cmm-options \ cmm-options
\ cpp-options \ cpp-options
\ cxx-options
\ cxx-sources \ cxx-sources
\ data-dir \ data-dir
\ data-files \ data-files
@ -111,7 +116,9 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
\ extra-framework-dirs \ extra-framework-dirs
\ extra-ghci-libraries \ extra-ghci-libraries
\ extra-lib-dirs \ extra-lib-dirs
\ extra-lib-dirs-static
\ extra-libraries \ extra-libraries
\ extra-libraries-static
\ extra-library-flavours \ extra-library-flavours
\ extra-source-files \ extra-source-files
\ extra-tmp-files \ extra-tmp-files
@ -133,6 +140,8 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
\ install-includes \ install-includes
\ js-sources \ js-sources
\ ld-options \ ld-options
\ lib-version-info
\ lib-version-linux
\ license \ license
\ license-file \ license-file
\ location \ location
@ -141,20 +150,26 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
\ manual \ manual
\ mixins \ mixins
\ module \ module
\ mod-def-file
\ name \ name
\ nhc98-options \ nhc98-options
\ options
\ other-extensions \ other-extensions
\ other-language \ other-language
\ other-languages \ other-languages
\ other-modules \ other-modules
\ package-url \ package-url
\ pkgconfig-depends \ pkgconfig-depends
\ scope
\ setup-depends \ setup-depends
\ signatures
\ stability \ stability
\ subdir \ subdir
\ synopsis \ synopsis
\ reexported-modules
\ tag \ tag
\ tested-with \ tested-with
\ test-module
\ type \ type
\ version \ version
\ virtual-modules \ virtual-modules

6
runtime/syntax/debchangelog.vim
View File

@ -3,7 +3,7 @@
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
" Wichert Akkerman <wakkerma@debian.org> " Wichert Akkerman <wakkerma@debian.org>
" Last Change: 2022 Jul 25 " Last Change: 2022 Oct 29
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
" Standard syntax initialization " Standard syntax initialization
@ -21,9 +21,9 @@ let s:cpo = &cpo
set cpo-=C set cpo-=C
let s:supported = [ let s:supported = [
\ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy', \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
\ 'buster', 'bullseye', 'bookworm', 'trixie', \ 'buster', 'bullseye', 'bookworm', 'trixie', 'forky',
\ \
\ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', 'lunar',
\ 'devel' \ 'devel'
\ ] \ ]
let s:unsupported = [ let s:unsupported = [

6
runtime/syntax/debsources.vim
View File

@ -2,7 +2,7 @@
" Language: Debian sources.list " Language: Debian sources.list
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl> " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
" Last Change: 2022 Jul 25 " Last Change: 2022 Oct 29
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
" Standard syntax initialization " Standard syntax initialization
@ -23,9 +23,9 @@ let s:cpo = &cpo
set cpo-=C set cpo-=C
let s:supported = [ let s:supported = [
\ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy', \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
\ 'buster', 'bullseye', 'bookworm', 'trixie', \ 'buster', 'bullseye', 'bookworm', 'trixie', 'forky',
\ \
\ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', 'lunar',
\ 'devel' \ 'devel'
\ ] \ ]
let s:unsupported = [ let s:unsupported = [

4
runtime/syntax/help.vim
View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: Vim help file " Language: Vim help file
" Maintainer: Bram Moolenaar (Bram@vim.org) " Maintainer: Bram Moolenaar (Bram@vim.org)
" Last Change: 2022 Oct 17 " Last Change: 2022 Nov 09
" Quit when a (custom) syntax file was already loaded " Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax") if exists("b:current_syntax")
@ -11,7 +11,7 @@ endif
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
syn match helpHeadline "^ *[-A-Z.][-A-Z0-9 .()_]*?\=\ze\(\s\+\*\|$\)" syn match helpHeadline "^[A-Z.][-A-Z0-9 .,()_]*?\=\ze\(\s\+\*\|$\)"
syn match helpSectionDelim "^===.*===$" syn match helpSectionDelim "^===.*===$"
syn match helpSectionDelim "^---.*--$" syn match helpSectionDelim "^---.*--$"
if has("conceal") if has("conceal")

20
runtime/syntax/hollywood.vim
View File

File diff suppressed because one or more lines are too long

6
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 Oct 16 " Last Change: 2022 Nov 06
" 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")
@ -45,11 +45,11 @@ syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1
syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2
syn region makeTarget transparent matchgroup=makeTarget syn region makeTarget transparent matchgroup=makeTarget
\ start="^[~A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*&\?:\?:\{1,2}[^:=]"rs=e-1 \ start="^[~A-Za-z0-9_./$(){}%-][A-Za-z0-9_./\t ${}()%-]*&\?:\?:\{1,2}[^:=]"rs=e-1
\ end="[^\\]$" \ end="[^\\]$"
\ keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment,makeDString \ keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment,makeDString
\ skipnl nextGroup=makeCommands \ skipnl nextGroup=makeCommands
syn match makeTarget "^[~A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*&\?::\=\s*$" syn match makeTarget "^[~A-Za-z0-9_./$(){}%*@-][A-Za-z0-9_./\t $(){}%*@-]*&\?::\=\s*$"
\ contains=makeIdent,makeSpecTarget,makeComment \ contains=makeIdent,makeSpecTarget,makeComment
\ skipnl nextgroup=makeCommands,makeCommandError \ skipnl nextgroup=makeCommands,makeCommandError

101
runtime/syntax/modula3.vim
View File

@ -2,18 +2,29 @@
" Language: Modula-3 " Language: Modula-3
" Maintainer: Doug Kearns <dougkearns@gmail.com> " Maintainer: Doug Kearns <dougkearns@gmail.com>
" Previous Maintainer: Timo Pedersen <dat97tpe@ludat.lth.se> " Previous Maintainer: Timo Pedersen <dat97tpe@ludat.lth.se>
" Last Change: 2021 Apr 08 " Last Change: 2022 Oct 31
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
endif endif
" Modula-3 keywords " Whitespace errors {{{1
syn keyword modula3Keyword ANY ARRAY AS BITS BRANDED BY CASE CONST DEFINITION if exists("modula3_space_errors")
syn keyword modula3Keyword EVAL EXIT EXCEPT EXCEPTION EXIT EXPORTS FINALLY if !exists("modula3_no_trail_space_error")
syn keyword modula3Keyword FROM GENERIC IMPORT LOCK METHOD OF RAISE RAISES syn match modula3SpaceError display excludenl "\s\+$"
syn keyword modula3Keyword READONLY RECORD REF RETURN SET TRY TYPE TYPECASE endif
syn keyword modula3Keyword UNSAFE VALUE VAR WITH if !exists("modula3_no_tab_space_error")
syn match modula3SpaceError display " \+\t"me=e-1
endif
endif
" Keywords {{{1
syn keyword modula3Keyword ANY ARRAY AS BITS BRANDED BY CASE CONST
syn keyword modula3Keyword DEFINITION EVAL EXIT EXCEPT EXCEPTION EXIT
syn keyword modula3Keyword EXPORTS FINALLY FROM GENERIC IMPORT LOCK METHOD
syn keyword modula3Keyword OF RAISE RAISES READONLY RECORD REF
syn keyword modula3Keyword RETURN SET TRY TYPE TYPECASE UNSAFE
syn keyword modula3Keyword VALUE VAR WITH
syn match modula3keyword "\<UNTRACED\>" syn match modula3keyword "\<UNTRACED\>"
@ -22,44 +33,73 @@ syn keyword modula3Block PROCEDURE FUNCTION MODULE INTERFACE REPEAT THEN
syn keyword modula3Block BEGIN END OBJECT METHODS OVERRIDES RECORD REVEAL syn keyword modula3Block BEGIN END OBJECT METHODS OVERRIDES RECORD REVEAL
syn keyword modula3Block WHILE UNTIL DO TO IF FOR ELSIF ELSE LOOP syn keyword modula3Block WHILE UNTIL DO TO IF FOR ELSIF ELSE LOOP
" Reserved identifiers " Reserved identifiers {{{1
syn keyword modula3Identifier ABS ADR ADRSIZE BITSIZE BYTESIZE CEILING DEC syn keyword modula3Identifier ABS ADR ADRSIZE BITSIZE BYTESIZE CEILING DEC
syn keyword modula3Identifier DISPOSE FIRST FLOAT FLOOR INC ISTYPE LAST syn keyword modula3Identifier DISPOSE FIRST FLOAT FLOOR INC ISTYPE LAST
syn keyword modula3Identifier LOOPHOLE MAX MIN NARROW NEW NUMBER ORD ROUND syn keyword modula3Identifier LOOPHOLE MAX MIN NARROW NEW NUMBER ORD ROUND
syn keyword modula3Identifier SUBARRAY TRUNC TYPECODE VAL syn keyword modula3Identifier SUBARRAY TRUNC TYPECODE VAL
" Predefined types " Predefined types {{{1
syn keyword modula3Type ADDRESS BOOLEAN CARDINAL CHAR EXTENDED INTEGER syn keyword modula3Type ADDRESS BOOLEAN CARDINAL CHAR EXTENDED INTEGER
syn keyword modula3Type LONGCARD LONGINT LONGREAL MUTEX NULL REAL REFANY TEXT syn keyword modula3Type LONGCARD LONGINT LONGREAL MUTEX NULL REAL REFANY TEXT
syn keyword modula3Type WIDECHAR syn keyword modula3Type WIDECHAR
syn match modula3Type "\<\%(UNTRACED\s\+\)\=ROOT\>" syn match modula3Type "\<\%(UNTRACED\s\+\)\=ROOT\>"
" Operators " Operators {{{1
syn keyword modulaOperator DIV MOD IN AND OR NOT syn keyword modula3Operator DIV MOD
syn keyword modula3Operator IN
syn keyword modula3Operator NOT AND OR
" TODO: exclude = from declarations
if exists("modula3_operators") if exists("modula3_operators")
syn match modula3Operator "\^" syn match modula3Operator "\^"
syn match modula3Operator "+\|-\|\*\|/\|&" syn match modula3Operator "[-+/*]"
" TODO: need to exclude = in procedure definitions syn match modula3Operator "&"
syn match modula3Operator "<=\|<\|>=\|>\|:\@<!=\|#" syn match modula3Operator "<=\|<:\@!\|>=\|>"
syn match modula3Operator ":\@<!=\|#"
endif endif
" Literals {{{1
" Booleans " Booleans
syn keyword modula3Boolean TRUE FALSE syn keyword modula3Boolean TRUE FALSE
" Nil " Nil
syn keyword modula3Nil NIL syn keyword modula3Nil NIL
" Integers " Numbers {{{2
syn match modula3Integer "\<\d\+L\=\>"
syn match modula3Integer "\<\d\d\=_\x\+L\=\>"
" Reals " NOTE: Negated numbers are constant expressions not literals
syn match modula3Real "\c\<\d\+\.\d\+\%([EDX][+-]\=\d\+\)\=\>"
syn case ignore
" Integers
syn match modula3Integer "\<\d\+L\=\>"
if exists("modula3_number_errors")
syn match modula3IntegerError "\<\d\d\=_\x\+L\=\>"
endif
let s:digits = "0123456789ABCDEF"
for s:radix in range(2, 16)
" Nvim does not support interpolated strings yet.
" exe $'syn match modula3Integer "\<{s:radix}_[{s:digits[:s:radix - 1]}]\+L\=\>"'
exe 'syn match modula3Integer "\<' .. s:radix .. '_[' .. s:digits[:s:radix - 1] .. ']\+L\=\>"'
endfor
unlet s:digits s:radix
" Reals
syn match modula3Real "\<\d\+\.\d\+\%([EDX][+-]\=\d\+\)\=\>"
syn case match
" Strings and characters {{{2
" String escape sequences " String escape sequences
syn match modula3Escape "\\['"ntrf]" contained display syn match modula3Escape "\\['"ntrf]" contained display
" TODO: limit to <= 377 (255)
syn match modula3Escape "\\\o\{3}" contained display syn match modula3Escape "\\\o\{3}" contained display
syn match modula3Escape "\\\\" contained display syn match modula3Escape "\\\\" contained display
@ -69,13 +109,23 @@ syn match modula3Character "'\%([^']\|\\.\|\\\o\{3}\)'" contains=modula3Escape
" Strings " Strings
syn region modula3String start=+"+ end=+"+ contains=modula3Escape syn region modula3String start=+"+ end=+"+ contains=modula3Escape
" Pragmas " Pragmas {{{1
" EXTERNAL INLINE ASSERT TRACE FATAL UNUSED OBSOLETE CALLBACK EXPORTED PRAGMA NOWARN LINE LL LL.sup SPEC
" Documented: INLINE ASSERT TRACE FATAL UNUSED OBSOLETE NOWARN
syn region modula3Pragma start="<\*" end="\*>" syn region modula3Pragma start="<\*" end="\*>"
" Comments " Comments {{{1
syn region modula3Comment start="(\*" end="\*)" contains=modula3Comment,@Spell if !exists("modula3_no_comment_fold")
syn region modula3Comment start="(\*" end="\*)" contains=modula3Comment,@Spell fold
syn region modula3LineCommentBlock start="^\s*(\*.*\*)\s*\n\%(^\s*(\*.*\*)\s*$\)\@=" end="^\s*(\*.*\*)\s*\n\%(^\s*(\*.*\*)\s*$\)\@!" contains=modula3Comment transparent fold keepend
else
syn region modula3Comment start="(\*" end="\*)" contains=modula3Comment,@Spell
endif
" Default highlighting " Syncing "{{{1
syn sync minlines=100
" Default highlighting {{{1
hi def link modula3Block Statement hi def link modula3Block Statement
hi def link modula3Boolean Boolean hi def link modula3Boolean Boolean
hi def link modula3Character Character hi def link modula3Character Character
@ -85,12 +135,13 @@ hi def link modula3Identifier Keyword
hi def link modula3Integer Number hi def link modula3Integer Number
hi def link modula3Keyword Statement hi def link modula3Keyword Statement
hi def link modula3Nil Constant hi def link modula3Nil Constant
hi def link modula3IntegerError Error
hi def link modula3Operator Operator hi def link modula3Operator Operator
hi def link modula3Pragma PreProc hi def link modula3Pragma PreProc
hi def link modula3Real Float hi def link modula3Real Float
hi def link modula3String String hi def link modula3String String
hi def link modula3Type Type hi def link modula3Type Type "}}}
let b:current_syntax = "modula3" let b:current_syntax = "modula3"
" vim: nowrap sw=2 sts=2 ts=8 noet: " vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:

23
runtime/syntax/sshconfig.vim
View File

@ -6,9 +6,10 @@
" Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de> " Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de>
" Contributor: Karsten Hopp <karsten@redhat.com> " Contributor: Karsten Hopp <karsten@redhat.com>
" Contributor: Dean, Adam Kenneth <adam.ken.dean@hpe.com> " Contributor: Dean, Adam Kenneth <adam.ken.dean@hpe.com>
" Last Change: 2021 Mar 29 " Last Change: 2022 Nov 09
" Added RemoteCommand from pull request #4809 " Added RemoteCommand from pull request #4809
" Included additional keywords from Martin. " Included additional keywords from Martin.
" Included PR #5753
" SSH Version: 8.5p1 " SSH Version: 8.5p1
" "
@ -57,12 +58,12 @@ syn match sshconfigCiphers "\<aes256-gcm@openssh\.com\>"
syn match sshconfigCiphers "\<chacha20-poly1305@openssh\.com\>" syn match sshconfigCiphers "\<chacha20-poly1305@openssh\.com\>"
syn keyword sshconfigMAC hmac-sha1 syn keyword sshconfigMAC hmac-sha1
syn keyword sshconfigMAC mac-sha1-96 syn keyword sshconfigMAC hmac-sha1-96
syn keyword sshconfigMAC mac-sha2-256 syn keyword sshconfigMAC hmac-sha2-256
syn keyword sshconfigMAC mac-sha2-512 syn keyword sshconfigMAC hmac-sha2-512
syn keyword sshconfigMAC mac-md5 syn keyword sshconfigMAC hmac-md5
syn keyword sshconfigMAC mac-md5-96 syn keyword sshconfigMAC hmac-md5-96
syn keyword sshconfigMAC mac-ripemd160 syn keyword sshconfigMAC hmac-ripemd160
syn match sshconfigMAC "\<hmac-ripemd160@openssh\.com\>" syn match sshconfigMAC "\<hmac-ripemd160@openssh\.com\>"
syn match sshconfigMAC "\<umac-64@openssh\.com\>" syn match sshconfigMAC "\<umac-64@openssh\.com\>"
syn match sshconfigMAC "\<umac-128@openssh\.com\>" syn match sshconfigMAC "\<umac-128@openssh\.com\>"
@ -78,16 +79,24 @@ syn match sshconfigMAC "\<umac-128-etm@openssh\.com\>"
syn keyword sshconfigHostKeyAlgo ssh-ed25519 syn keyword sshconfigHostKeyAlgo ssh-ed25519
syn match sshconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>" syn match sshconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<sk-ssh-ed25519@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<sk-ssh-ed25519-cert-v01@openssh\.com\>"
syn keyword sshconfigHostKeyAlgo ssh-rsa syn keyword sshconfigHostKeyAlgo ssh-rsa
syn keyword sshconfigHostKeyAlgo rsa-sha2-256
syn keyword sshconfigHostKeyAlgo rsa-sha2-512
syn keyword sshconfigHostKeyAlgo ssh-dss syn keyword sshconfigHostKeyAlgo ssh-dss
syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp256 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp256
syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp384 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp384
syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp521 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp521
syn match sshconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>" syn match sshconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<rsa-sha2-256-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<rsa-sha2-512-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>" syn match sshconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>" syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>" syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>" syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
syn match sshconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
syn keyword sshconfigPreferredAuth hostbased publickey password gssapi-with-mic syn keyword sshconfigPreferredAuth hostbased publickey password gssapi-with-mic
syn keyword sshconfigPreferredAuth keyboard-interactive syn keyword sshconfigPreferredAuth keyboard-interactive

16
runtime/syntax/sshdconfig.vim
View File

@ -7,7 +7,7 @@
" Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de> " Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de>
" Contributor: Karsten Hopp <karsten@redhat.com> " Contributor: Karsten Hopp <karsten@redhat.com>
" Originally: 2009-07-09 " Originally: 2009-07-09
" Last Change: 2021-03-29 " Last Change: 2022 Nov 09
" SSH Version: 8.5p1 " SSH Version: 8.5p1
" "
@ -59,12 +59,12 @@ syn match sshdconfigCiphers "\<aes256-gcm@openssh\.com\>"
syn match sshdconfigCiphers "\<chacha20-poly1305@openssh\.com\>" syn match sshdconfigCiphers "\<chacha20-poly1305@openssh\.com\>"
syn keyword sshdconfigMAC hmac-sha1 syn keyword sshdconfigMAC hmac-sha1
syn keyword sshdconfigMAC mac-sha1-96 syn keyword sshdconfigMAC hmac-sha1-96
syn keyword sshdconfigMAC mac-sha2-256 syn keyword sshdconfigMAC hmac-sha2-256
syn keyword sshdconfigMAC mac-sha2-512 syn keyword sshdconfigMAC hmac-sha2-512
syn keyword sshdconfigMAC mac-md5 syn keyword sshdconfigMAC hmac-md5
syn keyword sshdconfigMAC mac-md5-96 syn keyword sshdconfigMAC hmac-md5-96
syn keyword sshdconfigMAC mac-ripemd160 syn keyword sshdconfigMAC hmac-ripemd160
syn match sshdconfigMAC "\<hmac-ripemd160@openssh\.com\>" syn match sshdconfigMAC "\<hmac-ripemd160@openssh\.com\>"
syn match sshdconfigMAC "\<umac-64@openssh\.com\>" syn match sshdconfigMAC "\<umac-64@openssh\.com\>"
syn match sshdconfigMAC "\<umac-128@openssh\.com\>" syn match sshdconfigMAC "\<umac-128@openssh\.com\>"
@ -258,6 +258,8 @@ syn keyword sshdconfigKeyword Subsystem
syn keyword sshdconfigKeyword SyslogFacility syn keyword sshdconfigKeyword SyslogFacility
syn keyword sshdconfigKeyword TCPKeepAlive syn keyword sshdconfigKeyword TCPKeepAlive
syn keyword sshdconfigKeyword TrustedUserCAKeys syn keyword sshdconfigKeyword TrustedUserCAKeys
syn keyword sshdconfigKeyword UseBlacklist
syn keyword sshdconfigKeyword UseBlocklist
syn keyword sshdconfigKeyword UseDNS syn keyword sshdconfigKeyword UseDNS
syn keyword sshdconfigKeyword UseLogin syn keyword sshdconfigKeyword UseLogin
syn keyword sshdconfigKeyword UsePAM syn keyword sshdconfigKeyword UsePAM