diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-03 21:08:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-03 21:08:37 +0100 |
| commit | c0d670ce16d0e148b7d39ac354571b3d284a0b53 (patch) | |
| tree | 7d714a047715e24242cb2cd72707bc7fcddf3e50 | |
| parent | 0684e36a7ee0743f2889698fb8e0e14f7acae423 (diff) | |
patch 8.2.2085: Qt translation file is recognized as typescriptv8.2.2085
Problem: Qt translation file is recognized as typescript.
Solution: Check the first line for "<?xml". (closes #7418)
| -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 6d636ab8fe..7dca0e0d32 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1763,8 +1763,13 @@ au BufNewFile,BufReadPost *.tsscl setf tsscl " TWIG files au BufNewFile,BufReadPost *.twig setf twig -" Typescript -au BufNewFile,BufReadPost *.ts setf typescript +" Typescript or Qt translation file (which is XML) +au BufNewFile,BufReadPost *.ts + \ if getline(1) =~ '<?xml' | + \ setf xml | + \ else | + \ setf typescript | + \ endif " TypeScript with React au BufNewFile,BufRead *.tsx setf typescriptreact diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 15ba59ae9f..93540829a5 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -487,7 +487,6 @@ let s:filename_checks = { \ 'tssgm': ['file.tssgm'], \ 'tssop': ['file.tssop'], \ 'twig': ['file.twig'], - \ 'typescript': ['file.ts'], \ 'typescriptreact': ['file.tsx'], \ 'uc': ['file.uc'], \ 'udevconf': ['/etc/udev/udev.conf', 'any/etc/udev/udev.conf'], @@ -709,5 +708,22 @@ func Test_hook_file() filetype off endfunc +func Test_ts_file() + filetype on + + call writefile(['<?xml version="1.0" encoding="utf-8"?>'], 'Xfile.ts') + split Xfile.ts + call assert_equal('xml', &filetype) + bwipe! + + call writefile(['// looks like Typescript'], 'Xfile.ts') + split Xfile.ts + call assert_equal('typescript', &filetype) + bwipe! + + call delete('Xfile.hook') + filetype off +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index f3584c1d81..096698b7f4 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2085, +/**/ 2084, /**/ 2083, |