patch 9.0.0319: Godot shader files are not recognized

Problem:    Godot shader files are not recognized.
Solution:   Add patterns for "gdshader". (Maxim Kim, closes #11006)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 50de286240de97d2cf08a7fdb4e8f2eb1cc9ca9e..c2b89a5f80c901bb1c2b4531af10973327994329 100644 (file)
--- 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 4986b4418d4c40a52c08d16969f8baf3a8eb1277..18233e7ab1cd9009898ba3e8b55b9c6674c36609 100644 (file)
--- 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 6c9a330d9463734690efbcd243e969e08c871d49..f743bb970d72aa7f69f5a3b8eca752b7d7526ccc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    319,
 /**/
     318,
 /**/