nvim: support neovim/neovim@561df3098146 APIs

Signed-off-by: Koichi Shiraishi <[email protected]>

Author: zchee

nvim/api_def.go

@@ -388,6 +388,39 @@ func OptionInfo(name string) (opinfo OptionInfo) {
 	returnPtr()
 }
 
+// OptionValue gets the value of an option.
+//
+// The behavior of this function matches that of |:set|: the local value of an option is returned if it exists; otherwise,
+// the global value is returned.
+// Local values always correspond to the current buffer or window.
+//
+// To get a buffer-local or window-local option for a specific buffer or window, use BufferOption() or WindowOption().
+//
+// name is the option name.
+//
+// opts is the Optional parameters.
+//
+//  scope
+//
+// Analogous to |:setglobal| and |:setlocal|, respectively.
+func OptionValue(name string, opts map[string]OptionValueScope) (optionValue interface{}) {
+	name(nvim_get_option_value)
+}
+
+// SetOptionValue sets the value of an option. The behavior of this function matches that of
+// |:set|: for global-local options, both the global and local value are set
+// unless otherwise specified with {scope}.
+// name is the option name.
+//
+// opts is the Optional parameters.
+//
+//  scope
+//
+// Analogous to |:setglobal| and |:setlocal|, respectively.
+func SetOptionValue(name string, value interface{}, opts map[string]OptionValueScope) {
+	name(nvim_set_option_value)
+}
+
 // SetOption sets an option value.
 func SetOption(name string, value interface{}) {
 	name(nvim_set_option)
@@ -855,6 +888,33 @@ func EvalStatusLine(name string, opts map[string]interface{}) (statusline map[st
 	name(nvim_eval_statusline)
 }
 
+// AddUserCommand create a new user command.
+//
+// name is name of the new user command. Must begin with an uppercase letter.
+//
+// command is replacement command to execute when this user command is executed.
+// When called from Lua, the command can also be a Lua function.
+//
+// opts is optional command attributes. See |command-attributes| for more details.
+//
+// To use boolean attributes (such as |:command-bang| or |:command-bar|) set the value to "true".
+// In addition to the string options listed in |:command-complete|,
+// the "complete" key also accepts a Lua function which works like the "customlist" completion mode |:command-completion-customlist|.
+//
+//  desc (string)
+// Used for listing the command when a Lua function is used for {command}.
+//
+//  force (bool, default true)
+// Override any previous definition.
+func AddUserCommand(name string, command UserCommand, opts map[string]interface{}) {
+	name(nvim_add_user_command)
+}
+
+// DeleteUserCommand delete a user-defined command.
+func DeleteUserCommand(name string) {
+	name(nvim_del_user_command)
+}
+
 // buffer.c
 
 // BufferLineCount gets the buffer line count.
@@ -1079,6 +1139,20 @@ func BufferMark(buffer Buffer, name string) (pos [2]int) {
 	name(nvim_buf_get_mark)
 }
 
+// AddBufferUserCommand create a new user command |user-commands| in the given buffer.
+//
+// Only commands created with |:command-buffer| or this function can be deleted with this function.
+func AddBufferUserCommand(buffer Buffer, name string, command UserCommand, opts map[string]interface{}) {
+	name(nvim_buf_add_user_command)
+}
+
+// DeleteBufferUserCommand create a new user command |user-commands| in the given buffer.
+//
+// Only commands created with |:command-buffer| or this function can be deleted with this function.
+func DeleteBufferUserCommand(buffer Buffer, name string) {
+	name(nvim_buf_del_user_command)
+}
+
 // BufferExtmarkByID beturns position for a given extmark id.
 //
 // opts is optional parameters.

nvim/api_tool.go

@@ -435,28 +435,31 @@ var nvimTypes = map[string]string{
 	"bool":          "Boolean",
 	"int":           "Integer",
 	"interface{}":   "Object",
-	"Process":       "Object",
 	"string":        "String",
 	"float64":       "Float",
-	"ClientType":    "String",
-
-	"Channel":                  "Dictionary",
-	"*Channel":                 "Dictionary",
-	"ClientVersion":            "Dictionary",
-	"HLAttrs":                  "Dictionary",
-	"*HLAttrs":                 "Dictionary",
-	"WindowConfig":             "Dictionary",
-	"*WindowConfig":            "Dictionary",
-	"ClientAttributes":         "Dictionary",
-	"ClientMethods":            "Dictionary",
-	"map[string]*ClientMethod": "Dictionary",
-	"map[string]*Command":      "Dictionary",
-	"map[string][]string":      "Dictionary",
-	"map[string]bool":          "Dictionary",
-	"map[string]int":           "Dictionary",
-	"map[string]interface{}":   "Dictionary",
-	"Mode":                     "Dictionary",
-	"OptionInfo":               "Dictionary",
+
+	"ClientType":   "String",
+	"Process":      "Object",
+	"*UserCommand": "Object",
+
+	"Channel":                     "Dictionary",
+	"*Channel":                    "Dictionary",
+	"ClientVersion":               "Dictionary",
+	"HLAttrs":                     "Dictionary",
+	"*HLAttrs":                    "Dictionary",
+	"WindowConfig":                "Dictionary",
+	"*WindowConfig":               "Dictionary",
+	"ClientAttributes":            "Dictionary",
+	"ClientMethods":               "Dictionary",
+	"map[string]*ClientMethod":    "Dictionary",
+	"map[string]*Command":         "Dictionary",
+	"map[string][]string":         "Dictionary",
+	"map[string]bool":             "Dictionary",
+	"map[string]int":              "Dictionary",
+	"map[string]interface{}":      "Dictionary",
+	"map[string]OptionValueScope": "Dictionary",
+	"Mode":                        "Dictionary",
+	"OptionInfo":                  "Dictionary",
 
 	"[]*Channel":  "Array",
 	"[]*Process":  "Array",

nvim/types.go

@@ -405,33 +405,53 @@ type Command struct {
 	Definition string `msgpack:"definition"`
 }
 
-// UserCommand is replacement command to execute when this user command is executed.
-type UserCommand struct {
+// UserCommand represesents a user command.
+type UserCommand interface {
+	command()
+}
+
+// UserVimCommand is a user Vim command executed at UserCommand.
+type UserVimCommand string
+
+// make sure UserVimCommand implements the UserCommand interface.
+var _ UserCommand = (*UserVimCommand)(nil)
+
+// command implements UserCommand.command.
+func (UserVimCommand) command() {}
+
+// UserLuaCommand is a user Lua command executed at UserCommand.
+type UserLuaCommand struct {
 	// Args passed to the command, if any.
-	Args string `msgpack:"args"`
+	Args string `msgpack:"args,omitempty"`
 
 	// Bang true if the command was executed with a ! modifier.
 	Bang bool `msgpack:"bang"`
 
 	// StartLine is the starting line of the command range.
-	StartLine int `msgpack:"line1"`
+	StartLine int `msgpack:"line1,omitempty"`
 
 	// FinalLine is the final line of the command range.
-	FinalLine int `msgpack:"line2"`
+	FinalLine int `msgpack:"line2,omitempty"`
 
 	// Range is the number of items in the command range: 0, 1, or 2.
-	Range int `msgpack:"range"`
+	Range int `msgpack:"range,omitempty"`
 
 	// Count is the any count supplied.
-	Count int `msgpack:"count"`
+	Count int `msgpack:"count,omitempty"`
 
 	// Reg is the optional register, if specified.
-	Reg string `msgpack:"reg"`
+	Reg string `msgpack:"reg,omitempty"`
 
 	// Mode is the command modifiers, if any.
-	Mode string `msgpack:"mods"`
+	Mode string `msgpack:"mode,omitempty"`
 }
 
+// make sure UserLuaCommand implements the UserCommand interface.
+var _ UserCommand = (*UserLuaCommand)(nil)
+
+// command implements UserCommand.command.
+func (UserLuaCommand) command() {}
+
 // TextChunk represents a text chunk.
 type TextChunk struct {
 	// Text is text.
@@ -661,7 +681,7 @@ type OptionValueScope string
 // list of OptionValueScope.
 const (
 	GlobalScope = OptionValueScope("global")
-	LocalScope  = OptionValueScope("global")
+	LocalScope  = OptionValueScope("local")
 )
 
 // LogLevel represents a nvim log level.