mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-16 11:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25717 from gpanders/vim-e08bfef88bd0

Browse Source 
vim-patch:e08bfef88bd0, vim-patch:9.0.2053
This commit is contained in:
Gregory Anders
2023-10-19 14:30:19 -05:00
committed by GitHub
parent 315c711700 3ea13bca14
commit 2c9d4ef459
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/ftplugin/zig.vim
View File

@@ -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 =

2
runtime/lua/vim/filetype.lua
View File

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

27
runtime/syntax/zig.vim
View File

@@ -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"

3
test/old/testdir/test_filetype.vim
View File

@@ -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'],
\