aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

Update runtime files

Browse Source
This commit is contained in:
Bram Moolenaar 2022-05-07 21:54:03 +01:00
parent a7583c42cd
commit d899e51120
33 changed files with 15450 additions and 8842 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/CODEOWNERS vendored
View File

@ -126,6 +126,8 @@ runtime/ftplugin/tmux.vim @ericpruitt
runtime/ftplugin/toml.vim @averms runtime/ftplugin/toml.vim @averms
runtime/ftplugin/typescript.vim @dkearns runtime/ftplugin/typescript.vim @dkearns
runtime/ftplugin/typescriptreact.vim @dkearns runtime/ftplugin/typescriptreact.vim @dkearns
runtime/ftplugin/wget.vim @dkearns
runtime/ftplugin/wget2.vim @dkearns
runtime/ftplugin/xml.vim @chrisbra runtime/ftplugin/xml.vim @chrisbra
runtime/ftplugin/zsh.vim @chrisbra runtime/ftplugin/zsh.vim @chrisbra
runtime/indent/basic.vim @dkearns runtime/indent/basic.vim @dkearns
@ -268,6 +270,7 @@ runtime/syntax/tmux.vim @ericpruitt
runtime/syntax/toml.vim @averms runtime/syntax/toml.vim @averms
runtime/syntax/vim.vim @cecamp runtime/syntax/vim.vim @cecamp
runtime/syntax/wget.vim @dkearns runtime/syntax/wget.vim @dkearns
runtime/syntax/wget2.vim @dkearns
runtime/syntax/xbl.vim @dkearns runtime/syntax/xbl.vim @dkearns
runtime/syntax/xmath.vim @cecamp runtime/syntax/xmath.vim @cecamp
runtime/syntax/xml.vim @chrisbra runtime/syntax/xml.vim @chrisbra

4
runtime/doc/builtin.txt
View File

@ -1,4 +1,4 @@
*builtin.txt* For Vim version 8.2. Last change: 2022 Apr 25 *builtin.txt* For Vim version 8.2. Last change: 2022 May 04
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -2425,7 +2425,7 @@ feedkeys({string} [, {mode}]) *feedkeys()*
all typeahead will be consumed by the last call. all typeahead will be consumed by the last call.
'c' Remove any script context when executing, so that 'c' Remove any script context when executing, so that
legacy script syntax applies, "s:var" does not work, legacy script syntax applies, "s:var" does not work,
etc. Note that if the keys being using set a script etc. Note that if the string being fed sets a script
context this still applies. context this still applies.
'!' When used with 'x' will not end Insert mode. Can be '!' When used with 'x' will not end Insert mode. Can be
used in a test when a timer is set to exit Insert mode used in a test when a timer is set to exit Insert mode

2
runtime/doc/change.txt
View File

@ -1,4 +1,4 @@
*change.txt* For Vim version 8.2. Last change: 2022 Mar 05 *change.txt* For Vim version 8.2. Last change: 2022 May 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

2
runtime/doc/cmdline.txt
View File

@ -1,4 +1,4 @@
*cmdline.txt* For Vim version 8.2. Last change: 2022 Apr 09 *cmdline.txt* For Vim version 8.2. Last change: 2022 Apr 29
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

29
runtime/doc/eval.txt
View File

@ -1,4 +1,4 @@
*eval.txt* For Vim version 8.2. Last change: 2022 Apr 17 *eval.txt* For Vim version 8.2. Last change: 2022 May 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -523,8 +523,8 @@ only appear once. Examples: >
A key is always a String. You can use a Number, it will be converted to a A key is always a String. You can use a Number, it will be converted to a
String automatically. Thus the String '4' and the number 4 will find the same String automatically. Thus the String '4' and the number 4 will find the same
entry. Note that the String '04' and the Number 04 are different, since the entry. Note that the String '04' and the Number 04 are different, since the
Number will be converted to the String '4'. The empty string can also be used Number will be converted to the String '4', leading zeros are dropped. The
as a key. empty string can also be used as a key.
In |Vim9| script literaly keys can be used if the key consists of alphanumeric In |Vim9| script literaly keys can be used if the key consists of alphanumeric
characters, underscore and dash, see |vim9-literal-dict|. characters, underscore and dash, see |vim9-literal-dict|.
@ -534,7 +534,8 @@ legacy script. This does require the key to consist only of ASCII letters,
digits, '-' and '_'. Example: > digits, '-' and '_'. Example: >
:let mydict = #{zero: 0, one_key: 1, two-key: 2, 333: 3} :let mydict = #{zero: 0, one_key: 1, two-key: 2, 333: 3}
Note that 333 here is the string "333". Empty keys are not possible with #{}. Note that 333 here is the string "333". Empty keys are not possible with #{}.
In |Vim9| script the #{} form cannot be used. In |Vim9| script the #{} form cannot be used because it can be confused with
the start of a comment.
A value can be any expression. Using a Dictionary for a value creates a A value can be any expression. Using a Dictionary for a value creates a
nested Dictionary: > nested Dictionary: >
@ -3252,20 +3253,20 @@ text...
{endmarker}. {endmarker}.
If "eval" is not specified, then each line of text is If "eval" is not specified, then each line of text is
used as a |literal-string|. If "eval" is specified, used as a |literal-string|, except that single quotes
then any Vim expression in the form ``={expr}`` is doe not need to be doubled.
evaluated and the result replaces the expression. If "eval" is specified, then any Vim expression in the
form {expr} is evaluated and the result replaces the
expression, like with |interp-string|.
Example where $HOME is expanded: > Example where $HOME is expanded: >
let lines =<< trim eval END let lines =<< trim eval END
some text some text
See the file `=$HOME`/.vimrc See the file {$HOME}/.vimrc
more text more text
END END
< There can be multiple Vim expressions in a single line < There can be multiple Vim expressions in a single line
but an expression cannot span multiple lines. If any but an expression cannot span multiple lines. If any
expression evaluation fails, then the assignment fails. expression evaluation fails, then the assignment fails.
once the "`=" has been found {expr} and a backtick
must follow. {expr} cannot be empty.
{endmarker} must not contain white space. {endmarker} must not contain white space.
{endmarker} cannot start with a lower case character. {endmarker} cannot start with a lower case character.
@ -3318,10 +3319,10 @@ text...
DATA DATA
let code =<< trim eval CODE let code =<< trim eval CODE
let v = `=10 + 20` let v = {10 + 20}
let h = "`=$HOME`" let h = "{$HOME}"
let s = "`=Str1()` abc `=Str2()`" let s = "{Str1()} abc {Str2()}"
let n = `=MyFunc(3, 4)` let n = {MyFunc(3, 4)}
CODE CODE
< <
*E121* *E121*

2
runtime/doc/options.txt
View File

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

4
runtime/doc/quickref.txt
View File

@ -1,4 +1,4 @@
*quickref.txt* For Vim version 8.2. Last change: 2022 Apr 06 *quickref.txt* For Vim version 8.2. Last change: 2022 May 05
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -1350,7 +1350,7 @@ Context-sensitive completion on the command-line:
|CTRL-W_^| CTRL-W ^ split window and edit alternate file |CTRL-W_^| CTRL-W ^ split window and edit alternate file
|CTRL-W_n| CTRL-W n or :new create new empty window |CTRL-W_n| CTRL-W n or :new create new empty window
|CTRL-W_q| CTRL-W q or :q[uit] quit editing and close window |CTRL-W_q| CTRL-W q or :q[uit] quit editing and close window
|CTRL-W_c| CTRL-W c or :cl[ose] make buffer hidden and close window |CTRL-W_c| CTRL-W c or :clo[se] make buffer hidden and close window
|CTRL-W_o| CTRL-W o or :on[ly] make current window only one on the |CTRL-W_o| CTRL-W o or :on[ly] make current window only one on the
screen screen

2
runtime/doc/scroll.txt
View File

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

7
runtime/doc/syntax.txt
View File

@ -1,4 +1,4 @@
*syntax.txt* For Vim version 8.2. Last change: 2022 Apr 24 *syntax.txt* For Vim version 8.2. Last change: 2022 May 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -5238,6 +5238,9 @@ These are the default highlighting groups. These groups are used by the
'highlight' option default. Note that the highlighting depends on the value 'highlight' option default. Note that the highlighting depends on the value
of 'background'. You can see the current settings with the ":highlight" of 'background'. You can see the current settings with the ":highlight"
command. command.
When possible the name is highlighted in the used colors. If this makes it
unreadable use Visual selection.
*hl-ColorColumn* *hl-ColorColumn*
ColorColumn used for the columns set with 'colorcolumn' ColorColumn used for the columns set with 'colorcolumn'
*hl-Conceal* *hl-Conceal*
@ -5329,6 +5332,8 @@ Search Last search pattern highlighting (see 'hlsearch').
Also used for similar items that need to stand out. Also used for similar items that need to stand out.
*hl-CurSearch* *hl-CurSearch*
CurSearch Current match for the last search pattern (see 'hlsearch'). CurSearch Current match for the last search pattern (see 'hlsearch').
Note: this is correct after a search, but may get outdated if
changes are made or the screen is redrawn.
*hl-SpecialKey* *hl-SpecialKey*
SpecialKey Meta and special keys listed with ":map", also for text used SpecialKey Meta and special keys listed with ":map", also for text used
to show unprintable characters in the text, 'listchars'. to show unprintable characters in the text, 'listchars'.

16
runtime/doc/todo.txt
View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 8.2. Last change: 2022 Apr 27 *todo.txt* For Vim version 8.2. Last change: 2022 May 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -41,7 +41,6 @@ browser use: https://github.com/vim/vim/issues/1234
Once Vim9 is stable: Once Vim9 is stable:
- Use Vim9 for more runtime files. - Use Vim9 for more runtime files.
- Check code coverage, add more tests if needed. - Check code coverage, add more tests if needed.
vim9execute.c line 3500
vim9expr.c vim9expr.c
vim9instr.c vim9instr.c
vim9script.c vim9script.c
@ -128,6 +127,9 @@ Text properties:
- Popup attached to text property stays visible when text is deleted with - Popup attached to text property stays visible when text is deleted with
"cc". (#7737) "C" works OK. "dd" also files in a buffer with a single "cc". (#7737) "C" works OK. "dd" also files in a buffer with a single
line. line.
- Add text property that shifts text to make room for annotation (e.g.
variable type). Like the opposite of conceal. Requires fixing the cursor
positioning and mouse clicks as with conceal mode.
- Auto-indenting may cause highlighting to shift. (#7719) - Auto-indenting may cause highlighting to shift. (#7719)
- "cc" does not call inserted_bytes(). (Axel Forsman, #5763) - "cc" does not call inserted_bytes(). (Axel Forsman, #5763)
- Combining text property with 'cursorline' does not always work (Billie - Combining text property with 'cursorline' does not always work (Billie
@ -152,6 +154,7 @@ Terminal debugger:
- Make prompt-buffer variant work better. - Make prompt-buffer variant work better.
- Add option to not open the program window. It's not used when attaching to - Add option to not open the program window. It's not used when attaching to
an already running program. (M. Kelly) an already running program. (M. Kelly)
- Use the optional token on requests, match the result with it. #10300
- When only gdb window exists, on "quit" edit another buffer. - When only gdb window exists, on "quit" edit another buffer.
- Termdebug does not work when Vim was built with mzscheme: gdb hangs just - Termdebug does not work when Vim was built with mzscheme: gdb hangs just
after "run". Everything else works, including communication channel. Not after "run". Everything else works, including communication channel. Not
@ -203,7 +206,11 @@ Terminal emulator window:
- When 'encoding' is not utf-8, or the job is using another encoding, setup - When 'encoding' is not utf-8, or the job is using another encoding, setup
conversions. conversions.
String interpolation: Handle backslash and quotes in the expression normally,
do not require escaping.
Add autocmd functions. PR #10291 Add autocmd functions. PR #10291
a couple of outstanding comments, wait for Yegappan to respond
Can deref_func_name() and deref_function_name() be merged? Can deref_func_name() and deref_function_name() be merged?
@ -223,9 +230,6 @@ pass it on with modifications.
Test_communicate_ipv6(): is flaky on many systems Test_communicate_ipv6(): is flaky on many systems
Fails in line 64 of Ch_communicate, no exception is thrown. Fails in line 64 of Ch_communicate, no exception is thrown.
Patch for Template string: #4634
Have another look at the implementation.
Rename getdigraphlist -> digraph_getlist() etc. Rename getdigraphlist -> digraph_getlist() etc.
Can "CSI nr X" be used instead of outputting spaces? Is it faster? #8002 Can "CSI nr X" be used instead of outputting spaces? Is it faster? #8002
@ -328,6 +332,8 @@ Missing filetype test for bashrc, PKGBUILD, etc.
Add an option to not fetch terminal codes in xterm, to avoid flicker when t_Co Add an option to not fetch terminal codes in xterm, to avoid flicker when t_Co
changes. changes.
Add ??= operator, "a ??= b" works like "a = a ?? b". #10343
Add an option to start_timer() to return from the input loop with K_IGNORE. Add an option to start_timer() to return from the input loop with K_IGNORE.
This is useful e.g. when a popup was created that disables mappings, we need This is useful e.g. when a popup was created that disables mappings, we need
to return from vgetc() to make this happen. #7011 to return from vgetc() to make this happen. #7011

14
runtime/doc/vim9.txt
View File

@ -1,4 +1,4 @@
*vim9.txt* For Vim version 8.2. Last change: 2022 Apr 14 *vim9.txt* For Vim version 8.2. Last change: 2022 Apr 28
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -857,10 +857,16 @@ like in JavaScript: >
var dict = {["key" .. nr]: value} var dict = {["key" .. nr]: value}
The key type can be string, number, bool or float. Other types result in an The key type can be string, number, bool or float. Other types result in an
error. A number can be given with and without the []: > error. Without using [] the value is used as a string, keeping leading zeros.
var dict = {123: 'without', [456]: 'with'} An expression given with [] is evaluated and then converted to a string.
Leading zeros will then be dropped: >
var dict = {000123: 'without', [000456]: 'with'}
echo dict echo dict
{'456': 'with', '123': 'without'} {'456': 'with', '000123': 'without'}
A float only works inside [] because the dot is not accepted otherwise: >
var dict = {[00.013]: 'float'}
echo dict
{'0.013': 'float'}
No :xit, :t, :k, :append, :change or :insert ~ No :xit, :t, :k, :append, :change or :insert ~

2
runtime/doc/visual.txt
View File

@ -1,4 +1,4 @@
*visual.txt* For Vim version 8.2. Last change: 2022 Jan 20 *visual.txt* For Vim version 8.2. Last change: 2022 May 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

29
runtime/ftplugin/wget.vim Normal file
View File

@ -0,0 +1,29 @@
" Vim filetype plugin file
" Language: Wget configuration file (/etc/wgetrc ~/.wgetrc)
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2022 Apr 28
if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
setlocal comments=:#,://
setlocal commentstring=#\ %s
setlocal formatoptions-=t formatoptions+=croql
let b:undo_ftplugin = "setl fo< com< cms<"
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
let b:browsefilter = "Wget Configuration File (wgetrc, .wgetrc)\twgetrc;.wgetrc\n" .
\ "All Files (*.*)\t*.*\n"
let b:undo_ftplugin ..= " | unlet! b:browsefilter"
endif
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: nowrap sw=2 sts=2 ts=8

29
runtime/ftplugin/wget2.vim Normal file
View File

@ -0,0 +1,29 @@
" Vim filetype plugin file
" Language: Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2022 Apr 28
if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
setlocal comments=:#,://
setlocal commentstring=#\ %s
setlocal formatoptions-=t formatoptions+=croql
let b:undo_ftplugin = "setl fo< com< cms<"
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
let b:browsefilter = "Wget2 Configuration File (wget2rc, .wget2rc)\twget2rc;.wget2rc\n" .
\ "All Files (*.*)\t*.*\n"
let b:undo_ftplugin ..= " | unlet! b:browsefilter"
endif
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: nowrap sw=2 sts=2 ts=8

7
runtime/gvim.desktop
View File

@ -12,6 +12,7 @@ Name[it]=GVim
Name[ru]=GVim Name[ru]=GVim
Name[sr]=GVim Name[sr]=GVim
Name[tr]=GVim Name[tr]=GVim
Name[uk]=GVim
Name=GVim Name=GVim
# Translators: This is the Generic Application Name used in the Vim desktop file # Translators: This is the Generic Application Name used in the Vim desktop file
GenericName[ca]=Editor de text GenericName[ca]=Editor de text
@ -25,6 +26,7 @@ GenericName[ja]=テキストエディタ
GenericName[ru]=Текстовый редактор GenericName[ru]=Текстовый редактор
GenericName[sr]=Едитор текст GenericName[sr]=Едитор текст
GenericName[tr]=Metin Düzenleyici GenericName[tr]=Metin Düzenleyici
GenericName[uk]=Редактор Тексту
GenericName=Text Editor GenericName=Text Editor
# Translators: This is the comment used in the Vim desktop file # Translators: This is the comment used in the Vim desktop file
Comment[ca]=Edita fitxers de text Comment[ca]=Edita fitxers de text
@ -38,6 +40,7 @@ Comment[ja]=テキストファイルを編集します
Comment[ru]=Редактирование текстовых файлов Comment[ru]=Редактирование текстовых файлов
Comment[sr]=Уређујте текст фајлове Comment[sr]=Уређујте текст фајлове
Comment[tr]=Metin dosyaları düzenleyin Comment[tr]=Metin dosyaları düzenleyin
Comment[uk]=Редагувати текстові файли
Comment=Edit text files Comment=Edit text files
# The translations should come from the po file. Leave them here for now, they will # The translations should come from the po file. Leave them here for now, they will
# be overwritten by the po file when generating the desktop.file! # be overwritten by the po file when generating the desktop.file!
@ -97,9 +100,8 @@ Comment[sv]=Redigera textfiler
Comment[ta]=உரை கோப்புகளை தொகுக்கவும் Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
Comment[th]=แก้ไขแฟ้มข้อความ Comment[th]=แก้ไขแฟ้มข้อความ
Comment[tk]=Metin faýllary editle Comment[tk]=Metin faýllary editle
Comment[uk]=Редактор текстових файлів
Comment[vi]=Soạn thảo tập tin văn bản Comment[vi]=Soạn thảo tập tin văn bản
Comment[wa]=Asspougnî des fitchîs tecses Comment[wa]=Asspougnî des fitcs tecses
Comment[zh_CN]=编辑文本文件 Comment[zh_CN]=编辑文本文件
Comment[zh_TW]=編輯文字檔 Comment[zh_TW]=編輯文字檔
TryExec=gvim TryExec=gvim
@ -118,6 +120,7 @@ Keywords[ja]=テキスト;エディタ;
Keywords[ru]=текст;текстовый редактор; Keywords[ru]=текст;текстовый редактор;
Keywords[sr]=Текст;едитор; Keywords[sr]=Текст;едитор;
Keywords[tr]=Metin;düzenleyici; Keywords[tr]=Metin;düzenleyici;
Keywords[uk]=текст;редактор;
Keywords=Text;editor; Keywords=Text;editor;
# Translators: This is the Icon file name. Do NOT translate # Translators: This is the Icon file name. Do NOT translate
Icon=gvim Icon=gvim

5
runtime/indent/testdir/yaml.in
View File

@ -13,11 +13,6 @@ map: &anchor
map: val map: val
# END_INDENT # END_INDENT
# START_INDENT
map: multiline
value
# END_INDENT
# START_INDENT # START_INDENT
map: | map: |
line1 line1

5
runtime/indent/testdir/yaml.ok
View File

@ -13,11 +13,6 @@ map: &anchor
map: val map: val
# END_INDENT # END_INDENT
# START_INDENT
map: multiline
value
# END_INDENT
# START_INDENT # START_INDENT
map: | map: |
line1 line1

6
runtime/indent/yaml.vim
View File

@ -2,7 +2,7 @@
" Language: YAML " Language: YAML
" Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com>
" Last Update: Lukas Reineke " Last Update: Lukas Reineke
" Last Change: 2021 Aug 13 " Last Change: 2022 May 02
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists('b:did_indent') if exists('b:did_indent')
@ -54,7 +54,7 @@ let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
let s:c_ns_anchor_property = '\v\&'.s:c_ns_anchor_name let s:c_ns_anchor_property = '\v\&'.s:c_ns_anchor_name
let s:ns_word_char = '\v[[:alnum:]_\-]' let s:ns_word_char = '\v[[:alnum:]_\-]'
let s:ns_tag_char = '\v%('.s:ns_word_char.'|[#/;?:@&=+$.~*''()])' let s:ns_tag_char = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
let s:c_named_tag_handle = '\v\!'.s:ns_word_char.'+\!' let s:c_named_tag_handle = '\v\!'.s:ns_word_char.'+\!'
let s:c_secondary_tag_handle = '\v\!\!' let s:c_secondary_tag_handle = '\v\!\!'
let s:c_primary_tag_handle = '\v\!' let s:c_primary_tag_handle = '\v\!'
@ -63,7 +63,7 @@ let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
\ '|'.s:c_primary_tag_handle.')' \ '|'.s:c_primary_tag_handle.')'
let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+' let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
let s:c_non_specific_tag = '\v\!' let s:c_non_specific_tag = '\v\!'
let s:ns_uri_char = '\v%('.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])' let s:ns_uri_char = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>' let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
let s:c_ns_tag_property = '\v'.s:c_verbatim_tag. let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
\ '\v|'.s:c_ns_shorthand_tag. \ '\v|'.s:c_ns_shorthand_tag.

4
runtime/pack/dist/opt/termdebug/plugin/termdebug.vim vendored
View File

@ -2,7 +2,7 @@
" "
" Author: Bram Moolenaar " Author: Bram Moolenaar
" Copyright: Vim license applies, see ":help license" " Copyright: Vim license applies, see ":help license"
" Last Change: 2022 Apr 16 " Last Change: 2022 May 04
" "
" WORK IN PROGRESS - The basics works stable, more to come " WORK IN PROGRESS - The basics works stable, more to come
" Note: In general you need at least GDB 7.12 because this provides the " Note: In general you need at least GDB 7.12 because this provides the
@ -915,7 +915,7 @@ func s:DeleteCommands()
if empty(s:k_map_saved) if empty(s:k_map_saved)
nunmap K nunmap K
else else
call mapset('n', 0, s:k_map_saved) call mapset(s:k_map_saved)
endif endif
unlet s:k_map_saved unlet s:k_map_saved
endif endif

8
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: 2021 Jun 13 " Last Change: 2022 May 01
" 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")
@ -215,6 +215,12 @@ hi def link helpError Error
hi def link helpTodo Todo hi def link helpTodo Todo
hi def link helpURL String hi def link helpURL String
if expand('%:p') == $VIMRUNTIME .. '/doc/syntax.txt'
" highlight groups with their respective color
import 'dist/vimhelp.vim'
call vimhelp.HighlightGroups()
endif
let b:current_syntax = "help" let b:current_syntax = "help"
let &cpo = s:cpo_save let &cpo = s:cpo_save

7
runtime/syntax/i3config.vim
View File

@ -3,7 +3,7 @@
" Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com> " Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
" Maintainer: Quentin Hibon (github user hiqua) " Maintainer: Quentin Hibon (github user hiqua)
" Version: 0.4 " Version: 0.4
" Last Change: 2022 Jan 15 " Last Change: 2022 May 05
" References: " References:
" http://i3wm.org/docs/userguide.html#configuring " http://i3wm.org/docs/userguide.html#configuring
@ -50,6 +50,10 @@ syn match i3ConfigVariable /\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?/ contains=i3Confi
syn keyword i3ConfigInitializeKeyword set contained syn keyword i3ConfigInitializeKeyword set contained
syn match i3ConfigInitialize /^\s*set\s\+.*$/ contains=i3ConfigVariable,i3ConfigInitializeKeyword,i3ConfigColor,i3ConfigString syn match i3ConfigInitialize /^\s*set\s\+.*$/ contains=i3ConfigVariable,i3ConfigInitializeKeyword,i3ConfigColor,i3ConfigString
" Include
syn keyword i3ConfigIncludeKeyword include contained
syn match i3ConfigInclude /^\s*include\s\+.*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable
" Gaps " Gaps
syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained
syn match i3ConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable syn match i3ConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable
@ -221,6 +225,7 @@ hi def link i3ConfigAssignSpecial Special
hi def link i3ConfigFontNamespace PreProc hi def link i3ConfigFontNamespace PreProc
hi def link i3ConfigBindArgument PreProc hi def link i3ConfigBindArgument PreProc
hi def link i3ConfigNoStartupId PreProc hi def link i3ConfigNoStartupId PreProc
hi def link i3ConfigIncludeKeyword Identifier
hi def link i3ConfigFontKeyword Identifier hi def link i3ConfigFontKeyword Identifier
hi def link i3ConfigBindKeyword Identifier hi def link i3ConfigBindKeyword Identifier
hi def link i3ConfigOrientation Identifier hi def link i3ConfigOrientation Identifier

310
runtime/syntax/plsql.vim
View File

@ -4,7 +4,7 @@
" Previous Maintainer: Jeff Lanzarotta (jefflanzarotta at yahoo dot com) " Previous Maintainer: Jeff Lanzarotta (jefflanzarotta at yahoo dot com)
" Previous Maintainer: C. Laurence Gonsalves (clgonsal@kami.com) " Previous Maintainer: C. Laurence Gonsalves (clgonsal@kami.com)
" URL: https://github.com/lee-lindley/vim_plsql_syntax " URL: https://github.com/lee-lindley/vim_plsql_syntax
" Last Change: April 25, 2022 " Last Change: April 28, 2022
" History Lee Lindley (lee dot lindley at gmail dot com) " History Lee Lindley (lee dot lindley at gmail dot com)
" updated to 19c keywords. refined quoting. " updated to 19c keywords. refined quoting.
" separated reserved, non-reserved keywords and functions " separated reserved, non-reserved keywords and functions
@ -23,9 +23,6 @@
" To enable folding (It does setlocal foldmethod=syntax) " To enable folding (It does setlocal foldmethod=syntax)
" let plsql_fold = 1 " let plsql_fold = 1
" "
" If you want to try procedure folding, it has issues
" let plsql_procedure_fold = 1
"
" From my vimrc file -- turn syntax and syntax folding on, " From my vimrc file -- turn syntax and syntax folding on,
" associate file suffixes as plsql, open all the folds on file open " associate file suffixes as plsql, open all the folds on file open
" let plsql_fold = 1 " let plsql_fold = 1
@ -67,23 +64,23 @@ syn match plsqlSymbol "[;,.()]"
" Operators. and words that would be something else if not in operator mode " Operators. and words that would be something else if not in operator mode
syn match plsqlOperator "[-+*/=<>@"]" syn match plsqlOperator "[-+*/=<>@"]"
syn match plsqlOperator "\%\(\^=\|<=\|>=\|:=\|=>\|\.\.\|||\|<<\|>>\|\*\*\|!=\|\~=\)" syn match plsqlOperator "\(\^=\|<=\|>=\|:=\|=>\|\.\.\|||\|<<\|>>\|\*\*\|!=\|\~=\)"
syn match plsqlOperator "\<\%\(NOT\|AND\|OR\|LIKE\|BETWEEN\|IN\)\>" syn match plsqlOperator "\<\(NOT\|AND\|OR\|LIKE\|BETWEEN\|IN\)\>"
syn match plsqlBooleanLiteral "\<NULL\>" syn match plsqlBooleanLiteral "\<NULL\>"
syn match plsqlOperator "\<IS\\_s\+\%\(NOT\_s\+\)\?NULL\>" syn match plsqlOperator "\<IS\\_s\+\(NOT\_s\+\)\?NULL\>"
" "
" conditional compilation Preprocessor directives and sqlplus define sigil " conditional compilation Preprocessor directives and sqlplus define sigil
syn match plsqlPseudo "$[$a-z][a-z0-9$_#]*" syn match plsqlPseudo "$[$a-z][a-z0-9$_#]*"
syn match plsqlPseudo "&" syn match plsqlPseudo "&"
syn match plsqlReserved "\<\%\(CREATE\|THEN\|UPDATE\|INSERT\|SET\)\>" syn match plsqlReserved "\<\(CREATE\|THEN\|UPDATE\|INSERT\|SET\)\>"
syn match plsqlKeyword "\<\%\(REPLACE\|PACKAGE\|FUNCTION\|PROCEDURE\|TYPE|BODY\|WHEN\|MATCHED\)\>" syn match plsqlKeyword "\<\(REPLACE\|PACKAGE\|FUNCTION\|PROCEDURE\|TYPE|BODY\|WHEN\|MATCHED\)\>"
syn region plsqlUpdate syn region plsqlUpdate
\ matchgroup=plsqlReserved \ matchgroup=plsqlReserved
\ start="\<UPDATE\>" \ start="\<UPDATE\>"
\ end="\<SET\>" \ end="\<SET\>"
\ contains=@plsqlIdentifiers \ contains=@plsqlIdentifiers
syn match plsqlReserved "\<WHEN\_s\+\%\(NOT\_s\+\)\?MATCHED\_s\+THEN\_s\+\%\(UPDATE\|INSERT\)\%\(\_s\+SET\)\?" syn match plsqlReserved "\<WHEN\_s\+\(NOT\_s\+\)\?MATCHED\_s\+THEN\_s\+\(UPDATE\|INSERT\)\(\_s\+SET\)\?"
" "
" Oracle's non-reserved keywords " Oracle's non-reserved keywords
@ -463,7 +460,9 @@ syn keyword plsqlReserved OCIDURATION OCIINTERVAL OCILOBLOCATOR OCINUMBER OCIRAW
syn keyword plsqlReserved OCIROWID OCISTRING OCITYPE OF ON OPTION ORACLE ORADATA ORDER ORLANY ORLVARY syn keyword plsqlReserved OCIROWID OCISTRING OCITYPE OF ON OPTION ORACLE ORADATA ORDER ORLANY ORLVARY
syn keyword plsqlReserved OUT OVERRIDING PARALLEL_ENABLE PARAMETER PASCAL PCTFREE PIPE PIPELINED POLYMORPHIC syn keyword plsqlReserved OUT OVERRIDING PARALLEL_ENABLE PARAMETER PASCAL PCTFREE PIPE PIPELINED POLYMORPHIC
syn keyword plsqlReserved PRAGMA PRIOR PUBLIC RAISE RECORD RELIES_ON REM RENAME RESOURCE RESULT REVOKE ROWID syn keyword plsqlReserved PRAGMA PRIOR PUBLIC RAISE RECORD RELIES_ON REM RENAME RESOURCE RESULT REVOKE ROWID
syn keyword plsqlReserved SB1 SB2 SELECT SEPARATE SHARE SHORT SIZE SIZE_T SPARSE SQLCODE SQLDATA syn keyword plsqlReserved SB1 SB2
syn match plsqlReserved "\<SELECT\>"
syn keyword plsqlReserved SEPARATE SHARE SHORT SIZE SIZE_T SPARSE SQLCODE SQLDATA
syn keyword plsqlReserved SQLNAME SQLSTATE STANDARD START STORED STRUCT STYLE SYNONYM TABLE TDO syn keyword plsqlReserved SQLNAME SQLSTATE STANDARD START STORED STRUCT STYLE SYNONYM TABLE TDO
syn keyword plsqlReserved TRANSACTIONAL TRIGGER UB1 UB4 UNION UNIQUE UNSIGNED UNTRUSTED VALIST syn keyword plsqlReserved TRANSACTIONAL TRIGGER UB1 UB4 UNION UNIQUE UNSIGNED UNTRUSTED VALIST
syn keyword plsqlReserved VALUES VARIABLE VIEW VOID WHERE WITH syn keyword plsqlReserved VALUES VARIABLE VIEW VOID WHERE WITH
@ -517,28 +516,30 @@ syn match plsqlFunction "\.PREV\>"hs=s+1
syn match plsqlFunction "\.NEXT\>"hs=s+1 syn match plsqlFunction "\.NEXT\>"hs=s+1
if exists("plsql_legacy_sql_keywords") if exists("plsql_legacy_sql_keywords")
" Some of Oracle's SQL keywords. " Some of Oracle's SQL keywords.
syn keyword plsqlSQLKeyword ABORT ACCESS ACCESSED ADD AFTER ALL ALTER AND ANY syn keyword plsqlSQLKeyword ABORT ACCESS ACCESSED ADD AFTER ALL ALTER AND ANY
syn keyword plsqlSQLKeyword ASC ATTRIBUTE AUDIT AUTHORIZATION AVG BASE_TABLE syn keyword plsqlSQLKeyword ASC ATTRIBUTE AUDIT AUTHORIZATION AVG BASE_TABLE
syn keyword plsqlSQLKeyword BEFORE BETWEEN BY CASCADE CAST CHECK CLUSTER syn keyword plsqlSQLKeyword BEFORE BETWEEN BY CASCADE CAST CHECK CLUSTER
syn keyword plsqlSQLKeyword CLUSTERS COLAUTH COLUMN COMMENT COMPRESS CONNECT syn keyword plsqlSQLKeyword CLUSTERS COLAUTH COLUMN COMMENT COMPRESS CONNECT
syn keyword plsqlSQLKeyword CONSTRAINT CRASH CURRENT DATA DATABASE syn keyword plsqlSQLKeyword CONSTRAINT CRASH CURRENT DATA DATABASE
syn keyword plsqlSQLKeyword DATA_BASE DBA DEFAULT DELAY DELETE DESC DISTINCT syn keyword plsqlSQLKeyword DATA_BASE DBA DEFAULT DELAY DELETE DESC DISTINCT
syn keyword plsqlSQLKeyword DROP DUAL EXCLUSIVE EXISTS EXTENDS EXTRACT syn keyword plsqlSQLKeyword DROP DUAL EXCLUSIVE EXISTS EXTENDS EXTRACT
syn keyword plsqlSQLKeyword FILE FORCE FOREIGN FROM GRANT GROUP HAVING HEAP syn keyword plsqlSQLKeyword FILE FORCE FOREIGN FROM GRANT GROUP HAVING HEAP
syn keyword plsqlSQLKeyword IDENTIFIED IDENTIFIER IMMEDIATE IN INCLUDING syn keyword plsqlSQLKeyword IDENTIFIED IDENTIFIER IMMEDIATE IN INCLUDING
syn keyword plsqlSQLKeyword INCREMENT INDEX INDEXES INITIAL INSERT INSTEAD syn keyword plsqlSQLKeyword INCREMENT INDEX INDEXES INITIAL INSERT INSTEAD
syn keyword plsqlSQLKeyword INTERSECT INTO INVALIDATE ISOLATION KEY LIBRARY syn keyword plsqlSQLKeyword INTERSECT INTO INVALIDATE ISOLATION KEY LIBRARY
syn keyword plsqlSQLKeyword LIKE LOCK MAXEXTENTS MINUS MODE MODIFY MULTISET syn keyword plsqlSQLKeyword LIKE LOCK MAXEXTENTS MINUS MODE MODIFY MULTISET
syn keyword plsqlSQLKeyword NESTED NOAUDIT NOCOMPRESS NOT NOWAIT OF OFF OFFLINE syn keyword plsqlSQLKeyword NESTED NOAUDIT NOCOMPRESS NOT NOWAIT OF OFF OFFLINE
syn keyword plsqlSQLKeyword ON ONLINE OPERATOR OPTION ORDER ORGANIZATION syn keyword plsqlSQLKeyword ON ONLINE OPERATOR OPTION ORDER ORGANIZATION
syn keyword plsqlSQLKeyword PCTFREE PRIMARY PRIOR PRIVATE PRIVILEGES PUBLIC syn keyword plsqlSQLKeyword PCTFREE PRIMARY PRIOR PRIVATE PRIVILEGES PUBLIC
syn keyword plsqlSQLKeyword QUOTA RELEASE RENAME REPLACE RESOURCE REVOKE ROLLBACK syn keyword plsqlSQLKeyword QUOTA RELEASE RENAME REPLACE RESOURCE REVOKE ROLLBACK
syn keyword plsqlSQLKeyword ROW ROWLABEL ROWS SCHEMA SELECT SEPARATE SESSION SET syn keyword plsqlSQLKeyword ROW ROWLABEL ROWS SCHEMA
syn keyword plsqlSQLKeyword SHARE SIZE SPACE START STORE SUCCESSFUL SYNONYM syn match plsqlSQLKeyword "\<SELECT\>"
syn keyword plsqlSQLKeyword SYSDATE TABLE TABLES TABLESPACE TEMPORARY TO TREAT syn keyword plsqlSQLKeyword SEPARATE SESSION SET
syn keyword plsqlSQLKeyword TRIGGER TRUNCATE UID UNION UNIQUE UNLIMITED UPDATE syn keyword plsqlSQLKeyword SHARE SIZE SPACE START STORE SUCCESSFUL SYNONYM
syn keyword plsqlSQLKeyword USE USER VALIDATE VALUES VIEW WHENEVER WHERE WITH syn keyword plsqlSQLKeyword SYSDATE TABLE TABLES TABLESPACE TEMPORARY TO TREAT
syn keyword plsqlSQLKeyword TRIGGER TRUNCATE UID UNION UNIQUE UNLIMITED UPDATE
syn keyword plsqlSQLKeyword USE USER VALIDATE VALUES VIEW WHENEVER WHERE WITH
endif endif
@ -568,14 +569,13 @@ if exists("plsql_highlight_triggers")
syn keyword plsqlTrigger INSERTING UPDATING DELETING syn keyword plsqlTrigger INSERTING UPDATING DELETING
endif endif
" so can not contain it for folding " so can not contain it for folding. May no longer be necessary and can change them to plsqlKeyword
syn match plsqlBEGIN "\<BEGIN\>" syn match plsqlBEGIN "\<BEGIN\>"
syn match plsqlEND "\<END\>" syn match plsqlEND "\<END\>"
syn match plsqlISAS "\<\%\(IS\|AS\)\>" syn match plsqlISAS "\<\(IS\|AS\)\>"
" Various types of comments. " Various types of comments.
syntax region plsqlCommentL start="--" skip="\\$" end="$" keepend extend contains=@plsqlCommentGroup,plsqlSpaceError syntax region plsqlCommentL start="--" skip="\\$" end="$" keepend extend contains=@plsqlCommentGroup,plsqlSpaceError
if exists("plsql_fold") if exists("plsql_fold")
syntax region plsqlComment syntax region plsqlComment
\ start="/\*" end="\*/" \ start="/\*" end="\*/"
@ -599,11 +599,12 @@ syn match plsqlStringError "'.*$"
" Various types of literals. " Various types of literals.
" the + and - get sucked up as operators. Not sure how to take precedence here. Something to do with word boundaries. " the + and - get sucked up as operators. Not sure how to take precedence here. Something to do with word boundaries.
" most other syntax files do not try to includ +/- in the number token, so leave them as unary operators " most other syntax files do not try to includ +/- in the number token, so leave them as unary operators
" even though the oracle documentation counts the sign as part of the numeric literal
syn match plsqlNumbers transparent "\<\d\|\.\d" contains=plsqlIntLiteral,plsqlFloatLiteral syn match plsqlNumbers transparent "\<\d\|\.\d" contains=plsqlIntLiteral,plsqlFloatLiteral
syn match plsqlNumbersCom contained transparent "\<\d\|\.\d" contains=plsqlIntLiteral,plsqlFloatLiteral syn match plsqlNumbersCom contained transparent "\<\d\|\.\d" contains=plsqlIntLiteral,plsqlFloatLiteral
syn match plsqlIntLiteral contained "\d\+" syn match plsqlIntLiteral contained "\d\+"
syn match plsqlFloatLiteral contained "\d\+\.\%\(\d\+\%\([eE][+-]\?\d\+\)\?\)\?" syn match plsqlFloatLiteral contained "\d\+\.\(\d\+\([eE][+-]\?\d\+\)\?\)\?[fd]\?"
syn match plsqlFloatLiteral contained "\.\%\(\d\+\%\([eE][+-]\?\d\+\)\?\)" syn match plsqlFloatLiteral contained "\.\(\d\+\([eE][+-]\?\d\+\)\?\)[fd]\?"
" double quoted strings in SQL are database object names. Should be a subgroup of Normal. " double quoted strings in SQL are database object names. Should be a subgroup of Normal.
" We will use Character group as a proxy for that so color can be chosen close to Normal " We will use Character group as a proxy for that so color can be chosen close to Normal
@ -639,6 +640,8 @@ syn match plsqlAttribute "%\(BULK_EXCEPTIONS\|BULK_ROWCOUNT\|ISOPEN\|FOUND\|NOTF
syn cluster plsqlParenGroup contains=plsqlParenError,@plsqlCommentGroup,plsqlCommentSkip,plsqlIntLiteral,plsqlFloatLiteral,plsqlNumbersCom syn cluster plsqlParenGroup contains=plsqlParenError,@plsqlCommentGroup,plsqlCommentSkip,plsqlIntLiteral,plsqlFloatLiteral,plsqlNumbersCom
if exists("plsql_bracket_error") if exists("plsql_bracket_error")
" I suspect this code was copied from c.vim and never properly considered. Do
" we even use braces or brackets in sql or pl/sql?
if exists("plsql_fold") if exists("plsql_fold")
syn region plsqlParen start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInBracket fold keepend extend transparent syn region plsqlParen start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInBracket fold keepend extend transparent
else else
@ -650,135 +653,69 @@ if exists("plsql_bracket_error")
syn match plsqlErrInBracket contained "[);{}]" syn match plsqlErrInBracket contained "[);{}]"
else else
if exists("plsql_fold") if exists("plsql_fold")
syn region plsqlParen start='(' end=')' contains=ALLBUT,@plsqlParenGroup,@plsqlFoldingGroupIgnore,plsqlErrInParen fold keepend extend transparent syn region plsqlParen start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInParen fold keepend extend transparent
else else
syn region plsqlParen transparent start='(' end=')' contains=ALLBUT,@plsqlParenGroup,@plsqlFoldingGroupIgnore,plsqlErrInParen syn region plsqlParen transparent start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInParen
endif endif
"syn region plsqlParen transparent start='(' end=')' contains=ALLBUT,@plsqlParenGroup,@plsqlProcedureGroup,plsqlBlock,plsqlBlockCont,plsqlPackage,plsqlProcedureJava
syn match plsqlParenError ")" syn match plsqlParenError ")"
" should this not be parens isntead of brackets? I never quite followed what this was doing
syn match plsqlErrInParen contained "[{}]" syn match plsqlErrInParen contained "[{}]"
endif endif
syn match plsqlReserved "\<BODY\>" syn match plsqlReserved "\<BODY\>"
syn match plsqlReserved "\<CREATE\_s\+\%\(OR\_s\+REPLACE\_s\+\)\?" syn match plsqlReserved "\<CREATE\_s\+\(OR\_s\+REPLACE\_s\+\)\?"
" Loops. " Loops
syn match plsqlRepeat "\<\%\(FOR\|WHILE\|LOOP\|FORALL\)\>" syn match plsqlRepeat "\<\(FOR\|WHILE\|LOOP\|FORALL\)\>"
syn match plsqlRepeat "\<END\_s\+LOOP\>" syn match plsqlRepeat "\<END\_s\+LOOP\>"
syn match plsqlConditional "\<\%\(ELSIF\|IF\|ELSE\)\>" " conditionals
"syn match plsqlConditional "\<END\>\_s\+\<IF\>" syn match plsqlConditional "\<\(ELSIF\|IF\|ELSE\)\>"
syn match plsqlConditional "\<END\>\_s\+\<IF\>"
syn match plsqlCase "\<END\>\_s\+\<CASE\>"
syn match plsqlCase "\<CASE\>" syn match plsqlCase "\<CASE\>"
"syn match plsqlCase "\<END\>\s_\+\<CASE\>"
if exists("plsql_fold") if exists("plsql_fold")
setlocal foldmethod=syntax setlocal foldmethod=syntax
syn sync fromstart syn sync fromstart
syn cluster plsqlFoldingGroupIgnore contains=plsqlProcedureDeclaration syn cluster plsqlProcedureGroup contains=plsqlProcedure
syn cluster plsqlOnlyGroup contains=@plsqlProcedure,plsqlConditionalBlock,plsqlLoopBlock,plsqlBlock
"syntax match plsqlWhiteSpaceGroup "\_s\+" contained transparent syntax region plsqlUpdateSet
\ start="\(\<update\>\_s\+\(\<set\>\)\@![a-z][a-z0-9$_#]*\_s\+\(\(\<set\>\)\@![a-z][a-z0-9$_#]*\_s\+\)\?\)\|\(\<when\>\_s\+\<matched\>\_s\+\<then\>\_s\+\<update\>\_s\+\)\<set\>"
\ end="\(\_s*\(;\|\<from\>\|\<where\>\|\<when\>\)\)\@="
\ fold
\ keepend
\ extend
\ transparent
\ contains=ALLBUT,@plsqlOnlyGroup,plsqlSelect
syntax region plsqlSelect
\ start="\<select\>"
\ end="\(\_s*\<from\>\)\@="
\ fold
\ keepend
\ extend
\ transparent
\ contains=ALLBUT,@plsqlOnlyGroup,plsqlUpdateSet
if exists("plsql_procedure_fold") " this is brute force and requires you have the procedure/function name in the END
" this fails when a begin/end block is in a procedure. Unable to figure out why. - Lee " statement. ALthough Oracle makes it optional, we cannot. If you do not
" have it, then you can fold the BEGIN/END block of the procedure but not
" the specification of it (other than a paren group). You also cannot fold
" BEGIN/END blocks in the procedure body. Local procedures will fold as
" long as the END statement includes the procedure/function name.
" As for why we cannot make it work any other way, I don't know. It is
" something to do with both plsqlBlock and plsqlProcedure both consuming BEGIN and END,
" even if we use a lookahead for one of them.
syntax region plsqlProcedure syntax region plsqlProcedure
"\ start="\(create\(\_s\+or\_s\+replace\)\?\_s\+\)\?\<\(procedure\|function\)\>\_s\+\z([a-z][a-z0-9$_#]*\)" "\ start="\(create\(\_s\+or\_s\+replace\)\?\_s\+\)\?\<\(procedure\|function\)\>\_s\+\z([a-z][a-z0-9$_#]*\)"
\ start="\(create\(\_s\+or\_s\+replace\)\?\_s\+\)\?\<\(procedure\|function\)\>\_s\+\z([a-z][a-z0-9$_#]*\)\([^;]\|\n\)\{-}\(\_s\+\<\(is\|as\)\>\)\@=" \ start="\<\(procedure\|function\)\>\_s\+\(\z([a-z][a-z0-9$_#]*\)\)\([^;]\|\n\)\{-}\<\(is\|as\)\>\_.\{-}\(\<end\>\_s\+\2\_s*;\)\@="
\ end="\(\<end\>\(\_s\+\z1\)\?\_s*;\)" \ end="\<end\>\_s\+\z1\_s*;"
\ fold \ fold
\ keepend
\ extend \ extend
\ transparent \ transparent
\ keepend \ contains=ALLBUT,plsqlBlock
\ contains=plsqlProcedureDeclaration,plsqlProcedureBlock,@plsqlCommentAll,plsqlKeyword,plsqlReserved,plsqlTypeAttribute,plsqlStorage
syntax region plsqlProcedureDeclaration
\ transparent
\ fold
"\ start="\<\(is\|as\)\>\(\(\_.\)\{-}\<begin\>\)\@="
\ start="\<\(is\|as\)\>"
\ end="\(\_s\+\<begin\>\)\@="
\ nextgroup=plsqlProcedureBlock
\ contained
\ contains=ALLBUT,plsqlBlockCont,plsqlBlock,plsqlErrInBracket,plsqlPackage,plsqlProcedureDeclaration
",plsqlProcedureBlock
\ keepend
"\ extend
" must have keepend which is weird because it is 0 lenght
" ,plsqlEnd,plsqlISAS
syntax region plsqlProcedureBlock
\ start="\<begin\>"
"\ skip="\_s\+\<begin\>\_.\{-}\<end\>\_s*;"
\ matchgroup=NONE
\ end="\(\<end\>\(\_s\+\(if\|loop\|case\)\@![a-z][a-z0-9$_#]*\)\?\_s*;\)"
"\ end="\(\<end\>\)\@="
\ fold
\ contained
\ transparent
\ keepend
"\ extend
\ contains=ALLBUT,plsqlPackage,plsqlProcedure,plsqlProcedureBlock,plsqlProcedureDeclaration,plsqlProcedureJava,plsqlBlock
"syn cluster plsqlProcedureGroup contains=plsqlProcedure,plsqlProcedureDeclaration,plsqlProcedureBlock
syn cluster plsqlProcedureGroup contains=plsqlProcedure,plsqlProcedureDeclaration,plsqlProcedureBlock
" for inside packages
syn region plsqlProcedureSpec
\ start="\(procedure\|function\)\(\([^;]\|\n\)\{-}\<\(is\|as\)\>\)\@!"
"\ start="\(procedure\|function\)\(\([^;]\|\n\)\{-}\<\(is\|as\)\>\)\@!\(\_.*;\)\@="
\ end=";"
\ keepend extend
\ contains=@plsqlIdentifiers,plsqlKeyword,plsqlReserved,@plsqlCommentAll,plsqlParen
\ transparent
syntax region plsqlBlockCont
\ transparent
\ start="\<begin\>"
\ end="\<end\>\_s*;"
\ fold
\ extend
\ contained
\ contains=ALLBUT,@plsqlProcedureGroup,plsqlPackage,plsqlErrInBracket,PlsqlProcedureJava,plsqlBlock
\ keepend
"\ end="\<end\>\_s*\;"
syntax region plsqlProcedureJava
\ matchgroup=NONE
\ start="\(\/\*\(\(\*\/\)\@!\_.\)*\*\/\_s*\)\?\(\(\(overriding\_s*\)\?member\|constructor\|static\)\_s*\)\?\<\(procedure\|function\)\>\_s*\(\k*\)\_[^;]\{-}\<\(is\|as\)\>\_s*language\_s*java\_s*name"
\ matchgroup=plsqlStringLiteral
\ end="'\_[^']*'\_s*;"
\ keepend extend
\ fold
\ contains=ALLBUT,plsqlProcedure,plsqlProcedureDeclaration,plsqlProcedureBlock,plsqlBlockCont,plsqlBlock,plsqlProcedureJava,plsqlErrInBracket,plsqlStringLiteral
" syntax region plsqlPackage
" \ start="\<create\>\_s\+\(or\_s\+replace\_s\+\)\?package\_s\+\(body\_s\+\)\?\z([a-z][a-z0-9$_#]*\)\>"
" \ matchgroup=plsqlEnd
" \ end="\<end\>\(\%\(\_s\+\z1\)\?\_s*;\)\@="
" \ fold
" \ transparent
" \ keepend extend
" \ contains=plsqlProcedure,plsqlBlockCont,@plsqlCommentAll,plsqlKeyword,plsqlReserved,@plsqlIdentifiers
" "\ contains=ALLBUT,plsqlPackage,plsqlProcedureDeclaration,plsqlBlock,plsqlConditionalBlock,plsqlLoopBlock,plsqlCaseBlock
if exists("plsql_syntax_test_flag")
hi plsqlProcedureDeclaration guifg='blue'
hi plsqlProcedureBlock guifg='red'
hi plsqlProcedure guifg='green'
hi plsqlCaseBlock guifg='pink'
hi plsqlBlock NONE
else
hi plsqlPackage NONE
hi plsqlProcedureDeclaration NONE
hi plsqlProcedureBlock NONE
hi plsqlProcedure NONE
hi plsqlBlock NONE
hi plsqlCaseBlock NONE
endif
" end plsql_procedure_fold
endif
syntax region plsqlBlock syntax region plsqlBlock
\ start="\<begin\>" \ start="\<begin\>"
@ -809,7 +746,6 @@ if exists("plsql_fold")
\ contained \ contained
\ contains=ALLBUT,@plsqlProcedureGroup,plsqlPackage,plsqlErrInBracket,PlsqlProcedureJava \ contains=ALLBUT,@plsqlProcedureGroup,plsqlPackage,plsqlErrInBracket,PlsqlProcedureJava
" Conditionals.
syn region plsqlConditionalBlock syn region plsqlConditionalBlock
\ transparent \ transparent
\ start="\<if\>\(\_s*;\)\@!" \ start="\<if\>\(\_s*;\)\@!"
@ -827,45 +763,45 @@ endif
" Define the default highlighting. " Define the default highlighting.
" Only when an item doesn't have highlighting yet. " Only when an item doesn't have highlighting yet.
hi def link plsqlAttribute Macro hi def link plsqlAttribute Macro
hi def link plsqlBlockError Error hi def link plsqlBlockError Error
hi def link plsqlBooleanLiteral Boolean hi def link plsqlBooleanLiteral Boolean
hi def link plsqlQuotedIdentifier Character hi def link plsqlQuotedIdentifier Character
hi def link plsqlComment Comment hi def link plsqlComment Comment
hi def link plsqlCommentL Comment hi def link plsqlCommentL Comment
hi def link plsqlConditional Keyword hi def link plsqlConditional Conditional
hi def link plsqlCase Conditional hi def link plsqlCase Conditional
hi def link plsqlError Error hi def link plsqlError Error
hi def link plsqlErrInBracket Error hi def link plsqlErrInBracket Error
hi def link plsqlErrInBlock Error hi def link plsqlErrInBlock Error
hi def link plsqlErrInParen Error hi def link plsqlErrInParen Error
hi def link plsqlException Function hi def link plsqlException Function
hi def link plsqlFloatLiteral Float hi def link plsqlFloatLiteral Float
hi def link plsqlFunction Function hi def link plsqlFunction Function
hi def link plsqlGarbage Error hi def link plsqlGarbage Error
hi def link plsqlHostIdentifier Label hi def link plsqlHostIdentifier Label
hi def link plsqlIdentifier Normal hi def link plsqlIdentifier Normal
hi def link plsqlIntLiteral Number hi def link plsqlIntLiteral Number
hi def link plsqlOperator Operator hi def link plsqlOperator Operator
hi def link plsqlParenError Error hi def link plsqlParenError Error
hi def link plsqlSpaceError Error hi def link plsqlSpaceError Error
hi def link plsqlPseudo PreProc hi def link plsqlPseudo PreProc
hi def link plsqlKeyword Keyword hi def link plsqlKeyword Keyword
hi def link plsqlEND Keyword hi def link plsqlEND Keyword
hi def link plsqlBEGIN Keyword hi def link plsqlBEGIN Keyword
hi def link plsqlISAS Statement hi def link plsqlISAS Statement
hi def link plsqlReserved Statement hi def link plsqlReserved Statement
hi def link plsqlRepeat Repeat hi def link plsqlRepeat Repeat
hi def link plsqlStorage StorageClass hi def link plsqlStorage StorageClass
hi def link plsqlFunction Function hi def link plsqlFunction Function
hi def link plsqlStringError Error hi def link plsqlStringError Error
hi def link plsqlStringLiteral String hi def link plsqlStringLiteral String
hi def link plsqlCommentString String hi def link plsqlCommentString String
hi def link plsqlComment2String String hi def link plsqlComment2String String
hi def link plsqlTrigger Function hi def link plsqlTrigger Function
hi def link plsqlTypeAttribute StorageClass hi def link plsqlTypeAttribute StorageClass
hi def link plsqlTodo Todo hi def link plsqlTodo Todo
" to be able to change them, need override whether defined or not " to be able to change them after loading, need override whether defined or not
if exists("plsql_legacy_sql_keywords") if exists("plsql_legacy_sql_keywords")
hi link plsqlSQLKeyword Function hi link plsqlSQLKeyword Function
hi link plsqlSymbol Normal hi link plsqlSymbol Normal
@ -876,6 +812,8 @@ else
endif endif
let b:current_syntax = "plsql" let b:current_syntax = "plsql"
" restore setting from when we entered this file
let &cpo = s:cpo_sav let &cpo = s:cpo_sav
unlet! s:cpo_sav unlet! s:cpo_sav

16
runtime/syntax/vim.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: Vim 8.2 script " Language: Vim 8.2 script
" Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM> " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
" Last Change: April 26, 2022 " Last Change: May 07, 2022
" Version: 8.2-36 " Version: 8.2-38
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
" Automatically generated keyword lists: {{{1 " Automatically generated keyword lists: {{{1
@ -79,12 +79,12 @@ syn match vimHLGroup contained "Conceal"
syn case match syn case match
" Function Names {{{2 " Function Names {{{2
syn keyword vimFuncName contained abs argc assert_equal assert_match atan browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filter floor foldlevel function getchangelist getcmdline getcursorcharpos getftime getmarklist getreg gettagstack getwinposy has histdel hlID index inputsave isdirectory job_getchannel job_stop json_encode line listener_add log10 maplist matchaddpos matchfuzzypos menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setcallback prop_clear prop_type_change pumvisible range reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setcursorcharpos setmatches settabwinvar shiftwidth sign_place simplify sound_clear spellbadword state strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_blob test_null_list test_refcount test_void timer_stopall trunc uniq winbufnr win_getid win_id2win winnr win_splitmove syn keyword vimFuncName contained abs argc assert_equal assert_match atan browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filter floor foldlevel function getchangelist getcmdcompltype getcompletion getfperm getline getpos gettabvar getwinposx has histget hlset input inputsecret isdirectory job_getchannel job_stop json_encode line listener_add log10 maplist matchaddpos matchfuzzypos menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setcallback prop_clear prop_type_change pumvisible range reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setcursorcharpos setmatches settabwinvar shiftwidth sign_place simplify sound_clear spellbadword state strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_blob test_null_list test_refcount test_void timer_stopall trunc uniq winbufnr win_getid win_id2win winnr win_splitmove
syn keyword vimFuncName contained acos argidx assert_equalfile assert_nobeep atan2 browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath extend finddir fmod foldtext garbagecollect getchar getcmdpos getcwd getftype getmatches getreginfo gettext getwinvar has_key histget hlset input inputsecret isinf job_info join keys line2byte listener_flush luaeval mapnew matcharg matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_find prop_type_delete py3eval readblob reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setenv setpos settagstack sign_define sign_placelist sin soundfold spellsuggest str2float strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_channel test_null_partial test_setmouse timer_info tolower type values wincol win_gettype winlayout winrestcmd winwidth syn keyword vimFuncName contained acos argidx assert_equalfile assert_nobeep atan2 browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath extend finddir fmod foldtext garbagecollect getchar getcmdline getcurpos getfsize getloclist getqflist gettabwinvar getwinposy has_key histnr hostname inputdialog insert isinf job_info join keys line2byte listener_flush luaeval mapnew matcharg matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_find prop_type_delete py3eval readblob reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setenv setpos settagstack sign_define sign_placelist sin soundfold spellsuggest str2float strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_channel test_null_partial test_setmouse timer_info tolower type values wincol win_gettype winlayout winrestcmd winwidth
syn keyword vimFuncName contained add arglistid assert_exception assert_notequal balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extendnew findfile fnameescape foldtextresult get getcharmod getcmdtype getenv getimstatus getmousepos getregtype getwininfo glob haslocaldir histnr hostname inputdialog insert islocked job_setoptions js_decode len lispindent listener_remove map mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_dict test_null_string test_settime timer_pause toupper typename virtcol windowsversion win_gotoid winline winrestview wordcount syn keyword vimFuncName contained add arglistid assert_exception assert_notequal balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extendnew findfile fnameescape foldtextresult get getcharmod getcmdpos getcursorcharpos getftime getmarklist getreg gettagstack getwinvar haslocaldir hlexists iconv inputlist interrupt islocked job_setoptions js_decode len lispindent listener_remove map mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_dict test_null_string test_settime timer_pause toupper typename virtcol windowsversion win_gotoid winline winrestview wordcount
syn keyword vimFuncName contained and argv assert_fails assert_notmatch balloon_show bufexists bufwinid ceil ch_canread ch_getbufnr ch_read ch_status complete_check count deletebufline digraph_set eval exists_compiled feedkeys flatten fnamemodify foreground getbufinfo getcharpos getcmdwintype getfontname getjumplist getpid gettabinfo getwinpos glob2regpat hasmapto hlexists iconv inputlist interrupt isnan job_start js_encode libcall list2blob localtime maparg match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_event test_null_function test_option_not_set test_srand_seed timer_start tr undofile visualmode win_execute winheight win_move_separator winsaveview writefile syn keyword vimFuncName contained and argv assert_fails assert_notmatch balloon_show bufexists bufwinid ceil ch_canread ch_getbufnr ch_read ch_status complete_check count deletebufline digraph_set eval exists_compiled feedkeys flatten fnamemodify foreground getbufinfo getcharpos getcmdscreenpos getcwd getftype getmatches getreginfo gettext glob hasmapto hlget indent inputrestore invert isnan job_start js_encode libcall list2blob localtime maparg match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_event test_null_function test_option_not_set test_srand_seed timer_start tr undofile visualmode win_execute winheight win_move_separator winsaveview writefile
syn keyword vimFuncName contained append asin assert_false assert_report balloon_split buflisted bufwinnr changenr ch_close ch_getjob ch_readblob cindent complete_info cscope_connection did_filetype digraph_setlist eventhandler exp filereadable flattennew foldclosed fullcommand getbufline getcharsearch getcompletion getfperm getline getpos gettabvar getwinposx globpath histadd hlget indent inputrestore invert items job_status json_decode libcallnr list2str log mapcheck matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_ignore_error test_null_job test_override test_unknown timer_stop trim undotree wildmenumode win_findbuf win_id2tabwin win_move_statusline win_screenpos xor syn keyword vimFuncName contained append asin assert_false assert_report balloon_split buflisted bufwinnr changenr ch_close ch_getjob ch_readblob cindent complete_info cscope_connection did_filetype digraph_setlist eventhandler exp filereadable flattennew foldclosed fullcommand getbufline getcharsearch getcmdtype getenv getimstatus getmousepos getregtype getwininfo glob2regpat histadd hlID index inputsave isabsolutepath items job_status json_decode libcallnr list2str log mapcheck matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_ignore_error test_null_job test_override test_unknown timer_stop trim undotree wildmenumode win_findbuf win_id2tabwin win_move_statusline win_screenpos xor
syn keyword vimFuncName contained appendbufline assert_beeps assert_inrange assert_true blob2list bufload byte2line char2nr ch_close_in ch_info ch_readraw clearmatches confirm cursor diff_filler echoraw executable expand filewritable float2nr foldclosedend funcref getbufvar getcharstr getcurpos getfsize getloclist getqflist gettabwinvar syn keyword vimFuncName contained appendbufline assert_beeps assert_inrange assert_true blob2list bufload byte2line char2nr ch_close_in ch_info ch_readraw clearmatches confirm cursor diff_filler echoraw executable expand filewritable float2nr foldclosedend funcref getbufvar getcharstr getcmdwintype getfontname getjumplist getpid gettabinfo getwinpos globpath histdel
"--- syntax here and above generated by mkvimvim --- "--- syntax here and above generated by mkvimvim ---
" Special Vim Highlighting (not automatic) {{{1 " Special Vim Highlighting (not automatic) {{{1

338
runtime/syntax/wget.vim
View File

@ -1,7 +1,9 @@
" Vim syntax file " Vim syntax file
" Language: Wget configuration file (/etc/wgetrc ~/.wgetrc) " Language: Wget configuration file (/etc/wgetrc ~/.wgetrc)
" Maintainer: Doug Kearns <dougkearns@gmail.com> " Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2013 Jun 1 " Last Change: 2022 Apr 28
" GNU Wget 1.21 built on linux-gnu.
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -18,155 +20,206 @@ syn region wgetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
syn case ignore syn case ignore
syn keyword wgetBoolean on off contained
syn keyword wgetNumber inf contained
syn case match
syn match wgetNumber "\<\%(\d\+\|inf\)\>" contained syn keyword wgetBoolean on off yes no contained
syn match wgetQuota "\<\d\+[kKmM]\>" contained syn keyword wgetNumber inf contained
syn match wgetNumber "\<\d\+>" contained
syn match wgetQuota "\<\d\+[kmgt]\>" contained
syn match wgetTime "\<\d\+[smhdw]\>" contained syn match wgetTime "\<\d\+[smhdw]\>" contained
"{{{ Commands "{{{ Commands
let s:commands = map([ let s:commands =<< trim EOL
\ "accept", accept
\ "add_hostdir", accept_regex
\ "adjust_extension", add_host_dir
\ "always_rest", adjust_extension
\ "ask_password", always_rest
\ "auth_no_challenge", ask_password
\ "background", auth_no_challenge
\ "backup_converted", background
\ "backups", backup_converted
\ "base", backups
\ "bind_address", base
\ "ca_certificate", bind_address
\ "ca_directory", bind_dns_address
\ "cache", body_data
\ "certificate", body_file
\ "certificate_type", ca_certificate
\ "check_certificate", ca_directory
\ "connect_timeout", cache
\ "content_disposition", certificate
\ "continue", certificate_type
\ "convert_links", check_certificate
\ "cookies", choose_config
\ "cut_dirs", ciphers
\ "debug", compression
\ "default_page", connect_timeout
\ "delete_after", content_disposition
\ "dns_cache", content_on_error
\ "dns_timeout", continue
\ "dir_prefix", convert_file_only
\ "dir_struct", convert_links
\ "domains", cookies
\ "dot_bytes", crl_file
\ "dots_in_line", cut_dirs
\ "dot_spacing", debug
\ "dot_style", default_page
\ "egd_file", delete_after
\ "exclude_directories", dns_cache
\ "exclude_domains", dns_servers
\ "follow_ftp", dns_timeout
\ "follow_tags", dir_prefix
\ "force_html", dir_struct
\ "ftp_passwd", domains
\ "ftp_password", dot_bytes
\ "ftp_user", dots_in_line
\ "ftp_proxy", dot_spacing
\ "glob", dot_style
\ "header", egd_file
\ "html_extension", exclude_directories
\ "htmlify", exclude_domains
\ "http_keep_alive", follow_ftp
\ "http_passwd", follow_tags
\ "http_password", force_html
\ "http_proxy", ftp_passwd
\ "https_proxy", ftp_password
\ "http_user", ftp_user
\ "ignore_case", ftp_proxy
\ "ignore_length", ftps_clear_data_connection
\ "ignore_tags", ftps_fallback_to_ftp
\ "include_directories", ftps_implicit
\ "inet4_only", ftps_resume_ssl
\ "inet6_only", hsts
\ "input", hsts_file
\ "iri", ftp_stmlf
\ "keep_session_cookies", glob
\ "kill_longer", header
\ "limit_rate", html_extension
\ "load_cookies", htmlify
\ "locale", http_keep_alive
\ "local_encoding", http_passwd
\ "logfile", http_password
\ "login", http_proxy
\ "max_redirect", https_proxy
\ "mirror", https_only
\ "netrc", http_user
\ "no_clobber", if_modified_since
\ "no_parent", ignore_case
\ "no_proxy", ignore_length
\ "numtries", ignore_tags
\ "output_document", include_directories
\ "page_requisites", inet4_only
\ "passive_ftp", inet6_only
\ "passwd", input
\ "password", input_meta_link
\ "post_data", iri
\ "post_file", keep_bad_hash
\ "prefer_family", keep_session_cookies
\ "preserve_permissions", kill_longer
\ "private_key", limit_rate
\ "private_key_type", load_cookies
\ "progress", locale
\ "protocol_directories", local_encoding
\ "proxy_passwd", logfile
\ "proxy_password", login
\ "proxy_user", max_redirect
\ "quiet", metalink_index
\ "quota", metalink_over_http
\ "random_file", method
\ "random_wait", mirror
\ "read_timeout", netrc
\ "reclevel", no_clobber
\ "recursive", no_config
\ "referer", no_parent
\ "reject", no_proxy
\ "relative_only", numtries
\ "remote_encoding", output_document
\ "remove_listing", page_requisites
\ "restrict_file_names", passive_ftp
\ "retr_symlinks", passwd
\ "retry_connrefused", password
\ "robots", pinned_pubkey
\ "save_cookies", post_data
\ "save_headers", post_file
\ "secure_protocol", prefer_family
\ "server_response", preferred_location
\ "show_all_dns_entries", preserve_permissions
\ "simple_host_check", private_key
\ "span_hosts", private_key_type
\ "spider", progress
\ "strict_comments", protocol_directories
\ "sslcertfile", proxy_passwd
\ "sslcertkey", proxy_password
\ "timeout", proxy_user
\ "time_stamping", quiet
\ "use_server_timestamps", quota
\ "tries", random_file
\ "trust_server_names", random_wait
\ "user", read_timeout
\ "use_proxy", rec_level
\ "user_agent", recursive
\ "verbose", referer
\ "wait", regex_type
\ "wait_retry"], reject
\ "substitute(v:val, '_', '[-_]\\\\=', 'g')") rejected_log
reject_regex
relative_only
remote_encoding
remove_listing
report_speed
restrict_file_names
retr_symlinks
retry_connrefused
retry_on_host_error
retry_on_http_error
robots
save_cookies
save_headers
secure_protocol
server_response
show_all_dns_entries
show_progress
simple_host_check
span_hosts
spider
start_pos
strict_comments
sslcertfile
sslcertkey
timeout
timestamping
use_server_timestamps
tries
trust_server_names
unlink
use_askpass
user
use_proxy
user_agent
verbose
wait
wait_retry
warc_cdx
warc_cdx_dedup
warc_compression
warc_digests
warc_file
warc_header
warc_keep_log
warc_max_size
warc_temp_dir
wdebug
xattr
EOL
"}}} "}}}
syn case ignore call map(s:commands, "substitute(v:val, '_', '[-_]\\\\=', 'g')")
for cmd in s:commands for cmd in s:commands
exe 'syn match wgetCommand "' . cmd . '" nextgroup=wgetAssignmentOperator skipwhite contained' exe 'syn match wgetCommand "\<' . cmd . '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
endfor endfor
syn case match syn case match
syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
@ -179,6 +232,7 @@ hi def link wgetComment Comment
hi def link wgetNumber Number hi def link wgetNumber Number
hi def link wgetQuota Number hi def link wgetQuota Number
hi def link wgetString String hi def link wgetString String
hi def link wgetTime Number
hi def link wgetTodo Todo hi def link wgetTodo Todo
let b:current_syntax = "wget" let b:current_syntax = "wget"

250
runtime/syntax/wget2.vim Normal file
View File

@ -0,0 +1,250 @@
" Vim syntax file
" Language: Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2022 Apr 28
" GNU Wget2 2.0.0 - multithreaded metalink/file/website downloader
if exists("b:current_syntax")
finish
endif
let s:cpo_save = &cpo
set cpo&vim
syn match wgetComment "#.*$" contains=wgetTodo contained
syn keyword wgetTodo TODO NOTE FIXME XXX contained
syn region wgetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
syn case ignore
syn keyword wgetBoolean on off yes no y n contained
syn keyword wgetNumber infinity inf contained
syn match wgetNumber "\<\d\+>" contained
syn match wgetQuota "\<\d\+[kmgt]\>" contained
syn match wgetTime "\<\d\+[smhd]\>" contained
"{{{ Commands
let s:commands =<< trim EOL
accept
accept-regex
adjust-extension
append-output
ask-password
auth-no-challenge
background
backup-converted
backups
base
bind-address
bind-interface
body-data
body-file
ca-certificate
ca-directory
cache
certificate
certificate-type
check-certificate
check-hostname
chunk-size
clobber
compression
config
connect-timeout
content-disposition
content-on-error
continue
convert-file-only
convert-links
cookie-suffixes
cookies
crl-file
cut-dirs
cut-file-get-vars
cut-url-get-vars
debug
default-http-port
default-https-port
default-page
delete-after
directories
directory-prefix
dns-cache
dns-cache-preload
dns-timeout
domains
download-attr
egd-file
exclude-directories
exclude-domains
execute
filter-mime-type
filter-urls
follow-tags
force-atom
force-css
force-directories
force-html
force-metalink
force-progress
force-rss
force-sitemap
fsync-policy
gnupg-homedir
header
help
host-directories
hpkp
hpkp-file
hsts
hsts-file
hsts-preload
hsts-preload-file
html-extension
http-keep-alive
http-password
http-proxy
http-proxy-password
http-proxy-user
http-user
http2
http2-only
http2-request-window
https-enforce
https-only
https-proxy
hyperlink
if-modified-since
ignore-case
ignore-length
ignore-tags
include-directories
inet4-only
inet6-only
input-encoding
input-file
keep-extension
keep-session-cookies
level
limit-rate
list-plugins
load-cookies
local-db
local-encoding
local-plugin
max-redirect
max-threads
metalink
method
mirror
netrc
netrc-file
ocsp
ocsp-date
ocsp-file
ocsp-nonce
ocsp-server
ocsp-stapling
output-document
output-file
page-requisites
parent
password
plugin
plugin-dirs
plugin-help
plugin-opt
post-data
post-file
prefer-family
private-key
private-key-type
progress
protocol-directories
proxy
quiet
quota
random-file
random-wait
read-timeout
recursive
referer
regex-type
reject
reject-regex
remote-encoding
report-speed
restrict-file-names
retry-connrefused
retry-on-http-error
robots
save-content-on
save-cookies
save-headers
secure-protocol
server-response
signature-extensions
span-hosts
spider
start-pos
stats-dns
stats-ocsp
stats-server
stats-site
stats-tls
strict-comments
tcp-fastopen
timeout
timestamping
tls-false-start
tls-resume
tls-session-file
tries
trust-server-names
unlink
use-askpass
use-server-timestamps
user
user-agent
verbose
verify-save-failed
verify-sig
version
wait
waitretry
xattr
EOL
"}}}
call map(s:commands, "substitute(v:val, '_', '[-_]\\\\=', 'g')")
for cmd in s:commands
exe 'syn match wgetCommand "\<' . cmd . '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
endfor
syn case match
syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
syn match wgetAssignmentOperator "=" nextgroup=wgetString,wgetBoolean,wgetNumber,wgetQuota,wgetTime skipwhite contained
hi def link wgetAssignmentOperator Special
hi def link wgetBoolean Boolean
hi def link wgetCommand Identifier
hi def link wgetComment Comment
hi def link wgetNumber Number
hi def link wgetQuota Number
hi def link wgetString String
hi def link wgetTime Number
hi def link wgetTodo Todo
let b:current_syntax = "wget"
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: ts=8 fdm=marker:

6
runtime/tutor/Makefile
View File

@ -11,7 +11,7 @@ all: tutor.utf-8 \
tutor.de.utf-8 \ tutor.de.utf-8 \
tutor.el tutor.el.cp737 \ tutor.el tutor.el.cp737 \
tutor.eo \ tutor.eo \
tutor.es.utf-8 \ tutor.es \
tutor.fr.utf-8 \ tutor.fr.utf-8 \
tutor.hr tutor.hr.cp1250 \ tutor.hr tutor.hr.cp1250 \
tutor.hu tutor.hu.cp1250 \ tutor.hu tutor.hu.cp1250 \
@ -48,8 +48,8 @@ tutor.el: tutor.el.utf-8
tutor.el.cp737: tutor.el.utf-8 tutor.el.cp737: tutor.el.utf-8
iconv -f UTF-8 -t cp737 tutor.el.utf-8 > tutor.el.cp737 iconv -f UTF-8 -t cp737 tutor.el.utf-8 > tutor.el.cp737
tutor.es.utf-8: tutor.es tutor.es: tutor.es.utf-8
iconv -f ISO-8859-1 -t UTF-8 tutor.es > tutor.es.utf-8 iconv -f UTF-8 -t ISO-8859-1 tutor.es.utf-8 > tutor.es
tutor.fr.utf-8: tutor.fr tutor.fr.utf-8: tutor.fr
iconv -f ISO-8859-1 -t UTF-8 tutor.fr > tutor.fr.utf-8 iconv -f ISO-8859-1 -t UTF-8 tutor.fr > tutor.fr.utf-8

918
runtime/tutor/tutor.es
View File

File diff suppressed because it is too large Load Diff

918
runtime/tutor/tutor.es.utf-8
View File

File diff suppressed because it is too large Load Diff

5
runtime/vim.desktop
View File

@ -12,6 +12,7 @@ Name[it]=Vim
Name[ru]=Vim Name[ru]=Vim
Name[sr]=Vim Name[sr]=Vim
Name[tr]=Vim Name[tr]=Vim
Name[uk]=Vim
Name=Vim Name=Vim
# Translators: This is the Generic Application Name used in the Vim desktop file # Translators: This is the Generic Application Name used in the Vim desktop file
GenericName[ca]=Editor de text GenericName[ca]=Editor de text
@ -25,6 +26,7 @@ GenericName[ja]=テキストエディタ
GenericName[ru]=Текстовый редактор GenericName[ru]=Текстовый редактор
GenericName[sr]=Едитор текст GenericName[sr]=Едитор текст
GenericName[tr]=Metin Düzenleyici GenericName[tr]=Metin Düzenleyici
GenericName[uk]=Редактор Тексту
GenericName=Text Editor GenericName=Text Editor
# Translators: This is the comment used in the Vim desktop file # Translators: This is the comment used in the Vim desktop file
Comment[ca]=Edita fitxers de text Comment[ca]=Edita fitxers de text
@ -38,6 +40,7 @@ Comment[ja]=テキストファイルを編集します
Comment[ru]=Редактирование текстовых файлов Comment[ru]=Редактирование текстовых файлов
Comment[sr]=Уређујте текст фајлове Comment[sr]=Уређујте текст фајлове
Comment[tr]=Metin dosyaları düzenleyin Comment[tr]=Metin dosyaları düzenleyin
Comment[uk]=Редагувати текстові файли
Comment=Edit text files Comment=Edit text files
# The translations should come from the po file. Leave them here for now, they will # The translations should come from the po file. Leave them here for now, they will
# be overwritten by the po file when generating the desktop.file. # be overwritten by the po file when generating the desktop.file.
@ -97,7 +100,6 @@ Comment[sv]=Redigera textfiler
Comment[ta]=உரை கோப்புகளை தொகுக்கவும் Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
Comment[th]=แก้ไขแฟ้มข้อความ Comment[th]=แก้ไขแฟ้มข้อความ
Comment[tk]=Metin faýllary editle Comment[tk]=Metin faýllary editle
Comment[uk]=Редактор текстових файлів
Comment[vi]=Soạn thảo tập tin văn bản Comment[vi]=Soạn thảo tập tin văn bản
Comment[wa]=Asspougnî des fitchîs tecses Comment[wa]=Asspougnî des fitchîs tecses
Comment[zh_CN]=编辑文本文件 Comment[zh_CN]=编辑文本文件
@ -118,6 +120,7 @@ Keywords[ja]=テキスト;エディタ;
Keywords[ru]=текст;текстовый редактор; Keywords[ru]=текст;текстовый редактор;
Keywords[sr]=Текст;едитор; Keywords[sr]=Текст;едитор;
Keywords[tr]=Metin;düzenleyici; Keywords[tr]=Metin;düzenleyici;
Keywords[uk]=текст;редактор;
Keywords=Text;editor; Keywords=Text;editor;
# Translators: This is the Icon file name. Do NOT translate # Translators: This is the Icon file name. Do NOT translate
Icon=gvim Icon=gvim

3
src/po/gvim.desktop.in
View File

@ -65,9 +65,8 @@ Comment[sv]=Redigera textfiler
Comment[ta]=உரை கோப்புகளை தொகுக்கவும் Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
Comment[th]=แก้ไขแฟ้มข้อความ Comment[th]=แก้ไขแฟ้มข้อความ
Comment[tk]=Metin faýllary editle Comment[tk]=Metin faýllary editle
Comment[uk]=Редактор текстових файлів
Comment[vi]=Soạn thảo tập tin văn bản Comment[vi]=Soạn thảo tập tin văn bản
Comment[wa]=Asspougnî des fitchîs tecses Comment[wa]=Asspougnî des fitcs tecses
Comment[zh_CN]=编辑文本文件 Comment[zh_CN]=编辑文本文件
Comment[zh_TW]=編輯文字檔 Comment[zh_TW]=編輯文字檔
TryExec=gvim TryExec=gvim

10637
src/po/uk.cp1251.po
View File

File diff suppressed because it is too large Load Diff

10637
src/po/uk.po
View File

File diff suppressed because it is too large Load Diff

1
src/po/vim.desktop.in
View File

@ -65,7 +65,6 @@ Comment[sv]=Redigera textfiler
Comment[ta]=உரை கோப்புகளை தொகுக்கவும் Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
Comment[th]=แก้ไขแฟ้มข้อความ Comment[th]=แก้ไขแฟ้มข้อความ
Comment[tk]=Metin faýllary editle Comment[tk]=Metin faýllary editle
Comment[uk]=Редактор текстових файлів
Comment[vi]=Soạn thảo tập tin văn bản Comment[vi]=Soạn thảo tập tin văn bản
Comment[wa]=Asspougnî des fitchîs tecses Comment[wa]=Asspougnî des fitchîs tecses
Comment[zh_CN]=编辑文本文件 Comment[zh_CN]=编辑文本文件