Skip to content

Commit 8323cab

Browse files
committed
patch 8.2.2402: some filetypes not detected
Problem: Some filetypes not detected. Solution: Detect Ruby Signature and Puppet related files. (Doug Kearns)
1 parent f002a41 commit 8323cab

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

runtime/filetype.vim

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,9 +1176,10 @@ au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
11761176
" Password file
11771177
au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
11781178

1179-
" Pascal (also *.p)
1179+
" Pascal (also *.p, *.pp, *.inc)
11801180
au BufNewFile,BufRead *.pas setf pascal
11811181

1182+
" Pascal or Puppet manifest
11821183
au BufNewFile,BufRead *.pp call dist#ft#FTpp()
11831184

11841185
" Delphi or Lazarus program file
@@ -1269,7 +1270,7 @@ au BufNewFile,BufRead *.pov setf pov
12691270
" Povray configuration
12701271
au BufNewFile,BufRead .povrayrc setf povini
12711272

1272-
" Povray, PHP or assembly
1273+
" Povray, Pascal, PHP or assembly
12731274
au BufNewFile,BufRead *.inc call dist#ft#FTinc()
12741275

12751276
" Printcap and Termcap
@@ -1278,13 +1279,19 @@ au BufNewFile,BufRead *printcap
12781279
au BufNewFile,BufRead *termcap
12791280
\ let b:ptcap_type = "term" | setf ptcap
12801281

1281-
" PCCTS / ANTRL
1282-
"au BufNewFile,BufRead *.g setf antrl
1282+
" PCCTS / ANTLR
1283+
"au BufNewFile,BufRead *.g setf antlr
12831284
au BufNewFile,BufRead *.g setf pccts
12841285

12851286
" PPWizard
12861287
au BufNewFile,BufRead *.it,*.ih setf ppwiz
12871288

1289+
" Puppet
1290+
au BufNewFile,BufRead Puppetfile setf ruby
1291+
1292+
" Embedded Puppet
1293+
au BufNewFile,BufRead *.epp setf epuppet
1294+
12881295
" Obj 3D file format
12891296
" TODO: is there a way to avoid MS-Windows Object files?
12901297
au BufNewFile,BufRead *.obj setf obj
@@ -1427,8 +1434,8 @@ au BufNewFile,BufRead *.rb,*.rbw setf ruby
14271434
" RubyGems
14281435
au BufNewFile,BufRead *.gemspec setf ruby
14291436

1430-
" Rust
1431-
au BufNewFile,BufRead *.rs setf rust
1437+
" RBS (Ruby Signature)
1438+
au BufNewFile,BufRead *.rbs setf rbs
14321439

14331440
" Rackup
14341441
au BufNewFile,BufRead *.ru setf ruby
@@ -1442,6 +1449,9 @@ au BufNewFile,BufRead *.builder,*.rxml,*.rjs setf ruby
14421449
" Rantfile and Rakefile is like Ruby
14431450
au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake setf ruby
14441451

1452+
" Rust
1453+
au BufNewFile,BufRead *.rs setf rust
1454+
14451455
" S-lang (or shader language, or SmallLisp)
14461456
au BufNewFile,BufRead *.sl setf slang
14471457

src/testdir/test_filetype.vim

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ let s:filename_checks = {
162162
\ 'elinks': ['elinks.conf'],
163163
\ 'elm': ['file.elm'],
164164
\ 'elmfilt': ['filter-rules'],
165+
\ 'epuppet': ['file.epp'],
165166
\ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'],
166167
\ 'eruby': ['file.erb', 'file.rhtml'],
167168
\ 'esmtprc': ['anyesmtprc', 'esmtprc', 'some-esmtprc'],
@@ -391,6 +392,7 @@ let s:filename_checks = {
391392
\ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg', 'baseq2/file.cfg', 'id1/file.cfg', 'quake1/file.cfg', 'some-baseq2/file.cfg', 'some-id1/file.cfg', 'some-quake1/file.cfg'],
392393
\ 'radiance': ['file.rad', 'file.mat'],
393394
\ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
395+
\ 'rbs': ['file.rbs'],
394396
\ 'rc': ['file.rc', 'file.rch'],
395397
\ 'rcs': ['file,v'],
396398
\ 'readline': ['.inputrc', 'inputrc'],
@@ -407,7 +409,7 @@ let s:filename_checks = {
407409
\ 'rpl': ['file.rpl'],
408410
\ 'rst': ['file.rst'],
409411
\ 'rtf': ['file.rtf'],
410-
\ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file'],
412+
\ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile'],
411413
\ 'rust': ['file.rs'],
412414
\ 'samba': ['smb.conf'],
413415
\ 'sas': ['file.sas'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2402,
753755
/**/
754756
2401,
755757
/**/

0 commit comments

Comments
 (0)