From 9c8f9b10fcb177fb07684626b49118dd2d2540b5 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Thu, 6 Feb 2025 21:26:08 +0100 Subject: [PATCH] patch 9.1.1080: filetype: Mill files are not recognized Problem: filetype: Mill files are not recognized Solution: detect '*.mill' files as scala filetype (author) In the past [Mill](https://mill-build.org/mill/index.html) build files were always `build.sc` and treated as Scala files. However as the 0.12.x series of mill you can create a `build.mill` file. You can see a lot of examples of this if you search [GitHub](https://github.com/search?q=build.mill&type=code). This small change just ensures that if you have a `*.mill` file it treats it as a Scala file. closes: #16585 Signed-off-by: Chris Kipp Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 2 +- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index d2ff662269..dcb6130b32 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2212,7 +2212,7 @@ au BufNewFile,BufRead *.sass setf sass au BufNewFile,BufRead *.sa call dist#ft#FTsa() " Scala -au BufNewFile,BufRead *.scala setf scala +au BufNewFile,BufRead *.scala,*.mill setf scala " SBT - Scala Build Tool au BufNewFile,BufRead *.sbt setf sbt diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index e5411af154..3dcc665290 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -674,7 +674,7 @@ def s:GetFilenameChecks(): dict> sas: ['file.sas'], sass: ['file.sass'], sbt: ['file.sbt'], - scala: ['file.scala'], + scala: ['file.scala', 'file.mill'], scheme: ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config', '.lips_repl_history'], scilab: ['file.sci', 'file.sce'], screen: ['.screenrc', 'screenrc'], diff --git a/src/version.c b/src/version.c index 8fc6f602a7..d8e8c0ea6f 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1080, /**/ 1079, /**/