changeset 22989:7160e85d62ff v8.2.2041

patch 8.2.2041: haskell filetype not optimally recognized Commit: https://github.com/vim/vim/commit/a09bee322e605c8a076fa23c3d3259495a1129d2 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 24 20:13:26 2020 +0100 patch 8.2.2041: haskell filetype not optimally recognized Problem: Haskell filetype not optimally recognized. Solution: Recognize all *.hsc files as Haskell. (Marcin Szamotulski, closes #7354)
author Bram Moolenaar <Bram@vim.org>
date Tue, 24 Nov 2020 20:15:03 +0100
parents 6a48b29a5fb5
children d46d4c6dde13
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -697,15 +697,9 @@ au BufNewFile,BufRead *.haml			setf haml
 
 " Hamster Classic | Playground files
 au BufNewFile,BufRead *.hsm	  		setf hamster
-au BufNewFile,BufRead *.hsc
-	\ if match(join(getline(1,10), "\n"), '\%(^\|\n\)\s*\%({-#\_s*LANGUAGE\>\|\<module\>\)') != -1 |
-	\   setf haskell |
-	\ else |
-	\   setf hamster |
-	\ endif
 
 " Haskell
-au BufNewFile,BufRead *.hs,*.hs-boot		setf haskell
+au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot	setf haskell
 au BufNewFile,BufRead *.lhs			setf lhaskell
 au BufNewFile,BufRead *.chs			setf chaskell
 au BufNewFile,BufRead cabal.project		setf cabalproject
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -204,8 +204,8 @@ let s:filename_checks = {
     \ 'gsp': ['file.gsp'],
     \ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'],
     \ 'haml': ['file.haml'],
-    \ 'hamster': ['file.hsc', 'file.hsm'],
-    \ 'haskell': ['file.hs', 'file.hs-boot'],
+    \ 'hamster': ['file.hsm'],
+    \ 'haskell': ['file.hs', 'file.hsc', 'file.hs-boot'],
     \ 'haste': ['file.ht'],
     \ 'hastepreproc': ['file.htpp'],
     \ 'hb': ['file.hb'],
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2041,
+/**/
     2040,
 /**/
     2039,