# HG changeset patch # User Bram Moolenaar # Date 1555446606 -7200 # Node ID d24e5d848a09cc129e3f906d5d9414b60a50adf9 # Parent ad7f0b2a4dfdb28914f1965749c17dd3e88dbb7a patch 8.1.1177: .ts files are recognized as xml, typescript is more common commit https://github.com/vim/vim/commit/1a4dce7cad4af4de347853aad6d671da2df662ad Author: Bram Moolenaar Date: Tue Apr 16 22:21:05 2019 +0200 patch 8.1.1177: .ts files are recognized as xml, typescript is more common Problem: .ts files are recognized as xml, while typescript is more common. Solution: Recognize .ts files as typescript. (closes https://github.com/vim/vim/issues/4264) diff --git a/runtime/filetype.vim b/runtime/filetype.vim --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1699,6 +1699,9 @@ au BufNewFile,BufReadPost *.tsscl setf " 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 --- 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 --- 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,