patch 9.1.1468: filetype: bright(er)script files are not recognized

Problem:  filetype: bright(er)script files are not recognized
Solution: detect *.bs files as brighterscript filetype and *.brs as
          brightscript filetype, include filetype plugins (Riley Bruins)

closes: #17566

Signed-off-by: Riley Bruins <ribru17@hotmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 322f23cbf168e4e8532687a1efc62c3d8aeb2a47..197e37bc7da2bb63a03bbf3fc36d28abbab84659 100644 (file)
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -134,6 +134,8 @@ runtime/ftplugin/asy.vim            @avidseeker
 runtime/ftplugin/autohotkey.vim                @telemachus
 runtime/ftplugin/awk.vim               @dkearns
 runtime/ftplugin/basic.vim             @dkearns
+runtime/ftplugin/brighterscript.vim    @ribru17
+runtime/ftplugin/brightscript.vim      @ribru17
 runtime/ftplugin/bst.vim               @tpope
 runtime/ftplugin/c3.vim                @ttytm
 runtime/ftplugin/cabal.vim             @ribru17

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f90c6f87bb792fbd63247d7b7a272b19ed2aecc2..6b0e5d611e766e24caca91986cfc804546526523 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:          The Vim Project <https://github.com/vim/vim>
-" Last Change:         2025 Jun 03
+" Last Change:         2025 Jun 18
 " Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 
 " Listen very carefully, I will say this only once
@@ -309,6 +309,12 @@ au BufNewFile,BufRead *.bb,*.bbappend,*.bbclass,*/build/conf/*.conf,*/meta{-*,}/
 " Blkid cache file
 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
 
+" Brighterscript
+au BufNewFile,BufRead *.bs                     setf brighterscript
+
+" Brightscript
+au BufNewFile,BufRead *.brs                    setf brightscript
+
 " BSDL
 au BufNewFile,BufRead *.bsd,*.bsdl                     setf bsdl
 

diff --git a/runtime/ftplugin/brighterscript.vim b/runtime/ftplugin/brighterscript.vim
new file mode 100644 (file)
index 0000000..4fe585a
--- /dev/null
+++ b/runtime/ftplugin/brighterscript.vim
@@ -0,0 +1,11 @@
+" Vim filetype plugin
+" Language:    Brighterscript
+" Maintainer:  Riley Bruins <ribru17@gmail.com>
+" Last Change: 2025 Jun 17
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+runtime! ftplugin/brightscript.vim

diff --git a/runtime/ftplugin/brightscript.vim b/runtime/ftplugin/brightscript.vim
new file mode 100644 (file)
index 0000000..92bc56d
--- /dev/null
+++ b/runtime/ftplugin/brightscript.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:    Brightscript
+" Maintainer:  Riley Bruins <ribru17@gmail.com>
+" Last Change: 2025 Jun 17
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:' commentstring='\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3ae16e418bbf4ec06199a83933c97653fb497a64..0c74ffba7aeac932458f572591ad8f5a9de381da 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -142,6 +142,8 @@ def s:GetFilenameChecks(): dict<list<string>>
     blank: ['file.bl'],
     blueprint: ['file.blp'],
     bp: ['Android.bp'],
+    brighterscript: ['file.bs'],
+    brightscript: ['file.brs'],
     bsdl: ['file.bsd', 'file.bsdl'],
     bst: ['file.bst'],
     bzl: ['file.bazel', 'file.bzl', 'WORKSPACE', 'WORKSPACE.bzlmod'],

diff --git a/src/version.c b/src/version.c
index 168ff4e674473b9c3c3f36a02013c873762f9565..04c11f76ce2d64e2ddbb31d40f286d19f5760f64 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1468,
 /**/
     1467,
 /**/