Skip to content

Commit e4b991e

Browse files
gpanderschrisbra
authored andcommitted
patch 9.1.0610: filetype: OpenGL Shading Language files are not detected
Problem: filetype: OpenGL Shading Language files are not detected Solution: detect various file extensions as GLSL filetype, include indent and syntax script, do no longer recognize '*.comp' as Mason filetype (Gregory Anders) closes: #15317 Signed-off-by: Gregory Anders <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 9d57ea5 commit e4b991e

File tree

6 files changed

+777
-5
lines changed

6 files changed

+777
-5
lines changed

.github/MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ runtime/indent/freebasic.vim @dkearns
306306
runtime/indent/gdscript.vim @habamax
307307
runtime/indent/gitconfig.vim @tpope
308308
runtime/indent/gitolite.vim @sitaramc
309+
runtime/indent/glsl.vim @gpanders
309310
runtime/indent/go.vim @dbarnett
310311
runtime/indent/gyp.vim @ObserverOfTime
311312
runtime/indent/haml.vim @tpope
@@ -439,6 +440,7 @@ runtime/syntax/gitconfig.vim @tpope
439440
runtime/syntax/gitignore.vim @ObserverOfTime
440441
runtime/syntax/gitolite.vim @sitaramc
441442
runtime/syntax/gitrebase.vim @tpope
443+
runtime/syntax/glsl.vim @gpanders
442444
runtime/syntax/go.vim @bhcleek
443445
runtime/syntax/godoc.vim @dbarnett
444446
runtime/syntax/gp.vim @KBelabas

runtime/filetype.vim

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,9 @@ au BufNewFile,BufRead gkrellmrc,gkrellmrc_? setf gkrellmrc
915915
au BufNewFile,BufRead *.gleam setf gleam
916916

917917
" GLSL
918-
au BufNewFile,BufRead *.glsl setf glsl
918+
" Extensions supported by Khronos reference compiler (with one exception, ".glsl")
919+
" https://github.com/KhronosGroup/glslang
920+
au BufNewFile,BufRead *.vert,*.tesc,*.tese,*.glsl,*.geom,*.frag,*.comp,*.rgen,*.rmiss,*.rchit,*.rahit,*.rint,*.rcall setf glsl
919921

920922
" GN (generate ninja) files
921923
au BufNewFile,BufRead *.gn,*.gni setf gn
@@ -1414,8 +1416,8 @@ au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md
14141416
\ setf markdown |
14151417
\ endif
14161418

1417-
" Mason
1418-
au BufNewFile,BufRead *.mason,*.mhtml,*.comp setf mason
1419+
" Mason (it used to include *.comp, are those Mason files?)
1420+
au BufNewFile,BufRead *.mason,*.mhtml setf mason
14191421

14201422
" Mathematica, Matlab, Murphi, Objective C or Octave
14211423
au BufNewFile,BufRead *.m call dist#ft#FTm()

runtime/indent/glsl.vim

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
" Language: OpenGL Shading Language
2+
" Maintainer: Gregory Anders <[email protected]>
3+
" Last Modified: 2024 Jul 21
4+
" Upstream: https://github.com/tikhomirov/vim-glsl
5+
6+
if exists('b:did_indent')
7+
finish
8+
endif
9+
let b:did_indent = 1
10+
11+
setlocal autoindent cindent
12+
setlocal cinoptions&
13+
14+
let b:undo_indent = 'setl ai< ci< cino<'

0 commit comments

Comments
 (0)