patch 9.0.1438: .fs files are falsely recognized as forth files
Problem: .fs files are falsely recognized as forth files.
Solution: Check 100 lines for something that looks like forth. (Johan
Kotlinski, closes #12219, closes #11988)
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index bfc325d..5d2053d 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -307,14 +307,16 @@
if exists("g:filetype_fs")
exe "setf " .. g:filetype_fs
else
- var line = getline(nextnonblank(1))
- # comments and colon definitions
- if line =~ '^\s*\.\=( ' || line =~ '^\s*\\G\= ' || line =~ '^\\$'
- \ || line =~ '^\s*: \S'
- setf forth
- else
- setf fsharp
- endif
+ var n = 1
+ while n < 100 && n <= line("$")
+ # Forth comments and colon definitions
+ if getline(n) =~ "^[:(\\\\] "
+ setf forth
+ return
+ endif
+ n += 1
+ endwhile
+ setf fsharp
endif
enddef
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index a753ec8..af2969d 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -1212,27 +1212,11 @@
call assert_equal('forth', &filetype)
bwipe!
- call writefile(['.( Forth displayed inline comment )'], 'Xfile.fs')
- split Xfile.fs
- call assert_equal('forth', &filetype)
- bwipe!
-
call writefile(['\ Forth line comment'], 'Xfile.fs')
split Xfile.fs
call assert_equal('forth', &filetype)
bwipe!
- " empty line comment - no space required
- call writefile(['\'], 'Xfile.fs')
- split Xfile.fs
- call assert_equal('forth', &filetype)
- bwipe!
-
- call writefile(['\G Forth documentation comment '], 'Xfile.fs')
- split Xfile.fs
- call assert_equal('forth', &filetype)
- bwipe!
-
call writefile([': squared ( n -- n^2 )', 'dup * ;'], 'Xfile.fs')
split Xfile.fs
call assert_equal('forth', &filetype)
diff --git a/src/version.c b/src/version.c
index 0e612ee..47ecd53 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1438,
+/**/
1437,
/**/
1436,