summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorObserverOfTime <chronobserver@disroot.org>2022-09-27 13:07:05 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-27 13:07:05 +0100
commit49c311c9b18e18c05f93728d1f8a552923a18423 (patch)
tree321f54960c824c0a56f9444ab782e8f866b26064
parent7c1cbb6cd437c6e0c3ccc05840cc931108b4a60a (diff)
downloadvim-git-9.0.0604.tar.gz
patch 9.0.0604: luacheckrc file is not recognizedv9.0.0604
Problem: Luacheckrc file is not recognized. Solution: Use lua filetype for luacheckrc. (closes #11236)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 725bb6d28..519ea330f 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1112,6 +1112,9 @@ au BufNewFile,BufRead *.lou,*.lout setf lout
" Lua
au BufNewFile,BufRead *.lua setf lua
+" Luacheck
+au BufNewFile,BufRead .luacheckrc setf lua
+
" Luarocks
au BufNewFile,BufRead *.rockspec setf lua
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 1082eebff..8a8ee6c10 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -328,7 +328,7 @@ let s:filename_checks = {
\ 'lpc': ['file.lpc', 'file.ulpc'],
\ 'lsl': ['file.lsl'],
\ 'lss': ['file.lss'],
- \ 'lua': ['file.lua', 'file.rockspec', 'file.nse'],
+ \ 'lua': ['file.lua', 'file.rockspec', 'file.nse', '.luacheckrc'],
\ 'lynx': ['lynx.cfg'],
\ 'lyrics': ['file.lrc'],
\ 'm3build': ['m3makefile', 'm3overrides'],
diff --git a/src/version.c b/src/version.c
index f6b88274a..c96585e80 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 604,
+/**/
603,
/**/
602,