summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNullVoxPopuli <LPSego3+dev@gmail.com>2022-02-19 16:35:58 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-19 16:35:58 +0000
commitcdf717283ca70b18f20b8a2cefe7957083280c6f (patch)
tree9cdf3d2aaa37358e2690079f9539f44a0350ddd8
parentd56eb654f50434ea590142c0f080efba91bfe7f8 (diff)
patch 8.2.4424: ".gts" and ".gjs" files are not recognizedv8.2.4424
Problem: ".gts" and ".gjs" files are not recognized. Solution: Recognize Glimmer flavored typescript and javascript. (closes #9799)
-rw-r--r--runtime/filetype.vim4
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c75fdfb8c7..df076d1695 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -730,6 +730,10 @@ au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
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
+
" Gnuplot scripts
au BufNewFile,BufRead *.gpi,.gnuplot setf gnuplot
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index eaaa39a9cc..01978ef3f9 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -272,6 +272,7 @@ let s:filename_checks = {
\ 'java': ['file.java', 'file.jav'],
\ 'javacc': ['file.jj', 'file.jjt'],
\ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'],
+ \ 'javascript.glimmer': ['file.gjs'],
\ 'javascriptreact': ['file.jsx'],
\ 'jess': ['file.clp'],
\ 'jgraph': ['file.jgr'],
@@ -547,6 +548,7 @@ let s:filename_checks = {
\ 'tssgm': ['file.tssgm'],
\ 'tssop': ['file.tssop'],
\ 'twig': ['file.twig'],
+ \ 'typescript.glimmer': ['file.gts'],
\ 'typescriptreact': ['file.tsx'],
\ 'uc': ['file.uc'],
\ 'udevconf': ['/etc/udev/udev.conf', 'any/etc/udev/udev.conf'],
diff --git a/src/version.c b/src/version.c
index 7d585ba083..f15153131c 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 */
/**/
+ 4424,
+/**/
4423,
/**/
4422,