summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhysd <lin90162@yahoo.co.jp>2022-09-27 11:57:13 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-27 11:57:13 +0100
commit7fc6c0e4dab4e80b9806a973936af54276468513 (patch)
tree49b3fa58e666d3dfcf9b772c969e7b211630258a
parent368aa6908862874fdb901c534ee99033ac977e4a (diff)
downloadvim-git-7fc6c0e4dab4e80b9806a973936af54276468513.tar.gz
patch 9.0.0602: new TypeScript extensions are not recognizedv9.0.0602
Problem: New TypeScript extensions are not recognized. Solution: Recognize .mts and .cts files. (closes #11237)
-rw-r--r--runtime/filetype.vim11
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a5ac81262..725bb6d28 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -770,8 +770,8 @@ au BufNewFile,BufRead gitolite.conf setf gitolite
au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc setf perl
" Glimmer-flavored TypeScript and JavaScript
-au BufNewFile,BufRead *.gts setf typescript.glimmer
-au BufNewFile,BufRead *.gjs setf javascript.glimmer
+au BufNewFile,BufRead *.gts setf typescript.glimmer
+au BufNewFile,BufRead *.gjs setf javascript.glimmer
" Gnuplot scripts
au BufNewFile,BufRead *.gpi,.gnuplot setf gnuplot
@@ -2086,7 +2086,7 @@ au BufNewFile,BufRead *.tsv setf tsv
" TWIG files
au BufNewFile,BufReadPost *.twig setf twig
-" Typescript or Qt translation file (which is XML)
+" TypeScript or Qt translation file (which is XML)
au BufNewFile,BufReadPost *.ts
\ if getline(1) =~ '<?xml' |
\ setf xml |
@@ -2094,6 +2094,9 @@ au BufNewFile,BufReadPost *.ts
\ setf typescript |
\ endif
+" TypeScript module and common
+au BufNewFile,BufRead *.mts,*.cts setf typescript
+
" TypeScript with React
au BufNewFile,BufRead *.tsx setf typescriptreact
@@ -2285,7 +2288,7 @@ au BufNewFile,BufRead *.fsproj,*.fsproj.user setf xml
au BufNewFile,BufRead *.vbproj,*.vbproj.user setf xml
" Qt Linguist translation source and Qt User Interface Files are XML
-" However, for .ts Typescript is more common.
+" However, for .ts TypeScript is more common.
au BufNewFile,BufRead *.ui setf xml
" TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull)
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index ad77df357..1082eebff 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -584,6 +584,7 @@ let s:filename_checks = {
\ 'tssop': ['file.tssop'],
\ 'tsv': ['file.tsv'],
\ 'twig': ['file.twig'],
+ \ 'typescript': ['file.mts', 'file.cts'],
\ 'typescript.glimmer': ['file.gts'],
\ 'typescriptreact': ['file.tsx'],
\ 'uc': ['file.uc'],
diff --git a/src/version.c b/src/version.c
index 095252689..430475110 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 602,
+/**/
601,
/**/
600,