format,naming

Author: bounceme

ftdetect/javascript.vim

@@ -23,7 +23,7 @@ if g:jsx_pragma_required
   let b:jsx_pragma_found = search(s:jsx_pragma_pattern, 'npw')
 endif
 
-" if g:jsx_prevalent_declaration == 1
+" if g:jsx_check_react_import == 1
 "   parse the first line of js file (skipping comments). When it has a 'react'
 "   importation, we guess the user writes jsx
 " endif
@@ -34,7 +34,7 @@ let s:jsx_prevalent_pattern =
 fu! <SID>EnableJSX()
   if g:jsx_pragma_required && !b:jsx_pragma_found | return 0 | endif
   if g:jsx_ext_required && !exists('b:jsx_ext_found') &&
-        \ !(get(g:,'jsx_prevalent_declaration') && search(s:jsx_prevalent_pattern, 'nw'))
+        \ !(get(g:,'jsx_check_react_import') && search(s:jsx_prevalent_pattern, 'nw'))
     return 0
   endif
   return 1
@@ -43,4 +43,4 @@ endfu
 autocmd BufNewFile,BufRead *.jsx let b:jsx_ext_found = 1
 autocmd BufNewFile,BufRead *.jsx set filetype=javascript.jsx
 autocmd BufNewFile,BufRead *.js
-      \ if <SID>EnableJSX() | set filetype=javascript.jsx | endif
+  \ if <SID>EnableJSX() | set filetype=javascript.jsx | endif