From 42529540df6d80a39756d18550de82a6cee50141 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 20 May 2020 17:04:22 +0200
Subject: Remove non-working ftplugin line, closes #485

---
 build                 |  2 +-
 config.vim            |  3 +++
 ftdetect/polyglot.vim | 12 +++---------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/build b/build
index 5746c75c..c74054c0 100755
--- a/build
+++ b/build
@@ -67,7 +67,7 @@ extract() {
 
     output "${subdirs##, })"$'\n'
 
-    if (echo "julia coffee-script elixir fish git plantuml scala swift jinja" | grep -qF "$name"); then
+    if (echo "julia coffee-script elixir fish git plantuml scala swift jinja fsharp" | grep -qF "$name"); then
       echo "Skipping ftdetect installation of $name" >&2
       continue
     fi
diff --git a/config.vim b/config.vim
index 89c13c22..abb2a3b0 100644
--- a/config.vim
+++ b/config.vim
@@ -100,4 +100,7 @@ augroup filetypedetect
 
   "jsx
   au BufNewFile,BufRead *.jsx     setf javascriptreact
+
+  "fsharp
+  autocmd BufNewFile,BufRead *.fs,*.fsi,*.fsx set filetype=fsharp
 augroup END
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 6cedcea6..315da8c6 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -100,6 +100,9 @@ augroup filetypedetect
 
   "jsx
   au BufNewFile,BufRead *.jsx     setf javascriptreact
+
+  "fsharp
+  autocmd BufNewFile,BufRead *.fs,*.fsi,*.fsx set filetype=fsharp
 augroup END
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'acpiasl') == -1
   augroup filetypedetect
@@ -470,15 +473,6 @@ autocmd BufNewFile,BufRead *.fbs setfiletype fbs
   augroup end
 endif
 
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
-  augroup filetypedetect
-  " fsharp, from fsharp.vim in ionide/Ionide-vim:_BASIC
-" F#, fsharp
-autocmd BufNewFile,BufRead *.fs,*.fsi,*.fsx set filetype=fsharp
-autocmd BufNewFile,BufRead *.fsproj         set filetype=fsharp_project
-  augroup end
-endif
-
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
   augroup filetypedetect
   " gdscript, from gdscript3.vim in calviken/vim-gdscript3
-- 
cgit v1.2.3