IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(uncrustify): set maximum number of consecutive newlines to 2 (#18695)

Browse Source
This commit is contained in:
dundargoc 2022-05-25 20:31:14 +02:00 committed by GitHub
parent 8c4e62351f
commit 9fec6dc9a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
145 changed files with 5 additions and 586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/api/autocmd.c
View File

@ -31,7 +31,6 @@
goto goto_name; \
}
// ID for associating autocmds created via nvim_create_autocmd
// Used to delete autocmds from nvim_del_autocmd
static int64_t next_autocmd_id = 1;
@ -429,7 +428,6 @@ Integer nvim_create_autocmd(uint64_t channel_id, Object event, Dict(create_autoc
AucmdExecutable aucmd = AUCMD_EXECUTABLE_INIT;
Callback cb = CALLBACK_NONE;
if (!unpack_string_or_array(&event_array, &event, "event", true, err)) {
goto cleanup;
}
@ -550,7 +548,6 @@ Integer nvim_create_autocmd(uint64_t channel_id, Object event, Dict(create_autoc
}
});
cleanup:
aucmd_exec_free(&aucmd);
api_free_array(event_array);

5
src/nvim/api/buffer.c
View File

@ -35,7 +35,6 @@
# include "api/buffer.c.generated.h"
#endif
/// \defgroup api-buffer
///
/// \brief For more information on buffers, see |buffers|
@ -51,7 +50,6 @@
/// You can use |nvim_buf_is_loaded()| or |nvim_buf_line_count()| to check
/// whether a buffer is loaded.
/// Returns the number of lines in the given buffer.
///
/// @param buffer Buffer handle, or 0 for current buffer
@ -737,7 +735,6 @@ void nvim_buf_set_text(uint64_t channel_id, Buffer buffer, Integer start_row, In
(int)new_len - 1, (colnr_T)last_item.size, new_byte,
kExtmarkUndo);
changed_lines((linenr_T)start_row, 0, (linenr_T)end_row + 1,
(long)extra, true);
@ -1039,7 +1036,6 @@ void nvim_buf_del_var(Buffer buffer, String name, Error *err)
dict_set_var(buf->b_vars, name, NIL, true, false, err);
}
/// Gets a buffer option value
///
/// @param buffer Buffer handle, or 0 for current buffer
@ -1336,7 +1332,6 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
return rv;
}
/// call a function with buffer as temporary current buffer
///
/// This temporarily switches current buffer to "buffer".

3
src/nvim/api/deprecated.c
View File

@ -78,7 +78,6 @@ void nvim_buf_clear_highlight(Buffer buffer, Integer ns_id, Integer line_start,
nvim_buf_clear_namespace(buffer, ns_id, line_start, line_end, err);
}
/// Set the virtual text (annotation) for a buffer line.
///
/// @deprecated use nvim_buf_set_extmark to use full virtual text
@ -137,7 +136,6 @@ Integer nvim_buf_set_virtual_text(Buffer buffer, Integer src_id, Integer line, A
return 0;
}
Decoration *existing = decor_find_virttext(buf, (int)line, ns_id);
if (existing) {
@ -292,7 +290,6 @@ void buffer_set_line_slice(Buffer buffer, Integer start, Integer end, Boolean in
nvim_buf_set_lines(0, buffer, start, end, false, replacement, err);
}
/// Sets a buffer-scoped (b:) variable
///
/// @deprecated

6
src/nvim/api/extmark.c
View File

@ -94,7 +94,6 @@ static bool ns_initialized(uint32_t ns)
return ns < (uint32_t)next_namespace_id;
}
static Array extmark_to_array(const ExtmarkInfo *extmark, bool id, bool add_dict)
{
Array rv = ARRAY_DICT_INIT;
@ -233,7 +232,6 @@ ArrayOf(Integer) nvim_buf_get_extmark_by_id(Buffer buffer, Integer ns_id,
}
}
ExtmarkInfo extmark = extmark_from_id(buf, (uint32_t)ns_id, (uint32_t)id);
if (extmark.row < 0) {
return rv;
@ -333,7 +331,6 @@ Array nvim_buf_get_extmarks(Buffer buffer, Integer ns_id, Object start, Object e
limit = INT64_MAX;
}
bool reverse = false;
int l_row;
@ -352,7 +349,6 @@ Array nvim_buf_get_extmarks(Buffer buffer, Integer ns_id, Object start, Object e
reverse = true;
}
ExtmarkInfoArray marks = extmark_get(buf, (uint32_t)ns_id, l_row, l_col,
u_row, u_col, (int64_t)limit, reverse);
@ -675,7 +671,6 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer
goto error;
}
OPTION_TO_BOOL(decor.virt_lines_above, virt_lines_above, false);
if (opts->priority.type == kObjectTypeInteger) {
@ -777,7 +772,6 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer
col2 = 0;
}
// TODO(bfredl): synergize these two branches even more
if (ephemeral && decor_state.buf == buf) {
decor_add_ephemeral((int)line, (int)col, line2, col2, &decor, (uint64_t)ns_id, id);

7
src/nvim/api/private/helpers.c
View File

@ -407,7 +407,6 @@ void set_option_to(uint64_t channel_id, void *to, int type, String name, Object
});
}
buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
{
if (buffer == 0) {
@ -1040,8 +1039,8 @@ Object copy_object(Object obj)
}
}
void set_option_value_for(char *key, long numval, char *stringval, int opt_flags,
int opt_type, void *from, Error *err)
void set_option_value_for(char *key, long numval, char *stringval, int opt_flags, int opt_type,
void *from, Error *err)
{
switchwin_T switchwin;
aco_save_T aco;
@ -1080,7 +1079,6 @@ void set_option_value_for(char *key, long numval, char *stringval, int opt_flags
try_end(err);
}
static void set_option_value_err(char *key, long numval, char *stringval, int opt_flags, Error *err)
{
char *errmsg;
@ -1562,7 +1560,6 @@ void create_user_command(String name, Object command, Dict(user_command) *opts,
goto err;
}
if (api_object_to_bool(opts->register_, "register", false, err)) {
argt |= EX_REGSTR;
} else if (ERROR_SET(err)) {

2
src/nvim/api/private/helpers.h
View File

@ -146,7 +146,6 @@ typedef struct {
code; \
}
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "api/private/helpers.h.generated.h"
# include "keysets.h.generated.h"
@ -163,5 +162,4 @@ typedef struct {
current_sctx = save_current_sctx; \
} while (0);
#endif // NVIM_API_PRIVATE_HELPERS_H

3
src/nvim/api/ui.c
View File

@ -196,7 +196,6 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
remote_ui_disconnect(channel_id);
}
void nvim_ui_try_resize(uint64_t channel_id, Integer width, Integer height, Error *err)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{
@ -571,7 +570,6 @@ static void remote_ui_highlight_set(UI *ui, int id)
Array args = ARRAY_DICT_INIT;
UIData *data = ui->data;
if (data->hl_id == id) {
return;
}
@ -794,7 +792,6 @@ static void remote_ui_event(UI *ui, char *name, Array args, bool *args_consumed)
}
}
Array my_args = ARRAY_DICT_INIT;
// Objects are currently single-reference
// make a copy, but only if necessary

5
src/nvim/api/vim.c
View File

@ -209,7 +209,6 @@ static void on_redraw_event(void **argv)
redraw_all_later(NOT_VALID);
}
/// Sends input-keys to Nvim, subject to various quirks controlled by `mode`
/// flags. This is a blocking call, unlike |nvim_input()|.
///
@ -441,7 +440,6 @@ String nvim_replace_termcodes(String str, Boolean from_part, Boolean do_lt, Bool
return cstr_as_string(ptr);
}
/// Execute Lua code. Parameters (if any) are available as `...` inside the
/// chunk. The chunk can return a value.
///
@ -570,7 +568,6 @@ ArrayOf(String) nvim__get_runtime(Array pat, Boolean all, Dict(runtime) *opts, E
return runtime_get_named(is_lua, pat, all);
}
/// Changes the global working directory.
///
/// @param dir Directory path
@ -1245,7 +1242,6 @@ static void term_close(void *data)
channel_decref(chan);
}
/// Send data to channel `id`. For a job, it writes it to the
/// stdin of the process. For the stdio channel |channel-stdio|,
/// it writes to Nvim's stdout. For an internal terminal instance
@ -2192,7 +2188,6 @@ void nvim__screenshot(String path)
ui_call_screenshot(path);
}
/// Deletes an uppercase/file named mark. See |mark-motions|.
///
/// @note fails with error if a lowercase or buffer local named mark is used.

2
src/nvim/api/win_config.c
View File

@ -22,7 +22,6 @@
# include "api/win_config.c.generated.h"
#endif
/// Open a new window.
///
/// Currently this is used to open floating and external windows.
@ -590,7 +589,6 @@ static bool parse_float_config(Dict(float_config) *config, FloatConfig *fconfig,
return false;
}
if (HAS_KEY(config->focusable)) {
fconfig->focusable = api_object_to_bool(config->focusable, "'focusable' key", false, err);
if (ERROR_SET(err)) {

1
src/nvim/api/window.c
View File

@ -373,7 +373,6 @@ Boolean nvim_win_is_valid(Window window)
return ret;
}
/// Closes the window and hide the buffer it contains (like |:hide| with a
/// |window-ID|).
///

1
src/nvim/arabic.c
View File

@ -244,7 +244,6 @@
#define a_BYTE_ORDER_MARK 0xfeff
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "arabic.c.generated.h"
#endif

1
src/nvim/ascii.h
View File

@ -75,7 +75,6 @@
#define Ctrl_HAT 30 // ^
#define Ctrl__ 31
// Character that separates dir names in a path.
#ifdef BACKSLASH_IN_FILENAME
# define PATHSEP psepc

6
src/nvim/autocmd.c
View File

@ -126,7 +126,6 @@ static void augroup_map_del(int id, char *name)
}
}
static inline const char *get_deleted_augroup(void) FUNC_ATTR_ALWAYS_INLINE
{
if (deleted_augroup == NULL) {
@ -388,7 +387,6 @@ static void au_cleanup(void)
au_need_clean = false;
}
// Get the first AutoPat for a particular event.
AutoPat *au_get_autopat_for_event(event_T event)
FUNC_ATTR_PURE
@ -668,7 +666,6 @@ const char *event_nr2name(event_T event)
return "Unknown";
}
/// Return true if "event" is included in 'eventignore'.
///
/// @param event event to check
@ -1017,7 +1014,6 @@ int autocmd_register(int64_t id, event_T event, char *pat, int patlen, int group
findgroup = group;
}
// detect special <buffer[=X]> buffer-local patterns
int is_buflocal = aupat_is_buflocal(pat, patlen);
int buflocal_nr = 0;
@ -1853,7 +1849,6 @@ bool apply_autocmds_group(event_T event, char *fname, char *fname_io, bool force
reset_lnums();
}
if (eap != NULL) {
(void)set_cmdarg(NULL, save_cmdarg);
set_vim_var_nr(VV_CMDBANG, save_cmdbang);
@ -2651,7 +2646,6 @@ static bool arg_autocmd_flag_get(bool *flag, char **cmd_ptr, char *pattern, int
return false;
}
// UI Enter
void do_autocmd_uienter(uint64_t chanid, bool attached)
{

2
src/nvim/autocmd.h
View File

@ -61,7 +61,6 @@ typedef struct AutoPatCmd {
struct AutoPatCmd *next; // chain of active apc-s for auto-invalidation
} AutoPatCmd;
// Set by the apply_autocmds_group function if the given event is equal to
// EVENT_FILETYPE. Used by the readfile function in order to determine if
// EVENT_BUFREADPOST triggered the EVENT_FILETYPE.
@ -70,7 +69,6 @@ typedef struct AutoPatCmd {
// apply_autocmds_group.
EXTERN bool au_did_filetype INIT(= false);
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "autocmd.h.generated.h"
#endif

16
src/nvim/buffer.c
View File

@ -1025,11 +1025,9 @@ char *do_bufdel(int command, char_u *arg, int addr_count, int start_bnr, int end
}
}
return errormsg;
}
/// Make the current buffer empty.
/// Used when it is wiped out and it's the last buffer.
static int empty_curbuf(int close_others, int forceit, int action)
@ -1180,7 +1178,6 @@ int do_buffer(int action, int start, int dir, int count, int forceit)
return FAIL;
}
// delete buffer "buf" from memory and/or the list
if (unload) {
int forward;
@ -1425,7 +1422,6 @@ int do_buffer(int action, int start, int dir, int count, int forceit)
return OK;
}
/// Set current buffer to "buf". Executes autocommands and closes current
/// buffer.
///
@ -1585,7 +1581,6 @@ void enter_buffer(buf_T *buf)
scroll_cursor_halfway(false); // redisplay at correct position
}
// Change directories when the 'acd' option is set.
do_autochdir();
@ -1932,7 +1927,6 @@ void free_buf_options(buf_T *buf, int free_p_ff)
clear_string_option(&buf->b_p_menc);
}
/// Get alternate file "n".
/// Set linenr to "lnum" or altfpos.lnum if "lnum" == 0.
/// Also set cursor column to altfpos.col if 'startofline' is not set.
@ -2357,7 +2351,6 @@ int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options)
return count == 0 ? FAIL : OK;
}
/// Check for a match on the file name for buffer "buf" with regprog "prog".
///
/// @param ignore_case When true, ignore case. Use 'fic' otherwise.
@ -2491,7 +2484,6 @@ void buflist_setfpos(buf_T *const buf, win_T *const win, linenr_T lnum, colnr_T
}
}
/// Check that "wip" has 'diff' set and the diff is only for another tab page.
/// That's because a diff is local to a tab page.
static bool wininfo_other_tab_diff(wininfo_T *wip)
@ -3113,7 +3105,6 @@ void col_print(char_u *buf, size_t buflen, int col, int vcol)
static char_u *lasttitle = NULL;
static char_u *lasticon = NULL;
/// Put the title name in the title bar and icon of the window.
void maketitle(void)
{
@ -3331,7 +3322,6 @@ static bool value_change(char_u *str, char_u **last)
return false;
}
/// Set current window title
void resettitle(void)
{
@ -3356,7 +3346,6 @@ typedef enum {
kNumBaseHexadecimal = 16,
} NumberBase;
/// Build a string from the status line items in "fmt".
/// Return length of string in screen cells.
///
@ -3473,7 +3462,6 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
// so any user-visible characters must occur before here.
char *out_end_p = (out + outlen) - 1;
// Proceed character by character through the statusline format string
// fmt_p is the current position in the input buffer
for (char *fmt_p = usefmt; *fmt_p;) {
@ -3915,7 +3903,6 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
}
}
// If the output of the expression needs to be evaluated
// replace the %{} block with the result of evaluation
if (reevaluate && str != NULL && *str != 0
@ -4698,7 +4685,6 @@ void do_arg_all(int count, int forceit, int keep_tabs)
old_curwin = curwin;
old_curtab = curtab;
// Try closing all windows that are not in the argument list.
// Also close windows that are not full width;
// When 'hidden' or "forceit" set the buffer becomes hidden.
@ -4947,7 +4933,6 @@ void ex_buffer_all(exarg_T *eap)
setpcmark();
// Close superfluous windows (two windows for the same buffer).
// Also close windows that are not full-width.
if (had_tab > 0) {
@ -5098,7 +5083,6 @@ void ex_buffer_all(exarg_T *eap)
}
}
/// do_modelines() - process mode lines for the current file
///
/// @param flags

1
src/nvim/buffer_updates.c
View File

@ -186,7 +186,6 @@ void buf_updates_unload(buf_T *buf, bool can_reload)
}
}
void buf_updates_send_changes(buf_T *buf, linenr_T firstline, int64_t num_added,
int64_t num_removed, bool send_tick)
{

1
src/nvim/change.c
View File

@ -615,7 +615,6 @@ void ins_char_bytes(char_u *buf, size_t charlen)
oldlen = (size_t)utfc_ptr2len((char *)oldp + col);
}
// Push the replaced bytes onto the replace stack, so that they can be
// put back when BS is used. The bytes of a multi-byte character are
// done the other way around, so that the first byte is popped off

5
src/nvim/channel.c
View File

@ -279,13 +279,11 @@ static void channel_destroy_early(Channel *chan)
multiqueue_put(main_loop.events, free_channel_event, 1, chan);
}
static void close_cb(Stream *stream, void *data)
{
channel_decref(data);
}
/// Starts a job and returns the associated channel
///
/// @param[in] argv Arguments vector specifying the command to run,
@ -416,7 +414,6 @@ Channel *channel_job_start(char **argv, CallbackReader on_stdout, CallbackReader
return chan;
}
uint64_t channel_connect(bool tcp, const char *address, bool rpc, CallbackReader on_output,
int timeout, const char **error)
{
@ -555,7 +552,6 @@ size_t channel_send(uint64_t id, char *data, size_t len, bool data_owned, const
goto retfree;
}
Stream *in = channel_instream(chan);
if (in->closed) {
*error = _("Can't send data to closed stream");
@ -756,7 +752,6 @@ static void channel_callback_call(Channel *chan, CallbackReader *reader)
tv_clear(&rettv);
}
/// Open terminal for channel
///
/// Channel `chan` is assumed to be an open pty channel,

1
src/nvim/channel.h
View File

@ -149,5 +149,4 @@ static inline Stream *channel_outstream(Channel *chan)
abort();
}
#endif // NVIM_CHANNEL_H

2
src/nvim/charset.c
View File

@ -34,7 +34,6 @@
# include "charset.c.generated.h"
#endif
static bool chartab_initialized = false;
// b_chartab[] is an array with 256 bits, each bit representing one of the
@ -495,7 +494,6 @@ char_u *str_foldcase(char_u *str, int orglen, char_u *buf, int buflen)
i += utfc_ptr2len((char *)STR_PTR(i));
}
if (buf == NULL) {
return (char_u *)ga.ga_data;
}

1
src/nvim/cursor_shape.c
View File

@ -315,7 +315,6 @@ bool cursor_mode_uses_syn_id(int syn_id)
return false;
}
/// Return the index into shape_table[] for the current mode.
int cursor_get_mode_idx(void)
FUNC_ATTR_PURE

1
src/nvim/debugger.c
View File

@ -74,7 +74,6 @@ void do_debug(char_u *cmd)
#define CMD_UP 9
#define CMD_DOWN 10
RedrawingDisabled++; // don't redisplay the window
no_wait_return++; // don't wait for return
did_emsg = false; // don't use error from debugged stuff

2
src/nvim/decoration.c
View File

@ -180,7 +180,6 @@ static bool decor_virt_pos(Decoration decor)
return kv_size(decor.virt_text) || decor.ui_watched;
}
bool decor_redraw_start(buf_T *buf, int top_row, DecorState *state)
{
state->top_row = top_row;
@ -530,7 +529,6 @@ void decor_add_ephemeral(int start_row, int start_col, int end_row, int end_col,
decor_add(&decor_state, start_row, start_col, end_row, end_col, decor, true, ns_id, mark_id);
}
int decor_virt_lines(win_T *wp, linenr_T lnum, VirtLines *lines)
{
buf_T *buf = wp->w_buffer;

2
src/nvim/decoration.h
View File

@ -31,10 +31,8 @@ EXTERN const char *const hl_mode_str[] INIT(= { "", "replace", "combine", "blend
typedef kvec_t(VirtTextChunk) VirtText;
#define VIRTTEXT_EMPTY ((VirtText)KV_INITIAL_VALUE)
typedef kvec_t(struct virt_line { VirtText line; bool left_col; }) VirtLines;
struct Decoration {
VirtText virt_text;
VirtLines virt_lines;

2
src/nvim/decoration_provider.c
View File

@ -140,7 +140,6 @@ void providers_invoke_line(win_T *wp, DecorProviders *providers, int row, bool *
}
}
/// For each provider invoke the 'buf' callback for a given buffer.
///
/// @param buf Buffer
@ -158,7 +157,6 @@ void decor_providers_invoke_buf(buf_T *buf, DecorProviders *providers, char **er
}
}
/// For each provider invoke the 'end' callback
///
/// @param providers Decoration providers

2
src/nvim/diff.c
View File

@ -1371,7 +1371,6 @@ static void set_diff_option(win_T *wp, int value)
curbuf = curwin->w_buffer;
}
/// Set options in window "wp" for diff mode.
///
/// @param addbuf Add buffer to diff.
@ -2036,7 +2035,6 @@ void diff_set_topline(win_T *fromwin, win_T *towin)
}
towin->w_topfill = 0;
// search for a change that includes "lnum" in the list of diffblocks.
for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) {
if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx]) {

2
src/nvim/digraph.c
View File

@ -1832,7 +1832,6 @@ static void printdigraph(const digr_T *dp, result_T *previous)
msg_putchar('\n');
}
// Make msg_col a multiple of list_width by using spaces.
if (msg_col % list_width != 0) {
int spaces = (msg_col / list_width + 1) * list_width - msg_col;
@ -2016,7 +2015,6 @@ typedef struct {
#define KMAP_MAXLEN 20 // maximum length of "from" or "to"
/// Set up key mapping tables for the 'keymap' option.
///
/// @return NULL if OK, an error message for failure. This only needs to be

18
src/nvim/edit.c
View File

@ -245,7 +245,6 @@ typedef struct insert_state {
char_u *ptr;
} InsertState;
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "edit.c.generated.h"
#endif
@ -575,7 +574,6 @@ static int insert_check(VimState *state)
// When emsg() was called msg_scroll will have been set.
msg_scroll = false;
// Open fold at the cursor line, according to 'foldopen'.
if (fdo_flags & FDO_INSERT) {
foldOpenCursor();
@ -838,7 +836,6 @@ static int insert_execute(VimState *state, int key)
return insert_handle_key(s);
}
static int insert_handle_key(InsertState *s)
{
// The big switch to handle a character in insert mode.
@ -904,14 +901,12 @@ static int insert_handle_key(InsertState *s)
case K_SELECT: // end of Select mode mapping - ignore
break;
case K_HELP: // Help key works like <ESC> <Help>
case K_F1:
case K_XF1:
stuffcharReadbuff(K_HELP);
return 0; // exit insert mode
case ' ':
if (mod_mask != MOD_MASK_CTRL) {
goto normalchar;
@ -1157,7 +1152,6 @@ check_pum:
}
break;
case K_S_TAB: // When not mapped, use like a normal TAB
s->c = TAB;
FALLTHROUGH;
@ -2071,7 +2065,6 @@ bool ctrl_x_mode_not_defined_yet(void)
return ctrl_x_mode == CTRL_X_NOT_DEFINED_YET;
}
/// Check that the "dict" or "tsr" option can be used.
///
/// @param dict_opt check "dict" when true, "tsr" when false.
@ -2608,7 +2601,6 @@ void completeopt_was_set(void)
}
}
/*
* Start completion for the complete() function.
* "startcol" is where the matched text starts (1 is first column).
@ -2672,13 +2664,11 @@ void set_completion(colnr_T startcol, list_T *list)
ui_flush();
}
/* "compl_match_array" points the currently displayed list of entries in the
* popup menu. It is NULL when there is no popup menu. */
static pumitem_T *compl_match_array = NULL;
static int compl_match_arraysize;
/*
* Remove any popup menu.
*/
@ -3343,7 +3333,6 @@ static char_u *ins_compl_mode(void)
return (char_u *)"";
}
/*
* Delete one character before the cursor and show the subset of the matches
* that match the word that is now before the cursor.
@ -3929,7 +3918,6 @@ static buf_T *ins_compl_next_buf(buf_T *buf, int flag)
return buf;
}
/// Get the user-defined completion function name for completion 'type'
static char_u *get_complete_funcname(int type)
{
@ -5393,7 +5381,6 @@ static int ins_complete(int c, bool enable_pum)
save_w_leftcol = curwin->w_leftcol;
n = ins_compl_next(true, ins_compl_key2count(c), insert_match, false);
if (n > 1) { // all matches have been found
compl_matches = n;
}
@ -7754,7 +7741,6 @@ static void ins_reg(void)
add_to_showcmd_c(Ctrl_R);
}
// Don't map the register name. This also prevents the mode message to be
// deleted when ESC is hit.
no_mapping++;
@ -7999,7 +7985,6 @@ static bool ins_esc(long *count, int cmdchar, bool nomove)
}
}
State = MODE_NORMAL;
may_trigger_modechanged();
// need to position cursor again when on a TAB
@ -8202,7 +8187,6 @@ static void ins_del(void)
AppendCharToRedobuff(K_DEL);
}
/*
* Delete one character for ins_bs().
*/
@ -8628,7 +8612,6 @@ static void ins_mousescroll(int dir)
}
}
static void ins_left(void)
{
pos_T tpos;
@ -9154,7 +9137,6 @@ static int ins_digraph(void)
add_to_showcmd_c(Ctrl_K);
}
// don't map the digraph chars. This also prevents the
// mode message to be deleted when ESC is hit
no_mapping++;

12
src/nvim/eval.c
View File

@ -53,12 +53,10 @@
#include "nvim/version.h"
#include "nvim/window.h"
// TODO(ZyX-I): Remove DICT_MAXNEST, make users be non-recursive instead
#define DICT_MAXNEST 100 // maximum nesting of lists and dicts
static char *e_letunexp = N_("E18: Unexpected characters in :let");
static char *e_missbrac = N_("E111: Missing ']'");
static char *e_dictrange = N_("E719: Cannot use [:] with a Dictionary");
@ -1067,7 +1065,6 @@ int get_spellword(list_T *const list, const char **ret_word)
return tv_list_find_nr(list, -1, NULL);
}
// Call some vim script function and return the result in "*rettv".
// Uses argv[0] to argv[argc-1] for the function arguments. argv[argc]
// should have type VAR_UNKNOWN.
@ -1209,7 +1206,6 @@ void prof_child_exit(proftime_T *tm)
script_prof_restore(tm);
}
/// Evaluate 'foldexpr'. Returns the foldlevel, and any character preceding
/// it in "*cp". Doesn't give error messages.
int eval_foldexpr(char *arg, int *cp)
@ -2701,7 +2697,6 @@ void free_for_info(void *fi_void)
xfree(fi);
}
void set_context_for_expression(expand_T *xp, char *arg, cmdidx_T cmdidx)
FUNC_ATTR_NONNULL_ALL
{
@ -3146,7 +3141,6 @@ void del_menutrans_vars(void)
* get_user_var_name().
*/
static char *varnamebuf = NULL;
static size_t varnamebuflen = 0;
@ -5636,7 +5630,6 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack, list_stack
return abort;
}
/// Mark all lists and dicts referenced in given mark
///
/// @return true if setting references failed somehow.
@ -5683,7 +5676,6 @@ static inline bool set_ref_dict(dict_T *dict, int copyID)
return false;
}
/// Get the key for *{key: val} into "tv" and advance "arg".
///
/// @return FAIL when there is no valid key.
@ -7287,7 +7279,6 @@ static bool set_ref_in_callback(Callback *callback, int copyID, ht_stack_T **ht_
return set_ref_in_item(&tv, copyID, ht_stack, list_stack);
break;
default:
abort();
}
@ -10248,7 +10239,6 @@ repeat:
*usedlen += 2;
}
// ":t" - tail, just the basename
if (src[*usedlen] == ':' && src[*usedlen + 1] == 't') {
*usedlen += 2;
@ -10489,7 +10479,6 @@ bool common_job_callbacks(dict_T *vopts, CallbackReader *on_stdout, CallbackRead
return false;
}
Channel *find_job(uint64_t id, bool show_error)
{
Channel *data = find_channel(id);
@ -10507,7 +10496,6 @@ Channel *find_job(uint64_t id, bool show_error)
return data;
}
void script_host_eval(char *name, typval_T *argvars, typval_T *rettv)
{
if (check_secure()) {

1
src/nvim/eval.h
View File

@ -199,7 +199,6 @@ typedef struct {
hashtab_T sve_hashtab;
} save_v_event_T;
/// trans_function_name() flags
typedef enum {
TFN_INT = 1, ///< May use internal function name

22
src/nvim/eval/funcs.c
View File

@ -99,7 +99,6 @@ PRAGMA_DIAG_POP
// uncrustify:on
#endif
static char *e_listblobarg = N_("E899: Argument of %s must be a List or Blob");
static char *e_invalwindow = N_("E957: Invalid window number");
static char *e_reduceempty = N_("E998: Reduce of an empty %s with no initial value");
@ -112,7 +111,6 @@ static char *e_reduceempty = N_("E998: Reduce of an empty %s with no initial val
/// - using va_start() to initialize it gives "function with fixed args" error
static va_list dummy_ap;
/// Function given to ExpandGeneric() to obtain the list of internal
/// or user defined function names.
char *get_function_name(expand_T *xp, int idx)
@ -345,7 +343,6 @@ static void f_and(typval_T *argvars, typval_T *rettv, FunPtr fptr)
& tv_get_number_chk(&argvars[1], NULL);
}
/// "api_info()" function
static void f_api_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
@ -472,7 +469,6 @@ static void f_browsedir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
f_browse(argvars, rettv, NULL);
}
/// Find a buffer by number or exact name.
static buf_T *find_buffer(typval_T *avar)
{
@ -2169,7 +2165,6 @@ static void f_expand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
#endif
}
/// "menu_get(path [, modes])" function
static void f_menu_get(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
@ -2207,7 +2202,6 @@ static void f_expandcmd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
rettv->vval.v_string = (char *)cmdstr;
}
/// "flatten(list[, {maxdepth}])" function
static void f_flatten(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
@ -2359,7 +2353,6 @@ static void f_filewritable(typval_T *argvars, typval_T *rettv, FunPtr fptr)
rettv->vval.v_number = os_file_is_writable(filename);
}
static void findfilendir(typval_T *argvars, typval_T *rettv, int find_what)
{
char_u *fresult = NULL;
@ -2418,7 +2411,6 @@ static void findfilendir(typval_T *argvars, typval_T *rettv, int find_what)
}
}
/// "filter()" function
static void f_filter(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
@ -2502,7 +2494,6 @@ static void f_fnamemodify(typval_T *argvars, typval_T *rettv, FunPtr fptr)
xfree(fbuf);
}
/// "foldclosed()" function
static void foldclosed_both(typval_T *argvars, typval_T *rettv, int end)
{
@ -3570,7 +3561,6 @@ static void f_getloclist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
get_qf_loc_list(false, wp, &argvars[1], rettv);
}
/// "getmarklist()" function
static void f_getmarklist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
@ -4763,7 +4753,6 @@ static void f_inputlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
rettv->vval.v_number = selected;
}
static garray_T ga_userinput = { 0, 0, sizeof(tasave_T), 4, NULL };
/// "inputrestore()" function
@ -5005,7 +4994,6 @@ static void f_jobresize(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return;
}
Channel *data = find_job(argvars[0].vval.v_number, true);
if (!data) {
return;
@ -5170,7 +5158,6 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return;
}
dict_T *job_opts = NULL;
bool detach = false;
bool rpc = false;
@ -5660,7 +5647,6 @@ static void f_localtime(typval_T *argvars, typval_T *rettv, FunPtr fptr)
rettv->vval.v_number = (varnumber_T)time(NULL);
}
static void get_maparg(typval_T *argvars, typval_T *rettv, int exact)
{
char *keys_buf = NULL;
@ -5774,7 +5760,6 @@ static void f_mapcheck(typval_T *argvars, typval_T *rettv, FunPtr fptr)
get_maparg(argvars, rettv, FALSE);
}
static void find_some_match(typval_T *const argvars, typval_T *const rettv,
const SomeMatchType type)
{
@ -7903,7 +7888,6 @@ static void f_rpcrequest(typval_T *argvars, typval_T *rettv, FunPtr fptr)
set_current_funccal((funccall_T *)(provider_caller_scope.funccalp));
}
Error err = ERROR_INIT;
uint64_t chan_id = (uint64_t)argvars[0].vval.v_number;
@ -9578,7 +9562,6 @@ static void f_stdioopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return;
}
bool rpc = false;
CallbackReader on_stdin = CALLBACK_READER_INIT;
dict_T *opts = argvars[0].vval.v_dict;
@ -9602,7 +9585,6 @@ static void f_stdioopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
semsg(e_stdiochan2, error);
}
rettv->vval.v_number = (varnumber_T)id;
rettv->v_type = VAR_NUMBER;
}
@ -10390,7 +10372,6 @@ static void f_synIDattr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
modec = 'c';
}
const char *p = NULL;
switch (TOLOWER_ASC(what[0])) {
case 'b':
@ -10538,7 +10519,6 @@ static void f_systemlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
get_system_output_as_rettv(argvars, rettv, true);
}
/// "tabpagebuflist()" function
static void f_tabpagebuflist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
@ -10584,7 +10564,6 @@ static void f_tabpagenr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
rettv->vval.v_number = nr;
}
/// Common code for tabpagewinnr() and winnr().
static int get_winnr(tabpage_T *tp, typval_T *argvar)
{
@ -10898,7 +10877,6 @@ static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr)
timer_start(tv_get_number(&argvars[0]), repeat, &callback);
}
/// "timer_stop(timerid)" function
static void f_timer_stop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{

1
src/nvim/eval/typval.c
View File

@ -1515,7 +1515,6 @@ void tv_dict_free(dict_T *const d)
}
}
/// Unreference a dictionary
///
/// Decrements the reference count and frees dictionary when it becomes zero.

1
src/nvim/eval/userfunc.c
View File

@ -200,7 +200,6 @@ static void register_closure(ufunc_T *fp)
[current_funccal->fc_funcs.ga_len++] = fp;
}
/// @return a name for a lambda. Returned in static memory.
char_u *get_lambda_name(void)
{

1
src/nvim/event/loop.c
View File

@ -13,7 +13,6 @@
# include "event/loop.c.generated.h"
#endif
void loop_init(Loop *loop, void *data)
{
uv_loop_init(&loop->uv);

1
src/nvim/event/loop.h
View File

@ -82,7 +82,6 @@ typedef struct loop {
} \
} while (0)
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "event/loop.h.generated.h"
#endif

1
src/nvim/event/multiqueue.c
View File

@ -82,7 +82,6 @@ typedef struct {
int refcount;
} MulticastEvent; ///< Event present on multiple queues.
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "event/multiqueue.c.generated.h"
#endif

1
src/nvim/event/multiqueue.h
View File

@ -12,7 +12,6 @@ typedef void (*PutCallback)(MultiQueue *multiq, void *data);
#define multiqueue_put(q, h, ...) \
multiqueue_put_event(q, event_create(h, __VA_ARGS__));
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "event/multiqueue.h.generated.h"
#endif

1
src/nvim/event/process.h
View File

@ -33,7 +33,6 @@ struct process {
MultiQueue *events;
};
static inline Process process_init(Loop *loop, ProcessType type, void *data)
{
return (Process) {

1
src/nvim/event/rstream.c
View File

@ -42,7 +42,6 @@ void rstream_init(Stream *stream, size_t bufsize)
stream->buffer->nonfull_cb = on_rbuffer_nonfull;
}
/// Starts watching for events from a `Stream` instance.
///
/// @param stream The `Stream` instance

1
src/nvim/event/rstream.h
View File

@ -8,7 +8,6 @@
#include "nvim/event/loop.h"
#include "nvim/event/stream.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "event/rstream.h.generated.h"
#endif

1
src/nvim/event/signal.c
View File

@ -10,7 +10,6 @@
# include "event/signal.c.generated.h"
#endif
void signal_watcher_init(Loop *loop, SignalWatcher *watcher, void *data)
FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
{

1
src/nvim/event/time.c
View File

@ -11,7 +11,6 @@
# include "event/time.c.generated.h"
#endif
void time_watcher_init(Loop *loop, TimeWatcher *watcher, void *data)
FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
{

9
src/nvim/ex_cmds.c
View File

@ -73,7 +73,6 @@
#include "nvim/vim.h"
#include "nvim/window.h"
/// Case matching style to use for :substitute
typedef enum {
kSubHonorOptions = 0, ///< Honor the user's 'ignorecase'/'smartcase' options
@ -1507,7 +1506,6 @@ void do_shell(char *cmd, int flags)
return;
}
/*
* For autocommands we want to get the output on the current screen, to
* avoid having to type return below.
@ -2883,7 +2881,6 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
// Change directories when the 'acd' option is set.
do_autochdir();
theend:
if (bufref_valid(&old_curbuf) && old_curbuf.br_buf->terminal != NULL) {
terminal_check_size(old_curbuf.br_buf->terminal);
@ -4065,7 +4062,6 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
goto skip;
}
// 3. Substitute the string. During 'inccommand' preview only do this if
// there is a replace pattern.
if (!preview || has_second_delim) {
@ -4143,7 +4139,6 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
}
replaced_bytes += end.col - start.col;
// Now the trick is to replace CTRL-M chars with a real line
// break. This would make it impossible to insert a CTRL-M in
// the text. The line break can be avoided by preceding the
@ -4199,7 +4194,6 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
lnum - lnum_start, subcols, sublen - 1, kExtmarkUndo);
}
// 4. If subflags.do_all is set, find next match.
// Prevent endless loop with patterns that match empty
// strings, e.g. :s/$/pat/g or :s/[a-z]* /(&)/g.
@ -4751,7 +4745,6 @@ bool prepare_tagpreview(bool undo_sync)
return false;
}
/// ":help": open a read-only window on a help file
void ex_help(exarg_T *eap)
{
@ -4932,7 +4925,6 @@ erret:
xfree(tag);
}
/// In an argument search for a language specifiers in the form "@xx".
/// Changes the "@" to NUL if found, and returns a pointer to "xx".
///
@ -5520,7 +5512,6 @@ void ex_viusage(exarg_T *eap)
do_cmdline_cmd("help normal-index");
}
/// Generate tags in one help directory
///
/// @param dir Path to the doc directory

11
src/nvim/ex_cmds2.c
View File

@ -537,7 +537,6 @@ bool check_changed(buf_T *buf, int flags)
return false;
}
/// Ask the user what to do when abandoning a changed buffer.
/// Must check 'write' option first!
///
@ -625,7 +624,6 @@ bool can_abandon(buf_T *buf, int forceit)
|| forceit;
}
/// Add a buffer number to "bufnrs", unless it's already there.
static void add_bufnum(int *bufnrs, int *bufnump, int nr)
{
@ -878,7 +876,6 @@ int get_arglist_exp(char_u *str, int *fcountp, char_u ***fnamesp, bool wig)
return i;
}
/// @param str
/// @param what
/// AL_SET: Redefine the argument list to 'str'.
@ -1637,7 +1634,6 @@ void ex_compiler(exarg_T *eap)
}
}
/// ":options"
void ex_options(exarg_T *eap)
{
@ -2146,7 +2142,6 @@ theend:
return retval;
}
/// Check if fname was sourced before to finds its SID.
/// If it's new, generate a new SID.
///
@ -2192,7 +2187,6 @@ scriptitem_T *get_current_script_id(char_u *fname, sctx_T *ret_sctx)
return si;
}
/// ":scriptnames"
void ex_scriptnames(exarg_T *eap)
{
@ -2291,7 +2285,6 @@ linenr_T get_sourced_lnum(LineGetter fgetline, void *cookie)
: sourcing_lnum;
}
/// Get one full line from a sourced file.
/// Called by do_cmdline() when it's called from do_source().
///
@ -2619,7 +2612,6 @@ void do_finish(exarg_T *eap, int reanimate)
}
}
/// @return true when a sourced file had the ":finish" command: Don't give error
/// message for missing ":endif".
/// false when not sourcing a file.
@ -2721,7 +2713,6 @@ static char *get_mess_env(void)
#endif
/// Set the "v:lang" variable according to the current locale setting.
/// Also do "v:lc_time"and "v:ctype".
void set_lang_var(void)
@ -2869,7 +2860,6 @@ void ex_language(exarg_T *eap)
}
}
static char **locales = NULL; // Array of all available locales
# ifndef WIN32
@ -2971,7 +2961,6 @@ char *get_locales(expand_T *xp, int idx)
#endif
static void script_host_execute(char *name, exarg_T *eap)
{
size_t len;

1
src/nvim/ex_cmds2.h
View File

@ -6,7 +6,6 @@
#include "nvim/ex_docmd.h"
#include "nvim/runtime.h"
//
// flags for check_changed()
//

14
src/nvim/ex_docmd.c
View File

@ -115,7 +115,6 @@ struct loop_cookie {
void *cookie;
};
// Struct to save a few things while debugging. Used in do_cmdline() only.
struct dbg_stuff {
int trylevel;
@ -624,7 +623,6 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
next_cmdline = cmdline_copy;
}
// reset did_emsg for a function that is not aborted by an error
if (did_emsg && !force_abort
&& getline_equal(fgetline, cookie, get_func_line)
@ -1109,7 +1107,6 @@ static int current_tab_nr(tabpage_T *tab)
#define CURRENT_TAB_NR current_tab_nr(curtab)
#define LAST_TAB_NR current_tab_nr(NULL)
/// Figure out the address type for ":wincmd".
static void get_wincmd_addr_type(char *arg, exarg_T *eap)
{
@ -4675,7 +4672,6 @@ static void correct_range(exarg_T *eap)
}
}
/// For a ":vimgrep" or ":vimgrepadd" command return a pointer past the
/// pattern. Otherwise return eap->arg.
static char *skip_grep_pat(exarg_T *eap)
@ -5635,7 +5631,6 @@ fail:
return FAIL;
}
static struct {
cmd_addr_T expand;
char *name;
@ -6958,7 +6953,6 @@ static void ex_highlight(exarg_T *eap)
do_highlight((const char *)eap->arg, eap->forceit, false);
}
/// Call this function if we thought we were going to exit, but we won't
/// (because of an error). May need to restore the terminal mode.
void not_exiting(void)
@ -7165,7 +7159,6 @@ void ex_win_close(int forceit, win_T *win, tabpage_T *tp)
}
}
// free buffer when not hiding it or when it's a scratch buffer
if (tp == NULL) {
win_close(win, !need_hide && !buf_hide(buf), forceit);
@ -7442,7 +7435,6 @@ void alist_init(alist_T *al)
ga_init(&al->al_ga, (int)sizeof(aentry_T), 5);
}
/// Remove a reference from an argument list.
/// Ignored when the argument list is the global one.
/// If the argument list is no longer used by any window, free it.
@ -7683,7 +7675,6 @@ void ex_splitview(exarg_T *eap)
do_exedit(eap, old_curwin);
}
theend:
xfree(fname);
}
@ -7801,7 +7792,6 @@ static void ex_tabs(exarg_T *eap)
}
}
/// ":mode":
/// If no argument given, get the screen size and redraw.
static void ex_mode(exarg_T *eap)
@ -8011,7 +8001,6 @@ static void ex_nogui(exarg_T *eap)
eap->errmsg = N_("E25: Nvim does not have a built-in GUI");
}
static void ex_swapname(exarg_T *eap)
{
if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL) {
@ -8054,7 +8043,6 @@ static void ex_syncbind(exarg_T *eap)
topline = 1;
}
/*
* Set all scrollbind windows to the same topline.
*/
@ -8089,7 +8077,6 @@ static void ex_syncbind(exarg_T *eap)
}
}
static void ex_read(exarg_T *eap)
{
int i;
@ -9244,7 +9231,6 @@ static void ex_findpat(exarg_T *eap)
}
}
/// ":ptag", ":ptselect", ":ptjump", ":ptnext", etc.
static void ex_ptag(exarg_T *eap)
{

4
src/nvim/ex_eval.c
View File

@ -439,7 +439,6 @@ char *get_exception_string(void *value, except_type_T type, char *cmdname, int *
return ret;
}
/// Throw a new exception. "value" is the exception string for a
/// user or interrupt exception, or points to a message list in case of an
/// error exception.
@ -1140,7 +1139,6 @@ void ex_endwhile(exarg_T *eap)
}
}
/// Handle ":throw expr"
void ex_throw(exarg_T *eap)
{
@ -1868,7 +1866,6 @@ void leave_cleanup(cleanup_T *csp)
}
}
/// Make conditionals inactive and discard what's pending in finally clauses
/// until the conditional type searched for or a try conditional not in its
/// finally clause is reached. If this is in an active catch clause, finish
@ -2009,7 +2006,6 @@ static char *get_end_emsg(cstack_T *cstack)
return e_endif;
}
/// Rewind conditionals until index "idx" is reached. "cond_type" and
/// "cond_level" specify a conditional type and the address of a level variable
/// which is to be decremented with each skipped conditional of the specified

13
src/nvim/ex_getln.c
View File

@ -916,7 +916,6 @@ static uint8_t *command_line_enter(int firstc, long count, int indent, bool init
apply_autocmds(EVENT_CMDLINEENTER, firstcbuf, firstcbuf, false, curbuf);
restore_v_event(dict, &save_v_event);
tl_ret = try_leave(&tstate, &err);
if (!tl_ret && ERROR_SET(&err)) {
msg_putchar('\n');
@ -1606,7 +1605,6 @@ static int may_do_command_line_next_incsearch(int firstc, long count, incsearch_
int search_flags = SEARCH_NOOF;
char_u save;
if (search_delim == ccline.cmdbuff[skiplen]) {
pat = last_search_pattern();
if (pat == NULL) {
@ -2000,7 +1998,6 @@ static int command_line_handle_key(CommandLineState *s)
// Ignore mouse event or open_cmdwin() result.
return command_line_not_changed(s);
case K_MIDDLEDRAG:
case K_MIDDLERELEASE:
return command_line_not_changed(s); // Ignore mouse
@ -2010,7 +2007,6 @@ static int command_line_handle_key(CommandLineState *s)
redrawcmd();
return command_line_changed(s);
case K_LEFTDRAG:
case K_LEFTRELEASE:
case K_RIGHTDRAG:
@ -2060,7 +2056,6 @@ static int command_line_handle_key(CommandLineState *s)
case K_MOUSEMOVE:
return command_line_not_changed(s);
case K_SELECT: // end of Select mode mapping - ignore
return command_line_not_changed(s);
@ -2284,7 +2279,6 @@ static int command_line_handle_key(CommandLineState *s)
return command_line_changed(s);
}
static int command_line_not_changed(CommandLineState *s)
{
// Incremental searches for "/" and "?":
@ -2554,7 +2548,6 @@ static int cmd_startcol(void)
return ccline.cmdindent + ((ccline.cmdfirstc != NUL) ? 1 : 0);
}
/// Compute the column position for a byte position on the command line.
static int cmd_screencol(int bytepos)
{
@ -2617,7 +2610,6 @@ bool cmdline_overstrike(void)
return ccline.overstrike;
}
/// Return true if the cursor is at the end of the cmdline.
bool cmdline_at_end(void)
FUNC_ATTR_PURE
@ -3441,7 +3433,6 @@ static bool cmdline_paste(int regname, bool literally, bool remcr)
return FAIL;
}
// Need to set "textlock" to avoid nasty things like going to another
// buffer when evaluating an expression.
textlock++;
@ -5587,7 +5578,6 @@ static int ExpandPackAddDir(char_u *pat, int *num_file, char_u ***file)
return OK;
}
/// Expand `file` for all comma-separated directories in `path`.
/// Adds matches to `ga`.
void globpath(char_u *path, char_u *file, garray_T *ga, int expand_options)
@ -5628,7 +5618,6 @@ void globpath(char_u *path, char_u *file, garray_T *ga, int expand_options)
xfree(buf);
}
/*********************************
* Command line history stuff *
*********************************/
@ -5918,7 +5907,6 @@ void add_to_history(int histype, char_u *new_entry, int in_map, int sep)
}
}
/*
* Get identifier of newest history entry.
* "histype" may be one of the HIST_ values.
@ -5933,7 +5921,6 @@ int get_history_idx(int histype)
return history[histype][hisidx[histype]].hisnum;
}
/// Get pointer to the command line info to use. save_cmdline() may clear
/// ccline and put the previous value in ccline.prev_ccline.
static struct cmdline_info *get_ccline_ptr(void)

6
src/nvim/extmark.c
View File

@ -53,7 +53,6 @@ static uint32_t *buf_ns_ref(buf_T *buf, uint32_t ns_id, bool put)
return map_ref(uint32_t, uint32_t)(buf->b_extmark_ns, ns_id, put);
}
/// Create or update an extmark
///
/// must not be used during iteration!
@ -361,7 +360,6 @@ ExtmarkInfo extmark_from_id(buf_T *buf, uint32_t ns_id, uint32_t id)
return ret;
}
/// free extmarks from the buffer
void extmark_free_all(buf_T *buf)
{
@ -391,7 +389,6 @@ void extmark_free_all(buf_T *buf)
map_init(uint32_t, uint32_t, buf->b_extmark_ns);
}
/// Save info for undo/redo of set marks
static void u_extmark_set(buf_T *buf, uint64_t mark, int row, colnr_T col)
{
@ -501,7 +498,6 @@ void extmark_apply_undo(ExtmarkUndoObject undo_info, bool undo)
}
}
/// Adjust extmark row for inserted/deleted rows (columns stay fixed).
void extmark_adjust(buf_T *buf, linenr_T line1, linenr_T line2, long amount, long amount_after,
ExtmarkOp undo)
@ -593,7 +589,6 @@ void extmark_splice_impl(buf_T *buf, int start_row, colnr_T start_col, bcount_t
u_extmark_copy(buf, start_row, start_col, end_row, end_col);
}
marktree_splice(buf->b_marktree, (int32_t)start_row, start_col,
old_row, old_col,
new_row, new_col);
@ -684,7 +679,6 @@ void extmark_move_region(buf_T *buf, int start_row, colnr_T start_col, bcount_t
0, 0, 0,
extent_row, extent_col, extent_byte);
if (undo == kExtmarkUndo) {
u_header_T *uhp = u_force_get_undo_header(buf);
if (!uhp) {

2
src/nvim/extmark.h
View File

@ -26,7 +26,6 @@ typedef kvec_t(ExtmarkInfo) ExtmarkInfoArray;
// TODO(bfredl): good enough name for now.
typedef ptrdiff_t bcount_t;
// delete the columns between mincol and endcol
typedef struct {
int start_row;
@ -80,7 +79,6 @@ struct undo_object {
} data;
};
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "extmark.h.generated.h"
#endif

1
src/nvim/file_search.c
View File

@ -146,7 +146,6 @@ typedef struct ff_visited_list_hdr {
ff_visited_T *ffvl_visited_list;
} ff_visited_list_hdr_T;
/*
* '**' can be expanded to several directory levels.
* Set the default maximum depth.

10
src/nvim/fileio.c
View File

@ -147,7 +147,6 @@ void filemess(buf_T *buf, char_u *name, char_u *s, int attr)
msg_scrolled_ign = false;
}
/// Read lines from file "fname" into the buffer after line "from".
///
/// 1. We allocate blocks with try_malloc, as big as possible.
@ -839,7 +838,6 @@ retry:
fio_flags = get_fio_flags((char_u *)fenc);
}
#ifdef HAVE_ICONV
// Try using iconv() if we can't convert internally.
if (fio_flags == 0
@ -1293,7 +1291,6 @@ retry:
size -= conv_restlen;
}
while (p > (uint8_t *)ptr) {
if (fio_flags & FIO_LATIN1) {
u8c = *--p;
@ -1995,7 +1992,6 @@ bool is_dev_fd_file(char_u *fname)
}
#endif
/// From the current line count and characters read after that, estimate the
/// line number where we are now.
/// Used for error messages that include a line number.
@ -2146,7 +2142,6 @@ static char_u *readfile_charconvert(char_u *fname, char_u *fenc, int *fdp)
return tmpname;
}
/// Read marks for the current buffer from the ShaDa file, when we support
/// buffer marks and the buffer has a name.
static void check_marks_read(void)
@ -3053,7 +3048,6 @@ nobackup:
}
}
// Default: write the file directly. May write to a temp file for
// multi-byte conversion.
wfname = fname;
@ -3089,7 +3083,6 @@ nobackup:
}
}
if (converted && wb_flags == 0) {
#ifdef HAVE_ICONV
// Use iconv() conversion when conversion is needed and it's not done
@ -4109,7 +4102,6 @@ static bool ucs2bytes(unsigned c, char_u **pp, int flags) FUNC_ATTR_NONNULL_ALL
bool error = false;
int cc;
if (flags & FIO_UCS4) {
if (flags & FIO_ENDIAN_L) {
*p++ = c;
@ -4238,7 +4230,6 @@ static int get_fio_flags(const char_u *name)
return 0;
}
/// Check for a Unicode BOM (Byte Order Mark) at the start of p[size].
/// "size" must be at least 2.
///
@ -5493,7 +5484,6 @@ char_u *vim_tempname(void)
return vim_strsave(template);
}
/// Tries matching a filename with a "pattern" ("prog" is NULL), or use the
/// precompiled regprog "prog" ("pattern" is NULL). That avoids calling
/// vim_regcomp() often.

1
src/nvim/fold.c
View File

@ -660,7 +660,6 @@ void foldCreate(win_T *wp, pos_T start, pos_T end)
}
}
// deleteFold() {{{2
/// @param start delete all folds from start to end when not 0
/// @param end delete all folds from start to end when not 0

4
src/nvim/getchar.c
View File

@ -54,7 +54,6 @@
#include "nvim/undo.h"
#include "nvim/vim.h"
/// Index in scriptin
static int curscript = 0;
FileDescriptor *scriptin[NSCRIPT] = { NULL };
@ -3433,7 +3432,6 @@ theend:
return retval;
}
/// Set or remove a mapping or an abbreviation in the current buffer, OR
/// display (matching) mappings/abbreviations.
///
@ -4716,7 +4714,6 @@ char_u *check_map(char_u *keys, int mode, int exact, int ign_mod, int abbr, mapb
return NULL;
}
/// Add a mapping. Unlike @ref do_map this copies the {map} argument, so
/// static or read-only strings can be used.
///
@ -4858,7 +4855,6 @@ char *getcmdkeycmd(int promptc, void *cookie, int indent, bool do_concat)
c1 = TO_SPECIAL(c1, c2);
}
if (got_int) {
aborted = true;
} else if (c1 == '\r' || c1 == '\n') {

7
src/nvim/globals.h
View File

@ -96,7 +96,6 @@ EXTERN int Columns INIT(= DFLT_COLS); // nr of columns in the screen
EXTERN NS ns_hl_active INIT(= 0); // current ns that defines highlights
EXTERN bool ns_hl_changed INIT(= false); // highlight need update
// We use 64-bit file functions here, if available. E.g. ftello() returns
// off_t instead of long, which helps if long is 32 bit and off_t is 64 bit.
// We assume that when fseeko() is available then ftello() is too.
@ -202,7 +201,6 @@ EXTERN bool msg_scrolled_ign INIT(= false);
// is reset before the screen is redrawn, so we need to keep track of this.
EXTERN bool msg_did_scroll INIT(= false);
EXTERN char_u *keep_msg INIT(= NULL); // msg to be shown after redraw
EXTERN int keep_msg_attr INIT(= 0); // highlight attr for keep_msg
EXTERN bool need_fileinfo INIT(= false); // do fileinfo() after redraw
@ -315,7 +313,6 @@ EXTERN bool suppress_errthrow INIT(= false);
/// cstacks; the pending exceptions, however, are not on the caught stack.
EXTERN except_T *caught_stack INIT(= NULL);
///
/// Garbage collection can only take place when we are sure there are no Lists
/// or Dictionaries being used internally. This is flagged with
@ -361,7 +358,6 @@ EXTERN struct caller_scope {
} provider_caller_scope;
EXTERN int provider_call_nesting INIT(= 0);
EXTERN int t_colors INIT(= 256); // int value of T_CCO
// Flags to indicate an additional string for highlight name completion.
@ -478,7 +474,6 @@ EXTERN buf_T *curbuf INIT(= NULL); // currently active buffer
#define FOR_ALL_SIGNS_IN_BUF(buf, sign) \
for ((sign) = (buf)->b_signlist; (sign) != NULL; (sign) = (sign)->se_next) // NOLINT
// List of files being edited (global argument list). curwin->w_alist points
// to this when the window is using the global argument list.
EXTERN alist_T global_alist; // global argument list
@ -793,7 +788,6 @@ enum {
WM_LIST = 3, ///< cmdline CTRL-D
};
// Some file names are stored in pathdef.c, which is generated from the
// Makefile to make their value depend on the Makefile.
#ifdef HAVE_PATHDEF
@ -842,7 +836,6 @@ EXTERN bool no_hlsearch INIT(= false);
// Page number used for %N in 'pageheader' and 'guitablabel'.
EXTERN linenr_T printer_page_num;
EXTERN bool typebuf_was_filled INIT(= false); // received text from client
// or from feedkeys()

3
src/nvim/grid.c
View File

@ -17,7 +17,6 @@
// Per-cell attributes
static size_t linebuf_size = 0;
/// Determine if dedicated window grid should be used or the default_grid
///
/// If UI did not request multigrid support, draw all windows on the
@ -136,7 +135,6 @@ void grid_getbytes(ScreenGrid *grid, int row, int col, char_u *bytes, int *attrp
}
}
/// put string '*text' on the window grid at position 'row' and 'col', with
/// attributes 'attr', and update chars[] and attrs[].
/// Note: only outputs within one row, message is truncated at grid boundary!
@ -272,7 +270,6 @@ void grid_puts_len(ScreenGrid *grid, char_u *text, int textlen, int row, int col
schar_T buf;
schar_from_cc(buf, u8c, u8cc);
need_redraw = schar_cmp(grid->chars[off], buf)
|| (mbyte_cells == 2 && grid->chars[off + 1][0] != 0)
|| grid->attrs[off] != attr

1
src/nvim/grid_defs.h
View File

@ -21,7 +21,6 @@ enum {
kZIndexCmdlinePopupMenu = 250,
};
/// ScreenGrid represents a resizable rectuangular grid displayed by UI clients.
///
/// chars[] contains the UTF-8 text that is currently displayed on the grid.

8
src/nvim/hardcopy.c
View File

@ -116,7 +116,6 @@ static option_table_T printer_opts[OPT_PRINT_NUM_OPTIONS]
}
;
static const uint32_t cterm_color_8[8] = {
0x000000, 0xff0000, 0x00ff00, 0xffff00,
0x0000ff, 0xff00ff, 0x00ffff, 0xffffff
@ -366,7 +365,6 @@ static char *parse_list_options(char_u *option_str, option_table_T *table, size_
return ret;
}
/*
* If using a dark background, the colors will probably be too bright to show
* up well on white paper, so reduce their brightness.
@ -970,7 +968,6 @@ static colnr_T hardcopy_line(prt_settings_T *psettings, int page_line, prt_pos_T
return col;
}
/*
* PS printer stuff.
*
@ -1242,7 +1239,6 @@ static struct prt_ps_mbfont_S prt_ps_mbfonts[] =
#define PRT_RESOURCE_ENCODING "Encoding"
#define PRT_RESOURCE_CMAP "CMap"
/* Data for table based DSC comment recognition, easy to extend if VIM needs to
* read more comments. */
#define PRT_DSC_MISC_TYPE (-1)
@ -1254,7 +1250,6 @@ static struct prt_ps_mbfont_S prt_ps_mbfonts[] =
#define PRT_DSC_VERSION "%%Version:"
#define PRT_DSC_ENDCOMMENTS "%%EndComments:"
#define SIZEOF_CSTR(s) (sizeof(s) - 1)
static struct prt_dsc_comment_S prt_dsc_table[] =
{
@ -1265,7 +1260,6 @@ static struct prt_dsc_comment_S prt_dsc_table[] =
PRT_DSC_ENDCOMMENTS_TYPE }
};
/*
* Variables for the output PostScript file.
*/
@ -2053,7 +2047,6 @@ static void prt_font_metrics(int font_scale)
prt_char_width = PRT_PS_FONT_TO_USER(font_scale, prt_ps_font->wx);
}
static int prt_get_cpl(void)
{
if (prt_use_number()) {
@ -2168,7 +2161,6 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
struct prt_ps_encoding_S *p_mbenc_first;
struct prt_ps_charset_S *p_mbchar = NULL;
/*
* Set up font and encoding.
*/

1
src/nvim/hardcopy.h
View File

@ -80,7 +80,6 @@ typedef struct {
#define PRINT_NUMBER_WIDTH 8
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "hardcopy.h.generated.h"
#endif

2
src/nvim/highlight.c
View File

@ -229,7 +229,6 @@ int ns_get_hl(NS ns_id, int hl_id, bool link, bool nodefault)
}
}
bool win_check_ns_hl(win_T *wp)
{
if (ns_hl_changed) {
@ -760,7 +759,6 @@ Dictionary hlattrs2dict(HlAttrs ae, bool use_rgb)
PUT(hl, "underdash", BOOLEAN_OBJ(true));
}
if (mask & HL_ITALIC) {
PUT(hl, "italic", BOOLEAN_OBJ(true));
}

2
src/nvim/highlight_defs.h
View File

@ -178,7 +178,6 @@ EXTERN const char *hlf_names[] INIT(= {
[HLF_WBRNC] = "WinBarNC",
});
EXTERN int highlight_attr[HLF_COUNT]; // Highl. attr for each context.
EXTERN int highlight_attr_last[HLF_COUNT]; // copy for detecting changed groups
EXTERN int highlight_user[9]; // User[1-9] attributes
@ -222,5 +221,4 @@ typedef struct {
#define COLOR_ITEM_INITIALIZER { .attr_id = -1, .link_id = -1, \
.version = -1, .is_default = false }
#endif // NVIM_HIGHLIGHT_DEFS_H

1
src/nvim/highlight_group.c
View File

@ -1835,7 +1835,6 @@ int syn_get_final_id(int hl_id)
continue;
}
if (sgp->sg_link == 0 || sgp->sg_link > highlight_ga.ga_len) {
break;
}

23
src/nvim/if_cscope.c
View File

@ -68,7 +68,6 @@ static void cs_usage_msg(csid_e x)
(void)semsg(_("E560: Usage: cs[cope] %s"), cs_cmds[(int)x].usage);
}
static enum {
EXP_CSCOPE_SUBCMD, // expand ":cscope" sub-commands
EXP_SCSCOPE_SUBCMD, // expand ":scscope" sub-commands
@ -169,7 +168,6 @@ void set_context_in_cscope_cmd(expand_T *xp, const char *arg, cmdidx_T cmdidx)
}
}
/// Find the command, print help if invalid, and then call the corresponding
/// command function.
///
@ -274,7 +272,6 @@ void ex_cstag(exarg_T *eap)
}
}
/// This simulates a vim_fgets(), but for cscope, returns the next line
/// from the cscope output. should only be called from find_tags()
///
@ -292,7 +289,6 @@ bool cs_fgets(char_u *buf, int size)
return false;
}
/// Called only from do_tag(), when popping the tag stack.
void cs_free_tags(void)
{
@ -380,7 +376,6 @@ bool cs_connection(int num, char_u *dbpath, char_u *ppath)
return false;
} // cs_connection
/*
* PRIVATE functions
****************************************************************************/
@ -408,7 +403,6 @@ static void cs_stat_emsg(char *fname)
(void)semsg(_("E563: stat(%s) error: %d"), fname, err);
}
/// The common routine to add a new cscope connection. Called by
/// cs_add() and cs_reset(). I really don't like to do this, but this
/// routine uses a number of goto statements.
@ -520,7 +514,6 @@ add_err:
return CSCOPE_FAILURE;
}
static bool cs_check_for_connections(void)
{
return cs_cnt_connections() > 0;
@ -613,7 +606,6 @@ static int cs_cnt_matches(size_t idx)
return nlines;
}
/// Creates the actual cscope command query from what the user entered.
static char *cs_create_cmd(char *csoption, char *pattern)
{
@ -680,7 +672,6 @@ static char *cs_create_cmd(char *csoption, char *pattern)
return cmd;
}
/// This piece of code was taken/adapted from nvi. do we need to add
/// the BSD license notice?
static int cs_create_connection(size_t i)
@ -879,7 +870,6 @@ err_closing:
return CSCOPE_SUCCESS;
}
/// Query cscope using command line interface. Parse the output and use tselect
/// to allow choices. Like Nvi, creates a pipe to send to/from query/cscope.
///
@ -918,7 +908,6 @@ static int cs_find(exarg_T *eap)
eap->cmdidx == CMD_lcscope, (char_u *)(*eap->cmdlinep));
}
/// Common code for cscope find, shared by cs_find() and ex_cstag().
static bool cs_find_common(char *opt, char *pat, int forceit, int verbose, bool use_ll,
char_u *cmdline)
@ -1119,7 +1108,6 @@ static int cs_help(exarg_T *eap)
return CSCOPE_SUCCESS;
}
static void clear_csinfo(size_t i)
{
csinfo[i].fname = NULL;
@ -1193,7 +1181,6 @@ static int cs_insert_filelist(char *fname, char *ppath, char *flags, FileInfo *f
return (int)i;
}
/// Find cscope command in command table.
static cscmd_T *cs_lookup_cmd(exarg_T *eap)
{
@ -1221,7 +1208,6 @@ static cscmd_T *cs_lookup_cmd(exarg_T *eap)
return NULL;
}
/// Nuke em.
static int cs_kill(exarg_T *eap)
{
@ -1281,7 +1267,6 @@ static int cs_kill(exarg_T *eap)
return CSCOPE_SUCCESS;
}
/// Actually kills a specific cscope connection.
///
/// @param i cscope table index
@ -1296,7 +1281,6 @@ static void cs_kill_execute(size_t i, char *cname)
cs_release_csp(i, TRUE);
}
/// Convert the cscope output into a ctags style entry (as might be found
/// in a ctags tags file). there's one catch though: cscope doesn't tell you
/// the type of the tag you are looking for. for example, in Darren Hiebert's
@ -1343,7 +1327,6 @@ static char *cs_make_vim_style_matches(char *fname, char *slno, char *search, ch
return buf;
}
/// This is kind of hokey, but i don't see an easy way round this.
///
/// Store: keep a ptr to the (malloc'd) memory of matches originally
@ -1415,7 +1398,6 @@ static char *cs_manage_matches(char **matches, char **contexts, size_t totmatche
return p;
}
/// Parse cscope output.
static char *cs_parse_results(size_t cnumber, char *buf, int bufsize, char **context,
char **linenumber, char **search)
@ -1581,7 +1563,6 @@ static void cs_fill_results(char *tagstr, size_t totmatches, int *nummatches_a,
xfree(buf);
}
// get the requested path components
static char *cs_pathcomponents(char *path)
{
@ -1929,7 +1910,6 @@ static void cs_release_csp(size_t i, bool freefnpp)
clear_csinfo(i);
}
/// Calls cs_kill on all cscope connections then reinits.
static int cs_reset(exarg_T *eap)
{
@ -1980,7 +1960,6 @@ static int cs_reset(exarg_T *eap)
return CSCOPE_SUCCESS;
}
/// Construct the full pathname to a file found in the cscope database.
/// (Prepends ppath, if there is one and if it's not already prepended,
/// otherwise just uses the name found.)
@ -2031,7 +2010,6 @@ static char *cs_resolve_file(size_t i, char *name)
return fullname;
}
/// Show all cscope connections.
static int cs_show(exarg_T *eap)
{
@ -2059,7 +2037,6 @@ static int cs_show(exarg_T *eap)
return CSCOPE_SUCCESS;
}
/// Only called when VIM exits to quit any cscope sessions.
void cs_end(void)
{

7
src/nvim/indent.c
View File

@ -26,7 +26,6 @@
#include "nvim/strings.h"
#include "nvim/undo.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "indent.c.generated.h"
#endif
@ -40,7 +39,6 @@ int get_indent(void)
false);
}
// Count the size (in window cells) of the indent in line "lnum".
int get_indent_lnum(linenr_T lnum)
{
@ -50,7 +48,6 @@ int get_indent_lnum(linenr_T lnum)
false);
}
// Count the size (in window cells) of the indent in line "lnum" of buffer
// "buf".
int get_indent_buf(buf_T *buf, linenr_T lnum)
@ -61,7 +58,6 @@ int get_indent_buf(buf_T *buf, linenr_T lnum)
false);
}
/// Count the size (in window cells) of the indent in line "ptr", with
/// 'tabstop' at "ts".
/// If @param list is true, count only screen size for tabs.
@ -387,7 +383,6 @@ int set_indent(int size, int flags)
return retval;
}
// Return the indent of the current line after a number. Return -1 if no
// number was found. Used for 'n' in 'formatoptions': numbered list.
// Since a pattern is used it can actually handle more than numbers.
@ -580,7 +575,6 @@ int get_expr_indent(void)
return indent;
}
// When 'p' is present in 'cpoptions, a Vi compatible method is used.
// The incompatible newer method is quite a bit better at indenting
// code in lisp-like languages than the traditional one; it's still
@ -766,7 +760,6 @@ int get_lisp_indent(void)
return amount;
}
static int lisp_match(char_u *p)
{
char_u buf[LSIZE];

5
src/nvim/indent_c.c
View File

@ -212,7 +212,6 @@ int is_pos_in_string(const char_u *line, colnr_T col)
* Below "XXX" means that this function may unlock the current line.
*/
/*
* Return true if the string "line" starts with a word from 'cinwords'.
*/
@ -238,7 +237,6 @@ bool cin_is_cinword(const char_u *line)
return retval;
}
/*
* Skip over white space and C comments within the line.
* Also skip over Perl/shell comments if desired.
@ -1422,7 +1420,6 @@ static int cin_is_cpp_extern_c(const char_u *s)
return false;
}
/*
* Skip strings, chars and comments until at or past "trypos".
* Return the column found.
@ -1553,7 +1550,6 @@ static pos_T *find_match_paren_after_brace(int ind_maxparen)
return trypos;
}
/*
* Return ind_maxparen corrected for the difference in line number between the
* cursor position and "startpos". This makes sure that searching for a
@ -3746,7 +3742,6 @@ term_again:
amount += curbuf->b_ind_comment;
}
// add extra indent if the previous line ended in a backslash:
// "asdfasdf{backslash}
// here";

1
src/nvim/lib/kbtree.h
View File

@ -224,7 +224,6 @@
kb_putp_##name(b, &k); \
}
#define __KB_DEL(name, key_t, kbnode_t, T) \
static inline key_t __kb_delp_aux_##name(kbtree_##name##_t *b, kbnode_t *x, key_t * __restrict k, \
int s) \

1
src/nvim/lib/khash.h
View File

@ -113,7 +113,6 @@
* Added destructor
*/
#ifndef NVIM_LIB_KHASH_H
#define NVIM_LIB_KHASH_H

1
src/nvim/lib/klist.h
View File

@ -32,7 +32,6 @@
#include "nvim/func_attr.h"
#include "nvim/memory.h"
#define KMEMPOOL_INIT(name, kmptype_t, kmpfree_f) \
typedef struct { \
size_t cnt, n, max; \

1
src/nvim/lib/kvec.h
View File

@ -121,7 +121,6 @@
#define kv_push(v, x) \
(*kv_pushp(v) = (x))
#define kv_a(v, i) \
(*(((v).capacity <= (size_t)(i) \
? ((v).capacity = (v).size = (i) + 1, \

1
src/nvim/lib/queue.h
View File

@ -44,7 +44,6 @@ typedef struct _queue {
(q) = next; \
}
// ffi.cdef is unable to swallow `bool` in place of `int` here.
static inline int QUEUE_EMPTY(const QUEUE *const q)
FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT

1
src/nvim/log.h
View File

@ -16,7 +16,6 @@
# define NVIM_PROBE(name, n, ...)
#endif
#define TRACE_LOG_LEVEL 0
#define DEBUG_LOG_LEVEL 1
#define INFO_LOG_LEVEL 2

4
src/nvim/lua/converter.c
View File

@ -49,7 +49,6 @@ typedef struct {
#define LUA_PUSH_STATIC_STRING(lstate, s) \
lua_pushlstring(lstate, s, sizeof(s) - 1)
static LuaTableProps nlua_traverse_table(lua_State *const lstate)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
{
@ -674,7 +673,6 @@ static inline void nlua_create_typed_table(lua_State *lstate, const size_t narr,
lua_rawset(lstate, -3);
}
/// Convert given String to lua string
///
/// Leaves converted string on top of the stack.
@ -808,7 +806,6 @@ void nlua_push_Object(lua_State *lstate, const Object obj, bool special)
}
}
/// Convert lua value to string
///
/// Always pops one value from the stack.
@ -1297,7 +1294,6 @@ void nlua_init_types(lua_State *const lstate)
lua_rawset(lstate, -3);
}
void nlua_pop_keydict(lua_State *L, void *retval, field_hash hashy, Error *err)
{
if (!lua_istable(L, -1)) {

9
src/nvim/lua/executor.c
View File

@ -135,7 +135,6 @@ static int nlua_pcall(lua_State *lstate, int nargs, int nresults)
return status;
}
/// Gets the version of the current Nvim build.
///
/// @param lstate Lua interpreter state.
@ -147,7 +146,6 @@ static int nlua_nvim_version(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
return 1;
}
static void nlua_luv_error_event(void **argv)
{
char *error = (char *)argv[0];
@ -1041,7 +1039,6 @@ static int nlua_empty_dict_tostring(lua_State *lstate)
return 1;
}
#ifdef WIN32
/// os.getenv: override os.getenv to maintain coherency. #9681
///
@ -1055,7 +1052,6 @@ static int nlua_getenv(lua_State *lstate)
}
#endif
/// add the value to the registry
/// The current implementation does not support calls from threads.
LuaRef nlua_ref(lua_State *lstate, nlua_ref_state_t *ref_state, int index)
@ -1074,7 +1070,6 @@ LuaRef nlua_ref(lua_State *lstate, nlua_ref_state_t *ref_state, int index)
return ref;
}
LuaRef nlua_ref_global(lua_State *lstate, int index)
{
return nlua_ref(lstate, nlua_global_refs, index);
@ -1100,7 +1095,6 @@ void nlua_unref_global(lua_State *lstate, LuaRef ref)
nlua_unref(lstate, nlua_global_refs, ref);
}
void api_free_luaref(LuaRef ref)
{
nlua_unref_global(global_lstate, ref);
@ -1112,7 +1106,6 @@ void nlua_pushref(lua_State *lstate, LuaRef ref)
lua_rawgeti(lstate, LUA_REGISTRYINDEX, ref);
}
/// Gets a new reference to an object stored at original_ref
///
/// NOTE: It does not copy the value, it creates a new ref to the lua object.
@ -1130,7 +1123,6 @@ LuaRef api_new_luaref(LuaRef original_ref)
return new_ref;
}
/// Evaluate lua string
///
/// Used for luaeval().
@ -1744,7 +1736,6 @@ char_u *nlua_register_table_as_callable(typval_T *const arg)
char_u *name = register_cfunc(&nlua_CFunction_func_call,
&nlua_CFunction_func_free, state);
lua_pop(lstate, 1); // []
assert(top == lua_gettop(lstate));

2
src/nvim/lua/stdlib.c
View File

@ -349,7 +349,6 @@ static dict_T *nlua_get_var_scope(lua_State *lstate)
return dict;
}
int nlua_setvar(lua_State *lstate)
{
// non-local return if not found
@ -470,7 +469,6 @@ static int nlua_stricmp(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
return 1;
}
void nlua_state_add_stdlib(lua_State *const lstate, bool is_thread)
{
if (!is_thread) {

5
src/nvim/lua/treesitter.c
View File

@ -529,7 +529,6 @@ static int parser_set_ranges(lua_State *L)
size_t tbl_len = lua_objlen(L, 2);
TSRange *ranges = xmalloc(sizeof(TSRange) * tbl_len);
// [ parser, ranges ]
for (size_t index = 0; index < tbl_len; index++) {
lua_rawgeti(L, 2, index + 1); // [ parser, ranges, range ]
@ -558,7 +557,6 @@ static int parser_get_ranges(lua_State *L)
return 1;
}
// Tree methods
/// push tree interface on lua stack.
@ -656,7 +654,6 @@ static bool node_check(lua_State *L, int index, TSNode *res)
return false;
}
static int node_tostring(lua_State *L)
{
TSNode node;
@ -1059,7 +1056,6 @@ static int query_next_match(lua_State *L)
return 0;
}
static int query_next_capture(lua_State *L)
{
// Upvalues are:
@ -1205,7 +1201,6 @@ int tslua_parse_query(lua_State *L)
return 1;
}
static const char *query_err_string(TSQueryError err)
{
switch (err) {

1
src/nvim/macros.h
View File

@ -94,7 +94,6 @@
#define REPLACE_NORMAL(s) (((s) & REPLACE_FLAG) && !((s) & VREPLACE_FLAG))
// MB_PTR_ADV(): advance a pointer to the next character, taking care of
// multi-byte characters if needed. Skip over composing chars.
#define MB_PTR_ADV(p) (p += utfc_ptr2len((char *)p))

4
src/nvim/main.c
View File

@ -810,7 +810,6 @@ static void init_locale(void)
}
#endif
static uint64_t server_connect(char *server_addr, const char **errmsg)
{
if (server_addr == NULL) {
@ -917,7 +916,6 @@ static void remote_request(mparm_T *params, int remote_args, char *server_addr,
}
}
/// Decides whether text (as opposed to commands) will be read from stdin.
/// @see EDIT_STDIN
static bool edit_stdin(bool explicit, mparm_T *parmp)
@ -1493,7 +1491,6 @@ static void set_window_layout(mparm_T *paramp)
}
}
/*
* "-q errorfile": Load the error file now.
* If the error file can't be read, exit before doing anything else.
@ -2175,7 +2172,6 @@ static void usage(void)
mch_msg(_("\nSee \":help startup-options\" for all options.\n"));
}
/*
* Check the result of the ATTENTION dialog:
* When "Quit" selected, exit Vim.

2
src/nvim/map.c
View File

@ -32,7 +32,6 @@
#define handle_T_hash kh_int_hash_func
#define handle_T_eq kh_int_hash_equal
#if defined(ARCH_64)
# define ptr_t_hash(key) uint64_t_hash((uint64_t)key)
# define ptr_t_eq(a, b) uint64_t_eq((uint64_t)a, (uint64_t)b)
@ -163,7 +162,6 @@ static inline bool ColorKey_eq(ColorKey ae1, ColorKey ae2)
return memcmp(&ae1, &ae2, sizeof(ae1)) == 0;
}
MAP_IMPL(int, int, DEFAULT_INITIALIZER)
MAP_IMPL(cstr_t, ptr_t, DEFAULT_INITIALIZER)
MAP_IMPL(cstr_t, int, DEFAULT_INITIALIZER)

3
src/nvim/mark.c
View File

@ -1016,7 +1016,6 @@ static void mark_adjust_internal(linenr_T line1, linenr_T line2, long amount, lo
ONE_ADJUST(&(curbuf->b_last_cursor.mark.lnum));
}
// list of change positions
for (i = 0; i < curbuf->b_changelistlen; i++) {
ONE_ADJUST_NODEL(&(curbuf->b_changelist[i].mark.lnum));
@ -1586,7 +1585,6 @@ void mark_mb_adjustpos(buf_T *buf, pos_T *lp)
}
}
// Add information about mark 'mname' to list 'l'
static int add_mark(list_T *l, const char *mname, const pos_T *pos, int bufnr, const char *fname)
FUNC_ATTR_NONNULL_ARG(1, 2, 3)
@ -1614,7 +1612,6 @@ static int add_mark(list_T *l, const char *mname, const pos_T *pos, int bufnr, c
return OK;
}
/// Get information about marks local to a buffer.
///
/// @param[in] buf Buffer to get the marks from

3
src/nvim/marktree.c
View File

@ -575,7 +575,6 @@ void marktree_move(MarkTree *b, MarkTreeIter *itr, int row, int col)
marktree_del_itr(b, itr, false);
key.pos = (mtpos_t){ row, col };
marktree_put_key(b, key);
itr->node = NULL; // itr might become invalid by put
}
@ -799,7 +798,6 @@ bool marktree_itr_node_done(MarkTreeIter *itr)
return !itr->node || itr->i == itr->node->n - 1;
}
mtpos_t marktree_itr_pos(MarkTreeIter *itr)
{
mtpos_t pos = rawkey(itr).pos;
@ -961,7 +959,6 @@ past_continue_same_node:
}
}
while (itr->node) {
unrelative(oldbase[itr->lvl], &rawkey(itr).pos);
int realrow = rawkey(itr).pos.row;

3
src/nvim/marktree.h
View File

@ -32,7 +32,6 @@ typedef struct {
iterstate_t s[MT_MAX_DEPTH];
} MarkTreeIter;
// Internal storage
//
// NB: actual marks have flags > 0, so we can use (row,col,0) pseudo-key for
@ -109,7 +108,6 @@ static inline uint16_t mt_flags(bool right_gravity, uint8_t decor_level)
| (decor_level << MT_FLAG_DECOR_OFFSET));
}
struct mtnode_s {
int32_t n;
int32_t level;
@ -130,7 +128,6 @@ typedef struct {
PMap(uint64_t) id2node[1];
} MarkTree;
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "marktree.h.generated.h"
#endif

2
src/nvim/math.c
View File

@ -31,10 +31,12 @@ int xfpclassify(double d)
return m ? FP_NAN : FP_INFINITE;
}
}
int xisinf(double d)
{
return FP_INFINITE == xfpclassify(d);
}
int xisnan(double d)
{
return FP_NAN == xfpclassify(d);

7
src/nvim/mbyte.c
View File

@ -344,7 +344,6 @@ static int enc_canon_search(const char_u *name)
return -1;
}
/*
* Find canonical encoding "name" in the list and return its properties.
* Returns 0 if not found.
@ -1525,7 +1524,6 @@ ssize_t mb_utf_index_to_bytes(const char_u *s, size_t len, size_t index, bool us
return -1;
}
/*
* Version of strnicmp() that handles multi-byte characters.
* Needed for Big5, Shift-JIS and UTF-8 encoding. Other DBCS encodings can
@ -1867,7 +1865,6 @@ int mb_tail_off(const char_u *base, const char_u *p)
return i;
}
/// Return the offset from "p" to the first byte of the character it points
/// into. Can start anywhere in a stream of bytes.
/// Unlike utf_head_off() this doesn't include composing characters and returns a negative value.
@ -2129,7 +2126,6 @@ const char *mb_unescape(const char **const pp)
return NULL;
}
/*
* Skip the Vim specific head of a 'encoding' name.
*/
@ -2225,7 +2221,6 @@ static int enc_alias_search(const char_u *name)
return -1;
}
#ifdef HAVE_LANGINFO_H
# include <langinfo.h>
#endif
@ -2299,7 +2294,6 @@ enc_locale_copy_enc:
#if defined(HAVE_ICONV)
/*
* Call iconv_open() with a check if iconv() works properly (there are broken
* versions).
@ -2429,7 +2423,6 @@ static char_u *iconv_string(const vimconv_T *const vcp, char_u *str, size_t slen
#endif // HAVE_ICONV
/*
* Setup "vcp" for conversion from "from" to "to".
* The names must have been made canonical with enc_canonize().

1
src/nvim/memfile.c
View File

@ -60,7 +60,6 @@
#define MEMFILE_PAGE_SIZE 4096 /// default page size
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "memfile.c.generated.h"
#endif

5
src/nvim/memline.c
View File

@ -288,7 +288,6 @@ int ml_open(buf_T *buf)
buf->b_ml.ml_line_count = 1;
curwin->w_nrwidth_line_count = 0;
/*
* fill block0 struct and write page 0
*/
@ -732,7 +731,6 @@ static void add_b0_fenc(ZERO_BL *b0p, buf_T *buf)
}
}
/// Try to recover curbuf from the .swp file.
///
/// @param checkext if true, check the extension and detect whether it is a
@ -2445,7 +2443,6 @@ void ml_add_deleted_len_buf(buf_T *buf, char_u *ptr, ssize_t len)
}
}
int ml_replace(linenr_T lnum, char *line, bool copy)
{
return ml_replace_buf(curbuf, lnum, (char_u *)line, copy);
@ -3304,7 +3301,6 @@ char_u *get_file_in_dir(char_u *fname, char_u *dname)
return retval;
}
/// Print the ATTENTION message: info about an existing swap file.
///
/// @param buf buffer being edited
@ -3351,7 +3347,6 @@ static void attention_message(buf_T *buf, char_u *fname)
--no_wait_return;
}
/// Trigger the SwapExists autocommands.
///
/// @return a value for equivalent to do_dialog() (see below):

1
src/nvim/memory.c
View File

@ -661,7 +661,6 @@ void free_all_mem(void)
ResetRedobuff();
ResetRedobuff();
// highlight info
free_highlight();

18
src/nvim/menu.c
View File

@ -31,12 +31,10 @@
#define MENUDEPTH 10 // maximum depth of menus
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "menu.c.generated.h"
#endif
/// The character for each menu mode
static char menu_mode_chars[] = { 'n', 'v', 's', 'o', 'i', 'c', 't' };
@ -98,7 +96,6 @@ void ex_menu(exarg_T *eap)
break;
}
// Locate an optional "icon=filename" argument
// TODO(nvim): Currently this is only parsed. Should expose it to UIs.
if (STRNCMP(arg, "icon=", 5) == 0) {
@ -162,7 +159,6 @@ void ex_menu(exarg_T *eap)
return;
}
menu_path = arg;
if (*menu_path == '.') {
semsg(_(e_invarg2), menu_path);
@ -268,7 +264,6 @@ theend:
;
}
/// Add the menu with the given name to the menu hierarchy
///
/// @param[out] menuarg menu entry
@ -398,7 +393,6 @@ static int add_menu_path(const char *const menu_path, vimmenu_T *menuarg, const
}
}
menup = &menu->children;
parent = menu;
name = next_name;
@ -543,7 +537,6 @@ static int menu_enable_recurse(vimmenu_T *menu, char *name, int modes, int enabl
return FAIL;
}
return OK;
}
@ -615,7 +608,6 @@ static int remove_menu(vimmenu_T **menup, char *name, int modes, bool silent)
return FAIL;
}
// Recalculate modes for menu based on the new updated children
menu->modes &= ~modes;
child = menu->children;
@ -645,7 +637,6 @@ static void free_menu(vimmenu_T **menup)
menu = *menup;
// Don't change *menup until after calling gui_mch_destroy_menu(). The
// MacOS code needs the original structure to properly delete the menu.
*menup = menu->next;
@ -749,7 +740,6 @@ static dict_T *menu_get_recursive(const vimmenu_T *menu, int modes)
return dict;
}
/// Export menus matching path \p path_name
///
/// @param path_name
@ -776,7 +766,6 @@ bool menu_get(char *const path_name, int modes, list_T *list)
return true;
}
/// Find menu matching `name` and `modes`.
///
/// @param menu top menu to start looking from
@ -913,7 +902,6 @@ static void show_menus_recursive(vimmenu_T *menu, int modes, int depth)
}
}
/*
* Used when expanding menu names.
*/
@ -937,7 +925,6 @@ char *set_context_in_menu_cmd(expand_T *xp, const char *cmd, char *arg, bool for
xp->xp_context = EXPAND_UNSUCCESSFUL;
// Check for priority numbers, enable and disable
for (p = arg; *p; ++p) {
if (!ascii_isdigit(*p) && *p != '.') {
@ -1146,7 +1133,6 @@ char *get_menu_names(expand_T *xp, int idx)
return str;
}
/// Skip over this element of the menu path and return the start of the next
/// element. Any \ and ^Vs are removed from the current element.
///
@ -1197,7 +1183,6 @@ static bool menu_namecmp(const char *const name, const char *const mname)
&& (mname[i] == NUL || mname[i] == TAB);
}
/// Returns the \ref MENU_MODES specified by menu command `cmd`.
/// (eg :menu! returns MENU_CMDLINE_MODE | MENU_INSERT_MODE)
///
@ -1281,7 +1266,6 @@ static char *popup_mode_name(char *name, int idx)
return p;
}
/// Duplicate the menu item text and then process to see if a mnemonic key
/// and/or accelerator text has been identified.
///
@ -1346,7 +1330,6 @@ bool menu_is_popup(const char *const name)
return STRNCMP(name, "PopUp", 5) == 0;
}
// Return true if "name" is a toolbar menu name.
bool menu_is_toolbar(const char *const name)
FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
@ -1363,7 +1346,6 @@ int menu_is_separator(char *name)
return name[0] == '-' && name[STRLEN(name) - 1] == '-';
}
/// True if a popup menu or starts with \ref MNU_HIDDEN_CHAR
///
/// @return true if the menu is hidden

10
src/nvim/message.c
View File

@ -114,7 +114,6 @@ bool keep_msg_more = false; // keep_msg was set by msgmore()
* This is an allocated string or NULL when not used.
*/
// Extended msg state, currently used for external UIs with ext_messages
static const char *msg_ext_kind = NULL;
static Array msg_ext_chunks = ARRAY_DICT_INIT;
@ -265,7 +264,6 @@ void msg_multiline_attr(const char *s, int attr, bool check_int, bool *need_clea
}
}
/// @param keep set keep_msg if it doesn't scroll
bool msg_attr_keep(const char *s, int attr, bool keep, bool multiline)
FUNC_ATTR_NONNULL_ALL
@ -760,7 +758,6 @@ bool semsg_multiline(const char *const fmt, ...)
bool ret;
va_list ap;
static char errbuf[MULTILINE_BUFSIZE];
if (emsg_not_now()) {
return true;
@ -1010,7 +1007,6 @@ void ex_messages(void *const eap_p)
return;
}
p = first_msg_hist;
if (eap->addr_count != 0) {
@ -1168,7 +1164,6 @@ void wait_return(int redraw)
reg_recording = save_reg_recording;
scriptout = save_scriptout;
/*
* Allow scrolling back in the messages.
* Also accept scroll-down commands when messages fill the screen,
@ -1343,7 +1338,6 @@ void msgmore(long n)
}
}
void msg_ext_set_kind(const char *msg_kind)
{
// Don't change the label of an existing batch:
@ -2742,7 +2736,6 @@ static int do_more_prompt(int typed_char)
c = get_keystroke(resize_events);
}
toscroll = 0;
switch (c) {
case BS: // scroll one line back
@ -3440,7 +3433,6 @@ int do_dialog(int type, char_u *title, char_u *message, char_u *buttons, int dfl
return dfltbutton; // return default option
}
int save_msg_silent = msg_silent;
int oldState = State;
@ -3507,7 +3499,6 @@ int do_dialog(int type, char_u *title, char_u *message, char_u *buttons, int dfl
return retval;
}
/// Copy one character from "*from" to "*to", taking care of multi-byte
/// characters. Return the length of the character in bytes.
///
@ -3578,7 +3569,6 @@ static char_u *console_dialog_alloc(const char_u *message, char_u *buttons, bool
len += 2; // "x" -> "[x]"
}
// Now allocate space for the strings
xfree(confirm_msg);
confirm_msg = xmalloc(len);

1
src/nvim/message.h
View File

@ -69,7 +69,6 @@ EXTERN ScreenGrid msg_grid_adj INIT(= SCREEN_GRID_INIT);
// value of msg_scrolled at latest msg_scroll_flush.
EXTERN int msg_scrolled_at_flush INIT(= 0);
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "message.h.generated.h"
#endif

2
src/nvim/mouse.c
View File

@ -480,7 +480,6 @@ win_T *mouse_find_win(int *gridp, int *rowp, int *colp)
return NULL;
}
frame_T *fp;
fp = topframe;
@ -573,7 +572,6 @@ void setmouse(void)
ui_check_mouse();
}
// Set orig_topline. Used when jumping to another window, so that a double
// click still works.
void set_mouse_topline(win_T *wp)

1
src/nvim/mouse.h
View File

@ -41,7 +41,6 @@
#define MSCR_LEFT (-1)
#define MSCR_RIGHT (-2)
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "mouse.h.generated.h"
#endif

2
src/nvim/move.c
View File

@ -45,7 +45,6 @@ typedef struct {
# include "move.c.generated.h"
#endif
/*
* Compute wp->w_botline for the current wp->w_topline. Can be called after
* wp->w_topline changed.
@ -1863,7 +1862,6 @@ void cursor_correct(void)
curwin->w_viewport_invalid = true;
}
/*
* move screen 'count' pages up or down and update screen
*

5
src/nvim/msgpack_rpc/channel.c
View File

@ -49,7 +49,6 @@ void rpc_init(void)
msgpack_sbuffer_init(&out_buffer);
}
void rpc_start(Channel *channel)
{
channel_incref(channel);
@ -73,7 +72,6 @@ void rpc_start(Channel *channel)
}
}
static Channel *find_rpc_channel(uint64_t id)
{
Channel *chan = find_channel(id);
@ -359,7 +357,6 @@ static void handle_request(Channel *channel, msgpack_object *request)
}
}
/// Handles a message, depending on the type:
/// - Request: invokes method and writes the response (or error).
/// - Notification: invokes method (emits `nvim_error_event` on error).
@ -413,7 +410,6 @@ static bool channel_write(Channel *channel, WBuffer *buffer)
success = wstream_write(in, buffer);
}
if (!success) {
// If the write failed for any reason, close the channel
char buf[256];
@ -535,7 +531,6 @@ static void unsubscribe(Channel *channel, char *event)
xfree(event_string);
}
/// Mark rpc state as closed, and release its reference to the channel.
/// Don't call this directly, call channel_close(id, kChannelPartRpc, &error)
void rpc_close(Channel *channel)

1
src/nvim/msgpack_rpc/channel.h
View File

@ -17,7 +17,6 @@
/// of os_inchar(), so they are processed "just-in-time".
EXTERN MultiQueue *ch_before_blocking_events INIT(= NULL);
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "msgpack_rpc/channel.h.generated.h"
#endif

2
src/nvim/msgpack_rpc/helpers.c
View File

@ -22,7 +22,6 @@
static msgpack_zone zone;
static msgpack_sbuffer sbuffer;
void msgpack_rpc_helpers_init(void)
{
msgpack_zone_init(&zone, 0xfff);
@ -252,7 +251,6 @@ bool msgpack_rpc_to_dictionary(const msgpack_object *const obj, Dictionary *cons
arg->size = obj->via.array.size;
arg->items = xcalloc(obj->via.map.size, sizeof(KeyValuePair));
for (uint32_t i = 0; i < obj->via.map.size; i++) {
if (!msgpack_rpc_to_string(&obj->via.map.ptr[i].key,
&arg->items[i].key)) {

10
src/nvim/normal.c
View File

@ -86,7 +86,6 @@ typedef struct normal_state {
static int VIsual_mode_orig = NUL; // saved Visual mode
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "normal.c.generated.h"
#endif
@ -1605,7 +1604,6 @@ bool do_mouse(oparg_T *oap, int c, int dir, long count, bool fixindent)
}
}
// CTRL right mouse button does CTRL-T
if (is_click && (mod_mask & MOD_MASK_CTRL) && which_button == MOUSE_RIGHT) {
if (State & MODE_INSERT) {
@ -1781,7 +1779,6 @@ bool do_mouse(oparg_T *oap, int c, int dir, long count, bool fixindent)
return false;
}
// When 'mousemodel' is "popup" or "popup_setpos", translate mouse events:
// right button up -> pop-up menu
// shift-left button -> right button
@ -1902,7 +1899,6 @@ bool do_mouse(oparg_T *oap, int c, int dir, long count, bool fixindent)
}
}
// Set global flag that we are extending the Visual area with mouse dragging;
// temporarily minimize 'scrolloff'.
if (VIsual_active && is_drag && get_scrolloff_value(curwin)) {
@ -2556,7 +2552,6 @@ static char_u old_showcmd_buf[SHOWCMD_BUFLEN]; // For push_showcmd()
static bool showcmd_is_clear = true;
static bool showcmd_visual = false;
void clear_showcmd(void)
{
if (!p_sc) {
@ -3816,7 +3811,6 @@ dozet:
}
break;
case 'u': // "zug" and "zuw": undo "zg" and "zw"
no_mapping++;
allow_keys++; // no mapping for nchar, but allow key codes
@ -3903,7 +3897,6 @@ dozet:
}
}
/// "Q" command.
static void nv_regreplay(cmdarg_T *cap)
{
@ -5448,7 +5441,6 @@ static void n_swapchar(cmdarg_T *cap)
}
}
check_cursor();
curwin->w_set_curswant = true;
if (did_change) {
@ -5805,7 +5797,6 @@ static void n_start_visual_mode(int c)
}
}
/// CTRL-W: Window commands
static void nv_window(cmdarg_T *cap)
{
@ -6695,7 +6686,6 @@ static void nv_select(cmdarg_T *cap)
}
}
/// "G", "gg", CTRL-END, CTRL-HOME.
/// cap->arg is true for "G".
static void nv_goto(cmdarg_T *cap)

1
src/nvim/normal.h
View File

@ -76,7 +76,6 @@ typedef struct cmdarg_S {
#define CA_COMMAND_BUSY 1 // skip restarting edit() once
#define CA_NO_ADJ_OP_END 2 // don't adjust operator end
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "normal.h.generated.h"
#endif

8
src/nvim/ops.c
View File

@ -453,7 +453,6 @@ static void shift_block(oparg_T *oap, int amount)
non_white_col += incr;
}
const colnr_T block_space_width = non_white_col - oap->start_vcol;
// We will shift by "total" or "block_space_width", whichever is less.
const colnr_T shift_amount = block_space_width < total
@ -2105,7 +2104,6 @@ static int op_replace(oparg_T *oap, int c)
return OK;
}
/*
* Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?".
*/
@ -2629,7 +2627,6 @@ void clear_registers(void)
#endif
/// Free contents of yankreg `reg`.
/// Called for normal freeing and in case of error.
/// `reg` must not be NULL (but `reg->y_array` might be)
@ -3853,7 +3850,6 @@ void ex_display(exarg_T *eap)
continue; // did not ask for this register
}
if (i == -1) {
if (y_previous != NULL) {
yb = y_previous;
@ -5436,7 +5432,6 @@ void format_reg_type(MotionType reg_type, colnr_T reg_width, char *buf, size_t b
}
}
/// When `flags` has `kGRegList` return a list with text `s`.
/// Otherwise just return `s`.
///
@ -5817,7 +5812,6 @@ void clear_oparg(oparg_T *oap)
memset(oap, 0, sizeof(oparg_T));
}
/*
* Count the number of bytes, characters and "words" in a line.
*
@ -6286,7 +6280,6 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
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
@ -7276,7 +7269,6 @@ void restore_batch_count(int save_count)
}
}
/// Check whether register is empty
static inline bool reg_empty(const yankreg_T *const reg)
FUNC_ATTR_PURE

9
src/nvim/option.c
View File

@ -101,7 +101,6 @@
#define OPT_BUF(x) (idopt_T)(PV_BUF + (int)(x))
#define OPT_BOTH(x) (idopt_T)(PV_BOTH + (int)(x))
// WV_ and BV_ values get typecasted to this for the "indir" field
typedef enum {
PV_NONE = 0,
@ -211,7 +210,6 @@ typedef struct vimoption {
LastSet last_set; // script in which the option was last set
} vimoption_T;
/*
* Flags
*/
@ -519,7 +517,6 @@ void set_init_1(bool clean_arg)
*/
set_options_default(0);
curbuf->b_p_initialized = true;
curbuf->b_p_ar = -1; // no local 'autoread' value
curbuf->b_p_ul = NO_LOCAL_UNDOLEVEL;
@ -778,7 +775,6 @@ void free_all_options(void)
}
#endif
/// Initialize the options, part two: After getting Rows and Columns.
void set_init_2(bool headless)
{
@ -909,7 +905,6 @@ void set_helplang_default(const char *lang)
}
}
/// 'title' and 'icon' only default to true if they have not been set or reset
/// in .vimrc and we can read the old value.
/// When 'title' and 'icon' have been reset in .vimrc, we won't even check if
@ -2168,7 +2163,6 @@ static uint32_t *insecure_flag(win_T *const wp, int opt_idx, int opt_flags)
return &options[opt_idx].flags;
}
/// Redraw the window title and/or tab page text later.
static void redraw_titles(void)
{
@ -3967,7 +3961,6 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
// Remember where the option was set.
set_option_sctx_idx(opt_idx, opt_flags, current_sctx);
// May set global value for local option.
if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) {
*(int *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL) = value;
@ -4195,7 +4188,6 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
}
}
/*
* End of handling side effects for bool options.
*/
@ -4565,7 +4557,6 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, char *errbuf,
check_blending(curwin);
}
// Check the (new) bounds for Rows and Columns here.
if (p_lines < min_rows() && full_screen) {
if (errbuf != NULL) {

1
src/nvim/option_defs.h
View File

@ -49,7 +49,6 @@
# define DFLT_FFS_VI ""
#endif
// Possible values for 'encoding'
#define ENC_UCSBOM "ucs-bom" // check for BOM at start of file

Some files were not shown because too many files have changed in this diff Show More