From bedb3bd4d029b1df6d7b3ddb5286d7fe61fac56a Mon Sep 17 00:00:00 2001 From: Daniel Bershatsky Date: Wed, 20 Mar 2019 20:27:42 +0300 Subject: [PATCH 1/4] Allow to perform naked RPC requests --- nvim/nvim.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nvim/nvim.go b/nvim/nvim.go index d672ed2c..721b8de0 100644 --- a/nvim/nvim.go +++ b/nvim/nvim.go @@ -567,6 +567,14 @@ func (v *Nvim) Call(fname string, result interface{}, args ...interface{}) error return v.call("nvim_call_function", result, fname, args) } +// Invoke makes a RPC request. +func (v *Nvim) Invoke(procedure string, result interface{}, args ...interface{}) error { + if args == nil { + args = []interface{}{} + } + return v.ep.Call(procedure, result, args...) +} + // Call calls a vimscript function. func (b *Batch) Call(fname string, result interface{}, args ...interface{}) { if args == nil { From 3f01b4f41e362a5b9888e6cbbe6806c5f93bf1b7 Mon Sep 17 00:00:00 2001 From: Daniel Bershatsky Date: Sun, 24 Mar 2019 22:27:46 +0300 Subject: [PATCH 2/4] Allow to invoke atomically arbitrary RPC method --- nvim/apiimp.go | 13 +++++++++++++ nvim/nvim.go | 8 -------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/nvim/apiimp.go b/nvim/apiimp.go index 22041bea..44a6ef7f 100644 --- a/nvim/apiimp.go +++ b/nvim/apiimp.go @@ -1160,3 +1160,16 @@ func (v *Nvim) IsWindowValid(window Window) (bool, error) { func (b *Batch) IsWindowValid(window Window, result *bool) { b.call("nvim_win_is_valid", result, window) } + +// Invoke makes a RPC request. +func (v *Nvim) Invoke(procedure string, result interface{}, args ...interface{}) error { + if args == nil { + args = []interface{}{} + } + return v.ep.Call(procedure, result, args...) +} + +// Invoke makes a RPC request atomically as a part of batch request. +func (b *Batch) Invoke(procedure string, result interface{}, args ...interface{}) { + b.call(procedure, result, args...) +} diff --git a/nvim/nvim.go b/nvim/nvim.go index 721b8de0..d672ed2c 100644 --- a/nvim/nvim.go +++ b/nvim/nvim.go @@ -567,14 +567,6 @@ func (v *Nvim) Call(fname string, result interface{}, args ...interface{}) error return v.call("nvim_call_function", result, fname, args) } -// Invoke makes a RPC request. -func (v *Nvim) Invoke(procedure string, result interface{}, args ...interface{}) error { - if args == nil { - args = []interface{}{} - } - return v.ep.Call(procedure, result, args...) -} - // Call calls a vimscript function. func (b *Batch) Call(fname string, result interface{}, args ...interface{}) { if args == nil { From f4ee1d0190d2472228149831598484429688d009 Mon Sep 17 00:00:00 2001 From: Daniel Bershatsky Date: Sun, 24 Mar 2019 23:14:46 +0300 Subject: [PATCH 3/4] Move function to invoke procs to base file --- nvim/apiimp.go | 13 ------------- nvim/nvim.go | 10 ++++++++++ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/nvim/apiimp.go b/nvim/apiimp.go index 44a6ef7f..22041bea 100644 --- a/nvim/apiimp.go +++ b/nvim/apiimp.go @@ -1160,16 +1160,3 @@ func (v *Nvim) IsWindowValid(window Window) (bool, error) { func (b *Batch) IsWindowValid(window Window, result *bool) { b.call("nvim_win_is_valid", result, window) } - -// Invoke makes a RPC request. -func (v *Nvim) Invoke(procedure string, result interface{}, args ...interface{}) error { - if args == nil { - args = []interface{}{} - } - return v.ep.Call(procedure, result, args...) -} - -// Invoke makes a RPC request atomically as a part of batch request. -func (b *Batch) Invoke(procedure string, result interface{}, args ...interface{}) { - b.call(procedure, result, args...) -} diff --git a/nvim/nvim.go b/nvim/nvim.go index d672ed2c..62cd43f1 100644 --- a/nvim/nvim.go +++ b/nvim/nvim.go @@ -559,6 +559,11 @@ func (el ErrorList) Error() string { return el[0].Error() } +// Invoke makes a RPC request. +func (v *Nvim) Invoke(procedure string, result interface{}, args ...interface{}) error { + return v.call(procedure, result, args...) +} + // Call calls a vimscript function. func (v *Nvim) Call(fname string, result interface{}, args ...interface{}) error { if args == nil { @@ -567,6 +572,11 @@ func (v *Nvim) Call(fname string, result interface{}, args ...interface{}) error return v.call("nvim_call_function", result, fname, args) } +// Invoke makes a RPC request atomically as a part of batch request. +func (b *Batch) Invoke(procedure string, result interface{}, args ...interface{}) { + b.call(procedure, result, args...) +} + // Call calls a vimscript function. func (b *Batch) Call(fname string, result interface{}, args ...interface{}) { if args == nil { From 1dc4028eee7ab7cf2454436c3f8efd464919a00f Mon Sep 17 00:00:00 2001 From: Daniel Bershatsky Date: Mon, 25 Mar 2019 00:38:37 +0300 Subject: [PATCH 4/4] Rename method --- nvim/nvim.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nvim/nvim.go b/nvim/nvim.go index 62cd43f1..75a678bd 100644 --- a/nvim/nvim.go +++ b/nvim/nvim.go @@ -559,8 +559,8 @@ func (el ErrorList) Error() string { return el[0].Error() } -// Invoke makes a RPC request. -func (v *Nvim) Invoke(procedure string, result interface{}, args ...interface{}) error { +// Request makes a RPC request. +func (v *Nvim) Request(procedure string, result interface{}, args ...interface{}) error { return v.call(procedure, result, args...) } @@ -572,8 +572,8 @@ func (v *Nvim) Call(fname string, result interface{}, args ...interface{}) error return v.call("nvim_call_function", result, fname, args) } -// Invoke makes a RPC request atomically as a part of batch request. -func (b *Batch) Invoke(procedure string, result interface{}, args ...interface{}) { +// Request makes a RPC request atomically as a part of batch request. +func (b *Batch) Request(procedure string, result interface{}, args ...interface{}) { b.call(procedure, result, args...) }