summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Kim <habamax@gmail.com>2022-08-29 15:28:53 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-29 15:28:53 +0100
commitd5c8f11905abc1bdf3b8864dbc40187855ed9374 (patch)
treeea69e11f1ff3e2b35cbabe01de9cfa369c63a1b9
parent13608d851a0470ced30921428b3313c023d395d8 (diff)
patch 9.0.0319: Godot shader files are not recognizedv9.0.0319
Problem: Godot shader files are not recognized. Solution: Add patterns for "gdshader". (Maxim Kim, closes #11006)
-rw-r--r--runtime/filetype.vim5
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 50de286240..c2b89a5f80 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -696,7 +696,10 @@ au BufNewFile,BufRead *.mo,*.gdmo setf gdmo
au BufNewFile,BufRead *.gd setf gdscript
" Godot resource
-au BufRead,BufNewFile *.tscn,*.tres setf gdresource
+au BufRead,BufNewFile *.tscn,*.tres setf gdresource
+
+" Godot shader
+au BufRead,BufNewFile *.gdshader,*.shader setf gdshader
" Gedcom
au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4986b4418d..18233e7ab1 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -209,6 +209,7 @@ let s:filename_checks = {
\ 'gdmo': ['file.mo', 'file.gdmo'],
\ 'gdresource': ['file.tscn', 'file.tres'],
\ 'gdscript': ['file.gd'],
+ \ 'gdshader': ['file.gdshader', 'file.shader'],
\ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
\ 'gemtext': ['file.gmi', 'file.gemini'],
\ 'gift': ['file.gift'],
diff --git a/src/version.c b/src/version.c
index 6c9a330d94..f743bb970d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 319,
+/**/
318,
/**/
317,