diff options
| author | Bastian Venthur <bastian.venthur@flixbus.com> | 2021-08-17 23:44:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-17 23:44:54 +0200 |
| commit | dea561111a5761bf99397a246b8baa43e73288de (patch) | |
| tree | d0f4e2893ad63f84a4a84de7a7b46987c2dbd494 | |
| parent | 02f8694a6bd116ab3316add4a7ea6735bf2e8839 (diff) | |
patch 8.2.3358: structurizr files are not recognizedv8.2.3358
Problem: Structurizr files are not recognized.
Solution: Recognize the file by contents. (Bastian Venthur, closes #8764)
| -rw-r--r-- | runtime/filetype.vim | 9 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 26 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 648a19d9e0..ad18b7655e 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -537,8 +537,13 @@ au BufNewFile,BufRead *.drac,*.drc,*lvs,*lpe setf dracula " Datascript au BufNewFile,BufRead *.ds setf datascript -" dsl -au BufNewFile,BufRead *.dsl setf dsl +" dsl: DSSSL or Structurizr +au BufNewFile,BufRead *.dsl + \ if getline(1) =~ '^\s*<\!' | + \ setf dsl | + \ else | + \ setf structurizr | + \ endif " DTD (Document Type Definition for XML) au BufNewFile,BufRead *.dtd setf dtd diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index cd40b6d3ca..bda6f3ccff 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -151,7 +151,6 @@ let s:filename_checks = { \ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/pacman.conf', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap'], \ 'dot': ['file.dot', 'file.gv'], \ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'], - \ 'dsl': ['file.dsl'], \ 'dtd': ['file.dtd'], \ 'dts': ['file.dts', 'file.dtsi'], \ 'dune': ['jbuild', 'dune', 'dune-project', 'dune-workspace'], @@ -834,4 +833,21 @@ func Test_ex_file() filetype off endfunc +func Test_dsl_file() + filetype on + + call writefile([' <!doctype dsssl-spec ['], 'dslfile.dsl') + split dslfile.dsl + call assert_equal('dsl', &filetype) + bwipe! + + call writefile(['workspace {'], 'dslfile.dsl') + split dslfile.dsl + call assert_equal('structurizr', &filetype) + bwipe! + + call delete('dslfile.dsl') + filetype off +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 727257d28d..74b234aa8c 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3358, +/**/ 3357, /**/ 3356, |