mirror of
https://github.com/vim/vim
synced 2025-07-16 01:01:58 +00:00
patch 8.2.3703: most people call F# "fsharp" and not "fs"
Problem: Most people call F# "fsharp" and not "fs". Solution: Rename filetype "fs" to "fsharp".
This commit is contained in:
2
runtime/autoload/dist/ft.vim
vendored
2
runtime/autoload/dist/ft.vim
vendored
@ -231,7 +231,7 @@ func dist#ft#FTfs()
|
||||
\ || line =~ '^\s*: \S'
|
||||
setf forth
|
||||
else
|
||||
setf fs
|
||||
setf fsharp
|
||||
endif
|
||||
endif
|
||||
endfunc
|
||||
|
@ -634,9 +634,6 @@ au BufNewFile,BufRead *.mas,*.master setf master
|
||||
" Forth
|
||||
au BufNewFile,BufRead *.ft,*.fth setf forth
|
||||
|
||||
" F# or Forth
|
||||
au BufNewFile,BufRead *.fs call dist#ft#FTfs()
|
||||
|
||||
" Reva Forth
|
||||
au BufNewFile,BufRead *.frt setf reva
|
||||
|
||||
@ -652,6 +649,12 @@ au BufNewFile,BufRead *.fsl setf framescript
|
||||
" FStab
|
||||
au BufNewFile,BufRead fstab,mtab setf fstab
|
||||
|
||||
" F# or Forth
|
||||
au BufNewFile,BufRead *.fs call dist#ft#FTfs()
|
||||
|
||||
" F#
|
||||
au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
|
||||
|
||||
" GDB command files
|
||||
au BufNewFile,BufRead .gdbinit,gdbinit setf gdb
|
||||
|
||||
|
@ -187,7 +187,7 @@ let s:filename_checks = {
|
||||
\ 'fpcmake': ['file.fpc'],
|
||||
\ 'framescript': ['file.fsl'],
|
||||
\ 'freebasic': ['file.fb', 'file.bi'],
|
||||
\ 'fs': ['file.fs'],
|
||||
\ 'fsharp': ['file.fs', 'file.fsi', 'file.fsx'],
|
||||
\ 'fstab': ['fstab', 'mtab'],
|
||||
\ 'fvwm': ['/.fvwm/file', 'any/.fvwm/file'],
|
||||
\ 'gdb': ['.gdbinit', 'gdbinit'],
|
||||
@ -977,7 +977,7 @@ func Test_fs_file()
|
||||
|
||||
call writefile(['looks like F#'], 'Xfile.fs')
|
||||
split Xfile.fs
|
||||
call assert_equal('fs', &filetype)
|
||||
call assert_equal('fsharp', &filetype)
|
||||
bwipe!
|
||||
|
||||
let g:filetype_fs = 'forth'
|
||||
|
@ -753,6 +753,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3703,
|
||||
/**/
|
||||
3702,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user