kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 05:05:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:ef387c062bb1 (#27553)

Browse Source 
runtime(filetype): Modula-2 files with priority not detected (vim/vim#14055)

Problem:  Modula-2 files with a specified priority are not detected.
Solution: Match the priority syntax in module header lines when
          performing heuristic content detection.

Disable the :defcompile debug line.  This was accidentally left enabled
in commit 68a8947.

ef387c062b

Co-authored-by: dkearns <dougkearns@gmail.com>
This commit is contained in:
zeertzjq 2024-02-21 06:29:53 +08:00 committed by GitHub
parent 5e4a5f1aaa
commit f25c0c1eb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,7 +422,7 @@ end
--- @param bufnr integer
--- @return boolean
local function is_modula2(bufnr)
return matchregex(nextnonblank(bufnr, 1), [[\<MODULE\s\+\w\+\s*;\|^\s*(\*]])
return matchregex(nextnonblank(bufnr, 1), [[\<MODULE\s\+\w\+\s*\%(\[.*]\s*\)\=;\|^\s*(\*]])
end
--- @param bufnr integer

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

@ -1511,82 +1511,89 @@ func Test_mod_file()
filetype on
" *.mod defaults to Modsim III
call writefile(['locks like Modsim III'], 'modfile.mod')
split modfile.mod
call writefile(['locks like Modsim III'], 'Xfile.mod', 'D')
split Xfile.mod
call assert_equal('modsim3', &filetype)
bwipe!
" Users preference set by g:filetype_mod
let g:filetype_mod = 'lprolog'
split modfile.mod
split Xfile.mod
call assert_equal('lprolog', &filetype)
unlet g:filetype_mod
bwipe!
" LambdaProlog module
call writefile(['module lpromod.'], 'Xfile.mod')
split Xfile.mod
call assert_equal('lprolog', &filetype)
bwipe!
" LambdaProlog with comment and empty lines prior module
call writefile(['', '% with', '% comment', '', 'module lpromod.'], 'Xfile.mod')
split Xfile.mod
call assert_equal('lprolog', &filetype)
bwipe!
" RAPID header start with a line containing only "%%%",
" but is not always present.
call writefile(['%%%'], 'modfile.mod')
split modfile.mod
call writefile(['%%%'], 'Xfile.mod')
split Xfile.mod
call assert_equal('rapid', &filetype)
bwipe!
call delete('modfile.mod')
" RAPID supports umlauts in module names, leading spaces,
" the .mod extension is not case sensitive.
call writefile([' module ÜmlautModule'], 'modfile.Mod')
split modfile.Mod
call writefile([' module ÜmlautModule'], 'Xfile.Mod', 'D')
split Xfile.Mod
call assert_equal('rapid', &filetype)
bwipe!
call delete('modfile.Mod')
" RAPID is not case sensitive, embedded spaces, sysmodule,
" file starts with empty line(s).
call writefile(['', 'MODULE rapidmödüle (SYSMODULE,NOSTEPIN)'], 'modfile.MOD')
split modfile.MOD
call writefile(['', 'MODULE rapidmödüle (SYSMODULE,NOSTEPIN)'], 'Xfile.MOD', 'D')
split Xfile.MOD
call assert_equal('rapid', &filetype)
bwipe!
" Modula-2 MODULE not start of line
call writefile(['IMPLEMENTATION MODULE Module2Mod;'], 'modfile.MOD')
split modfile.MOD
call writefile(['IMPLEMENTATION MODULE Module2Mod;'], 'Xfile.mod')
split Xfile.mod
call assert_equal('modula2', &filetype)
call assert_equal('pim', b:modula2.dialect)
bwipe!
" Modula-2 with comment and empty lines prior MODULE
call writefile(['', '(* with', ' comment *)', '', 'MODULE Module2Mod;'], 'modfile.MOD')
split modfile.MOD
call writefile(['', '(* with', ' comment *)', '', 'MODULE Module2Mod;'], 'Xfile.mod')
split Xfile.mod
call assert_equal('modula2', &filetype)
call assert_equal('pim', b:modula2.dialect)
bwipe!
call delete('modfile.MOD')
" LambdaProlog module
call writefile(['module lpromod.'], 'modfile.mod')
split modfile.mod
call assert_equal('lprolog', &filetype)
" Modula-2 program MODULE with priorty (and uppercase extension)
call writefile(['MODULE Module2Mod [42];'], 'Xfile.MOD')
split Xfile.MOD
call assert_equal('modula2', &filetype)
call assert_equal('pim', b:modula2.dialect)
bwipe!
" LambdaProlog with comment and empty lines prior module
call writefile(['', '% with', '% comment', '', 'module lpromod.'], 'modfile.mod')
split modfile.mod
call assert_equal('lprolog', &filetype)
" Modula-2 implementation MODULE with priorty (and uppercase extension)
call writefile(['IMPLEMENTATION MODULE Module2Mod [42];'], 'Xfile.MOD')
split Xfile.MOD
call assert_equal('modula2', &filetype)
call assert_equal('pim', b:modula2.dialect)
bwipe!
call delete('modfile.mod')
" go.mod
call writefile(['module example.com/M'], 'go.mod')
call writefile(['module example.com/M'], 'go.mod', 'D')
split go.mod
call assert_equal('gomod', &filetype)
bwipe!
call delete('go.mod')
call writefile(['module M'], 'go.mod')
split go.mod
call assert_equal('gomod', &filetype)
bwipe!
call delete('go.mod')
filetype off
endfunc