commit c0d670ce16d0e148b7d39ac354571b3d284a0b53
author Bram Moolenaar <Bram@vim.org> Thu Dec 03 21:08:37 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Dec 03 21:08:37 2020 +0100
tree 7d714a047715e24242cb2cd72707bc7fcddf3e50
parent 0684e36a7ee0743f2889698fb8e0e14f7acae423

patch 8.2.2085: Qt translation file is recognized as typescript

Problem:    Qt translation file is recognized as typescript.
Solution:   Check the first line for "<?xml". (closes #7418)

src/testdir/test_filetype.vim

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 15ba59a..9354082 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -487,7 +487,6 @@
     \ '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 @@
   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

src/version.c

diff --git a/src/version.c b/src/version.c
index f3584c1..096698b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2085,
+/**/
     2084,
 /**/
     2083,