move flow detect to ft detect file (pangloss#913)

bounceme · web-flow · commit b6c00a1943a6 · 2017-04-05T09:37:16.000-07:00
* move flow detect to ft detect file

* remove syntax instance

* Update javascript.vim

* concise match
diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
@@ -1,7 +1,13 @@
-au BufNewFile,BufRead *.js setf javascript
-au BufNewFile,BufRead *.jsm setf javascript
-au BufNewFile,BufRead Jakefile setf javascript
-au BufNewFile,BufRead *.es6 setf javascript
+au BufNewFile,BufRead *.{js,jsm,es6},Jakefile setf javascript
+
+fun! s:SourceFlowSyntax()
+  if !exists('javascript_plugin_flow') && !exists('b:flow_active') &&
+        \ search('\v\C%^\_s*%(//\s*|/\*[ \t\n*]*)\@flow>','nw')
+    runtime extras/flow.vim
+    let b:flow_active = 1
+  endif
+endfun
+au FileType javascript au BufRead,BufWritePost <buffer> call s:SourceFlowSyntax()
 
 fun! s:SelectJavascript()
   if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
@@ -233,7 +233,7 @@ if exists("javascript_plugin_jsdoc")
   endif
 endif
 
-if exists("javascript_plugin_flow") || search('\v\C%^\_s*%(//\s*|/\*[ \t\n*]*)\@flow>','nw')
+if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
