summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-11-30 13:02:58 +0000
committerBram Moolenaar <Bram@vim.org>2021-11-30 13:02:58 +0000
commit53ba95e4f0a82f6dab1791bb01f6cddc9b3f61b3 (patch)
treeb0530560f173b7e3959139d98f168fbd0dba412c
parent98cb90ef865089a5ddd20bc0303d449fb7d97fb2 (diff)
downloadvim-git-53ba95e4f0a82f6dab1791bb01f6cddc9b3f61b3.tar.gz
patch 8.2.3703: most people call F# "fsharp" and not "fs"v8.2.3703
Problem: Most people call F# "fsharp" and not "fs". Solution: Rename filetype "fs" to "fsharp".
-rw-r--r--runtime/autoload/dist/ft.vim2
-rw-r--r--runtime/filetype.vim9
-rw-r--r--src/testdir/test_filetype.vim4
-rw-r--r--src/version.c2
4 files changed, 11 insertions, 6 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 0cbcb1bbb..74df87154 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -231,7 +231,7 @@ func dist#ft#FTfs()
\ || line =~ '^\s*: \S'
setf forth
else
- setf fs
+ setf fsharp
endif
endif
endfunc
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index fd3998b29..f687cc77a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -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
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3b875bbb9..f1966f43e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -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'
diff --git a/src/version.c b/src/version.c
index 302db8e0b..a190af5c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3703,
+/**/
3702,
/**/
3701,