diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2020-08-18 21:29:46 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2020-08-18 21:30:22 +0200 |
| commit | 69eae22ea68523b34ba7c43f00283f3da9007fe1 (patch) | |
| tree | 2c42e1210272a42a9cc1842ec1ca7d1415f8411c | |
| parent | f8cee0172b311d5c9b78cf7a44b8829b218cc64e (diff) | |
| download | vim-polyglot-69eae22ea68523b34ba7c43f00283f3da9007fe1.tar.gz vim-polyglot-69eae22ea68523b34ba7c43f00283f3da9007fe1.zip | |
Let fsharp have priority over fs files, fixes #523
| -rwxr-xr-x | build.py | 2 | ||||
| -rw-r--r-- | ftdetect/polyglot.vim | 12 |
2 files changed, 7 insertions, 7 deletions
@@ -136,9 +136,9 @@ language("Ferm", extensions=[".ferm"], filenames=["ferm.conf"], filetype="ferm") language("fish") language("YAML", extra_filenames=["fish_history", "fish_read_history"]) language("Flatbuffers", extensions=[".fbs"], filetype="fbs", polyglot="flatbuffers") -language("F#", polyglot="fsharp", filetype="fsharp") language("GDScript", filetype="gdscript3", polyglot="gdscript") language("GLSL", extra_extensions=[".comp"]) +language("F#", polyglot="fsharp", filetype="fsharp") language("Git Config", polyglot="git", filetype="gitconfig", extra_filenames=["*.git/config", "*/.config/git/config", "*.git/modules/**/config", "gitconfig"]) language("Git Rebase", polyglot="git", filetype="gitrebase", filenames=["git-rebase-todo"]) language("Git Send Email", polyglot="git", filetype="gitsendemail", filenames=[".gitsendemail.*"]) diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 6e604622..3a843e68 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -267,12 +267,6 @@ if index(g:polyglot_disabled, 'flatbuffers') == -1 au BufNewFile,BufRead *.fbs set ft=fbs endif -if index(g:polyglot_disabled, 'fsharp') == -1 - au BufNewFile,BufRead *.fs set ft=fsharp - au BufNewFile,BufRead *.fsi set ft=fsharp - au BufNewFile,BufRead *.fsx set ft=fsharp -endif - if index(g:polyglot_disabled, 'gdscript') == -1 au BufNewFile,BufRead *.gd set ft=gdscript3 endif @@ -301,6 +295,12 @@ if index(g:polyglot_disabled, 'glsl') == -1 au BufNewFile,BufRead *.vshader set ft=glsl endif +if index(g:polyglot_disabled, 'fsharp') == -1 + au BufNewFile,BufRead *.fs set ft=fsharp + au BufNewFile,BufRead *.fsi set ft=fsharp + au BufNewFile,BufRead *.fsx set ft=fsharp +endif + if index(g:polyglot_disabled, 'git') == -1 au BufNewFile,BufRead *.gitconfig set ft=gitconfig au BufNewFile,BufRead *.git/config set ft=gitconfig |