summaryrefslogtreecommitdiffstats
path: root/ftdetect
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2016-05-03 12:56:11 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2016-05-03 12:56:11 +0200
commit8cd62b9eab04cd80998a810c103b80d49fc64a89 (patch)
tree231115681ec694907a923745892508358ff529be /ftdetect
parent93e3f020a9637b3df9109348cef5fcc3e0bbda43 (diff)
downloadvim-polyglot-2.9.0.tar.gz
vim-polyglot-2.9.0.zip
Change javascript provider to pangloss/vim-javascript, closes #80v2.9.0
Diffstat (limited to 'ftdetect')
-rw-r--r--ftdetect/polyglot.vim12
1 files changed, 12 insertions, 0 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 3866d907..5f30e46e 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -192,6 +192,18 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jasmine') == -1
autocmd BufNewFile,BufRead *Spec.js,*_spec.js set filetype=jasmine.javascript syntax=jasmine
endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+
+au BufNewFile,BufRead *.js setf javascript
+au BufNewFile,BufRead *.jsm setf javascript
+au BufNewFile,BufRead Jakefile setf javascript
+fun! s:SelectJavascript()
+ if getline(1) =~# '^#!.*/bin/env\s\+node\>'
+ set ft=javascript
+ endif
+endfun
+au BufNewFile,BufRead * call s:SelectJavascript()
+endif
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
if !exists('g:jsx_ext_required')