diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-04-16 22:21:05 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-04-16 22:21:05 +0200 |
commit | 1a4dce7cad4af4de347853aad6d671da2df662ad (patch) | |
tree | d379d386b097410f1658cd4607f72f1ef7abae2e | |
parent | 7f27976589f075d591d54f754be257b5f6e6fd92 (diff) | |
download | vim-git-1a4dce7cad4af4de347853aad6d671da2df662ad.tar.gz |
patch 8.1.1177: .ts files are recognized as xml, typescript is more commonv8.1.1177
Problem: .ts files are recognized as xml, while typescript is more common.
Solution: Recognize .ts files as typescript. (closes #4264)
-rw-r--r-- | runtime/filetype.vim | 3 | ||||
-rw-r--r-- | src/testdir/test_filetype.vim | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 89370f79c..6d68c7152 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1699,6 +1699,9 @@ au BufNewFile,BufReadPost *.tsscl setf tsscl " TWIG files au BufNewFile,BufReadPost *.twig setf twig +" Typescript +au BufNewFile,BufReadPost *.ts setf typescript + " Motif UIT/UIL files au BufNewFile,BufRead *.uit,*.uil setf uil diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index fd2f38355..fe6a0a151 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -451,6 +451,7 @@ let s:filename_checks = { \ 'tssgm': ['file.tssgm'], \ 'tssop': ['file.tssop'], \ 'twig': ['file.twig'], + \ 'typescript': ['file.ts'], \ 'uc': ['file.uc'], \ 'udevconf': ['/etc/udev/udev.conf'], \ 'udevperm': ['/etc/udev/permissions.d/file.permissions'], @@ -485,7 +486,7 @@ let s:filename_checks = { \ 'xhtml': ['file.xhtml', 'file.xht'], \ 'xinetd': ['/etc/xinetd.conf'], \ 'xmath': ['file.msc', 'file.msf'], - \ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.ts', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl'], + \ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl'], \ 'xmodmap': ['anyXmodmap'], \ 'xf86conf': ['xorg.conf', 'xorg.conf-4'], \ 'xpm2': ['file.xpm2'], diff --git a/src/version.c b/src/version.c index bfb5c59c6..939f378be 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1177, +/**/ 1176, /**/ 1175, |