patch 9.1.0532: filetype: Cedar files not recognized

Problem:  filetype: Cedar files not recognized
Solution: Detect '*.cedar' files as cedar filetype
          (Riley Bruins)

References: https://github.com/cedar-policy

closes: #15148

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

diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index d36c6e7aad5702173c747750194a199bd5b59233..2b4c475ff99a788ee17b99c8b308740f7d682170 100644 (file)
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -113,6 +113,7 @@ runtime/ftplugin/astro.vim          @romainl
 runtime/ftplugin/awk.vim               @dkearns
 runtime/ftplugin/basic.vim             @dkearns
 runtime/ftplugin/bst.vim               @tpope
+runtime/ftplugin/cedar.vim             @ribru17
 runtime/ftplugin/cfg.vim               @chrisbra
 runtime/ftplugin/chatito.vim           @ObserverOfTime
 runtime/ftplugin/chicken.vim           @evhan

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6cb2de1d65f21491c40946f566b4b21dea263b7a..c814baa2363c23379f22061f694c0002043607c7 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -321,6 +321,9 @@ au BufNewFile,BufRead *.toc
 " Cdrdao config
 au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,.cdrdao     setf cdrdaoconf
 
+" Cedar
+au BufNewFile,BufRead *.cedar                  setf cedar
+
 " Cfengine
 au BufNewFile,BufRead cfengine.conf            setf cfengine
 

diff --git a/runtime/ftplugin/cedar.vim b/runtime/ftplugin/cedar.vim
new file mode 100644 (file)
index 0000000..74a1903
--- /dev/null
+++ b/runtime/ftplugin/cedar.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:    Cedar
+" Maintainer:  Riley Bruins <ribru17@gmail.com>
+" Last Change: 2024 Jul 4
+
+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 2dd317e63504761af453c698f1d7433c757d1e52..a3d88910bc308c30e167faee59d562a4eaa9d5b4 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -142,6 +142,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     cdl: ['file.cdl'],
     cdrdaoconf: ['/etc/cdrdao.conf', '/etc/defaults/cdrdao', '/etc/default/cdrdao', '.cdrdao', 'any/etc/cdrdao.conf', 'any/etc/default/cdrdao', 'any/etc/defaults/cdrdao'],
     cdrtoc: ['file.toc'],
+    cedar: ['file.cedar'],
     cf: ['file.cfm', 'file.cfi', 'file.cfc'],
     cfengine: ['cfengine.conf'],
     cfg: ['file.hgrc', 'filehgrc', 'hgrc', 'some-hgrc'],

diff --git a/src/version.c b/src/version.c
index 9cf60326ae2f23d24f41c3659e080ca343155e97..9cea3449346db5ccd04caddd71bafa0917a7fa69 100644 (file)
--- 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 */
+/**/
+    532,
 /**/
     531,
 /**/