aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/eval.txt21
-rw-r--r--src/nvim/eval.c205
-rw-r--r--src/nvim/eval.h3
-rw-r--r--src/nvim/eval/decode.c10
-rw-r--r--src/nvim/globals.h6
-rw-r--r--src/nvim/normal.c843
-rw-r--r--src/nvim/ops.c794
-rw-r--r--src/nvim/option.c148
-rw-r--r--src/nvim/testdir/test_autocmd.vim522
-rw-r--r--test/functional/legacy/autocmd_option_spec.lua420
10 files changed, 1947 insertions, 1025 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4d4e011c08..44cfffd85c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2042,10 +2042,29 @@ v:option_new New value of the option. Valid while executing an |OptionSet|
autocommand.
*v:option_old*
v:option_old Old value of the option. Valid while executing an |OptionSet|
- autocommand.
+ autocommand. Depending on the command used for setting and the
+ kind of option this is either the local old value or the
+ global old value.
+ *v:option_oldlocal*
+v:option_oldlocal
+ Old local value of the option. Valid while executing an
+ |OptionSet| autocommand.
+ *v:option_oldglobal*
+v:option_oldglobal
+ Old global value of the option. Valid while executing an
+ |OptionSet| autocommand.
*v:option_type*
v:option_type Scope of the set command. Valid while executing an
|OptionSet| autocommand. Can be either "global" or "local"
+ *v:option_command*
+v:option_command
+ Command used to set the option. Valid while executing an
+ |OptionSet| autocommand.
+ value option was set via ~
+ "setlocal" |:setlocal| or ":let l:xxx"
+ "setglobal" |:setglobal| or ":let g:xxx"
+ "set" |:set| or |:let|
+ "modeline" |modeline|
*v:operator* *operator-variable*
v:operator The last operator given in Normal mode. This is a single
character except for commands starting with <g> or <z>,
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 78c069c45f..85e81ee975 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -134,13 +134,15 @@ typedef struct {
.vv_flags = flags, \
}
+#define VIMVAR_KEY_LEN 16 // Maximum length of the key of v:variables
+
// Array to hold the value of v: variables.
// The value is in a dictitem, so that it can also be used in the v: scope.
// The reason to use this table anyway is for very quick access to the
// variables with the VV_ defines.
static struct vimvar {
char *vv_name; ///< Name of the variable, without v:.
- TV_DICTITEM_STRUCT(17) vv_di; ///< Value and name for key (max 16 chars).
+ TV_DICTITEM_STRUCT(VIMVAR_KEY_LEN + 1) vv_di; ///< Value and name for key (max 16 chars).
char vv_flags; ///< Flags: #VV_COMPAT, #VV_RO, #VV_RO_SBX.
} vimvars[] =
{
@@ -150,100 +152,103 @@ static struct vimvar {
// VV_SEND_SERVER "servername"
// VV_REG "register"
// VV_OP "operator"
- VV(VV_COUNT, "count", VAR_NUMBER, VV_RO),
- VV(VV_COUNT1, "count1", VAR_NUMBER, VV_RO),
- VV(VV_PREVCOUNT, "prevcount", VAR_NUMBER, VV_RO),
- VV(VV_ERRMSG, "errmsg", VAR_STRING, 0),
- VV(VV_WARNINGMSG, "warningmsg", VAR_STRING, 0),
- VV(VV_STATUSMSG, "statusmsg", VAR_STRING, 0),
- VV(VV_SHELL_ERROR, "shell_error", VAR_NUMBER, VV_RO),
- VV(VV_THIS_SESSION, "this_session", VAR_STRING, 0),
- VV(VV_VERSION, "version", VAR_NUMBER, VV_COMPAT+VV_RO),
- VV(VV_LNUM, "lnum", VAR_NUMBER, VV_RO_SBX),
- VV(VV_TERMRESPONSE, "termresponse", VAR_STRING, VV_RO),
- VV(VV_FNAME, "fname", VAR_STRING, VV_RO),
- VV(VV_LANG, "lang", VAR_STRING, VV_RO),
- VV(VV_LC_TIME, "lc_time", VAR_STRING, VV_RO),
- VV(VV_CTYPE, "ctype", VAR_STRING, VV_RO),
- VV(VV_CC_FROM, "charconvert_from", VAR_STRING, VV_RO),
- VV(VV_CC_TO, "charconvert_to", VAR_STRING, VV_RO),
- VV(VV_FNAME_IN, "fname_in", VAR_STRING, VV_RO),
- VV(VV_FNAME_OUT, "fname_out", VAR_STRING, VV_RO),
- VV(VV_FNAME_NEW, "fname_new", VAR_STRING, VV_RO),
- VV(VV_FNAME_DIFF, "fname_diff", VAR_STRING, VV_RO),
- VV(VV_CMDARG, "cmdarg", VAR_STRING, VV_RO),
- VV(VV_FOLDSTART, "foldstart", VAR_NUMBER, VV_RO_SBX),
- VV(VV_FOLDEND, "foldend", VAR_NUMBER, VV_RO_SBX),
- VV(VV_FOLDDASHES, "folddashes", VAR_STRING, VV_RO_SBX),
- VV(VV_FOLDLEVEL, "foldlevel", VAR_NUMBER, VV_RO_SBX),
- VV(VV_PROGNAME, "progname", VAR_STRING, VV_RO),
- VV(VV_SEND_SERVER, "servername", VAR_STRING, VV_RO),
- VV(VV_DYING, "dying", VAR_NUMBER, VV_RO),
- VV(VV_EXCEPTION, "exception", VAR_STRING, VV_RO),
- VV(VV_THROWPOINT, "throwpoint", VAR_STRING, VV_RO),
- VV(VV_REG, "register", VAR_STRING, VV_RO),
- VV(VV_CMDBANG, "cmdbang", VAR_NUMBER, VV_RO),
- VV(VV_INSERTMODE, "insertmode", VAR_STRING, VV_RO),
- VV(VV_VAL, "val", VAR_UNKNOWN, VV_RO),
- VV(VV_KEY, "key", VAR_UNKNOWN, VV_RO),
- VV(VV_PROFILING, "profiling", VAR_NUMBER, VV_RO),
- VV(VV_FCS_REASON, "fcs_reason", VAR_STRING, VV_RO),
- VV(VV_FCS_CHOICE, "fcs_choice", VAR_STRING, 0),
- VV(VV_BEVAL_BUFNR, "beval_bufnr", VAR_NUMBER, VV_RO),
- VV(VV_BEVAL_WINNR, "beval_winnr", VAR_NUMBER, VV_RO),
- VV(VV_BEVAL_WINID, "beval_winid", VAR_NUMBER, VV_RO),
- VV(VV_BEVAL_LNUM, "beval_lnum", VAR_NUMBER, VV_RO),
- VV(VV_BEVAL_COL, "beval_col", VAR_NUMBER, VV_RO),
- VV(VV_BEVAL_TEXT, "beval_text", VAR_STRING, VV_RO),
- VV(VV_SCROLLSTART, "scrollstart", VAR_STRING, 0),
- VV(VV_SWAPNAME, "swapname", VAR_STRING, VV_RO),
- VV(VV_SWAPCHOICE, "swapchoice", VAR_STRING, 0),
- VV(VV_SWAPCOMMAND, "swapcommand", VAR_STRING, VV_RO),
- VV(VV_CHAR, "char", VAR_STRING, 0),
- VV(VV_MOUSE_WIN, "mouse_win", VAR_NUMBER, 0),
- VV(VV_MOUSE_WINID, "mouse_winid", VAR_NUMBER, 0),
- VV(VV_MOUSE_LNUM, "mouse_lnum", VAR_NUMBER, 0),
- VV(VV_MOUSE_COL, "mouse_col", VAR_NUMBER, 0),
- VV(VV_OP, "operator", VAR_STRING, VV_RO),
- VV(VV_SEARCHFORWARD, "searchforward", VAR_NUMBER, 0),
- VV(VV_HLSEARCH, "hlsearch", VAR_NUMBER, 0),
- VV(VV_OLDFILES, "oldfiles", VAR_LIST, 0),
- VV(VV_WINDOWID, "windowid", VAR_NUMBER, VV_RO_SBX),
- VV(VV_PROGPATH, "progpath", VAR_STRING, VV_RO),
- VV(VV_COMPLETED_ITEM, "completed_item", VAR_DICT, VV_RO),
- VV(VV_OPTION_NEW, "option_new", VAR_STRING, VV_RO),
- VV(VV_OPTION_OLD, "option_old", VAR_STRING, VV_RO),
- VV(VV_OPTION_TYPE, "option_type", VAR_STRING, VV_RO),
- VV(VV_ERRORS, "errors", VAR_LIST, 0),
- VV(VV_FALSE, "false", VAR_BOOL, VV_RO),
- VV(VV_TRUE, "true", VAR_BOOL, VV_RO),
- VV(VV_NULL, "null", VAR_SPECIAL, VV_RO),
- VV(VV_NUMBERMAX, "numbermax", VAR_NUMBER, VV_RO),
- VV(VV_NUMBERMIN, "numbermin", VAR_NUMBER, VV_RO),
- VV(VV_NUMBERSIZE, "numbersize", VAR_NUMBER, VV_RO),
- VV(VV_VIM_DID_ENTER, "vim_did_enter", VAR_NUMBER, VV_RO),
- VV(VV_TESTING, "testing", VAR_NUMBER, 0),
- VV(VV_TYPE_NUMBER, "t_number", VAR_NUMBER, VV_RO),
- VV(VV_TYPE_STRING, "t_string", VAR_NUMBER, VV_RO),
- VV(VV_TYPE_FUNC, "t_func", VAR_NUMBER, VV_RO),
- VV(VV_TYPE_LIST, "t_list", VAR_NUMBER, VV_RO),
- VV(VV_TYPE_DICT, "t_dict", VAR_NUMBER, VV_RO),
- VV(VV_TYPE_FLOAT, "t_float", VAR_NUMBER, VV_RO),
- VV(VV_TYPE_BOOL, "t_bool", VAR_NUMBER, VV_RO),
- VV(VV_TYPE_BLOB, "t_blob", VAR_NUMBER, VV_RO),
- VV(VV_EVENT, "event", VAR_DICT, VV_RO),
- VV(VV_ECHOSPACE, "echospace", VAR_NUMBER, VV_RO),
- VV(VV_ARGV, "argv", VAR_LIST, VV_RO),
- VV(VV_COLLATE, "collate", VAR_STRING, VV_RO),
- VV(VV_EXITING, "exiting", VAR_NUMBER, VV_RO),
+ VV(VV_COUNT, "count", VAR_NUMBER, VV_RO),
+ VV(VV_COUNT1, "count1", VAR_NUMBER, VV_RO),
+ VV(VV_PREVCOUNT, "prevcount", VAR_NUMBER, VV_RO),
+ VV(VV_ERRMSG, "errmsg", VAR_STRING, 0),
+ VV(VV_WARNINGMSG, "warningmsg", VAR_STRING, 0),
+ VV(VV_STATUSMSG, "statusmsg", VAR_STRING, 0),
+ VV(VV_SHELL_ERROR, "shell_error", VAR_NUMBER, VV_RO),
+ VV(VV_THIS_SESSION, "this_session", VAR_STRING, 0),
+ VV(VV_VERSION, "version", VAR_NUMBER, VV_COMPAT+VV_RO),
+ VV(VV_LNUM, "lnum", VAR_NUMBER, VV_RO_SBX),
+ VV(VV_TERMRESPONSE, "termresponse", VAR_STRING, VV_RO),
+ VV(VV_FNAME, "fname", VAR_STRING, VV_RO),
+ VV(VV_LANG, "lang", VAR_STRING, VV_RO),
+ VV(VV_LC_TIME, "lc_time", VAR_STRING, VV_RO),
+ VV(VV_CTYPE, "ctype", VAR_STRING, VV_RO),
+ VV(VV_CC_FROM, "charconvert_from", VAR_STRING, VV_RO),
+ VV(VV_CC_TO, "charconvert_to", VAR_STRING, VV_RO),
+ VV(VV_FNAME_IN, "fname_in", VAR_STRING, VV_RO),
+ VV(VV_FNAME_OUT, "fname_out", VAR_STRING, VV_RO),
+ VV(VV_FNAME_NEW, "fname_new", VAR_STRING, VV_RO),
+ VV(VV_FNAME_DIFF, "fname_diff", VAR_STRING, VV_RO),
+ VV(VV_CMDARG, "cmdarg", VAR_STRING, VV_RO),
+ VV(VV_FOLDSTART, "foldstart", VAR_NUMBER, VV_RO_SBX),
+ VV(VV_FOLDEND, "foldend", VAR_NUMBER, VV_RO_SBX),
+ VV(VV_FOLDDASHES, "folddashes", VAR_STRING, VV_RO_SBX),
+ VV(VV_FOLDLEVEL, "foldlevel", VAR_NUMBER, VV_RO_SBX),
+ VV(VV_PROGNAME, "progname", VAR_STRING, VV_RO),
+ VV(VV_SEND_SERVER, "servername", VAR_STRING, VV_RO),
+ VV(VV_DYING, "dying", VAR_NUMBER, VV_RO),
+ VV(VV_EXCEPTION, "exception", VAR_STRING, VV_RO),
+ VV(VV_THROWPOINT, "throwpoint", VAR_STRING, VV_RO),
+ VV(VV_REG, "register", VAR_STRING, VV_RO),
+ VV(VV_CMDBANG, "cmdbang", VAR_NUMBER, VV_RO),
+ VV(VV_INSERTMODE, "insertmode", VAR_STRING, VV_RO),
+ VV(VV_VAL, "val", VAR_UNKNOWN, VV_RO),
+ VV(VV_KEY, "key", VAR_UNKNOWN, VV_RO),
+ VV(VV_PROFILING, "profiling", VAR_NUMBER, VV_RO),
+ VV(VV_FCS_REASON, "fcs_reason", VAR_STRING, VV_RO),
+ VV(VV_FCS_CHOICE, "fcs_choice", VAR_STRING, 0),
+ VV(VV_BEVAL_BUFNR, "beval_bufnr", VAR_NUMBER, VV_RO),
+ VV(VV_BEVAL_WINNR, "beval_winnr", VAR_NUMBER, VV_RO),
+ VV(VV_BEVAL_WINID, "beval_winid", VAR_NUMBER, VV_RO),
+ VV(VV_BEVAL_LNUM, "beval_lnum", VAR_NUMBER, VV_RO),
+ VV(VV_BEVAL_COL, "beval_col", VAR_NUMBER, VV_RO),
+ VV(VV_BEVAL_TEXT, "beval_text", VAR_STRING, VV_RO),
+ VV(VV_SCROLLSTART, "scrollstart", VAR_STRING, 0),
+ VV(VV_SWAPNAME, "swapname", VAR_STRING, VV_RO),
+ VV(VV_SWAPCHOICE, "swapchoice", VAR_STRING, 0),
+ VV(VV_SWAPCOMMAND, "swapcommand", VAR_STRING, VV_RO),
+ VV(VV_CHAR, "char", VAR_STRING, 0),
+ VV(VV_MOUSE_WIN, "mouse_win", VAR_NUMBER, 0),
+ VV(VV_MOUSE_WINID, "mouse_winid", VAR_NUMBER, 0),
+ VV(VV_MOUSE_LNUM, "mouse_lnum", VAR_NUMBER, 0),
+ VV(VV_MOUSE_COL, "mouse_col", VAR_NUMBER, 0),
+ VV(VV_OP, "operator", VAR_STRING, VV_RO),
+ VV(VV_SEARCHFORWARD, "searchforward", VAR_NUMBER, 0),
+ VV(VV_HLSEARCH, "hlsearch", VAR_NUMBER, 0),
+ VV(VV_OLDFILES, "oldfiles", VAR_LIST, 0),
+ VV(VV_WINDOWID, "windowid", VAR_NUMBER, VV_RO_SBX),
+ VV(VV_PROGPATH, "progpath", VAR_STRING, VV_RO),
+ VV(VV_COMPLETED_ITEM, "completed_item", VAR_DICT, VV_RO),
+ VV(VV_OPTION_NEW, "option_new", VAR_STRING, VV_RO),
+ VV(VV_OPTION_OLD, "option_old", VAR_STRING, VV_RO),
+ VV(VV_OPTION_OLDLOCAL, "option_oldlocal", VAR_STRING, VV_RO),
+ VV(VV_OPTION_OLDGLOBAL, "option_oldglobal", VAR_STRING, VV_RO),
+ VV(VV_OPTION_COMMAND, "option_command", VAR_STRING, VV_RO),
+ VV(VV_OPTION_TYPE, "option_type", VAR_STRING, VV_RO),
+ VV(VV_ERRORS, "errors", VAR_LIST, 0),
+ VV(VV_FALSE, "false", VAR_BOOL, VV_RO),
+ VV(VV_TRUE, "true", VAR_BOOL, VV_RO),
+ VV(VV_NULL, "null", VAR_SPECIAL, VV_RO),
+ VV(VV_NUMBERMAX, "numbermax", VAR_NUMBER, VV_RO),
+ VV(VV_NUMBERMIN, "numbermin", VAR_NUMBER, VV_RO),
+ VV(VV_NUMBERSIZE, "numbersize", VAR_NUMBER, VV_RO),
+ VV(VV_VIM_DID_ENTER, "vim_did_enter", VAR_NUMBER, VV_RO),
+ VV(VV_TESTING, "testing", VAR_NUMBER, 0),
+ VV(VV_TYPE_NUMBER, "t_number", VAR_NUMBER, VV_RO),
+ VV(VV_TYPE_STRING, "t_string", VAR_NUMBER, VV_RO),
+ VV(VV_TYPE_FUNC, "t_func", VAR_NUMBER, VV_RO),
+ VV(VV_TYPE_LIST, "t_list", VAR_NUMBER, VV_RO),
+ VV(VV_TYPE_DICT, "t_dict", VAR_NUMBER, VV_RO),
+ VV(VV_TYPE_FLOAT, "t_float", VAR_NUMBER, VV_RO),
+ VV(VV_TYPE_BOOL, "t_bool", VAR_NUMBER, VV_RO),
+ VV(VV_TYPE_BLOB, "t_blob", VAR_NUMBER, VV_RO),
+ VV(VV_EVENT, "event", VAR_DICT, VV_RO),
+ VV(VV_ECHOSPACE, "echospace", VAR_NUMBER, VV_RO),
+ VV(VV_ARGV, "argv", VAR_LIST, VV_RO),
+ VV(VV_COLLATE, "collate", VAR_STRING, VV_RO),
+ VV(VV_EXITING, "exiting", VAR_NUMBER, VV_RO),
// Neovim
- VV(VV_STDERR, "stderr", VAR_NUMBER, VV_RO),
- VV(VV_MSGPACK_TYPES, "msgpack_types", VAR_DICT, VV_RO),
- VV(VV__NULL_STRING, "_null_string", VAR_STRING, VV_RO),
- VV(VV__NULL_LIST, "_null_list", VAR_LIST, VV_RO),
- VV(VV__NULL_DICT, "_null_dict", VAR_DICT, VV_RO),
- VV(VV__NULL_BLOB, "_null_blob", VAR_BLOB, VV_RO),
- VV(VV_LUA, "lua", VAR_PARTIAL, VV_RO),
+ VV(VV_STDERR, "stderr", VAR_NUMBER, VV_RO),
+ VV(VV_MSGPACK_TYPES, "msgpack_types", VAR_DICT, VV_RO),
+ VV(VV__NULL_STRING, "_null_string", VAR_STRING, VV_RO),
+ VV(VV__NULL_LIST, "_null_list", VAR_LIST, VV_RO),
+ VV(VV__NULL_DICT, "_null_dict", VAR_DICT, VV_RO),
+ VV(VV__NULL_BLOB, "_null_blob", VAR_BLOB, VV_RO),
+ VV(VV_LUA, "lua", VAR_PARTIAL, VV_RO),
};
#undef VV
@@ -344,7 +349,7 @@ void eval_init(void)
for (size_t i = 0; i < ARRAY_SIZE(vimvars); i++) {
p = &vimvars[i];
- assert(STRLEN(p->vv_name) <= 16);
+ assert(STRLEN(p->vv_name) <= VIMVAR_KEY_LEN);
STRCPY(p->vv_di.di_key, p->vv_name);
if (p->vv_flags & VV_RO) {
p->vv_di.di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
@@ -10447,11 +10452,15 @@ void option_last_set_msg(LastSet last_set)
}
}
-// reset v:option_new, v:option_old and v:option_type
+// reset v:option_new, v:option_old, v:option_oldlocal, v:option_oldglobal,
+// v:option_type, and v:option_command.
void reset_v_option_vars(void)
{
- set_vim_var_string(VV_OPTION_NEW, NULL, -1);
- set_vim_var_string(VV_OPTION_OLD, NULL, -1);
+ set_vim_var_string(VV_OPTION_NEW, NULL, -1);
+ set_vim_var_string(VV_OPTION_OLD, NULL, -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, NULL, -1);
+ set_vim_var_string(VV_OPTION_OLDGLOBAL, NULL, -1);
+ set_vim_var_string(VV_OPTION_COMMAND, NULL, -1);
set_vim_var_string(VV_OPTION_TYPE, NULL, -1);
}
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index 1131f3d14c..3b3a68bd29 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -138,6 +138,9 @@ typedef enum {
VV_COMPLETED_ITEM,
VV_OPTION_NEW,
VV_OPTION_OLD,
+ VV_OPTION_OLDLOCAL,
+ VV_OPTION_OLDGLOBAL,
+ VV_OPTION_COMMAND,
VV_OPTION_TYPE,
VV_ERRORS,
VV_FALSE,
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index 4601d47a23..797420c150 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -726,11 +726,11 @@ json_decode_string_cycle_start:
semsg(_("E474: Using comma in place of colon: %.*s"), LENP(p, e));
goto json_decode_string_fail;
} else if (last_container.special_val == NULL
- ? (last_container.container.v_type == VAR_DICT
- ? (DICT_LEN(last_container.container.vval.v_dict) == 0)
- : (tv_list_len(last_container.container.vval.v_list)
- == 0))
- : (tv_list_len(last_container.special_val) == 0)) {
+ ? (last_container.container.v_type == VAR_DICT
+ ? (DICT_LEN(last_container.container.vval.v_dict) == 0)
+ : (tv_list_len(last_container.container.vval.v_list)
+ == 0))
+ : (tv_list_len(last_container.special_val) == 0)) {
semsg(_("E474: Leading comma: %.*s"), LENP(p, e));
goto json_decode_string_fail;
}
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 7ae7b65702..b2422fd531 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -4,6 +4,7 @@
#include <inttypes.h>
#include <stdbool.h>
+#include "nvim/ascii.h"
#include "nvim/event/loop.h"
#include "nvim/ex_eval.h"
#include "nvim/iconv.h"
@@ -533,6 +534,11 @@ EXTERN int VIsual_mode INIT(= 'v');
/// true when redoing Visual.
EXTERN int redo_VIsual_busy INIT(= false);
+// The Visual area is remembered for reselection.
+EXTERN int resel_VIsual_mode INIT(= NUL); // 'v', 'V', or Ctrl-V
+EXTERN linenr_T resel_VIsual_line_count; // number of lines
+EXTERN colnr_T resel_VIsual_vcol; // nr of cols or end col
+
/// When pasting text with the middle mouse button in visual mode with
/// restart_edit set, remember where it started so we can set Insstart.
EXTERN pos_T where_paste_started;
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index f2b272a13f..9332c55b5f 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -31,8 +31,8 @@
#include "nvim/fileio.h"
#include "nvim/fold.h"
#include "nvim/getchar.h"
+#include "nvim/globals.h"
#include "nvim/indent.h"
-#include "nvim/indent_c.h"
#include "nvim/keymap.h"
#include "nvim/log.h"
#include "nvim/main.h"
@@ -84,12 +84,6 @@ typedef struct normal_state {
pos_T old_pos;
} NormalState;
-/*
- * The Visual area is remembered for reselection.
- */
-static int resel_VIsual_mode = NUL; // 'v', 'V', or Ctrl-V
-static linenr_T resel_VIsual_line_count; // number of lines
-static colnr_T resel_VIsual_vcol; // nr of cols or end col
static int VIsual_mode_orig = NUL; // saved Visual mode
@@ -1455,758 +1449,6 @@ static void set_vcount_ca(cmdarg_T *cap, bool *set_prevcount)
*set_prevcount = false; // only set v:prevcount once
}
-// Handle an operator after Visual mode or when the movement is finished.
-// "gui_yank" is true when yanking text for the clipboard.
-void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
-{
- oparg_T *oap = cap->oap;
- pos_T old_cursor;
- bool empty_region_error;
- int restart_edit_save;
- int lbr_saved = curwin->w_p_lbr;
-
-
- // The visual area is remembered for redo
- static int redo_VIsual_mode = NUL; // 'v', 'V', or Ctrl-V
- static linenr_T redo_VIsual_line_count; // number of lines
- static colnr_T redo_VIsual_vcol; // number of cols or end column
- static long redo_VIsual_count; // count for Visual operator
- static int redo_VIsual_arg; // extra argument
- bool include_line_break = false;
-
- old_cursor = curwin->w_cursor;
-
- /*
- * If an operation is pending, handle it...
- */
- if ((finish_op
- || VIsual_active)
- && oap->op_type != OP_NOP) {
- // Yank can be redone when 'y' is in 'cpoptions', but not when yanking
- // for the clipboard.
- const bool redo_yank = vim_strchr(p_cpo, CPO_YANK) != NULL && !gui_yank;
-
- // Avoid a problem with unwanted linebreaks in block mode
- if (curwin->w_p_lbr) {
- curwin->w_valid &= ~VALID_VIRTCOL;
- }
- curwin->w_p_lbr = false;
- oap->is_VIsual = VIsual_active;
- if (oap->motion_force == 'V') {
- oap->motion_type = kMTLineWise;
- } else if (oap->motion_force == 'v') {
- // If the motion was linewise, "inclusive" will not have been set.
- // Use "exclusive" to be consistent. Makes "dvj" work nice.
- if (oap->motion_type == kMTLineWise) {
- oap->inclusive = false;
- } else if (oap->motion_type == kMTCharWise) {
- // If the motion already was charwise, toggle "inclusive"
- oap->inclusive = !oap->inclusive;
- }
- oap->motion_type = kMTCharWise;
- } else if (oap->motion_force == Ctrl_V) {
- // Change line- or charwise motion into Visual block mode.
- if (!VIsual_active) {
- VIsual_active = true;
- VIsual = oap->start;
- }
- VIsual_mode = Ctrl_V;
- VIsual_select = false;
- VIsual_reselect = false;
- }
-
- // Only redo yank when 'y' flag is in 'cpoptions'.
- // Never redo "zf" (define fold).
- if ((redo_yank || oap->op_type != OP_YANK)
- && ((!VIsual_active || oap->motion_force)
- // Also redo Operator-pending Visual mode mappings.
- || ((cap->cmdchar == ':' || cap->cmdchar == K_COMMAND)
- && oap->op_type != OP_COLON))
- && cap->cmdchar != 'D'
- && oap->op_type != OP_FOLD
- && oap->op_type != OP_FOLDOPEN
- && oap->op_type != OP_FOLDOPENREC
- && oap->op_type != OP_FOLDCLOSE
- && oap->op_type != OP_FOLDCLOSEREC
- && oap->op_type != OP_FOLDDEL
- && oap->op_type != OP_FOLDDELREC) {
- prep_redo(oap->regname, cap->count0,
- get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
- oap->motion_force, cap->cmdchar, cap->nchar);
- if (cap->cmdchar == '/' || cap->cmdchar == '?') { // was a search
- /*
- * If 'cpoptions' does not contain 'r', insert the search
- * pattern to really repeat the same command.
- */
- if (vim_strchr(p_cpo, CPO_REDO) == NULL) {
- AppendToRedobuffLit(cap->searchbuf, -1);
- }
- AppendToRedobuff(NL_STR);
- } else if (cap->cmdchar == ':' || cap->cmdchar == K_COMMAND) {
- // do_cmdline() has stored the first typed line in
- // "repeat_cmdline". When several lines are typed repeating
- // won't be possible.
- if (repeat_cmdline == NULL) {
- ResetRedobuff();
- } else {
- AppendToRedobuffLit(repeat_cmdline, -1);
- AppendToRedobuff(NL_STR);
- XFREE_CLEAR(repeat_cmdline);
- }
- }
- }
-
- if (redo_VIsual_busy) {
- /* Redo of an operation on a Visual area. Use the same size from
- * redo_VIsual_line_count and redo_VIsual_vcol. */
- oap->start = curwin->w_cursor;
- curwin->w_cursor.lnum += redo_VIsual_line_count - 1;
- if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) {
- curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
- }
- VIsual_mode = redo_VIsual_mode;
- if (redo_VIsual_vcol == MAXCOL || VIsual_mode == 'v') {
- if (VIsual_mode == 'v') {
- if (redo_VIsual_line_count <= 1) {
- validate_virtcol();
- curwin->w_curswant =
- curwin->w_virtcol + redo_VIsual_vcol - 1;
- } else {
- curwin->w_curswant = redo_VIsual_vcol;
- }
- } else {
- curwin->w_curswant = MAXCOL;
- }
- coladvance(curwin->w_curswant);
- }
- cap->count0 = redo_VIsual_count;
- cap->count1 = (cap->count0 == 0 ? 1 : cap->count0);
- } else if (VIsual_active) {
- if (!gui_yank) {
- // Save the current VIsual area for '< and '> marks, and "gv"
- curbuf->b_visual.vi_start = VIsual;
- curbuf->b_visual.vi_end = curwin->w_cursor;
- curbuf->b_visual.vi_mode = VIsual_mode;
- if (VIsual_mode_orig != NUL) {
- curbuf->b_visual.vi_mode = VIsual_mode_orig;
- VIsual_mode_orig = NUL;
- }
- curbuf->b_visual.vi_curswant = curwin->w_curswant;
- curbuf->b_visual_mode_eval = VIsual_mode;
- }
-
- // In Select mode, a linewise selection is operated upon like a
- // charwise selection.
- // Special case: gH<Del> deletes the last line.
- if (VIsual_select && VIsual_mode == 'V'
- && cap->oap->op_type != OP_DELETE) {
- if (lt(VIsual, curwin->w_cursor)) {
- VIsual.col = 0;
- curwin->w_cursor.col =
- (colnr_T)STRLEN(ml_get(curwin->w_cursor.lnum));
- } else {
- curwin->w_cursor.col = 0;
- VIsual.col = (colnr_T)STRLEN(ml_get(VIsual.lnum));
- }
- VIsual_mode = 'v';
- }
- /* If 'selection' is "exclusive", backup one character for
- * charwise selections. */
- else if (VIsual_mode == 'v') {
- include_line_break =
- unadjust_for_sel();
- }
-
- oap->start = VIsual;
- if (VIsual_mode == 'V') {
- oap->start.col = 0;
- oap->start.coladd = 0;
- }
- }
-
- /*
- * Set oap->start to the first position of the operated text, oap->end
- * to the end of the operated text. w_cursor is equal to oap->start.
- */
- if (lt(oap->start, curwin->w_cursor)) {
- // Include folded lines completely.
- if (!VIsual_active) {
- if (hasFolding(oap->start.lnum, &oap->start.lnum, NULL)) {
- oap->start.col = 0;
- }
- if ((curwin->w_cursor.col > 0
- || oap->inclusive
- || oap->motion_type == kMTLineWise)
- && hasFolding(curwin->w_cursor.lnum, NULL,
- &curwin->w_cursor.lnum)) {
- curwin->w_cursor.col = (colnr_T)STRLEN(get_cursor_line_ptr());
- }
- }
- oap->end = curwin->w_cursor;
- curwin->w_cursor = oap->start;
-
- /* w_virtcol may have been updated; if the cursor goes back to its
- * previous position w_virtcol becomes invalid and isn't updated
- * automatically. */
- curwin->w_valid &= ~VALID_VIRTCOL;
- } else {
- // Include folded lines completely.
- if (!VIsual_active && oap->motion_type == kMTLineWise) {
- if (hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum,
- NULL)) {
- curwin->w_cursor.col = 0;
- }
- if (hasFolding(oap->start.lnum, NULL, &oap->start.lnum)) {
- oap->start.col = (colnr_T)STRLEN(ml_get(oap->start.lnum));
- }
- }
- oap->end = oap->start;
- oap->start = curwin->w_cursor;
- }
-
- // Just in case lines were deleted that make the position invalid.
- check_pos(curwin->w_buffer, &oap->end);
- oap->line_count = oap->end.lnum - oap->start.lnum + 1;
-
- // Set "virtual_op" before resetting VIsual_active.
- virtual_op = virtual_active();
-
- if (VIsual_active || redo_VIsual_busy) {
- get_op_vcol(oap, redo_VIsual_vcol, true);
-
- if (!redo_VIsual_busy && !gui_yank) {
- /*
- * Prepare to reselect and redo Visual: this is based on the
- * size of the Visual text
- */
- resel_VIsual_mode = VIsual_mode;
- if (curwin->w_curswant == MAXCOL) {
- resel_VIsual_vcol = MAXCOL;
- } else {
- if (VIsual_mode != Ctrl_V) {
- getvvcol(curwin, &(oap->end),
- NULL, NULL, &oap->end_vcol);
- }
- if (VIsual_mode == Ctrl_V || oap->line_count <= 1) {
- if (VIsual_mode != Ctrl_V) {
- getvvcol(curwin, &(oap->start),
- &oap->start_vcol, NULL, NULL);
- }
- resel_VIsual_vcol = oap->end_vcol - oap->start_vcol + 1;
- } else {
- resel_VIsual_vcol = oap->end_vcol;
- }
- }
- resel_VIsual_line_count = oap->line_count;
- }
-
- // can't redo yank (unless 'y' is in 'cpoptions') and ":"
- if ((redo_yank || oap->op_type != OP_YANK)
- && oap->op_type != OP_COLON
- && oap->op_type != OP_FOLD
- && oap->op_type != OP_FOLDOPEN
- && oap->op_type != OP_FOLDOPENREC
- && oap->op_type != OP_FOLDCLOSE
- && oap->op_type != OP_FOLDCLOSEREC
- && oap->op_type != OP_FOLDDEL
- && oap->op_type != OP_FOLDDELREC
- && oap->motion_force == NUL) {
- /* Prepare for redoing. Only use the nchar field for "r",
- * otherwise it might be the second char of the operator. */
- if (cap->cmdchar == 'g' && (cap->nchar == 'n'
- || cap->nchar == 'N')) {
- prep_redo(oap->regname, cap->count0,
- get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
- oap->motion_force, cap->cmdchar, cap->nchar);
- } else if (cap->cmdchar != ':' && cap->cmdchar != K_COMMAND) {
- int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL;
-
- // reverse what nv_replace() did
- if (nchar == REPLACE_CR_NCHAR) {
- nchar = CAR;
- } else if (nchar == REPLACE_NL_NCHAR) {
- nchar = NL;
- }
- prep_redo(oap->regname, 0L, NUL, 'v', get_op_char(oap->op_type),
- get_extra_op_char(oap->op_type), nchar);
- }
- if (!redo_VIsual_busy) {
- redo_VIsual_mode = resel_VIsual_mode;
- redo_VIsual_vcol = resel_VIsual_vcol;
- redo_VIsual_line_count = resel_VIsual_line_count;
- redo_VIsual_count = cap->count0;
- redo_VIsual_arg = cap->arg;
- }
- }
-
- // oap->inclusive defaults to true.
- // If oap->end is on a NUL (empty line) oap->inclusive becomes
- // false. This makes "d}P" and "v}dP" work the same.
- if (oap->motion_force == NUL || oap->motion_type == kMTLineWise) {
- oap->inclusive = true;
- }
- if (VIsual_mode == 'V') {
- oap->motion_type = kMTLineWise;
- } else if (VIsual_mode == 'v') {
- oap->motion_type = kMTCharWise;
- if (*ml_get_pos(&(oap->end)) == NUL
- && (include_line_break || !virtual_op)) {
- oap->inclusive = false;
- // Try to include the newline, unless it's an operator
- // that works on lines only.
- if (*p_sel != 'o'
- && !op_on_lines(oap->op_type)
- && oap->end.lnum < curbuf->b_ml.ml_line_count) {
- oap->end.lnum++;
- oap->end.col = 0;
- oap->end.coladd = 0;
- oap->line_count++;
- }
- }
- }
-
- redo_VIsual_busy = false;
-
- /*
- * Switch Visual off now, so screen updating does
- * not show inverted text when the screen is redrawn.
- * With OP_YANK and sometimes with OP_COLON and OP_FILTER there is
- * no screen redraw, so it is done here to remove the inverted
- * part.
- */
- if (!gui_yank) {
- VIsual_active = false;
- setmouse();
- mouse_dragging = 0;
- may_clear_cmdline();
- if ((oap->op_type == OP_YANK
- || oap->op_type == OP_COLON
- || oap->op_type == OP_FUNCTION
- || oap->op_type == OP_FILTER)
- && oap->motion_force == NUL) {
- // Make sure redrawing is correct.
- curwin->w_p_lbr = lbr_saved;
- redraw_curbuf_later(INVERTED);
- }
- }
- }
-
- // Include the trailing byte of a multi-byte char.
- if (oap->inclusive) {
- const int l = utfc_ptr2len(ml_get_pos(&oap->end));
- if (l > 1) {
- oap->end.col += l - 1;
- }
- }
- curwin->w_set_curswant = true;
-
- /*
- * oap->empty is set when start and end are the same. The inclusive
- * flag affects this too, unless yanking and the end is on a NUL.
- */
- oap->empty = (oap->motion_type != kMTLineWise
- && (!oap->inclusive
- || (oap->op_type == OP_YANK
- && gchar_pos(&oap->end) == NUL))
- && equalpos(oap->start, oap->end)
- && !(virtual_op && oap->start.coladd != oap->end.coladd)
- );
- /*
- * For delete, change and yank, it's an error to operate on an
- * empty region, when 'E' included in 'cpoptions' (Vi compatible).
- */
- empty_region_error = (oap->empty
- && vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL);
-
- /* Force a redraw when operating on an empty Visual region, when
- * 'modifiable is off or creating a fold. */
- if (oap->is_VIsual && (oap->empty || !MODIFIABLE(curbuf)
- || oap->op_type == OP_FOLD
- )) {
- curwin->w_p_lbr = lbr_saved;
- redraw_curbuf_later(INVERTED);
- }
-
- /*
- * If the end of an operator is in column one while oap->motion_type
- * is kMTCharWise and oap->inclusive is false, we put op_end after the last
- * character in the previous line. If op_start is on or before the
- * first non-blank in the line, the operator becomes linewise
- * (strange, but that's the way vi does it).
- */
- if (oap->motion_type == kMTCharWise
- && oap->inclusive == false
- && !(cap->retval & CA_NO_ADJ_OP_END)
- && oap->end.col == 0
- && (!oap->is_VIsual || *p_sel == 'o')
- && oap->line_count > 1) {
- oap->end_adjusted = true; // remember that we did this
- oap->line_count--;
- oap->end.lnum--;
- if (inindent(0)) {
- oap->motion_type = kMTLineWise;
- } else {
- oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
- if (oap->end.col) {
- --oap->end.col;
- oap->inclusive = true;
- }
- }
- } else {
- oap->end_adjusted = false;
- }
-
- switch (oap->op_type) {
- case OP_LSHIFT:
- case OP_RSHIFT:
- op_shift(oap, true,
- oap->is_VIsual ? (int)cap->count1 :
- 1);
- auto_format(false, true);
- break;
-
- case OP_JOIN_NS:
- case OP_JOIN:
- if (oap->line_count < 2) {
- oap->line_count = 2;
- }
- if (curwin->w_cursor.lnum + oap->line_count - 1 >
- curbuf->b_ml.ml_line_count) {
- beep_flush();
- } else {
- do_join((size_t)oap->line_count, oap->op_type == OP_JOIN,
- true, true, true);
- auto_format(false, true);
- }
- break;
-
- case OP_DELETE:
- VIsual_reselect = false; // don't reselect now
- if (empty_region_error) {
- vim_beep(BO_OPER);
- CancelRedo();
- } else {
- (void)op_delete(oap);
- // save cursor line for undo if it wasn't saved yet
- if (oap->motion_type == kMTLineWise
- && has_format_option(FO_AUTO)
- && u_save_cursor() == OK) {
- auto_format(false, true);
- }
- }
- break;
-
- case OP_YANK:
- if (empty_region_error) {
- if (!gui_yank) {
- vim_beep(BO_OPER);
- CancelRedo();
- }
- } else {
- curwin->w_p_lbr = lbr_saved;
- oap->excl_tr_ws = cap->cmdchar == 'z';
- (void)op_yank(oap, !gui_yank, false);
- }
- check_cursor_col();
- break;
-
- case OP_CHANGE:
- VIsual_reselect = false; // don't reselect now
- if (empty_region_error) {
- vim_beep(BO_OPER);
- CancelRedo();
- } else {
- /* This is a new edit command, not a restart. Need to
- * remember it to make 'insertmode' work with mappings for
- * Visual mode. But do this only once and not when typed and
- * 'insertmode' isn't set. */
- if (p_im || !KeyTyped) {
- restart_edit_save = restart_edit;
- } else {
- restart_edit_save = 0;
- }
- restart_edit = 0;
-
- // Restore linebreak, so that when the user edits it looks as before.
- curwin->w_p_lbr = lbr_saved;
-
- // Reset finish_op now, don't want it set inside edit().
- finish_op = false;
- if (op_change(oap)) { // will call edit()
- cap->retval |= CA_COMMAND_BUSY;
- }
- if (restart_edit == 0) {
- restart_edit = restart_edit_save;
- }
- }
- break;
-
- case OP_FILTER:
- if (vim_strchr(p_cpo, CPO_FILTER) != NULL) {
- AppendToRedobuff("!\r"); // Use any last used !cmd.
- } else {
- bangredo = true; // do_bang() will put cmd in redo buffer.
- }
- FALLTHROUGH;
-
- case OP_INDENT:
- case OP_COLON:
-
- /*
- * If 'equalprg' is empty, do the indenting internally.
- */
- if (oap->op_type == OP_INDENT && *get_equalprg() == NUL) {
- if (curbuf->b_p_lisp) {
- op_reindent(oap, get_lisp_indent);
- break;
- }
- op_reindent(oap,
- *curbuf->b_p_inde != NUL ? get_expr_indent :
- get_c_indent);
- break;
- }
-
- op_colon(oap);
- break;
-
- case OP_TILDE:
- case OP_UPPER:
- case OP_LOWER:
- case OP_ROT13:
- if (empty_region_error) {
- vim_beep(BO_OPER);
- CancelRedo();
- } else {
- op_tilde(oap);
- }
- check_cursor_col();
- break;
-
- case OP_FORMAT:
- if (*curbuf->b_p_fex != NUL) {
- op_formatexpr(oap); // use expression
- } else {
- if (*p_fp != NUL || *curbuf->b_p_fp != NUL) {
- op_colon(oap); // use external command
- } else {
- op_format(oap, false); // use internal function
- }
- }
- break;
-
- case OP_FORMAT2:
- op_format(oap, true); // use internal function
- break;
-
- case OP_FUNCTION:
- // Restore linebreak, so that when the user edits it looks as
- // before.
- curwin->w_p_lbr = lbr_saved;
- op_function(oap); // call 'operatorfunc'
- break;
-
- case OP_INSERT:
- case OP_APPEND:
- VIsual_reselect = false; // don't reselect now
- if (empty_region_error) {
- vim_beep(BO_OPER);
- CancelRedo();
- } else {
- /* This is a new edit command, not a restart. Need to
- * remember it to make 'insertmode' work with mappings for
- * Visual mode. But do this only once. */
- restart_edit_save = restart_edit;
- restart_edit = 0;
-
- // Restore linebreak, so that when the user edits it looks as before.
- curwin->w_p_lbr = lbr_saved;
-
- op_insert(oap, cap->count1);
-
- // Reset linebreak, so that formatting works correctly.
- curwin->w_p_lbr = false;
-
- /* TODO: when inserting in several lines, should format all
- * the lines. */
- auto_format(false, true);
-
- if (restart_edit == 0) {
- restart_edit = restart_edit_save;
- } else {
- cap->retval |= CA_COMMAND_BUSY;
- }
- }
- break;
-
- case OP_REPLACE:
- VIsual_reselect = false; // don't reselect now
- if (empty_region_error) {
- vim_beep(BO_OPER);
- CancelRedo();
- } else {
- // Restore linebreak, so that when the user edits it looks as before.
- curwin->w_p_lbr = lbr_saved;
-
- op_replace(oap, cap->nchar);
- }
- break;
-
- case OP_FOLD:
- VIsual_reselect = false; // don't reselect now
- foldCreate(curwin, oap->start, oap->end);
- break;
-
- case OP_FOLDOPEN:
- case OP_FOLDOPENREC:
- case OP_FOLDCLOSE:
- case OP_FOLDCLOSEREC:
- VIsual_reselect = false; // don't reselect now
- opFoldRange(oap->start, oap->end,
- oap->op_type == OP_FOLDOPEN
- || oap->op_type == OP_FOLDOPENREC,
- oap->op_type == OP_FOLDOPENREC
- || oap->op_type == OP_FOLDCLOSEREC,
- oap->is_VIsual);
- break;
-
- case OP_FOLDDEL:
- case OP_FOLDDELREC:
- VIsual_reselect = false; // don't reselect now
- deleteFold(curwin, oap->start.lnum, oap->end.lnum,
- oap->op_type == OP_FOLDDELREC, oap->is_VIsual);
- break;
-
- case OP_NR_ADD:
- case OP_NR_SUB:
- if (empty_region_error) {
- vim_beep(BO_OPER);
- CancelRedo();
- } else {
- VIsual_active = true;
- curwin->w_p_lbr = lbr_saved;
- op_addsub(oap, cap->count1, redo_VIsual_arg);
- VIsual_active = false;
- }
- check_cursor_col();
- break;
- default:
- clearopbeep(oap);
- }
- virtual_op = kNone;
- if (!gui_yank) {
- /*
- * if 'sol' not set, go back to old column for some commands
- */
- if (!p_sol && oap->motion_type == kMTLineWise && !oap->end_adjusted
- && (oap->op_type == OP_LSHIFT || oap->op_type == OP_RSHIFT
- || oap->op_type == OP_DELETE)) {
- curwin->w_p_lbr = false;
- coladvance(curwin->w_curswant = old_col);
- }
- } else {
- curwin->w_cursor = old_cursor;
- }
- clearop(oap);
- motion_force = NUL;
- }
- curwin->w_p_lbr = lbr_saved;
-}
-
-/*
- * Handle indent and format operators and visual mode ":".
- */
-static void op_colon(oparg_T *oap)
-{
- stuffcharReadbuff(':');
- if (oap->is_VIsual) {
- stuffReadbuff("'<,'>");
- } else {
- // Make the range look nice, so it can be repeated.
- if (oap->start.lnum == curwin->w_cursor.lnum) {
- stuffcharReadbuff('.');
- } else {
- stuffnumReadbuff((long)oap->start.lnum);
- }
- if (oap->end.lnum != oap->start.lnum) {
- stuffcharReadbuff(',');
- if (oap->end.lnum == curwin->w_cursor.lnum) {
- stuffcharReadbuff('.');
- } else if (oap->end.lnum == curbuf->b_ml.ml_line_count) {
- stuffcharReadbuff('$');
- } else if (oap->start.lnum == curwin->w_cursor.lnum) {
- stuffReadbuff(".+");
- stuffnumReadbuff(oap->line_count - 1);
- } else {
- stuffnumReadbuff((long)oap->end.lnum);
- }
- }
- }
- if (oap->op_type != OP_COLON) {
- stuffReadbuff("!");
- }
- if (oap->op_type == OP_INDENT) {
- stuffReadbuff((const char *)get_equalprg());
- stuffReadbuff("\n");
- } else if (oap->op_type == OP_FORMAT) {
- if (*curbuf->b_p_fp != NUL) {
- stuffReadbuff((const char *)curbuf->b_p_fp);
- } else if (*p_fp != NUL) {
- stuffReadbuff((const char *)p_fp);
- } else {
- stuffReadbuff("fmt");
- }
- stuffReadbuff("\n']");
- }
-
- /*
- * do_cmdline() does the rest
- */
-}
-
-/*
- * Handle the "g@" operator: call 'operatorfunc'.
- */
-static void op_function(const oparg_T *oap)
- FUNC_ATTR_NONNULL_ALL
-{
- const TriState save_virtual_op = virtual_op;
- const bool save_finish_op = finish_op;
-
- if (*p_opfunc == NUL) {
- emsg(_("E774: 'operatorfunc' is empty"));
- } else {
- // Set '[ and '] marks to text to be operated on.
- curbuf->b_op_start = oap->start;
- curbuf->b_op_end = oap->end;
- if (oap->motion_type != kMTLineWise && !oap->inclusive) {
- // Exclude the end position.
- decl(&curbuf->b_op_end);
- }
-
- typval_T argv[2];
- argv[0].v_type = VAR_STRING;
- argv[1].v_type = VAR_UNKNOWN;
- argv[0].vval.v_string =
- (char_u *)(((const char *const[]) {
- [kMTBlockWise] = "block",
- [kMTLineWise] = "line",
- [kMTCharWise] = "char",
- })[oap->motion_type]);
-
- // Reset virtual_op so that 'virtualedit' can be changed in the
- // function.
- virtual_op = kNone;
-
- // Reset finish_op so that mode() returns the right value.
- finish_op = false;
-
- (void)call_func_retnr(p_opfunc, 1, argv);
-
- virtual_op = save_virtual_op;
- finish_op = save_finish_op;
- }
-}
-
// Move the current tab to tab in same column as mouse or to end of the
// tabline if there is no tab there.
static void move_tab_to_mouse(void)
@@ -3096,6 +2338,14 @@ void reset_VIsual(void)
}
}
+void restore_visual_mode(void)
+{
+ if (VIsual_mode_orig != NUL) {
+ curbuf->b_visual.vi_mode = VIsual_mode_orig;
+ VIsual_mode_orig = NUL;
+ }
+}
+
// Check for a balloon-eval special item to include when searching for an
// identifier. When "dir" is BACKWARD "ptr[-1]" must be valid!
// Returns true if the character at "*ptr" should be included.
@@ -3274,7 +2524,7 @@ static void prep_redo_cmd(cmdarg_T *cap)
* Prepare for redo of any command.
* Note that only the last argument can be a multi-byte char.
*/
-static void prep_redo(int regname, long num, int cmd1, int cmd2, int cmd3, int cmd4, int cmd5)
+void prep_redo(int regname, long num, int cmd1, int cmd2, int cmd3, int cmd4, int cmd5)
{
ResetRedobuff();
if (regname != 0) { // yank from specified buffer
@@ -3331,7 +2581,7 @@ static bool checkclearopq(oparg_T *oap)
return true;
}
-static void clearop(oparg_T *oap)
+void clearop(oparg_T *oap)
{
oap->op_type = OP_NOP;
oap->regname = 0;
@@ -3340,7 +2590,7 @@ static void clearop(oparg_T *oap)
motion_force = NUL;
}
-static void clearopbeep(oparg_T *oap)
+void clearopbeep(oparg_T *oap)
{
clearop(oap);
beep_flush();
@@ -3370,7 +2620,7 @@ static void unshift_special(cmdarg_T *cap)
/// If the mode is currently displayed clear the command line or update the
/// command displayed.
-static void may_clear_cmdline(void)
+void may_clear_cmdline(void)
{
if (mode_displayed) {
// unshow visual mode later
@@ -7738,7 +6988,7 @@ static void adjust_for_sel(cmdarg_T *cap)
* Should check VIsual_mode before calling this.
* Returns true when backed up to the previous line.
*/
-static bool unadjust_for_sel(void)
+bool unadjust_for_sel(void)
{
pos_T *pp;
@@ -8328,71 +7578,6 @@ static void nv_open(cmdarg_T *cap)
}
}
-/// Calculate start/end virtual columns for operating in block mode.
-///
-/// @param initial when true: adjust position for 'selectmode'
-static void get_op_vcol(oparg_T *oap, colnr_T redo_VIsual_vcol, bool initial)
-{
- colnr_T start;
- colnr_T end;
-
- if (VIsual_mode != Ctrl_V
- || (!initial && oap->end.col < curwin->w_width_inner)) {
- return;
- }
-
- oap->motion_type = kMTBlockWise;
-
- // prevent from moving onto a trail byte
- mark_mb_adjustpos(curwin->w_buffer, &oap->end);
-
- getvvcol(curwin, &(oap->start), &oap->start_vcol, NULL, &oap->end_vcol);
- if (!redo_VIsual_busy) {
- getvvcol(curwin, &(oap->end), &start, NULL, &end);
-
- if (start < oap->start_vcol) {
- oap->start_vcol = start;
- }
- if (end > oap->end_vcol) {
- if (initial && *p_sel == 'e'
- && start >= 1
- && start - 1 >= oap->end_vcol) {
- oap->end_vcol = start - 1;
- } else {
- oap->end_vcol = end;
- }
- }
- }
-
- // if '$' was used, get oap->end_vcol from longest line
- if (curwin->w_curswant == MAXCOL) {
- curwin->w_cursor.col = MAXCOL;
- oap->end_vcol = 0;
- for (curwin->w_cursor.lnum = oap->start.lnum;
- curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) {
- getvvcol(curwin, &curwin->w_cursor, NULL, NULL, &end);
- if (end > oap->end_vcol) {
- oap->end_vcol = end;
- }
- }
- } else if (redo_VIsual_busy) {
- oap->end_vcol = oap->start_vcol + redo_VIsual_vcol - 1;
- }
-
- // Correct oap->end.col and oap->start.col to be the
- // upper-left and lower-right corner of the block area.
- //
- // (Actually, this does convert column positions into character
- // positions)
- curwin->w_cursor.lnum = oap->end.lnum;
- coladvance(oap->end_vcol);
- oap->end = curwin->w_cursor;
-
- curwin->w_cursor = oap->start;
- coladvance(oap->start_vcol);
- oap->start = curwin->w_cursor;
-}
-
// Handle an arbitrary event in normal mode
static void nv_event(cmdarg_T *cap)
{
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 38de24b8ad..52c382028e 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -27,7 +27,9 @@
#include "nvim/fileio.h"
#include "nvim/fold.h"
#include "nvim/getchar.h"
+#include "nvim/globals.h"
#include "nvim/indent.h"
+#include "nvim/indent_c.h"
#include "nvim/lib/kvec.h"
#include "nvim/log.h"
#include "nvim/macros.h"
@@ -37,6 +39,7 @@
#include "nvim/memory.h"
#include "nvim/message.h"
#include "nvim/misc1.h"
+#include "nvim/mouse.h"
#include "nvim/move.h"
#include "nvim/normal.h"
#include "nvim/ops.h"
@@ -1768,7 +1771,7 @@ static void replace_character(int c)
/*
* Replace a whole area with one character.
*/
-int op_replace(oparg_T *oap, int c)
+static int op_replace(oparg_T *oap, int c)
{
int n, numc;
int num_chars;
@@ -4177,7 +4180,7 @@ static int same_leader(linenr_T lnum, int leader1_len, char_u *leader1_flags, in
/// Implementation of the format operator 'gq'.
///
/// @param keep_cursor keep cursor on same text char
-void op_format(oparg_T *oap, int keep_cursor)
+static void op_format(oparg_T *oap, int keep_cursor)
{
long old_line_count = curbuf->b_ml.ml_line_count;
@@ -4245,7 +4248,7 @@ void op_format(oparg_T *oap, int keep_cursor)
/*
* Implementation of the format operator 'gq' for when using 'formatexpr'.
*/
-void op_formatexpr(oparg_T *oap)
+static void op_formatexpr(oparg_T *oap)
{
if (oap->is_VIsual) {
// When there is no change: need to remove the Visual selection
@@ -5936,6 +5939,791 @@ void cursor_pos_info(dict_T *dict)
}
}
+// Handle indent and format operators and visual mode ":".
+static void op_colon(oparg_T *oap)
+{
+ stuffcharReadbuff(':');
+ if (oap->is_VIsual) {
+ stuffReadbuff("'<,'>");
+ } else {
+ // Make the range look nice, so it can be repeated.
+ if (oap->start.lnum == curwin->w_cursor.lnum) {
+ stuffcharReadbuff('.');
+ } else {
+ stuffnumReadbuff((long)oap->start.lnum);
+ }
+ if (oap->end.lnum != oap->start.lnum) {
+ stuffcharReadbuff(',');
+ if (oap->end.lnum == curwin->w_cursor.lnum) {
+ stuffcharReadbuff('.');
+ } else if (oap->end.lnum == curbuf->b_ml.ml_line_count) {
+ stuffcharReadbuff('$');
+ } else if (oap->start.lnum == curwin->w_cursor.lnum) {
+ stuffReadbuff(".+");
+ stuffnumReadbuff(oap->line_count - 1);
+ } else {
+ stuffnumReadbuff((long)oap->end.lnum);
+ }
+ }
+ }
+ if (oap->op_type != OP_COLON) {
+ stuffReadbuff("!");
+ }
+ if (oap->op_type == OP_INDENT) {
+ stuffReadbuff((const char *)get_equalprg());
+ stuffReadbuff("\n");
+ } else if (oap->op_type == OP_FORMAT) {
+ if (*curbuf->b_p_fp != NUL) {
+ stuffReadbuff((const char *)curbuf->b_p_fp);
+ } else if (*p_fp != NUL) {
+ stuffReadbuff((const char *)p_fp);
+ } else {
+ stuffReadbuff("fmt");
+ }
+ stuffReadbuff("\n']");
+ }
+
+ // do_cmdline() does the rest
+}
+
+// Handle the "g@" operator: call 'operatorfunc'.
+static void op_function(const oparg_T *oap)
+ FUNC_ATTR_NONNULL_ALL
+{
+ const TriState save_virtual_op = virtual_op;
+ const bool save_finish_op = finish_op;
+
+ if (*p_opfunc == NUL) {
+ emsg(_("E774: 'operatorfunc' is empty"));
+ } else {
+ // Set '[ and '] marks to text to be operated on.
+ curbuf->b_op_start = oap->start;
+ curbuf->b_op_end = oap->end;
+ if (oap->motion_type != kMTLineWise && !oap->inclusive) {
+ // Exclude the end position.
+ decl(&curbuf->b_op_end);
+ }
+
+ typval_T argv[2];
+ argv[0].v_type = VAR_STRING;
+ argv[1].v_type = VAR_UNKNOWN;
+ argv[0].vval.v_string =
+ (char_u *)(((const char *const[]) {
+ [kMTBlockWise] = "block",
+ [kMTLineWise] = "line",
+ [kMTCharWise] = "char",
+ })[oap->motion_type]);
+
+ // Reset virtual_op so that 'virtualedit' can be changed in the
+ // function.
+ virtual_op = kNone;
+
+ // Reset finish_op so that mode() returns the right value.
+ finish_op = false;
+
+ (void)call_func_retnr(p_opfunc, 1, argv);
+
+ virtual_op = save_virtual_op;
+ finish_op = save_finish_op;
+ }
+}
+
+/// Calculate start/end virtual columns for operating in block mode.
+///
+/// @param initial when true: adjust position for 'selectmode'
+static void get_op_vcol(oparg_T *oap, colnr_T redo_VIsual_vcol, bool initial)
+{
+ colnr_T start;
+ colnr_T end;
+
+ if (VIsual_mode != Ctrl_V
+ || (!initial && oap->end.col < curwin->w_width_inner)) {
+ return;
+ }
+
+ oap->motion_type = kMTBlockWise;
+
+ // prevent from moving onto a trail byte
+ mark_mb_adjustpos(curwin->w_buffer, &oap->end);
+
+ getvvcol(curwin, &(oap->start), &oap->start_vcol, NULL, &oap->end_vcol);
+ if (!redo_VIsual_busy) {
+ getvvcol(curwin, &(oap->end), &start, NULL, &end);
+
+ if (start < oap->start_vcol) {
+ oap->start_vcol = start;
+ }
+ if (end > oap->end_vcol) {
+ if (initial && *p_sel == 'e'
+ && start >= 1
+ && start - 1 >= oap->end_vcol) {
+ oap->end_vcol = start - 1;
+ } else {
+ oap->end_vcol = end;
+ }
+ }
+ }
+
+ // if '$' was used, get oap->end_vcol from longest line
+ if (curwin->w_curswant == MAXCOL) {
+ curwin->w_cursor.col = MAXCOL;
+ oap->end_vcol = 0;
+ for (curwin->w_cursor.lnum = oap->start.lnum;
+ curwin->w_cursor.lnum <= oap->end.lnum; curwin->w_cursor.lnum++) {
+ getvvcol(curwin, &curwin->w_cursor, NULL, NULL, &end);
+ if (end > oap->end_vcol) {
+ oap->end_vcol = end;
+ }
+ }
+ } else if (redo_VIsual_busy) {
+ oap->end_vcol = oap->start_vcol + redo_VIsual_vcol - 1;
+ }
+
+ // Correct oap->end.col and oap->start.col to be the
+ // upper-left and lower-right corner of the block area.
+ //
+ // (Actually, this does convert column positions into character
+ // positions)
+ curwin->w_cursor.lnum = oap->end.lnum;
+ coladvance(oap->end_vcol);
+ oap->end = curwin->w_cursor;
+
+ curwin->w_cursor = oap->start;
+ coladvance(oap->start_vcol);
+ oap->start = curwin->w_cursor;
+}
+
+// Handle an operator after Visual mode or when the movement is finished.
+// "gui_yank" is true when yanking text for the clipboard.
+void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
+{
+ oparg_T *oap = cap->oap;
+ pos_T old_cursor;
+ bool empty_region_error;
+ int restart_edit_save;
+ int lbr_saved = curwin->w_p_lbr;
+
+
+ // The visual area is remembered for redo
+ static int redo_VIsual_mode = NUL; // 'v', 'V', or Ctrl-V
+ static linenr_T redo_VIsual_line_count; // number of lines
+ static colnr_T redo_VIsual_vcol; // number of cols or end column
+ static long redo_VIsual_count; // count for Visual operator
+ static int redo_VIsual_arg; // extra argument
+ bool include_line_break = false;
+
+ old_cursor = curwin->w_cursor;
+
+ // If an operation is pending, handle it...
+ if ((finish_op
+ || VIsual_active)
+ && oap->op_type != OP_NOP) {
+ // Yank can be redone when 'y' is in 'cpoptions', but not when yanking
+ // for the clipboard.
+ const bool redo_yank = vim_strchr(p_cpo, CPO_YANK) != NULL && !gui_yank;
+
+ // Avoid a problem with unwanted linebreaks in block mode
+ if (curwin->w_p_lbr) {
+ curwin->w_valid &= ~VALID_VIRTCOL;
+ }
+ curwin->w_p_lbr = false;
+ oap->is_VIsual = VIsual_active;
+ if (oap->motion_force == 'V') {
+ oap->motion_type = kMTLineWise;
+ } else if (oap->motion_force == 'v') {
+ // If the motion was linewise, "inclusive" will not have been set.
+ // Use "exclusive" to be consistent. Makes "dvj" work nice.
+ if (oap->motion_type == kMTLineWise) {
+ oap->inclusive = false;
+ } else if (oap->motion_type == kMTCharWise) {
+ // If the motion already was charwise, toggle "inclusive"
+ oap->inclusive = !oap->inclusive;
+ }
+ oap->motion_type = kMTCharWise;
+ } else if (oap->motion_force == Ctrl_V) {
+ // Change line- or charwise motion into Visual block mode.
+ if (!VIsual_active) {
+ VIsual_active = true;
+ VIsual = oap->start;
+ }
+ VIsual_mode = Ctrl_V;
+ VIsual_select = false;
+ VIsual_reselect = false;
+ }
+
+ // Only redo yank when 'y' flag is in 'cpoptions'.
+ // Never redo "zf" (define fold).
+ if ((redo_yank || oap->op_type != OP_YANK)
+ && ((!VIsual_active || oap->motion_force)
+ // Also redo Operator-pending Visual mode mappings.
+ || ((cap->cmdchar == ':' || cap->cmdchar == K_COMMAND)
+ && oap->op_type != OP_COLON))
+ && cap->cmdchar != 'D'
+ && oap->op_type != OP_FOLD
+ && oap->op_type != OP_FOLDOPEN
+ && oap->op_type != OP_FOLDOPENREC
+ && oap->op_type != OP_FOLDCLOSE
+ && oap->op_type != OP_FOLDCLOSEREC
+ && oap->op_type != OP_FOLDDEL
+ && oap->op_type != OP_FOLDDELREC) {
+ prep_redo(oap->regname, cap->count0,
+ get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
+ oap->motion_force, cap->cmdchar, cap->nchar);
+ if (cap->cmdchar == '/' || cap->cmdchar == '?') { // was a search
+ // If 'cpoptions' does not contain 'r', insert the search
+ // pattern to really repeat the same command.
+ if (vim_strchr(p_cpo, CPO_REDO) == NULL) {
+ AppendToRedobuffLit(cap->searchbuf, -1);
+ }
+ AppendToRedobuff(NL_STR);
+ } else if (cap->cmdchar == ':' || cap->cmdchar == K_COMMAND) {
+ // do_cmdline() has stored the first typed line in
+ // "repeat_cmdline". When several lines are typed repeating
+ // won't be possible.
+ if (repeat_cmdline == NULL) {
+ ResetRedobuff();
+ } else {
+ AppendToRedobuffLit(repeat_cmdline, -1);
+ AppendToRedobuff(NL_STR);
+ XFREE_CLEAR(repeat_cmdline);
+ }
+ }
+ }
+
+ if (redo_VIsual_busy) {
+ // Redo of an operation on a Visual area. Use the same size from
+ // redo_VIsual_line_count and redo_VIsual_vcol.
+ oap->start = curwin->w_cursor;
+ curwin->w_cursor.lnum += redo_VIsual_line_count - 1;
+ if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) {
+ curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
+ }
+ VIsual_mode = redo_VIsual_mode;
+ if (redo_VIsual_vcol == MAXCOL || VIsual_mode == 'v') {
+ if (VIsual_mode == 'v') {
+ if (redo_VIsual_line_count <= 1) {
+ validate_virtcol();
+ curwin->w_curswant =
+ curwin->w_virtcol + redo_VIsual_vcol - 1;
+ } else {
+ curwin->w_curswant = redo_VIsual_vcol;
+ }
+ } else {
+ curwin->w_curswant = MAXCOL;
+ }
+ coladvance(curwin->w_curswant);
+ }
+ cap->count0 = redo_VIsual_count;
+ cap->count1 = (cap->count0 == 0 ? 1 : cap->count0);
+ } else if (VIsual_active) {
+ if (!gui_yank) {
+ // Save the current VIsual area for '< and '> marks, and "gv"
+ curbuf->b_visual.vi_start = VIsual;
+ curbuf->b_visual.vi_end = curwin->w_cursor;
+ curbuf->b_visual.vi_mode = VIsual_mode;
+ restore_visual_mode();
+ curbuf->b_visual.vi_curswant = curwin->w_curswant;
+ curbuf->b_visual_mode_eval = VIsual_mode;
+ }
+
+ // In Select mode, a linewise selection is operated upon like a
+ // charwise selection.
+ // Special case: gH<Del> deletes the last line.
+ if (VIsual_select && VIsual_mode == 'V'
+ && cap->oap->op_type != OP_DELETE) {
+ if (lt(VIsual, curwin->w_cursor)) {
+ VIsual.col = 0;
+ curwin->w_cursor.col =
+ (colnr_T)STRLEN(ml_get(curwin->w_cursor.lnum));
+ } else {
+ curwin->w_cursor.col = 0;
+ VIsual.col = (colnr_T)STRLEN(ml_get(VIsual.lnum));
+ }
+ VIsual_mode = 'v';
+ } else if (VIsual_mode == 'v') {
+ // If 'selection' is "exclusive", backup one character for
+ // charwise selections.
+ include_line_break =
+ unadjust_for_sel();
+ }
+
+ oap->start = VIsual;
+ if (VIsual_mode == 'V') {
+ oap->start.col = 0;
+ oap->start.coladd = 0;
+ }
+ }
+
+ // Set oap->start to the first position of the operated text, oap->end
+ // to the end of the operated text. w_cursor is equal to oap->start.
+ if (lt(oap->start, curwin->w_cursor)) {
+ // Include folded lines completely.
+ if (!VIsual_active) {
+ if (hasFolding(oap->start.lnum, &oap->start.lnum, NULL)) {
+ oap->start.col = 0;
+ }
+ if ((curwin->w_cursor.col > 0
+ || oap->inclusive
+ || oap->motion_type == kMTLineWise)
+ && hasFolding(curwin->w_cursor.lnum, NULL,
+ &curwin->w_cursor.lnum)) {
+ curwin->w_cursor.col = (colnr_T)STRLEN(get_cursor_line_ptr());
+ }
+ }
+ oap->end = curwin->w_cursor;
+ curwin->w_cursor = oap->start;
+
+ // w_virtcol may have been updated; if the cursor goes back to its
+ // previous position w_virtcol becomes invalid and isn't updated
+ // automatically.
+ curwin->w_valid &= ~VALID_VIRTCOL;
+ } else {
+ // Include folded lines completely.
+ if (!VIsual_active && oap->motion_type == kMTLineWise) {
+ if (hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum,
+ NULL)) {
+ curwin->w_cursor.col = 0;
+ }
+ if (hasFolding(oap->start.lnum, NULL, &oap->start.lnum)) {
+ oap->start.col = (colnr_T)STRLEN(ml_get(oap->start.lnum));
+ }
+ }
+ oap->end = oap->start;
+ oap->start = curwin->w_cursor;
+ }
+
+ // Just in case lines were deleted that make the position invalid.
+ check_pos(curwin->w_buffer, &oap->end);
+ oap->line_count = oap->end.lnum - oap->start.lnum + 1;
+
+ // Set "virtual_op" before resetting VIsual_active.
+ virtual_op = virtual_active();
+
+ if (VIsual_active || redo_VIsual_busy) {
+ get_op_vcol(oap, redo_VIsual_vcol, true);
+
+ if (!redo_VIsual_busy && !gui_yank) {
+ // Prepare to reselect and redo Visual: this is based on the
+ // size of the Visual text
+ resel_VIsual_mode = VIsual_mode;
+ if (curwin->w_curswant == MAXCOL) {
+ resel_VIsual_vcol = MAXCOL;
+ } else {
+ if (VIsual_mode != Ctrl_V) {
+ getvvcol(curwin, &(oap->end),
+ NULL, NULL, &oap->end_vcol);
+ }
+ if (VIsual_mode == Ctrl_V || oap->line_count <= 1) {
+ if (VIsual_mode != Ctrl_V) {
+ getvvcol(curwin, &(oap->start),
+ &oap->start_vcol, NULL, NULL);
+ }
+ resel_VIsual_vcol = oap->end_vcol - oap->start_vcol + 1;
+ } else {
+ resel_VIsual_vcol = oap->end_vcol;
+ }
+ }
+ resel_VIsual_line_count = oap->line_count;
+ }
+
+ // can't redo yank (unless 'y' is in 'cpoptions') and ":"
+ if ((redo_yank || oap->op_type != OP_YANK)
+ && oap->op_type != OP_COLON
+ && oap->op_type != OP_FOLD
+ && oap->op_type != OP_FOLDOPEN
+ && oap->op_type != OP_FOLDOPENREC
+ && oap->op_type != OP_FOLDCLOSE
+ && oap->op_type != OP_FOLDCLOSEREC
+ && oap->op_type != OP_FOLDDEL
+ && oap->op_type != OP_FOLDDELREC
+ && oap->motion_force == NUL) {
+ // Prepare for redoing. Only use the nchar field for "r",
+ // otherwise it might be the second char of the operator.
+ if (cap->cmdchar == 'g' && (cap->nchar == 'n'
+ || cap->nchar == 'N')) {
+ prep_redo(oap->regname, cap->count0,
+ get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
+ oap->motion_force, cap->cmdchar, cap->nchar);
+ } else if (cap->cmdchar != ':' && cap->cmdchar != K_COMMAND) {
+ int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL;
+
+ // reverse what nv_replace() did
+ if (nchar == REPLACE_CR_NCHAR) {
+ nchar = CAR;
+ } else if (nchar == REPLACE_NL_NCHAR) {
+ nchar = NL;
+ }
+ prep_redo(oap->regname, 0L, NUL, 'v', get_op_char(oap->op_type),
+ get_extra_op_char(oap->op_type), nchar);
+ }
+ if (!redo_VIsual_busy) {
+ redo_VIsual_mode = resel_VIsual_mode;
+ redo_VIsual_vcol = resel_VIsual_vcol;
+ redo_VIsual_line_count = resel_VIsual_line_count;
+ redo_VIsual_count = cap->count0;
+ redo_VIsual_arg = cap->arg;
+ }
+ }
+
+ // oap->inclusive defaults to true.
+ // If oap->end is on a NUL (empty line) oap->inclusive becomes
+ // false. This makes "d}P" and "v}dP" work the same.
+ if (oap->motion_force == NUL || oap->motion_type == kMTLineWise) {
+ oap->inclusive = true;
+ }
+ if (VIsual_mode == 'V') {
+ oap->motion_type = kMTLineWise;
+ } else if (VIsual_mode == 'v') {
+ oap->motion_type = kMTCharWise;
+ if (*ml_get_pos(&(oap->end)) == NUL
+ && (include_line_break || !virtual_op)) {
+ oap->inclusive = false;
+ // Try to include the newline, unless it's an operator
+ // that works on lines only.
+ if (*p_sel != 'o'
+ && !op_on_lines(oap->op_type)
+ && oap->end.lnum < curbuf->b_ml.ml_line_count) {
+ oap->end.lnum++;
+ oap->end.col = 0;
+ oap->end.coladd = 0;
+ oap->line_count++;
+ }
+ }
+ }
+
+ redo_VIsual_busy = false;
+
+ // Switch Visual off now, so screen updating does
+ // not show inverted text when the screen is redrawn.
+ // With OP_YANK and sometimes with OP_COLON and OP_FILTER there is
+ // no screen redraw, so it is done here to remove the inverted
+ // part.
+ if (!gui_yank) {
+ VIsual_active = false;
+ setmouse();
+ mouse_dragging = 0;
+ may_clear_cmdline();
+ if ((oap->op_type == OP_YANK
+ || oap->op_type == OP_COLON
+ || oap->op_type == OP_FUNCTION
+ || oap->op_type == OP_FILTER)
+ && oap->motion_force == NUL) {
+ // Make sure redrawing is correct.
+ curwin->w_p_lbr = lbr_saved;
+ redraw_curbuf_later(INVERTED);
+ }
+ }
+ }
+
+ // Include the trailing byte of a multi-byte char.
+ if (oap->inclusive) {
+ const int l = utfc_ptr2len(ml_get_pos(&oap->end));
+ if (l > 1) {
+ oap->end.col += l - 1;
+ }
+ }
+ curwin->w_set_curswant = true;
+
+ // oap->empty is set when start and end are the same. The inclusive
+ // flag affects this too, unless yanking and the end is on a NUL.
+ oap->empty = (oap->motion_type != kMTLineWise
+ && (!oap->inclusive
+ || (oap->op_type == OP_YANK
+ && gchar_pos(&oap->end) == NUL))
+ && equalpos(oap->start, oap->end)
+ && !(virtual_op && oap->start.coladd != oap->end.coladd));
+ // For delete, change and yank, it's an error to operate on an
+ // empty region, when 'E' included in 'cpoptions' (Vi compatible).
+ empty_region_error = (oap->empty
+ && vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL);
+
+ // Force a redraw when operating on an empty Visual region, when
+ // 'modifiable is off or creating a fold.
+ if (oap->is_VIsual && (oap->empty || !MODIFIABLE(curbuf)
+ || oap->op_type == OP_FOLD)) {
+ curwin->w_p_lbr = lbr_saved;
+ redraw_curbuf_later(INVERTED);
+ }
+
+ // If the end of an operator is in column one while oap->motion_type
+ // is kMTCharWise and oap->inclusive is false, we put op_end after the last
+ // character in the previous line. If op_start is on or before the
+ // first non-blank in the line, the operator becomes linewise
+ // (strange, but that's the way vi does it).
+ if (oap->motion_type == kMTCharWise
+ && oap->inclusive == false
+ && !(cap->retval & CA_NO_ADJ_OP_END)
+ && oap->end.col == 0
+ && (!oap->is_VIsual || *p_sel == 'o')
+ && oap->line_count > 1) {
+ oap->end_adjusted = true; // remember that we did this
+ oap->line_count--;
+ oap->end.lnum--;
+ if (inindent(0)) {
+ oap->motion_type = kMTLineWise;
+ } else {
+ oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
+ if (oap->end.col) {
+ oap->end.col--;
+ oap->inclusive = true;
+ }
+ }
+ } else {
+ oap->end_adjusted = false;
+ }
+
+ switch (oap->op_type) {
+ case OP_LSHIFT:
+ case OP_RSHIFT:
+ op_shift(oap, true,
+ oap->is_VIsual ? (int)cap->count1 :
+ 1);
+ auto_format(false, true);
+ break;
+
+ case OP_JOIN_NS:
+ case OP_JOIN:
+ if (oap->line_count < 2) {
+ oap->line_count = 2;
+ }
+ if (curwin->w_cursor.lnum + oap->line_count - 1 >
+ curbuf->b_ml.ml_line_count) {
+ beep_flush();
+ } else {
+ do_join((size_t)oap->line_count, oap->op_type == OP_JOIN,
+ true, true, true);
+ auto_format(false, true);
+ }
+ break;
+
+ case OP_DELETE:
+ VIsual_reselect = false; // don't reselect now
+ if (empty_region_error) {
+ vim_beep(BO_OPER);
+ CancelRedo();
+ } else {
+ (void)op_delete(oap);
+ // save cursor line for undo if it wasn't saved yet
+ if (oap->motion_type == kMTLineWise
+ && has_format_option(FO_AUTO)
+ && u_save_cursor() == OK) {
+ auto_format(false, true);
+ }
+ }
+ break;
+
+ case OP_YANK:
+ if (empty_region_error) {
+ if (!gui_yank) {
+ vim_beep(BO_OPER);
+ CancelRedo();
+ }
+ } else {
+ curwin->w_p_lbr = lbr_saved;
+ oap->excl_tr_ws = cap->cmdchar == 'z';
+ (void)op_yank(oap, !gui_yank, false);
+ }
+ check_cursor_col();
+ break;
+
+ case OP_CHANGE:
+ VIsual_reselect = false; // don't reselect now
+ if (empty_region_error) {
+ vim_beep(BO_OPER);
+ CancelRedo();
+ } else {
+ // This is a new edit command, not a restart. Need to
+ // remember it to make 'insertmode' work with mappings for
+ // Visual mode. But do this only once and not when typed and
+ // 'insertmode' isn't set.
+ if (p_im || !KeyTyped) {
+ restart_edit_save = restart_edit;
+ } else {
+ restart_edit_save = 0;
+ }
+ restart_edit = 0;
+
+ // Restore linebreak, so that when the user edits it looks as before.
+ curwin->w_p_lbr = lbr_saved;
+
+ // Reset finish_op now, don't want it set inside edit().
+ finish_op = false;
+ if (op_change(oap)) { // will call edit()
+ cap->retval |= CA_COMMAND_BUSY;
+ }
+ if (restart_edit == 0) {
+ restart_edit = restart_edit_save;
+ }
+ }
+ break;
+
+ case OP_FILTER:
+ if (vim_strchr(p_cpo, CPO_FILTER) != NULL) {
+ AppendToRedobuff("!\r"); // Use any last used !cmd.
+ } else {
+ bangredo = true; // do_bang() will put cmd in redo buffer.
+ }
+ FALLTHROUGH;
+
+ case OP_INDENT:
+ case OP_COLON:
+
+ // If 'equalprg' is empty, do the indenting internally.
+ if (oap->op_type == OP_INDENT && *get_equalprg() == NUL) {
+ if (curbuf->b_p_lisp) {
+ op_reindent(oap, get_lisp_indent);
+ break;
+ }
+ op_reindent(oap,
+ *curbuf->b_p_inde != NUL ? get_expr_indent :
+ get_c_indent);
+ break;
+ }
+
+ op_colon(oap);
+ break;
+
+ case OP_TILDE:
+ case OP_UPPER:
+ case OP_LOWER:
+ case OP_ROT13:
+ if (empty_region_error) {
+ vim_beep(BO_OPER);
+ CancelRedo();
+ } else {
+ op_tilde(oap);
+ }
+ check_cursor_col();
+ break;
+
+ case OP_FORMAT:
+ if (*curbuf->b_p_fex != NUL) {
+ op_formatexpr(oap); // use expression
+ } else {
+ if (*p_fp != NUL || *curbuf->b_p_fp != NUL) {
+ op_colon(oap); // use external command
+ } else {
+ op_format(oap, false); // use internal function
+ }
+ }
+ break;
+
+ case OP_FORMAT2:
+ op_format(oap, true); // use internal function
+ break;
+
+ case OP_FUNCTION:
+ // Restore linebreak, so that when the user edits it looks as
+ // before.
+ curwin->w_p_lbr = lbr_saved;
+ op_function(oap); // call 'operatorfunc'
+ break;
+
+ case OP_INSERT:
+ case OP_APPEND:
+ VIsual_reselect = false; // don't reselect now
+ if (empty_region_error) {
+ vim_beep(BO_OPER);
+ CancelRedo();
+ } else {
+ // This is a new edit command, not a restart. Need to
+ // remember it to make 'insertmode' work with mappings for
+ // Visual mode. But do this only once.
+ restart_edit_save = restart_edit;
+ restart_edit = 0;
+
+ // Restore linebreak, so that when the user edits it looks as before.
+ curwin->w_p_lbr = lbr_saved;
+
+ op_insert(oap, cap->count1);
+
+ // Reset linebreak, so that formatting works correctly.
+ curwin->w_p_lbr = false;
+
+ // TODO(brammool): when inserting in several lines, should format all
+ // the lines.
+ auto_format(false, true);
+
+ if (restart_edit == 0) {
+ restart_edit = restart_edit_save;
+ } else {
+ cap->retval |= CA_COMMAND_BUSY;
+ }
+ }
+ break;
+
+ case OP_REPLACE:
+ VIsual_reselect = false; // don't reselect now
+ if (empty_region_error) {
+ vim_beep(BO_OPER);
+ CancelRedo();
+ } else {
+ // Restore linebreak, so that when the user edits it looks as before.
+ curwin->w_p_lbr = lbr_saved;
+
+ op_replace(oap, cap->nchar);
+ }
+ break;
+
+ case OP_FOLD:
+ VIsual_reselect = false; // don't reselect now
+ foldCreate(curwin, oap->start, oap->end);
+ break;
+
+ case OP_FOLDOPEN:
+ case OP_FOLDOPENREC:
+ case OP_FOLDCLOSE:
+ case OP_FOLDCLOSEREC:
+ VIsual_reselect = false; // don't reselect now
+ opFoldRange(oap->start, oap->end,
+ oap->op_type == OP_FOLDOPEN
+ || oap->op_type == OP_FOLDOPENREC,
+ oap->op_type == OP_FOLDOPENREC
+ || oap->op_type == OP_FOLDCLOSEREC,
+ oap->is_VIsual);
+ break;
+
+ case OP_FOLDDEL:
+ case OP_FOLDDELREC:
+ VIsual_reselect = false; // don't reselect now
+ deleteFold(curwin, oap->start.lnum, oap->end.lnum,
+ oap->op_type == OP_FOLDDELREC, oap->is_VIsual);
+ break;
+
+ case OP_NR_ADD:
+ case OP_NR_SUB:
+ if (empty_region_error) {
+ vim_beep(BO_OPER);
+ CancelRedo();
+ } else {
+ VIsual_active = true;
+ curwin->w_p_lbr = lbr_saved;
+ op_addsub(oap, cap->count1, redo_VIsual_arg);
+ VIsual_active = false;
+ }
+ check_cursor_col();
+ break;
+ default:
+ clearopbeep(oap);
+ }
+ virtual_op = kNone;
+ if (!gui_yank) {
+ // if 'sol' not set, go back to old column for some commands
+ if (!p_sol && oap->motion_type == kMTLineWise && !oap->end_adjusted
+ && (oap->op_type == OP_LSHIFT || oap->op_type == OP_RSHIFT
+ || oap->op_type == OP_DELETE)) {
+ curwin->w_p_lbr = false;
+ coladvance(curwin->w_curswant = old_col);
+ }
+ } else {
+ curwin->w_cursor = old_cursor;
+ }
+ clearop(oap);
+ motion_force = NUL;
+ }
+ curwin->w_p_lbr = lbr_saved;
+}
+
/// Check if the default register (used in an unnamed paste) should be a
/// clipboard register. This happens when `clipboard=unnamed[plus]` is set
/// and a provider is available.
diff --git a/src/nvim/option.c b/src/nvim/option.c
index ee5f62d826..1fe2e1d04c 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1301,7 +1301,11 @@ int do_set(char_u *arg, int opt_flags)
char_u *oldval = NULL; // previous value if *varp
char_u *newval;
char_u *origval = NULL;
+ char_u *origval_l = NULL;
+ char_u *origval_g = NULL;
char *saved_origval = NULL;
+ char *saved_origval_l = NULL;
+ char *saved_origval_g = NULL;
char *saved_newval = NULL;
unsigned newlen;
int comma;
@@ -1319,10 +1323,21 @@ int do_set(char_u *arg, int opt_flags)
// new value is valid.
oldval = *(char_u **)varp;
+ if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
+ origval_l = *(char_u **)get_varp_scope(&(options[opt_idx]), OPT_LOCAL);
+ origval_g = *(char_u **)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL);
+
+ // A global-local string option might have an empty
+ // option as value to indicate that the global
+ // value should be used.
+ if (((int)options[opt_idx].indir & PV_BOTH) && origval_l == empty_option) {
+ origval_l = origval_g;
+ }
+ }
+
// When setting the local value of a global
// option, the old value may be the global value.
- if (((int)options[opt_idx].indir & PV_BOTH) && (opt_flags
- & OPT_LOCAL)) {
+ if (((int)options[opt_idx].indir & PV_BOTH) && (opt_flags & OPT_LOCAL)) {
origval = *(char_u **)get_varp(&options[opt_idx]);
} else {
origval = oldval;
@@ -1388,6 +1403,12 @@ int do_set(char_u *arg, int opt_flags)
if (origval == oldval) {
origval = *(char_u **)varp;
}
+ if (origval_l == oldval) {
+ origval_l = *(char_u **)varp;
+ }
+ if (origval_g == oldval) {
+ origval_g = *(char_u **)varp;
+ }
oldval = *(char_u **)varp;
}
/*
@@ -1596,6 +1617,8 @@ int do_set(char_u *arg, int opt_flags)
// origval may be freed by
// did_set_string_option(), make a copy.
saved_origval = (origval != NULL) ? xstrdup((char *)origval) : 0;
+ saved_origval_l = (origval_l != NULL) ? xstrdup((char *)origval_l) : 0;
+ saved_origval_g = (origval_g != NULL) ? xstrdup((char *)origval_g) : 0;
// newval (and varp) may become invalid if the
// buffer is closed by autocommands.
@@ -1630,8 +1653,8 @@ int do_set(char_u *arg, int opt_flags)
if (errmsg == NULL) {
if (!starting) {
- trigger_optionsset_string(opt_idx, opt_flags, saved_origval,
- saved_newval);
+ trigger_optionsset_string(opt_idx, opt_flags, saved_origval, saved_origval_l,
+ saved_origval_g, saved_newval);
}
if (options[opt_idx].flags & P_UI_OPTION) {
ui_call_option_set(cstr_as_string(options[opt_idx].fullname),
@@ -1639,6 +1662,8 @@ int do_set(char_u *arg, int opt_flags)
}
}
xfree(saved_origval);
+ xfree(saved_origval_l);
+ xfree(saved_origval_g);
xfree(saved_newval);
// If error detected, print the error message.
@@ -2233,9 +2258,19 @@ static char *set_string_option(const int opt_idx, const char *const value, const
? OPT_GLOBAL : OPT_LOCAL)
: opt_flags));
char *const oldval = *varp;
+ char *oldval_l = NULL;
+ char *oldval_g = NULL;
+
+ if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
+ oldval_l = *(char **)get_varp_scope(&(options[opt_idx]), OPT_LOCAL);
+ oldval_g = *(char **)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL);
+ }
+
*varp = s;
char *const saved_oldval = xstrdup(oldval);
+ char *const saved_oldval_l = (oldval_l != NULL) ? xstrdup((char *)oldval_l) : 0;
+ char *const saved_oldval_g = (oldval_g != NULL) ? xstrdup((char *)oldval_g) : 0;
char *const saved_newval = xstrdup(s);
int value_checked = false;
@@ -2249,7 +2284,8 @@ static char *set_string_option(const int opt_idx, const char *const value, const
// call autocommand after handling side effects
if (r == NULL) {
if (!starting) {
- trigger_optionsset_string(opt_idx, opt_flags, saved_oldval, saved_newval);
+ trigger_optionsset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g,
+ saved_newval);
}
if (options[opt_idx].flags & P_UI_OPTION) {
ui_call_option_set(cstr_as_string(options[opt_idx].fullname),
@@ -2257,6 +2293,8 @@ static char *set_string_option(const int opt_idx, const char *const value, const
}
}
xfree(saved_oldval);
+ xfree(saved_oldval_l);
+ xfree(saved_oldval_g);
xfree(saved_newval);
return r;
@@ -3851,6 +3889,7 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
const int opt_flags)
{
int old_value = *(int *)varp;
+ int old_global_value = 0;
// Disallow changing some options from secure mode
if ((secure || sandbox != 0)
@@ -3858,6 +3897,13 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
return (char *)e_secure;
}
+ // Save the global value before changing anything. This is needed as for
+ // a global-only option setting the "local value" in fact sets the global
+ // value (since there is only one value).
+ if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
+ old_global_value = *(int *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL);
+ }
+
*(int *)varp = value; // set the new value
// Remember where the option was set.
set_option_sctx_idx(opt_idx, opt_flags, current_sctx);
@@ -4134,20 +4180,35 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
// Don't do this while starting up or recursively.
if (!starting && *get_vim_var_str(VV_OPTION_TYPE) == NUL) {
char buf_old[2];
+ char buf_old_global[2];
char buf_new[2];
char buf_type[7];
- vim_snprintf(buf_old, ARRAY_SIZE(buf_old), "%d",
- old_value ? true: false);
- vim_snprintf(buf_new, ARRAY_SIZE(buf_new), "%d",
- value ? true: false);
+ vim_snprintf(buf_old, ARRAY_SIZE(buf_old), "%d", old_value ? true : false);
+ vim_snprintf(buf_old_global, ARRAY_SIZE(buf_old_global), "%d", old_global_value ? true : false);
+ vim_snprintf(buf_new, ARRAY_SIZE(buf_new), "%d", value ? true : false);
vim_snprintf(buf_type, ARRAY_SIZE(buf_type), "%s",
(opt_flags & OPT_LOCAL) ? "local" : "global");
set_vim_var_string(VV_OPTION_NEW, buf_new, -1);
set_vim_var_string(VV_OPTION_OLD, buf_old, -1);
set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
- apply_autocmds(EVENT_OPTIONSET,
- (char_u *)options[opt_idx].fullname,
- NULL, false, NULL);
+ if (opt_flags & OPT_LOCAL) {
+ set_vim_var_string(VV_OPTION_COMMAND, "setlocal", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, buf_old, -1);
+ }
+ if (opt_flags & OPT_GLOBAL) {
+ set_vim_var_string(VV_OPTION_COMMAND, "setglobal", -1);
+ set_vim_var_string(VV_OPTION_OLDGLOBAL, buf_old, -1);
+ }
+ if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
+ set_vim_var_string(VV_OPTION_COMMAND, "set", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, buf_old, -1);
+ set_vim_var_string(VV_OPTION_OLDGLOBAL, buf_old_global, -1);
+ }
+ if (opt_flags & OPT_MODELINE) {
+ set_vim_var_string(VV_OPTION_COMMAND, "modeline", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, buf_old, -1);
+ }
+ apply_autocmds(EVENT_OPTIONSET, (char_u *)options[opt_idx].fullname, NULL, false, NULL);
reset_v_option_vars();
}
@@ -4181,7 +4242,8 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, char *errbuf,
{
char *errmsg = NULL;
long old_value = *(long *)varp;
- long old_Rows = Rows; // remember old Rows
+ long old_global_value = 0; // only used when setting a local and global option
+ long old_Rows = Rows; // remember old Rows
long *pp = (long *)varp;
// Disallow changing some options from secure mode.
@@ -4190,6 +4252,13 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, char *errbuf,
return e_secure;
}
+ // Save the global value before changing anything. This is needed as for
+ // a global-only option setting the "local value" infact sets the global
+ // value (since there is only one value).
+ if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
+ old_global_value = *(long *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL);
+ }
+
// Many number options assume their value is in the signed int range.
if (value < INT_MIN || value > INT_MAX) {
return e_invarg;
@@ -4534,19 +4603,36 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, char *errbuf,
// Don't do this while starting up, failure or recursively.
if (!starting && errmsg == NULL && *get_vim_var_str(VV_OPTION_TYPE) == NUL) {
char buf_old[NUMBUFLEN];
+ char buf_old_global[NUMBUFLEN];
char buf_new[NUMBUFLEN];
char buf_type[7];
vim_snprintf(buf_old, ARRAY_SIZE(buf_old), "%ld", old_value);
+ vim_snprintf(buf_old_global, ARRAY_SIZE(buf_old_global), "%ld", old_global_value);
vim_snprintf(buf_new, ARRAY_SIZE(buf_new), "%ld", value);
vim_snprintf(buf_type, ARRAY_SIZE(buf_type), "%s",
(opt_flags & OPT_LOCAL) ? "local" : "global");
set_vim_var_string(VV_OPTION_NEW, buf_new, -1);
set_vim_var_string(VV_OPTION_OLD, buf_old, -1);
set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
- apply_autocmds(EVENT_OPTIONSET,
- (char_u *)options[opt_idx].fullname,
- NULL, false, NULL);
+ if (opt_flags & OPT_LOCAL) {
+ set_vim_var_string(VV_OPTION_COMMAND, "setlocal", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, buf_old, -1);
+ }
+ if (opt_flags & OPT_GLOBAL) {
+ set_vim_var_string(VV_OPTION_COMMAND, "setglobal", -1);
+ set_vim_var_string(VV_OPTION_OLDGLOBAL, buf_old, -1);
+ }
+ if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
+ set_vim_var_string(VV_OPTION_COMMAND, "set", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, buf_old, -1);
+ set_vim_var_string(VV_OPTION_OLDGLOBAL, buf_old_global, -1);
+ }
+ if (opt_flags & OPT_MODELINE) {
+ set_vim_var_string(VV_OPTION_COMMAND, "modeline", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, buf_old, -1);
+ }
+ apply_autocmds(EVENT_OPTIONSET, (char_u *)options[opt_idx].fullname, NULL, false, NULL);
reset_v_option_vars();
}
@@ -4565,7 +4651,15 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, char *errbuf,
return (char *)errmsg;
}
-static void trigger_optionsset_string(int opt_idx, int opt_flags, char *oldval, char *newval)
+/// Trigger the OptionSet autocommand.
+/// "opt_idx" is the index of the option being set.
+/// "opt_flags" can be OPT_LOCAL etc.
+/// "oldval" the old value
+/// "oldval_l" the old local value (only non-NULL if global and local value are set)
+/// "oldval_g" the old global value (only non-NULL if global and local value are set)
+/// "newval" the new value
+static void trigger_optionsset_string(int opt_idx, int opt_flags, char *oldval, char *oldval_l,
+ char *oldval_g, char *newval)
{
// Don't do this recursively.
if (oldval != NULL
@@ -4578,8 +4672,24 @@ static void trigger_optionsset_string(int opt_idx, int opt_flags, char *oldval,
set_vim_var_string(VV_OPTION_OLD, oldval, -1);
set_vim_var_string(VV_OPTION_NEW, newval, -1);
set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
- apply_autocmds(EVENT_OPTIONSET,
- (char_u *)options[opt_idx].fullname, NULL, false, NULL);
+ if (opt_flags & OPT_LOCAL) {
+ set_vim_var_string(VV_OPTION_COMMAND, "setlocal", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, oldval, -1);
+ }
+ if (opt_flags & OPT_GLOBAL) {
+ set_vim_var_string(VV_OPTION_COMMAND, "setglobal", -1);
+ set_vim_var_string(VV_OPTION_OLDGLOBAL, oldval, -1);
+ }
+ if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
+ set_vim_var_string(VV_OPTION_COMMAND, "set", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, oldval_l, -1);
+ set_vim_var_string(VV_OPTION_OLDGLOBAL, oldval_g, -1);
+ }
+ if (opt_flags & OPT_MODELINE) {
+ set_vim_var_string(VV_OPTION_COMMAND, "modeline", -1);
+ set_vim_var_string(VV_OPTION_OLDLOCAL, oldval, -1);
+ }
+ apply_autocmds(EVENT_OPTIONSET, (char_u *)options[opt_idx].fullname, NULL, false, NULL);
reset_v_option_vars();
}
}
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index 49d56349a5..5b145dd1d2 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -580,9 +580,10 @@ func Test_empty_doau()
endfunc
func s:AutoCommandOptionSet(match)
+ let template = "Option: <%s>, OldVal: <%s>, OldValLocal: <%s>, OldValGlobal: <%s>, NewVal: <%s>, Scope: <%s>, Command: <%s>\n"
let item = remove(g:options, 0)
- let expected = printf("Option: <%s>, Oldval: <%s>, NewVal: <%s>, Scope: <%s>\n", item[0], item[1], item[2], item[3])
- let actual = printf("Option: <%s>, Oldval: <%s>, NewVal: <%s>, Scope: <%s>\n", a:match, v:option_old, v:option_new, v:option_type)
+ let expected = printf(template, item[0], item[1], item[2], item[3], item[4], item[5], item[6])
+ let actual = printf(template, a:match, v:option_old, v:option_oldlocal, v:option_oldglobal, v:option_new, v:option_type, v:option_command)
let g:opt = [expected, actual]
"call assert_equal(expected, actual)
endfunc
@@ -596,130 +597,593 @@ func Test_OptionSet()
au OptionSet * :call s:AutoCommandOptionSet(expand("<amatch>"))
" 1: Setting number option"
- let g:options = [['number', 0, 1, 'global']]
+ let g:options = [['number', 0, 0, 0, 1, 'global', 'set']]
set nu
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 2: Setting local number option"
- let g:options = [['number', 1, 0, 'local']]
+ let g:options = [['number', 1, 1, '', 0, 'local', 'setlocal']]
setlocal nonu
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 3: Setting global number option"
- let g:options = [['number', 1, 0, 'global']]
+ let g:options = [['number', 1, '', 1, 0, 'global', 'setglobal']]
setglobal nonu
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 4: Setting local autoindent option"
- let g:options = [['autoindent', 0, 1, 'local']]
+ let g:options = [['autoindent', 0, 0, '', 1, 'local', 'setlocal']]
setlocal ai
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 5: Setting global autoindent option"
- let g:options = [['autoindent', 0, 1, 'global']]
+ let g:options = [['autoindent', 0, '', 0, 1, 'global', 'setglobal']]
setglobal ai
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 6: Setting global autoindent option"
- let g:options = [['autoindent', 1, 0, 'global']]
+ let g:options = [['autoindent', 1, 1, 1, 0, 'global', 'set']]
+ set ai!
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 6a: Setting global autoindent option"
+ let g:options = [['autoindent', 1, 1, 0, 0, 'global', 'set']]
+ noa setlocal ai
+ noa setglobal noai
set ai!
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" Should not print anything, use :noa
" 7: don't trigger OptionSet"
- let g:options = [['invalid', 1, 1, 'invalid']]
+ let g:options = [['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']]
noa set nonu
- call assert_equal([['invalid', 1, 1, 'invalid']], g:options)
+ call assert_equal([['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 8: Setting several global list and number option"
- let g:options = [['list', 0, 1, 'global'], ['number', 0, 1, 'global']]
+ let g:options = [['list', 0, 0, 0, 1, 'global', 'set'], ['number', 0, 0, 0, 1, 'global', 'set']]
set list nu
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 9: don't trigger OptionSet"
- let g:options = [['invalid', 1, 1, 'invalid'], ['invalid', 1, 1, 'invalid']]
+ let g:options = [['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid'], ['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']]
noa set nolist nonu
- call assert_equal([['invalid', 1, 1, 'invalid'], ['invalid', 1, 1, 'invalid']], g:options)
+ call assert_equal([['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid'], ['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 10: Setting global acd"
- let g:options = [['autochdir', 0, 1, 'local']]
+ let g:options = [['autochdir', 0, 0, '', 1, 'local', 'setlocal']]
setlocal acd
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 11: Setting global autoread (also sets local value)"
- let g:options = [['autoread', 0, 1, 'global']]
+ let g:options = [['autoread', 0, 0, 0, 1, 'global', 'set']]
set ar
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 12: Setting local autoread"
- let g:options = [['autoread', 1, 1, 'local']]
+ let g:options = [['autoread', 1, 1, '', 1, 'local', 'setlocal']]
setlocal ar
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 13: Setting global autoread"
- let g:options = [['autoread', 1, 0, 'global']]
+ let g:options = [['autoread', 1, '', 1, 0, 'global', 'setglobal']]
setglobal invar
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 14: Setting option backspace through :let"
- let g:options = [['backspace', '', 'eol,indent,start', 'global']]
+ let g:options = [['backspace', '', '', '', 'eol,indent,start', 'global', 'set']]
let &bs = "eol,indent,start"
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 15: Setting option backspace through setbufvar()"
- let g:options = [['backup', 0, 1, 'local']]
+ let g:options = [['backup', 0, 0, '', 1, 'local', 'setlocal']]
" try twice, first time, shouldn't trigger because option name is invalid,
" second time, it should trigger
- call assert_fails("call setbufvar(1, '&l:bk', 1)", "E355")
+ let bnum = bufnr('%')
+ call assert_fails("call setbufvar(bnum, '&l:bk', 1)", 'E355:')
" should trigger, use correct option name
- call setbufvar(1, '&backup', 1)
+ call setbufvar(bnum, '&backup', 1)
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 16: Setting number option using setwinvar"
- let g:options = [['number', 0, 1, 'local']]
+ let g:options = [['number', 0, 0, '', 1, 'local', 'setlocal']]
call setwinvar(0, '&number', 1)
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
" 17: Setting key option, shouldn't trigger"
- let g:options = [['key', 'invalid', 'invalid1', 'invalid']]
+ let g:options = [['key', 'invalid', 'invalid1', 'invalid2', 'invalid3', 'invalid4', 'invalid5']]
setlocal key=blah
setlocal key=
- call assert_equal([['key', 'invalid', 'invalid1', 'invalid']], g:options)
+ call assert_equal([['key', 'invalid', 'invalid1', 'invalid2', 'invalid3', 'invalid4', 'invalid5']], g:options)
call assert_equal(g:opt[0], g:opt[1])
- " 18: Setting string option"
+
+ " 18a: Setting string global option"
+ let oldval = &backupext
+ let g:options = [['backupext', oldval, oldval, oldval, 'foo', 'global', 'set']]
+ set backupext=foo
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 18b: Resetting string global option"
+ let g:options = [['backupext', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
+ set backupext&
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 18c: Setting global string global option"
+ let g:options = [['backupext', oldval, '', oldval, 'bar', 'global', 'setglobal']]
+ setglobal backupext=bar
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 18d: Setting local string global option"
+ " As this is a global option this sets the global value even though
+ " :setlocal is used!
+ noa set backupext& " Reset global and local value (without triggering autocmd)
+ let g:options = [['backupext', oldval, oldval, '', 'baz', 'local', 'setlocal']]
+ setlocal backupext=baz
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 18e: Setting again string global option"
+ noa setglobal backupext=ext_global " Reset global and local value (without triggering autocmd)
+ noa setlocal backupext=ext_local " Sets the global(!) value!
+ let g:options = [['backupext', 'ext_local', 'ext_local', 'ext_local', 'fuu', 'global', 'set']]
+ set backupext=fuu
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 19a: Setting string global-local (to buffer) option"
let oldval = &tags
- let g:options = [['tags', oldval, 'tagpath', 'global']]
+ let g:options = [['tags', oldval, oldval, oldval, 'tagpath', 'global', 'set']]
set tags=tagpath
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
- " 1l: Resetting string option"
- let g:options = [['tags', 'tagpath', oldval, 'global']]
+ " 19b: Resetting string global-local (to buffer) option"
+ let g:options = [['tags', 'tagpath', 'tagpath', 'tagpath', oldval, 'global', 'set']]
set tags&
call assert_equal([], g:options)
call assert_equal(g:opt[0], g:opt[1])
+ " 19c: Setting global string global-local (to buffer) option "
+ let g:options = [['tags', oldval, '', oldval, 'tagpath1', 'global', 'setglobal']]
+ setglobal tags=tagpath1
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 19d: Setting local string global-local (to buffer) option"
+ let g:options = [['tags', 'tagpath1', 'tagpath1', '', 'tagpath2', 'local', 'setlocal']]
+ setlocal tags=tagpath2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 19e: Setting again string global-local (to buffer) option"
+ " Note: v:option_old is the old global value for global-local string options
+ " but the old local value for all other kinds of options.
+ noa setglobal tags=tag_global " Reset global and local value (without triggering autocmd)
+ noa setlocal tags=tag_local
+ let g:options = [['tags', 'tag_global', 'tag_local', 'tag_global', 'tagpath', 'global', 'set']]
+ set tags=tagpath
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 19f: Setting string global-local (to buffer) option to an empty string"
+ " Note: v:option_old is the old global value for global-local string options
+ " but the old local value for all other kinds of options.
+ noa set tags=tag_global " Reset global and local value (without triggering autocmd)
+ noa setlocal tags= " empty string
+ let g:options = [['tags', 'tag_global', '', 'tag_global', 'tagpath', 'global', 'set']]
+ set tags=tagpath
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 20a: Setting string local (to buffer) option"
+ let oldval = &spelllang
+ let g:options = [['spelllang', oldval, oldval, oldval, 'elvish,klingon', 'global', 'set']]
+ set spelllang=elvish,klingon
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 20b: Resetting string local (to buffer) option"
+ let g:options = [['spelllang', 'elvish,klingon', 'elvish,klingon', 'elvish,klingon', oldval, 'global', 'set']]
+ set spelllang&
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 20c: Setting global string local (to buffer) option"
+ let g:options = [['spelllang', oldval, '', oldval, 'elvish', 'global', 'setglobal']]
+ setglobal spelllang=elvish
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 20d: Setting local string local (to buffer) option"
+ noa set spelllang& " Reset global and local value (without triggering autocmd)
+ let g:options = [['spelllang', oldval, oldval, '', 'klingon', 'local', 'setlocal']]
+ setlocal spelllang=klingon
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 20e: Setting again string local (to buffer) option"
+ " Note: v:option_old is the old global value for global-local string options
+ " but the old local value for all other kinds of options.
+ noa setglobal spelllang=spellglobal " Reset global and local value (without triggering autocmd)
+ noa setlocal spelllang=spelllocal
+ let g:options = [['spelllang', 'spelllocal', 'spelllocal', 'spellglobal', 'foo', 'global', 'set']]
+ set spelllang=foo
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 21a: Setting string global-local (to window) option"
+ let oldval = &statusline
+ let g:options = [['statusline', oldval, oldval, oldval, 'foo', 'global', 'set']]
+ set statusline=foo
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 21b: Resetting string global-local (to window) option"
+ " Note: v:option_old is the old global value for global-local string options
+ " but the old local value for all other kinds of options.
+ let g:options = [['statusline', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
+ set statusline&
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 21c: Setting global string global-local (to window) option"
+ let g:options = [['statusline', oldval, '', oldval, 'bar', 'global', 'setglobal']]
+ setglobal statusline=bar
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 21d: Setting local string global-local (to window) option"
+ noa set statusline& " Reset global and local value (without triggering autocmd)
+ let g:options = [['statusline', oldval, oldval, '', 'baz', 'local', 'setlocal']]
+ setlocal statusline=baz
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 21e: Setting again string global-local (to window) option"
+ " Note: v:option_old is the old global value for global-local string options
+ " but the old local value for all other kinds of options.
+ noa setglobal statusline=bar " Reset global and local value (without triggering autocmd)
+ noa setlocal statusline=baz
+ let g:options = [['statusline', 'bar', 'baz', 'bar', 'foo', 'global', 'set']]
+ set statusline=foo
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 22a: Setting string local (to window) option"
+ let oldval = &foldignore
+ let g:options = [['foldignore', oldval, oldval, oldval, 'fo', 'global', 'set']]
+ set foldignore=fo
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 22b: Resetting string local (to window) option"
+ let g:options = [['foldignore', 'fo', 'fo', 'fo', oldval, 'global', 'set']]
+ set foldignore&
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 22c: Setting global string local (to window) option"
+ let g:options = [['foldignore', oldval, '', oldval, 'bar', 'global', 'setglobal']]
+ setglobal foldignore=bar
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 22d: Setting local string local (to window) option"
+ noa set foldignore& " Reset global and local value (without triggering autocmd)
+ let g:options = [['foldignore', oldval, oldval, '', 'baz', 'local', 'setlocal']]
+ setlocal foldignore=baz
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 22e: Setting again string local (to window) option"
+ noa setglobal foldignore=glob " Reset global and local value (without triggering autocmd)
+ noa setlocal foldignore=loc
+ let g:options = [['foldignore', 'loc', 'loc', 'glob', 'fo', 'global', 'set']]
+ set foldignore=fo
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 23a: Setting global number global option"
+ noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal cmdheight=1 " Sets the global(!) value!
+ let g:options = [['cmdheight', '1', '', '1', '2', 'global', 'setglobal']]
+ setglobal cmdheight=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 23b: Setting local number global option"
+ noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal cmdheight=1 " Sets the global(!) value!
+ let g:options = [['cmdheight', '1', '1', '', '2', 'local', 'setlocal']]
+ setlocal cmdheight=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 23c: Setting again number global option"
+ noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal cmdheight=1 " Sets the global(!) value!
+ let g:options = [['cmdheight', '1', '1', '1', '2', 'global', 'set']]
+ set cmdheight=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 23d: Setting again number global option"
+ noa set cmdheight=8 " Reset global and local value (without triggering autocmd)
+ let g:options = [['cmdheight', '8', '8', '8', '2', 'global', 'set']]
+ set cmdheight=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 24a: Setting global number global-local (to buffer) option"
+ noa setglobal undolevels=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal undolevels=1
+ let g:options = [['undolevels', '8', '', '8', '2', 'global', 'setglobal']]
+ setglobal undolevels=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 24b: Setting local number global-local (to buffer) option"
+ noa setglobal undolevels=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal undolevels=1
+ let g:options = [['undolevels', '1', '1', '', '2', 'local', 'setlocal']]
+ setlocal undolevels=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 24c: Setting again number global-local (to buffer) option"
+ noa setglobal undolevels=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal undolevels=1
+ let g:options = [['undolevels', '1', '1', '8', '2', 'global', 'set']]
+ set undolevels=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 24d: Setting again global number global-local (to buffer) option"
+ noa set undolevels=8 " Reset global and local value (without triggering autocmd)
+ let g:options = [['undolevels', '8', '8', '8', '2', 'global', 'set']]
+ set undolevels=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 25a: Setting global number local (to buffer) option"
+ noa setglobal wrapmargin=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal wrapmargin=1
+ let g:options = [['wrapmargin', '8', '', '8', '2', 'global', 'setglobal']]
+ setglobal wrapmargin=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 25b: Setting local number local (to buffer) option"
+ noa setglobal wrapmargin=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal wrapmargin=1
+ let g:options = [['wrapmargin', '1', '1', '', '2', 'local', 'setlocal']]
+ setlocal wrapmargin=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 25c: Setting again number local (to buffer) option"
+ noa setglobal wrapmargin=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal wrapmargin=1
+ let g:options = [['wrapmargin', '1', '1', '8', '2', 'global', 'set']]
+ set wrapmargin=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 25d: Setting again global number local (to buffer) option"
+ noa set wrapmargin=8 " Reset global and local value (without triggering autocmd)
+ let g:options = [['wrapmargin', '8', '8', '8', '2', 'global', 'set']]
+ set wrapmargin=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 26: Setting number global-local (to window) option.
+ " Such option does currently not exist.
+
+
+ " 27a: Setting global number local (to window) option"
+ noa setglobal foldcolumn=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal foldcolumn=1
+ let g:options = [['foldcolumn', '8', '', '8', '2', 'global', 'setglobal']]
+ setglobal foldcolumn=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 27b: Setting local number local (to window) option"
+ noa setglobal foldcolumn=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal foldcolumn=1
+ let g:options = [['foldcolumn', '1', '1', '', '2', 'local', 'setlocal']]
+ setlocal foldcolumn=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 27c: Setting again number local (to window) option"
+ noa setglobal foldcolumn=8 " Reset global and local value (without triggering autocmd)
+ noa setlocal foldcolumn=1
+ let g:options = [['foldcolumn', '1', '1', '8', '2', 'global', 'set']]
+ set foldcolumn=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 27d: Setting again global number local (to window) option"
+ noa set foldcolumn=8 " Reset global and local value (without triggering autocmd)
+ let g:options = [['foldcolumn', '8', '8', '8', '2', 'global', 'set']]
+ set foldcolumn=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 28a: Setting global boolean global option"
+ noa setglobal nowrapscan " Reset global and local value (without triggering autocmd)
+ noa setlocal wrapscan " Sets the global(!) value!
+ let g:options = [['wrapscan', '1', '', '1', '0', 'global', 'setglobal']]
+ setglobal nowrapscan
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 28b: Setting local boolean global option"
+ noa setglobal nowrapscan " Reset global and local value (without triggering autocmd)
+ noa setlocal wrapscan " Sets the global(!) value!
+ let g:options = [['wrapscan', '1', '1', '', '0', 'local', 'setlocal']]
+ setlocal nowrapscan
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 28c: Setting again boolean global option"
+ noa setglobal nowrapscan " Reset global and local value (without triggering autocmd)
+ noa setlocal wrapscan " Sets the global(!) value!
+ let g:options = [['wrapscan', '1', '1', '1', '0', 'global', 'set']]
+ set nowrapscan
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 28d: Setting again global boolean global option"
+ noa set nowrapscan " Reset global and local value (without triggering autocmd)
+ let g:options = [['wrapscan', '0', '0', '0', '1', 'global', 'set']]
+ set wrapscan
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 29a: Setting global boolean global-local (to buffer) option"
+ noa setglobal noautoread " Reset global and local value (without triggering autocmd)
+ noa setlocal autoread
+ let g:options = [['autoread', '0', '', '0', '1', 'global', 'setglobal']]
+ setglobal autoread
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 29b: Setting local boolean global-local (to buffer) option"
+ noa setglobal noautoread " Reset global and local value (without triggering autocmd)
+ noa setlocal autoread
+ let g:options = [['autoread', '1', '1', '', '0', 'local', 'setlocal']]
+ setlocal noautoread
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 29c: Setting again boolean global-local (to buffer) option"
+ noa setglobal noautoread " Reset global and local value (without triggering autocmd)
+ noa setlocal autoread
+ let g:options = [['autoread', '1', '1', '0', '1', 'global', 'set']]
+ set autoread
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 29d: Setting again global boolean global-local (to buffer) option"
+ noa set noautoread " Reset global and local value (without triggering autocmd)
+ let g:options = [['autoread', '0', '0', '0', '1', 'global', 'set']]
+ set autoread
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 30a: Setting global boolean local (to buffer) option"
+ noa setglobal nocindent " Reset global and local value (without triggering autocmd)
+ noa setlocal cindent
+ let g:options = [['cindent', '0', '', '0', '1', 'global', 'setglobal']]
+ setglobal cindent
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 30b: Setting local boolean local (to buffer) option"
+ noa setglobal nocindent " Reset global and local value (without triggering autocmd)
+ noa setlocal cindent
+ let g:options = [['cindent', '1', '1', '', '0', 'local', 'setlocal']]
+ setlocal nocindent
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 30c: Setting again boolean local (to buffer) option"
+ noa setglobal nocindent " Reset global and local value (without triggering autocmd)
+ noa setlocal cindent
+ let g:options = [['cindent', '1', '1', '0', '1', 'global', 'set']]
+ set cindent
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 30d: Setting again global boolean local (to buffer) option"
+ noa set nocindent " Reset global and local value (without triggering autocmd)
+ let g:options = [['cindent', '0', '0', '0', '1', 'global', 'set']]
+ set cindent
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 31: Setting boolean global-local (to window) option
+ " Currently no such option exists.
+
+
+ " 32a: Setting global boolean local (to window) option"
+ noa setglobal nocursorcolumn " Reset global and local value (without triggering autocmd)
+ noa setlocal cursorcolumn
+ let g:options = [['cursorcolumn', '0', '', '0', '1', 'global', 'setglobal']]
+ setglobal cursorcolumn
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 32b: Setting local boolean local (to window) option"
+ noa setglobal nocursorcolumn " Reset global and local value (without triggering autocmd)
+ noa setlocal cursorcolumn
+ let g:options = [['cursorcolumn', '1', '1', '', '0', 'local', 'setlocal']]
+ setlocal nocursorcolumn
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 32c: Setting again boolean local (to window) option"
+ noa setglobal nocursorcolumn " Reset global and local value (without triggering autocmd)
+ noa setlocal cursorcolumn
+ let g:options = [['cursorcolumn', '1', '1', '0', '1', 'global', 'set']]
+ set cursorcolumn
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+ " 32d: Setting again global boolean local (to window) option"
+ noa set nocursorcolumn " Reset global and local value (without triggering autocmd)
+ let g:options = [['cursorcolumn', '0', '0', '0', '1', 'global', 'set']]
+ set cursorcolumn
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
+ " 33: Test autocommands when an option value is converted internally.
+ noa set backspace=1 " Reset global and local value (without triggering autocmd)
+ let g:options = [['backspace', 'indent,eol', 'indent,eol', 'indent,eol', '2', 'global', 'set']]
+ set backspace=2
+ call assert_equal([], g:options)
+ call assert_equal(g:opt[0], g:opt[1])
+
+
" Cleanup
au! OptionSet
" set tags&
- for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp', 'tags']
+ for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp', 'backupext', 'tags', 'spelllang', 'statusline', 'foldignore', 'cmdheight', 'undolevels', 'wrapmargin', 'foldcolumn', 'wrapscan', 'autoread', 'cindent', 'cursorcolumn']
exe printf(":set %s&vim", opt)
endfor
call test_override('starting', 0)
diff --git a/test/functional/legacy/autocmd_option_spec.lua b/test/functional/legacy/autocmd_option_spec.lua
index 1914818215..5e586d3a6a 100644
--- a/test/functional/legacy/autocmd_option_spec.lua
+++ b/test/functional/legacy/autocmd_option_spec.lua
@@ -1,6 +1,6 @@
local helpers = require('test.functional.helpers')(after_each)
local nvim = helpers.meths
-local clear, eq, neq = helpers.clear, helpers.eq, helpers.neq
+local clear, eq, neq, eval = helpers.clear, helpers.eq, helpers.neq, helpers.eval
local curbuf, buf = helpers.curbuf, helpers.bufmeths
local curwin = helpers.curwin
local exec_capture = helpers.exec_capture
@@ -10,11 +10,14 @@ local function declare_hook_function()
source([[
fu! AutoCommand(match, bufnr, winnr)
let l:acc = {
- \ 'option' : a:match,
- \ 'oldval' : v:option_old,
- \ 'newval' : v:option_new,
- \ 'scope' : v:option_type,
- \ 'attr' : {
+ \ 'option' : a:match,
+ \ 'oldval' : v:option_old,
+ \ 'oldval_l' : v:option_oldlocal,
+ \ 'oldval_g' : v:option_oldglobal,
+ \ 'newval' : v:option_new,
+ \ 'scope' : v:option_type,
+ \ 'cmd' : v:option_command,
+ \ 'attr' : {
\ 'bufnr' : a:bufnr,
\ 'winnr' : a:winnr,
\ }
@@ -42,13 +45,16 @@ local function get_result()
return ret
end
-local function expected_table(option, oldval, newval, scope, attr)
+local function expected_table(option, oldval, oldval_l, oldval_g, newval, scope, cmd, attr)
return {
- option = option,
- oldval = tostring(oldval),
- newval = tostring(newval),
- scope = scope,
- attr = attr,
+ option = option,
+ oldval = tostring(oldval),
+ oldval_l = tostring(oldval_l),
+ oldval_g = tostring(oldval_g),
+ newval = tostring(newval),
+ scope = scope,
+ cmd = cmd,
+ attr = attr,
}
end
@@ -66,7 +72,7 @@ local function expected_combination(...)
end
for i, v in ipairs(args) do
- local attr = v[5]
+ local attr = v[8]
if not attr then
-- remove attr entries
ret[i].attr = nil
@@ -112,7 +118,7 @@ local function get_new_window_number()
end
describe('au OptionSet', function()
- describe('with any opton (*)', function()
+ describe('with any option (*)', function()
before_each(function()
clear()
@@ -123,44 +129,44 @@ describe('au OptionSet', function()
it('should be called in setting number option', function()
command('set nu')
- expected_combination({'number', 0, 1, 'global'})
+ expected_combination({'number', 0, 0, 0, 1, 'global', 'set'})
command('setlocal nonu')
- expected_combination({'number', 1, 0, 'local'})
+ expected_combination({'number', 1, 1, '', 0, 'local', 'setlocal'})
command('setglobal nonu')
- expected_combination({'number', 1, 0, 'global'})
+ expected_combination({'number', 1, '', 1, 0, 'global', 'setglobal'})
end)
it('should be called in setting autoindent option',function()
command('setlocal ai')
- expected_combination({'autoindent', 0, 1, 'local'})
+ expected_combination({'autoindent', 0, 0, '', 1, 'local', 'setlocal'})
command('setglobal ai')
- expected_combination({'autoindent', 0, 1, 'global'})
+ expected_combination({'autoindent', 0, '', 0, 1, 'global', 'setglobal'})
command('set noai')
- expected_combination({'autoindent', 1, 0, 'global'})
+ expected_combination({'autoindent', 1, 1, 1, 0, 'global', 'set'})
end)
it('should be called in inverting global autoindent option',function()
command('set ai!')
- expected_combination({'autoindent', 0, 1, 'global'})
+ expected_combination({'autoindent', 0, 0, 0, 1, 'global', 'set'})
end)
it('should be called in being unset local autoindent option',function()
command('setlocal ai')
- expected_combination({'autoindent', 0, 1, 'local'})
+ expected_combination({'autoindent', 0, 0, '', 1, 'local', 'setlocal'})
command('setlocal ai<')
- expected_combination({'autoindent', 1, 0, 'local'})
+ expected_combination({'autoindent', 1, 1, '', 0, 'local', 'setlocal'})
end)
it('should be called in setting global list and number option at the same time',function()
command('set list nu')
expected_combination(
- {'list', 0, 1, 'global'},
- {'number', 0, 1, 'global'}
+ {'list', 0, 0, 0, 1, 'global', 'set'},
+ {'number', 0, 0, 0, 1, 'global', 'set'}
)
end)
@@ -171,25 +177,27 @@ describe('au OptionSet', function()
it('should be called in setting local acd', function()
command('setlocal acd')
- expected_combination({'autochdir', 0, 1, 'local'})
+ expected_combination({'autochdir', 0, 0, '', 1, 'local', 'setlocal'})
end)
it('should be called in setting autoread', function()
command('set noar')
- expected_combination({'autoread', 1, 0, 'global'})
+ expected_combination({'autoread', 1, 1, 1, 0, 'global', 'set'})
command('setlocal ar')
- expected_combination({'autoread', 0, 1, 'local'})
+ expected_combination({'autoread', 0, 0, '', 1, 'local', 'setlocal'})
end)
it('should be called in inverting global autoread', function()
command('setglobal invar')
- expected_combination({'autoread', 1, 0, 'global'})
+ expected_combination({'autoread', 1, '', 1, 0, 'global', 'setglobal'})
end)
it('should be called in setting backspace option through :let', function()
+ local oldval = eval('&backspace')
+
command('let &bs=""')
- expected_combination({'backspace', 'indent,eol,start', '', 'global'})
+ expected_combination({'backspace', oldval, oldval, oldval, '', 'global', 'set'})
end)
describe('being set by setbufvar()', function()
@@ -200,7 +208,7 @@ describe('au OptionSet', function()
it('should trigger using correct option name', function()
command('call setbufvar(1, "&backup", 1)')
- expected_combination({'backup', 0, 1, 'local'})
+ expected_combination({'backup', 0, 0, '', 1, 'local', 'setlocal'})
end)
it('should trigger if the current buffer is different from the targetted buffer', function()
@@ -208,9 +216,339 @@ describe('au OptionSet', function()
local new_bufnr = buf.get_number(new_buffer)
command('call setbufvar(' .. new_bufnr .. ', "&buftype", "nofile")')
- expected_combination({'buftype', '', 'nofile', 'local', {bufnr = new_bufnr}})
+ expected_combination({'buftype', '', '', '', 'nofile', 'local', 'setlocal', {bufnr = new_bufnr}})
end)
end)
+
+ it('with string global option', function()
+ local oldval = eval('&backupext')
+
+ command('set backupext=foo')
+ expected_combination({'backupext', oldval, oldval, oldval, 'foo', 'global', 'set'})
+
+ command('set backupext&')
+ expected_combination({'backupext', 'foo', 'foo', 'foo', oldval, 'global', 'set'})
+
+ command('setglobal backupext=bar')
+ expected_combination({'backupext', oldval, '', oldval, 'bar', 'global', 'setglobal'})
+
+ command('noa set backupext&')
+ -- As this is a global option this sets the global value even though :setlocal is used!
+ command('setlocal backupext=baz')
+ expected_combination({'backupext', oldval, oldval, '', 'baz', 'local', 'setlocal'})
+
+ command('noa setglobal backupext=ext_global')
+ command('noa setlocal backupext=ext_local') -- Sets the global(!) value
+ command('set backupext=foo')
+ expected_combination({
+ 'backupext', 'ext_local', 'ext_local', 'ext_local', 'foo', 'global', 'set'
+ })
+ end)
+
+ it('with string global-local (to buffer) option', function()
+ local oldval = eval('&tags')
+
+ command('set tags=tagpath')
+ expected_combination({'tags', oldval, oldval, oldval, 'tagpath', 'global', 'set'})
+
+ command('set tags&')
+ expected_combination({'tags', 'tagpath', 'tagpath', 'tagpath', oldval, 'global', 'set'})
+
+ command('setglobal tags=tagpath1')
+ expected_combination({'tags', oldval, '', oldval, 'tagpath1', 'global', 'setglobal'})
+
+ command('setlocal tags=tagpath2')
+ expected_combination({'tags', 'tagpath1', 'tagpath1', '', 'tagpath2', 'local', 'setlocal'})
+
+ -- Note: v:option_old is the old global value for global-local string options
+ -- but the old local value for all other kinds of options.
+ command('noa setglobal tags=tag_global')
+ command('noa setlocal tags=tag_local')
+ command('set tags=tagpath')
+ expected_combination({
+ 'tags', 'tag_global', 'tag_local', 'tag_global', 'tagpath', 'global', 'set'
+ })
+
+ -- Note: v:option_old is the old global value for global-local string options
+ -- but the old local value for all other kinds of options.
+ command('noa set tags=tag_global')
+ command('noa setlocal tags=')
+ command('set tags=tagpath')
+ expected_combination({'tags', 'tag_global', '', 'tag_global', 'tagpath', 'global', 'set'})
+ end)
+
+ it('with string local (to buffer) option', function()
+ local oldval = eval('&spelllang')
+
+ command('set spelllang=elvish,klingon')
+ expected_combination({'spelllang', oldval, oldval, oldval, 'elvish,klingon', 'global', 'set'})
+
+ command('set spelllang&')
+ expected_combination({
+ 'spelllang', 'elvish,klingon', 'elvish,klingon', 'elvish,klingon', oldval, 'global', 'set'
+ })
+
+ command('setglobal spelllang=elvish')
+ expected_combination({'spelllang', oldval, '', oldval, 'elvish', 'global', 'setglobal'})
+
+ command('noa set spelllang&')
+ command('setlocal spelllang=klingon')
+ expected_combination({'spelllang', oldval, oldval, '', 'klingon', 'local', 'setlocal'})
+
+ -- Note: v:option_old is the old global value for global-local string options
+ -- but the old local value for all other kinds of options.
+ command('noa setglobal spelllang=spellglobal')
+ command('noa setlocal spelllang=spelllocal')
+ command('set spelllang=foo')
+ expected_combination({
+ 'spelllang', 'spelllocal', 'spelllocal', 'spellglobal', 'foo', 'global', 'set'
+ })
+ end)
+
+ it('with string global-local (to window) option', function()
+ local oldval = eval('&statusline')
+
+ command('set statusline=foo')
+ expected_combination({'statusline', oldval, oldval, '', 'foo', 'global', 'set'})
+
+ -- Note: v:option_old is the old global value for global-local string options
+ -- but the old local value for all other kinds of options.
+ command('set statusline&')
+ expected_combination({'statusline', 'foo', 'foo', 'foo', oldval, 'global', 'set'})
+
+ command('setglobal statusline=bar')
+ expected_combination({'statusline', oldval, '', oldval, 'bar', 'global', 'setglobal'})
+
+ command('noa set statusline&')
+ command('setlocal statusline=baz')
+ expected_combination({'statusline', oldval, oldval, '', 'baz', 'local', 'setlocal'})
+
+ -- Note: v:option_old is the old global value for global-local string options
+ -- but the old local value for all other kinds of options.
+ command('noa setglobal statusline=bar')
+ command('noa setlocal statusline=baz')
+ command('set statusline=foo')
+ expected_combination({'statusline', 'bar', 'baz', 'bar', 'foo', 'global', 'set'})
+ end)
+
+ it('with string local (to window) option', function()
+ local oldval = eval('&foldignore')
+
+ command('set foldignore=fo')
+ expected_combination({'foldignore', oldval, oldval, oldval, 'fo', 'global', 'set'})
+
+ command('set foldignore&')
+ expected_combination({'foldignore', 'fo', 'fo', 'fo', oldval, 'global', 'set'})
+
+ command('setglobal foldignore=bar')
+ expected_combination({'foldignore', oldval, '', oldval, 'bar', 'global', 'setglobal'})
+
+ command('noa set foldignore&')
+ command('setlocal foldignore=baz')
+ expected_combination({'foldignore', oldval, oldval, '', 'baz', 'local', 'setlocal'})
+
+ command('noa setglobal foldignore=glob')
+ command('noa setlocal foldignore=loc')
+ command('set foldignore=fo')
+ expected_combination({'foldignore', 'loc', 'loc', 'glob', 'fo', 'global', 'set'})
+ end)
+
+ it('with number global option', function()
+ command('noa setglobal cmdheight=8')
+ command('noa setlocal cmdheight=1') -- Sets the global(!) value
+ command('setglobal cmdheight=2')
+ expected_combination({'cmdheight', 1, '', 1, 2, 'global', 'setglobal'})
+
+ command('noa setglobal cmdheight=8')
+ command('noa setlocal cmdheight=1') -- Sets the global(!) value
+ command('setlocal cmdheight=2')
+ expected_combination({'cmdheight', 1, 1, '', 2, 'local', 'setlocal'})
+
+ command('noa setglobal cmdheight=8')
+ command('noa setlocal cmdheight=1') -- Sets the global(!) value
+ command('set cmdheight=2')
+ expected_combination({'cmdheight', 1, 1, 1, 2, 'global', 'set'})
+
+ command('noa set cmdheight=8')
+ command('set cmdheight=2')
+ expected_combination({'cmdheight', 8, 8, 8, 2, 'global', 'set'})
+ end)
+
+ it('with number global-local (to buffer) option', function()
+ command('noa setglobal undolevels=8')
+ command('noa setlocal undolevels=1')
+ command('setglobal undolevels=2')
+ expected_combination({'undolevels', 8, '', 8, 2, 'global', 'setglobal'})
+
+ command('noa setglobal undolevels=8')
+ command('noa setlocal undolevels=1')
+ command('setlocal undolevels=2')
+ expected_combination({'undolevels', 1, 1, '', 2, 'local', 'setlocal'})
+
+ command('noa setglobal undolevels=8')
+ command('noa setlocal undolevels=1')
+ command('set undolevels=2')
+ expected_combination({'undolevels', 1, 1, 8, 2, 'global', 'set'})
+
+ command('noa set undolevels=8')
+ command('set undolevels=2')
+ expected_combination({'undolevels', 8, 8, 8, 2, 'global', 'set'})
+ end)
+
+ it('with number local (to buffer) option', function()
+ command('noa setglobal wrapmargin=8')
+ command('noa setlocal wrapmargin=1')
+ command('setglobal wrapmargin=2')
+ expected_combination({'wrapmargin', 8, '', 8, 2, 'global', 'setglobal'})
+
+ command('noa setglobal wrapmargin=8')
+ command('noa setlocal wrapmargin=1')
+ command('setlocal wrapmargin=2')
+ expected_combination({'wrapmargin', 1, 1, '', 2, 'local', 'setlocal'})
+
+ command('noa setglobal wrapmargin=8')
+ command('noa setlocal wrapmargin=1')
+ command('set wrapmargin=2')
+ expected_combination({'wrapmargin', 1, 1, 8, 2, 'global', 'set'})
+
+ command('noa set wrapmargin=8')
+ command('set wrapmargin=2')
+ expected_combination({'wrapmargin', 8, 8, 8, 2, 'global', 'set'})
+ end)
+
+ it('with number global-local (to window) option', function()
+ command('noa setglobal scrolloff=8')
+ command('noa setlocal scrolloff=1')
+ command('setglobal scrolloff=2')
+ expected_combination({'scrolloff', 8, '', 8, 2, 'global', 'setglobal'})
+
+ command('noa setglobal scrolloff=8')
+ command('noa setlocal scrolloff=1')
+ command('setlocal scrolloff=2')
+ expected_combination({'scrolloff', 1, 1, '', 2, 'local', 'setlocal'})
+
+ command('noa setglobal scrolloff=8')
+ command('noa setlocal scrolloff=1')
+ command('set scrolloff=2')
+ expected_combination({'scrolloff', 1, 1, 8, 2, 'global', 'set'})
+
+ command('noa set scrolloff=8')
+ command('set scrolloff=2')
+ expected_combination({'scrolloff', 8, 8, 8, 2, 'global', 'set'})
+ end)
+
+ it('with number local (to window) option', function()
+ command('noa setglobal foldcolumn=8')
+ command('noa setlocal foldcolumn=1')
+ command('setglobal foldcolumn=2')
+ expected_combination({'foldcolumn', 8, '', 8, 2, 'global', 'setglobal'})
+
+ command('noa setglobal foldcolumn=8')
+ command('noa setlocal foldcolumn=1')
+ command('setlocal foldcolumn=2')
+ expected_combination({'foldcolumn', 1, 1, '', 2, 'local', 'setlocal'})
+
+ command('noa setglobal foldcolumn=8')
+ command('noa setlocal foldcolumn=1')
+ command('set foldcolumn=2')
+ expected_combination({'foldcolumn', 1, 1, 8, 2, 'global', 'set'})
+
+ command('noa set foldcolumn=8')
+ command('set foldcolumn=2')
+ expected_combination({'foldcolumn', 8, 8, 8, 2, 'global', 'set'})
+ end)
+
+ it('with boolean global option', function()
+ command('noa setglobal nowrapscan')
+ command('noa setlocal wrapscan') -- Sets the global(!) value
+ command('setglobal nowrapscan')
+ expected_combination({'wrapscan', 1, '', 1, 0, 'global', 'setglobal'})
+
+ command('noa setglobal nowrapscan')
+ command('noa setlocal wrapscan') -- Sets the global(!) value
+ command('setlocal nowrapscan')
+ expected_combination({'wrapscan', 1, 1, '', 0, 'local', 'setlocal'})
+
+ command('noa setglobal nowrapscan')
+ command('noa setlocal wrapscan') -- Sets the global(!) value
+ command('set nowrapscan')
+ expected_combination({'wrapscan', 1, 1, 1, 0, 'global', 'set'})
+
+ command('noa set nowrapscan')
+ command('set wrapscan')
+ expected_combination({'wrapscan', 0, 0, 0, 1, 'global', 'set'})
+ end)
+
+ it('with boolean global-local (to buffer) option', function()
+ command('noa setglobal noautoread')
+ command('noa setlocal autoread')
+ command('setglobal autoread')
+ expected_combination({'autoread', 0, '', 0, 1, 'global', 'setglobal'})
+
+ command('noa setglobal noautoread')
+ command('noa setlocal autoread')
+ command('setlocal noautoread')
+ expected_combination({'autoread', 1, 1, '', 0, 'local', 'setlocal'})
+
+ command('noa setglobal noautoread')
+ command('noa setlocal autoread')
+ command('set autoread')
+ expected_combination({'autoread', 1, 1, 0, 1, 'global', 'set'})
+
+ command('noa set noautoread')
+ command('set autoread')
+ expected_combination({'autoread', 0, 0, 0, 1, 'global', 'set'})
+ end)
+
+ it('with boolean local (to buffer) option', function()
+ command('noa setglobal nocindent')
+ command('noa setlocal cindent')
+ command('setglobal cindent')
+ expected_combination({'cindent', 0, '', 0, 1, 'global', 'setglobal'})
+
+ command('noa setglobal nocindent')
+ command('noa setlocal cindent')
+ command('setlocal nocindent')
+ expected_combination({'cindent', 1, 1, '', 0, 'local', 'setlocal'})
+
+ command('noa setglobal nocindent')
+ command('noa setlocal cindent')
+ command('set cindent')
+ expected_combination({'cindent', 1, 1, 0, 1, 'global', 'set'})
+
+ command('noa set nocindent')
+ command('set cindent')
+ expected_combination({'cindent', 0, 0, 0, 1, 'global', 'set'})
+ end)
+
+ it('with boolean local (to window) option', function()
+ command('noa setglobal nocursorcolumn')
+ command('noa setlocal cursorcolumn')
+ command('setglobal cursorcolumn')
+ expected_combination({'cursorcolumn', 0, '', 0, 1, 'global', 'setglobal'})
+
+ command('noa setglobal nocursorcolumn')
+ command('noa setlocal cursorcolumn')
+ command('setlocal nocursorcolumn')
+ expected_combination({'cursorcolumn', 1, 1, '', 0, 'local', 'setlocal'})
+
+ command('noa setglobal nocursorcolumn')
+ command('noa setlocal cursorcolumn')
+ command('set cursorcolumn')
+ expected_combination({'cursorcolumn', 1, 1, 0, 1, 'global', 'set'})
+
+ command('noa set nocursorcolumn')
+ command('set cursorcolumn')
+ expected_combination({'cursorcolumn', 0, 0, 0, 1, 'global', 'set'})
+ end)
+
+ it('with option value converted internally', function()
+ command('noa set backspace=1')
+ command('set backspace=2')
+ expected_combination(({
+ 'backspace', 'indent,eol', 'indent,eol', 'indent,eol', '2', 'global', 'set'
+ }))
+ end)
end)
describe('with specific option', function()
@@ -228,13 +566,13 @@ describe('au OptionSet', function()
expected_empty()
command('setlocal ro')
- expected_combination({'readonly', 0, 1, 'local'})
+ expected_combination({'readonly', 0, 0, '', 1, 'local', 'setlocal'})
command('setglobal ro')
- expected_combination({'readonly', 0, 1, 'global'})
+ expected_combination({'readonly', 0, '', 0, 1, 'global', 'setglobal'})
command('set noro')
- expected_combination({'readonly', 1, 0, 'global'})
+ expected_combination({'readonly', 1, 1, 1, 0, 'global', 'set'})
end)
describe('being set by setbufvar()', function()
@@ -249,7 +587,7 @@ describe('au OptionSet', function()
set_hook('backup')
command('call setbufvar(1, "&backup", 1)')
- expected_combination({'backup', 0, 1, 'local'})
+ expected_combination({'backup', 0, 0, '', 1, 'local', 'setlocal'})
end)
it('should trigger if the current buffer is different from the targetted buffer', function()
@@ -259,7 +597,7 @@ describe('au OptionSet', function()
local new_bufnr = buf.get_number(new_buffer)
command('call setbufvar(' .. new_bufnr .. ', "&buftype", "nofile")')
- expected_combination({'buftype', '', 'nofile', 'local', {bufnr = new_bufnr}})
+ expected_combination({'buftype', '', '', '', 'nofile', 'local', 'setlocal', {bufnr = new_bufnr}})
end)
end)
@@ -275,7 +613,7 @@ describe('au OptionSet', function()
set_hook('backup')
command('call setwinvar(1, "&backup", 1)')
- expected_combination({'backup', 0, 1, 'local'})
+ expected_combination({'backup', 0, 0, '', 1, 'local', 'setlocal'})
end)
it('should not trigger if the current window is different from the targetted window', function()
@@ -295,7 +633,7 @@ describe('au OptionSet', function()
nvim.set_option('autochdir', true)
eq(true, nvim.get_option('autochdir'))
- expected_combination({'autochdir', '0', '1', 'global'})
+ expected_combination({'autochdir', 0, '', 0, 1, 'global', 'setglobal'})
end)
it('should trigger if a number option be set globally', function()
@@ -303,7 +641,7 @@ describe('au OptionSet', function()
nvim.set_option('cmdheight', 5)
eq(5, nvim.get_option('cmdheight'))
- expected_combination({'cmdheight', 1, 5, 'global'})
+ expected_combination({'cmdheight', 1, '', 1, 5, 'global', 'setglobal'})
end)
it('should trigger if a string option be set globally', function()
@@ -311,7 +649,7 @@ describe('au OptionSet', function()
nvim.set_option('ambiwidth', 'double')
eq('double', nvim.get_option('ambiwidth'))
- expected_combination({'ambiwidth', 'single', 'double', 'global'})
+ expected_combination({'ambiwidth', 'single', '', 'single', 'double', 'global', 'setglobal'})
end)
end)
end)