Mercurial > vim
changeset 33617:f7351afc42cf
runtime(zig): Update Zig runtime files (#13388)
Commit: https://github.com/vim/vim/commit/e08bfef88bd05a9d27ee16c57cd10173e280f600
Author: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu Oct 19 10:16:59 2023 -0500
runtime(zig): Update Zig runtime files (https://github.com/vim/vim/issues/13388)
Update runtime files from upstream (https://github.com/zig/zig.vim) at
commit 54c216e5306a5c3878a60596aacb94dca8652ab9.
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 19 Oct 2023 17:30:05 +0200 |
| parents | 965ed6e19279 |
| children | 698de9399942 |
| files | runtime/filetype.vim runtime/ftplugin/zig.vim runtime/syntax/zig.vim |
| diffstat | 3 files changed, 20 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1998,9 +1998,8 @@ au BufNewFile,BufRead .tcshrc,*.tcsh,tcs " (patterns ending in a start further below) au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias call dist#ft#CSH() -" Zig and Zir (Zig Intermediate Representation) -au BufNewFile,BufRead *.zig setf zig -au BufNewFile,BufRead *.zir setf zir +" Zig and Zig Object Notation (ZON) +au BufNewFile,BufRead *.zig,*.zon setf zig " Zserio au BufNewFile,BufRead *.zs setf zserio
--- a/runtime/ftplugin/zig.vim +++ b/runtime/ftplugin/zig.vim @@ -28,7 +28,7 @@ setlocal formatoptions-=t formatoptions+ setlocal suffixesadd=.zig,.zir if has('comments') - setlocal comments=:///,://!,://,:\\\\ + setlocal comments=:///,://!,:// setlocal commentstring=//\ %s endif @@ -53,7 +53,7 @@ endif unlet! s:tmp_cwd if exists('g:zig_std_dir') - let &l:path = &l:path . ',' . g:zig_std_dir + let &l:path = g:zig_std_dir . ',' . &l:path endif let b:undo_ftplugin =
--- a/runtime/syntax/zig.vim +++ b/runtime/syntax/zig.vim @@ -34,6 +34,7 @@ let s:zig_syntax_keywords = { \ , "usize" \ , "comptime_int" \ , "comptime_float" + \ , "c_char" \ , "c_short" \ , "c_ushort" \ , "c_int" @@ -96,6 +97,7 @@ let s:zig_syntax_keywords = { \ , "@atomicStore" \ , "@bitCast" \ , "@breakpoint" + \ , "@trap" \ , "@alignCast" \ , "@alignOf" \ , "@cDefine" @@ -107,6 +109,7 @@ let s:zig_syntax_keywords = { \ , "@cmpxchgStrong" \ , "@compileError" \ , "@compileLog" + \ , "@constCast" \ , "@ctz" \ , "@popCount" \ , "@divExact" @@ -126,9 +129,10 @@ let s:zig_syntax_keywords = { \ , "@unionInit" \ , "@frameAddress" \ , "@import" + \ , "@inComptime" \ , "@newStackCall" \ , "@asyncCall" - \ , "@intToPtr" + \ , "@ptrFromInt" \ , "@max" \ , "@min" \ , "@memcpy" @@ -145,7 +149,7 @@ let s:zig_syntax_keywords = { \ , "@panic" \ , "@prefetch" \ , "@ptrCast" - \ , "@ptrToInt" + \ , "@intFromPtr" \ , "@rem" \ , "@returnAddress" \ , "@setCold" @@ -169,25 +173,26 @@ let s:zig_syntax_keywords = { \ , "@subWithOverflow" \ , "@intCast" \ , "@floatCast" - \ , "@intToFloat" - \ , "@floatToInt" - \ , "@boolToInt" - \ , "@errSetCast" + \ , "@floatFromInt" + \ , "@intFromFloat" + \ , "@intFromBool" + \ , "@errorCast" \ , "@truncate" \ , "@typeInfo" \ , "@typeName" \ , "@TypeOf" \ , "@atomicRmw" - \ , "@intToError" - \ , "@errorToInt" - \ , "@intToEnum" - \ , "@enumToInt" + \ , "@errorFromInt" + \ , "@intFromError" + \ , "@enumFromInt" + \ , "@intFromEnum" \ , "@setAlignStack" \ , "@frame" \ , "@Frame" \ , "@frameSize" \ , "@bitReverse" \ , "@Vector" + \ , "@volatileCast" \ , "@sin" \ , "@cos" \ , "@tan" @@ -196,7 +201,7 @@ let s:zig_syntax_keywords = { \ , "@log" \ , "@log2" \ , "@log10" - \ , "@fabs" + \ , "@abs" \ , "@floor" \ , "@ceil" \ , "@trunc"