Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

vim: hide :ReloadBuffer command

  • Loading branch information...
commit a2e5de3400310116e6054c4e635c88754adb4a1b 1 parent d5ad8f5
def-lkb def-lkb authored
Showing with 16 additions and 1 deletion.
  1. +14 −0 extensions.ml
  2. +2 −1  vim/autoload/merlin.vim
14 extensions.ml
View
@@ -28,6 +28,20 @@ let ext_any =
val val' : 'a
end",
[]
+
+let ext_js =
+ parse_sig
+ "module Js : sig
+ val un_js : 'a Js.t -> 'a
+ val un_meth : 'a Js.meth -> 'a
+ end",
+ []
+
+(* a##m | (un_js a)#m#get
+ a##m <- e | (un_js a)#m#set e
+ a##m (a,b,c) | un_meth ((un_js a)#m a b c …)
+ Js constructors : todo *)
+
let registry = [ext_lwt;ext_any]
let register env =
3  vim/autoload/merlin.vim
View
@@ -193,7 +193,8 @@ function! merlin#Register()
command! -buffer -nargs=? -complete=dir SourcePath call merlin#Path("source", <q-args>)
command! -buffer -nargs=? -complete=dir BuildPath call merlin#Path("build", <q-args>)
command! -buffer -nargs=0 Reload call merlin#Reload()
- command! -buffer -nargs=0 ReloadBuffer call merlin#ReloadBuffer()
+ " Used only to debug synchronization, do not expose to end-user
+ "command! -buffer -nargs=0 ReloadBuffer call merlin#ReloadBuffer()
command! -buffer -complete=custom,merlin#PackageList -nargs=* Use call merlin#Use(<f-args>)
command! -buffer -nargs=0 LoadProject call merlin#LoadProject()
command! -buffer -nargs=0 EchoDotMerlin call merlin#EchoDotMerlin()
Please sign in to comment.
Something went wrong with that request. Please try again.