Merge pull request #25717 from gpanders/vim-e08bfef88bd0

vim-patch:e08bfef88bd0, vim-patch:9.0.2053

runtime/ftplugin/zig.vim

@@ -28,7 +28,7 @@ setlocal formatoptions-=t formatoptions+=croql
 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 =

runtime/lua/vim/filetype.lua

@@ -1119,7 +1119,7 @@ local extension = {
   yuck = 'yuck',
   z8a = 'z8a',
   zig = 'zig',
-  zir = 'zir',
+  zon = 'zig',
   zu = 'zimbu',
   zut = 'zimbutempl',
   zs = 'zserio',

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"
+    \ ,                  "@floatFromInt"
-    \ ,                  "@floatToInt"
+    \ ,                  "@intFromFloat"
-    \ ,                  "@boolToInt"
+    \ ,                  "@intFromBool"
-    \ ,                  "@errSetCast"
+    \ ,                  "@errorCast"
     \ ,                  "@truncate"
     \ ,                  "@typeInfo"
     \ ,                  "@typeName"
     \ ,                  "@TypeOf"
     \ ,                  "@atomicRmw"
-    \ ,                  "@intToError"
+    \ ,                  "@errorFromInt"
-    \ ,                  "@errorToInt"
+    \ ,                  "@intFromError"
-    \ ,                  "@intToEnum"
+    \ ,                  "@enumFromInt"
-    \ ,                  "@enumToInt"
+    \ ,                  "@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"

test/old/testdir/test_filetype.vim

@@ -735,10 +735,9 @@ func s:GetFilenameChecks() abort
     \ 'yang': ['file.yang'],
     \ 'yuck': ['file.yuck'],
     \ 'z8a': ['file.z8a'],
-    \ 'zig': ['file.zig'],
+    \ 'zig': ['file.zig', 'build.zig.zon'],
     \ 'zimbu': ['file.zu'],
     \ 'zimbutempl': ['file.zut'],
-    \ 'zir': ['file.zir'],
     \ 'zserio': ['file.zs'],
     \ 'zsh': ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh', '.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file', 'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file'],
     \