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

Merge pull request #6807 from bfredl/attrindent

Browse Source 
[RFC] lint: check indentation of FUNC_ATTR lines
This commit is contained in:
Björn Linse 2017-06-03 21:00:05 +02:00 committed by GitHub
commit 1b2acb8d95
13 changed files with 129 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/clint.py
View File

@ -2600,16 +2600,23 @@ def CheckBraces(filename, clean_lines, linenum, error):
else: else:
func_start_linenum = end_linenum + 1 func_start_linenum = end_linenum + 1
while not clean_lines.lines[func_start_linenum] == '{': while not clean_lines.lines[func_start_linenum] == '{':
if not Match(r'^(?:\s*\b(?:FUNC_ATTR|REAL_FATTR)_\w+\b(?:\(\d+(, \d+)*\))?)+$', attrline = Match(r'^((?!# *define).*?)(?:FUNC_ATTR|FUNC_API|REAL_FATTR)_\w+(?:\(\d+(, \d+)*\))?',
clean_lines.lines[func_start_linenum]): clean_lines.lines[func_start_linenum])
if attrline:
if len(attrline.group(1)) != 2:
error(filename, func_start_linenum,
'whitespace/indent', 5,
'Function attribute line should have 2-space '
'indent')
func_start_linenum += 1
else:
if clean_lines.lines[func_start_linenum].endswith('{'): if clean_lines.lines[func_start_linenum].endswith('{'):
error(filename, func_start_linenum, error(filename, func_start_linenum,
'readability/braces', 5, 'readability/braces', 5,
'Brace starting function body must be placed ' 'Brace starting function body must be placed '
'after the function signature') 'after the function signature')
break break
else:
func_start_linenum += 1
# An else clause should be on the same line as the preceding closing brace. # An else clause should be on the same line as the preceding closing brace.
# If there is no preceding closing brace, there should be one. # If there is no preceding closing brace, there should be one.

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

@ -35,7 +35,7 @@
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Line count /// @return Line count
Integer nvim_buf_line_count(Buffer buffer, Error *err) Integer nvim_buf_line_count(Buffer buffer, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -157,7 +157,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
Integer end, Integer end,
Boolean strict_indexing, Boolean strict_indexing,
Error *err) Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -270,7 +270,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
Boolean strict_indexing, Boolean strict_indexing,
ArrayOf(String) replacement, // NOLINT ArrayOf(String) replacement, // NOLINT
Error *err) Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -425,7 +425,7 @@ end:
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Variable value /// @return Variable value
Object nvim_buf_get_var(Buffer buffer, String name, Error *err) Object nvim_buf_get_var(Buffer buffer, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -442,7 +442,7 @@ Object nvim_buf_get_var(Buffer buffer, String name, Error *err)
/// ///
/// @return `b:changedtick` value. /// @return `b:changedtick` value.
Integer nvim_buf_get_changedtick(Buffer buffer, Error *err) Integer nvim_buf_get_changedtick(Buffer buffer, Error *err)
FUNC_API_SINCE(2) FUNC_API_SINCE(2)
{ {
const buf_T *const buf = find_buffer_by_handle(buffer, err); const buf_T *const buf = find_buffer_by_handle(buffer, err);
@ -480,7 +480,7 @@ ArrayOf(Dictionary) nvim_buf_get_keymap(Buffer buffer, String mode, Error *err)
/// @param value Variable value /// @param value Variable value
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_buf_set_var(Buffer buffer, String name, Object value, Error *err) void nvim_buf_set_var(Buffer buffer, String name, Object value, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -497,7 +497,7 @@ void nvim_buf_set_var(Buffer buffer, String name, Object value, Error *err)
/// @param name Variable name /// @param name Variable name
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_buf_del_var(Buffer buffer, String name, Error *err) void nvim_buf_del_var(Buffer buffer, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -558,7 +558,7 @@ Object buffer_del_var(Buffer buffer, String name, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Option value /// @return Option value
Object nvim_buf_get_option(Buffer buffer, String name, Error *err) Object nvim_buf_get_option(Buffer buffer, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -577,7 +577,7 @@ Object nvim_buf_get_option(Buffer buffer, String name, Error *err)
/// @param value Option value /// @param value Option value
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_buf_set_option(Buffer buffer, String name, Object value, Error *err) void nvim_buf_set_option(Buffer buffer, String name, Object value, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -597,8 +597,8 @@ void nvim_buf_set_option(Buffer buffer, String name, Object value, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Buffer number /// @return Buffer number
Integer nvim_buf_get_number(Buffer buffer, Error *err) Integer nvim_buf_get_number(Buffer buffer, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
FUNC_API_DEPRECATED_SINCE(2) FUNC_API_DEPRECATED_SINCE(2)
{ {
Integer rv = 0; Integer rv = 0;
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -616,7 +616,7 @@ Integer nvim_buf_get_number(Buffer buffer, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Buffer name /// @return Buffer name
String nvim_buf_get_name(Buffer buffer, Error *err) String nvim_buf_get_name(Buffer buffer, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
String rv = STRING_INIT; String rv = STRING_INIT;
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -634,7 +634,7 @@ String nvim_buf_get_name(Buffer buffer, Error *err)
/// @param name Buffer name /// @param name Buffer name
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_buf_set_name(Buffer buffer, String name, Error *err) void nvim_buf_set_name(Buffer buffer, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -664,7 +664,7 @@ void nvim_buf_set_name(Buffer buffer, String name, Error *err)
/// @param buffer Buffer handle /// @param buffer Buffer handle
/// @return true if the buffer is valid, false otherwise /// @return true if the buffer is valid, false otherwise
Boolean nvim_buf_is_valid(Buffer buffer) Boolean nvim_buf_is_valid(Buffer buffer)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Error stub = ERROR_INIT; Error stub = ERROR_INIT;
Boolean ret = find_buffer_by_handle(buffer, &stub) != NULL; Boolean ret = find_buffer_by_handle(buffer, &stub) != NULL;
@ -698,7 +698,7 @@ void buffer_insert(Buffer buffer,
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return (row, col) tuple /// @return (row, col) tuple
ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err) ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -774,7 +774,7 @@ Integer nvim_buf_add_highlight(Buffer buffer,
Integer col_start, Integer col_start,
Integer col_end, Integer col_end,
Error *err) Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
if (!buf) { if (!buf) {
@ -815,7 +815,7 @@ void nvim_buf_clear_highlight(Buffer buffer,
Integer line_start, Integer line_start,
Integer line_end, Integer line_end,
Error *err) Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
if (!buf) { if (!buf) {

14
src/nvim/api/tabpage.c
View File

@ -18,7 +18,7 @@
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return List of windows in `tabpage` /// @return List of windows in `tabpage`
ArrayOf(Window) nvim_tabpage_list_wins(Tabpage tabpage, Error *err) ArrayOf(Window) nvim_tabpage_list_wins(Tabpage tabpage, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
tabpage_T *tab = find_tab_by_handle(tabpage, err); tabpage_T *tab = find_tab_by_handle(tabpage, err);
@ -48,7 +48,7 @@ ArrayOf(Window) nvim_tabpage_list_wins(Tabpage tabpage, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Variable value /// @return Variable value
Object nvim_tabpage_get_var(Tabpage tabpage, String name, Error *err) Object nvim_tabpage_get_var(Tabpage tabpage, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
tabpage_T *tab = find_tab_by_handle(tabpage, err); tabpage_T *tab = find_tab_by_handle(tabpage, err);
@ -69,7 +69,7 @@ void nvim_tabpage_set_var(Tabpage tabpage,
String name, String name,
Object value, Object value,
Error *err) Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
tabpage_T *tab = find_tab_by_handle(tabpage, err); tabpage_T *tab = find_tab_by_handle(tabpage, err);
@ -86,7 +86,7 @@ void nvim_tabpage_set_var(Tabpage tabpage,
/// @param name Variable name /// @param name Variable name
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_tabpage_del_var(Tabpage tabpage, String name, Error *err) void nvim_tabpage_del_var(Tabpage tabpage, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
tabpage_T *tab = find_tab_by_handle(tabpage, err); tabpage_T *tab = find_tab_by_handle(tabpage, err);
@ -145,7 +145,7 @@ Object tabpage_del_var(Tabpage tabpage, String name, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Window handle /// @return Window handle
Window nvim_tabpage_get_win(Tabpage tabpage, Error *err) Window nvim_tabpage_get_win(Tabpage tabpage, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Window rv = 0; Window rv = 0;
tabpage_T *tab = find_tab_by_handle(tabpage, err); tabpage_T *tab = find_tab_by_handle(tabpage, err);
@ -173,7 +173,7 @@ Window nvim_tabpage_get_win(Tabpage tabpage, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Tabpage number /// @return Tabpage number
Integer nvim_tabpage_get_number(Tabpage tabpage, Error *err) Integer nvim_tabpage_get_number(Tabpage tabpage, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Integer rv = 0; Integer rv = 0;
tabpage_T *tab = find_tab_by_handle(tabpage, err); tabpage_T *tab = find_tab_by_handle(tabpage, err);
@ -190,7 +190,7 @@ Integer nvim_tabpage_get_number(Tabpage tabpage, Error *err)
/// @param tabpage Tabpage handle /// @param tabpage Tabpage handle
/// @return true if the tabpage is valid, false otherwise /// @return true if the tabpage is valid, false otherwise
Boolean nvim_tabpage_is_valid(Tabpage tabpage) Boolean nvim_tabpage_is_valid(Tabpage tabpage)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Error stub = ERROR_INIT; Error stub = ERROR_INIT;
Boolean ret = find_tab_by_handle(tabpage, &stub) != NULL; Boolean ret = find_tab_by_handle(tabpage, &stub) != NULL;

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

@ -30,13 +30,13 @@ typedef struct {
static PMap(uint64_t) *connected_uis = NULL; static PMap(uint64_t) *connected_uis = NULL;
void remote_ui_init(void) void remote_ui_init(void)
FUNC_API_NOEXPORT FUNC_API_NOEXPORT
{ {
connected_uis = pmap_new(uint64_t)(); connected_uis = pmap_new(uint64_t)();
} }
void remote_ui_disconnect(uint64_t channel_id) void remote_ui_disconnect(uint64_t channel_id)
FUNC_API_NOEXPORT FUNC_API_NOEXPORT
{ {
UI *ui = pmap_get(uint64_t)(connected_uis, channel_id); UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
if (!ui) { if (!ui) {
@ -53,7 +53,7 @@ void remote_ui_disconnect(uint64_t channel_id)
void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height, void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
Dictionary options, Error *err) Dictionary options, Error *err)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{ {
if (pmap_has(uint64_t)(connected_uis, channel_id)) { if (pmap_has(uint64_t)(connected_uis, channel_id)) {
api_set_error(err, kErrorTypeException, "UI already attached for channel"); api_set_error(err, kErrorTypeException, "UI already attached for channel");
@ -125,7 +125,7 @@ void ui_attach(uint64_t channel_id, Integer width, Integer height,
} }
void nvim_ui_detach(uint64_t channel_id, Error *err) void nvim_ui_detach(uint64_t channel_id, Error *err)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{ {
if (!pmap_has(uint64_t)(connected_uis, channel_id)) { if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
api_set_error(err, kErrorTypeException, "UI is not attached for channel"); api_set_error(err, kErrorTypeException, "UI is not attached for channel");
@ -137,7 +137,7 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
void nvim_ui_try_resize(uint64_t channel_id, Integer width, void nvim_ui_try_resize(uint64_t channel_id, Integer width,
Integer height, Error *err) Integer height, Error *err)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{ {
if (!pmap_has(uint64_t)(connected_uis, channel_id)) { if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
api_set_error(err, kErrorTypeException, "UI is not attached for channel"); api_set_error(err, kErrorTypeException, "UI is not attached for channel");
@ -158,7 +158,7 @@ void nvim_ui_try_resize(uint64_t channel_id, Integer width,
void nvim_ui_set_option(uint64_t channel_id, String name, void nvim_ui_set_option(uint64_t channel_id, String name,
Object value, Error *error) Object value, Error *error)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{ {
if (!pmap_has(uint64_t)(connected_uis, channel_id)) { if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
api_set_error(error, kErrorTypeException, "UI is not attached for channel"); api_set_error(error, kErrorTypeException, "UI is not attached for channel");

56
src/nvim/api/ui_events.in.h
View File

@ -11,61 +11,61 @@
#include "nvim/ui.h" #include "nvim/ui.h"
void resize(Integer rows, Integer columns) void resize(Integer rows, Integer columns)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void clear(void) void clear(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void eol_clear(void) void eol_clear(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void cursor_goto(Integer row, Integer col) void cursor_goto(Integer row, Integer col)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void mode_info_set(Boolean enabled, Array cursor_styles) void mode_info_set(Boolean enabled, Array cursor_styles)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void update_menu(void) void update_menu(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void busy_start(void) void busy_start(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void busy_stop(void) void busy_stop(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void mouse_on(void) void mouse_on(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void mouse_off(void) void mouse_off(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void mode_change(String mode, Integer mode_idx) void mode_change(String mode, Integer mode_idx)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void set_scroll_region(Integer top, Integer bot, Integer left, Integer right) void set_scroll_region(Integer top, Integer bot, Integer left, Integer right)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void scroll(Integer count) void scroll(Integer count)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void highlight_set(HlAttrs attrs) void highlight_set(HlAttrs attrs)
FUNC_API_SINCE(3) FUNC_API_REMOTE_IMPL FUNC_API_BRIDGE_IMPL; FUNC_API_SINCE(3) FUNC_API_REMOTE_IMPL FUNC_API_BRIDGE_IMPL;
void put(String str) void put(String str)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void bell(void) void bell(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void visual_bell(void) void visual_bell(void)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void flush(void) void flush(void)
FUNC_API_SINCE(3) FUNC_API_REMOTE_IMPL; FUNC_API_SINCE(3) FUNC_API_REMOTE_IMPL;
void update_fg(Integer fg) void update_fg(Integer fg)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void update_bg(Integer bg) void update_bg(Integer bg)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void update_sp(Integer sp) void update_sp(Integer sp)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void suspend(void) void suspend(void)
FUNC_API_SINCE(3) FUNC_API_BRIDGE_IMPL; FUNC_API_SINCE(3) FUNC_API_BRIDGE_IMPL;
void set_title(String title) void set_title(String title)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void set_icon(String icon) void set_icon(String icon)
FUNC_API_SINCE(3); FUNC_API_SINCE(3);
void popupmenu_show(Array items, Integer selected, Integer row, Integer col) void popupmenu_show(Array items, Integer selected, Integer row, Integer col)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void popupmenu_hide(void) void popupmenu_hide(void)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void popupmenu_select(Integer selected) void popupmenu_select(Integer selected)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void tabline_update(Tabpage current, Array tabs) void tabline_update(Tabpage current, Array tabs)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
#endif // NVIM_API_UI_EVENTS_IN_H #endif // NVIM_API_UI_EVENTS_IN_H

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

@ -45,7 +45,7 @@
/// @param command Ex-command string /// @param command Ex-command string
/// @param[out] err Error details (including actual VimL error), if any /// @param[out] err Error details (including actual VimL error), if any
void nvim_command(String command, Error *err) void nvim_command(String command, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
// Run the command // Run the command
try_start(); try_start();
@ -63,7 +63,7 @@ void nvim_command(String command, Error *err)
/// @see feedkeys() /// @see feedkeys()
/// @see vim_strsave_escape_csi /// @see vim_strsave_escape_csi
void nvim_feedkeys(String keys, String mode, Boolean escape_csi) void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
bool remap = true; bool remap = true;
bool insert = false; bool insert = false;
@ -130,7 +130,7 @@ void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
/// @return Number of bytes actually written (can be fewer than /// @return Number of bytes actually written (can be fewer than
/// requested if the buffer becomes full). /// requested if the buffer becomes full).
Integer nvim_input(String keys) Integer nvim_input(String keys)
FUNC_API_SINCE(1) FUNC_API_ASYNC FUNC_API_SINCE(1) FUNC_API_ASYNC
{ {
return (Integer)input_enqueue(keys); return (Integer)input_enqueue(keys);
} }
@ -142,7 +142,7 @@ Integer nvim_input(String keys)
/// @see cpoptions /// @see cpoptions
String nvim_replace_termcodes(String str, Boolean from_part, Boolean do_lt, String nvim_replace_termcodes(String str, Boolean from_part, Boolean do_lt,
Boolean special) Boolean special)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
if (str.size == 0) { if (str.size == 0) {
// Empty string // Empty string
@ -162,7 +162,7 @@ String nvim_replace_termcodes(String str, Boolean from_part, Boolean do_lt,
} }
String nvim_command_output(String str, Error *err) String nvim_command_output(String str, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
do_cmdline_cmd("redir => v:command_output"); do_cmdline_cmd("redir => v:command_output");
nvim_command(str, err); nvim_command(str, err);
@ -183,7 +183,7 @@ String nvim_command_output(String str, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Evaluation result or expanded object /// @return Evaluation result or expanded object
Object nvim_eval(String expr, Error *err) Object nvim_eval(String expr, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Object rv = OBJECT_INIT; Object rv = OBJECT_INIT;
// Evaluate the expression // Evaluate the expression
@ -214,7 +214,7 @@ Object nvim_eval(String expr, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Result of the function call /// @return Result of the function call
Object nvim_call_function(String fname, Array args, Error *err) Object nvim_call_function(String fname, Array args, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Object rv = OBJECT_INIT; Object rv = OBJECT_INIT;
if (args.size > MAX_FUNC_ARGS) { if (args.size > MAX_FUNC_ARGS) {
@ -282,7 +282,7 @@ Object nvim_execute_lua(String code, Array args, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Number of cells /// @return Number of cells
Integer nvim_strwidth(String str, Error *err) Integer nvim_strwidth(String str, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
if (str.size > INT_MAX) { if (str.size > INT_MAX) {
api_set_error(err, kErrorTypeValidation, "String length is too high"); api_set_error(err, kErrorTypeValidation, "String length is too high");
@ -296,7 +296,7 @@ Integer nvim_strwidth(String str, Error *err)
/// ///
/// @return List of paths /// @return List of paths
ArrayOf(String) nvim_list_runtime_paths(void) ArrayOf(String) nvim_list_runtime_paths(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
uint8_t *rtp = p_rtp; uint8_t *rtp = p_rtp;
@ -338,7 +338,7 @@ ArrayOf(String) nvim_list_runtime_paths(void)
/// @param dir Directory path /// @param dir Directory path
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_set_current_dir(String dir, Error *err) void nvim_set_current_dir(String dir, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
if (dir.size >= MAXPATHL) { if (dir.size >= MAXPATHL) {
api_set_error(err, kErrorTypeValidation, "Directory string is too long"); api_set_error(err, kErrorTypeValidation, "Directory string is too long");
@ -367,7 +367,7 @@ void nvim_set_current_dir(String dir, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Current line string /// @return Current line string
String nvim_get_current_line(Error *err) String nvim_get_current_line(Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return buffer_get_line(curbuf->handle, curwin->w_cursor.lnum - 1, err); return buffer_get_line(curbuf->handle, curwin->w_cursor.lnum - 1, err);
} }
@ -377,7 +377,7 @@ String nvim_get_current_line(Error *err)
/// @param line Line contents /// @param line Line contents
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_set_current_line(String line, Error *err) void nvim_set_current_line(String line, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buffer_set_line(curbuf->handle, curwin->w_cursor.lnum - 1, line, err); buffer_set_line(curbuf->handle, curwin->w_cursor.lnum - 1, line, err);
} }
@ -386,7 +386,7 @@ void nvim_set_current_line(String line, Error *err)
/// ///
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_del_current_line(Error *err) void nvim_del_current_line(Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buffer_del_line(curbuf->handle, curwin->w_cursor.lnum - 1, err); buffer_del_line(curbuf->handle, curwin->w_cursor.lnum - 1, err);
} }
@ -397,7 +397,7 @@ void nvim_del_current_line(Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Variable value /// @return Variable value
Object nvim_get_var(String name, Error *err) Object nvim_get_var(String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return dict_get_value(&globvardict, name, err); return dict_get_value(&globvardict, name, err);
} }
@ -408,7 +408,7 @@ Object nvim_get_var(String name, Error *err)
/// @param value Variable value /// @param value Variable value
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_set_var(String name, Object value, Error *err) void nvim_set_var(String name, Object value, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
dict_set_var(&globvardict, name, value, false, false, err); dict_set_var(&globvardict, name, value, false, false, err);
} }
@ -418,7 +418,7 @@ void nvim_set_var(String name, Object value, Error *err)
/// @param name Variable name /// @param name Variable name
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_del_var(String name, Error *err) void nvim_del_var(String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
dict_set_var(&globvardict, name, NIL, true, false, err); dict_set_var(&globvardict, name, NIL, true, false, err);
} }
@ -457,7 +457,7 @@ Object vim_del_var(String name, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Variable value /// @return Variable value
Object nvim_get_vvar(String name, Error *err) Object nvim_get_vvar(String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return dict_get_value(&vimvardict, name, err); return dict_get_value(&vimvardict, name, err);
} }
@ -468,7 +468,7 @@ Object nvim_get_vvar(String name, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Option value (global) /// @return Option value (global)
Object nvim_get_option(String name, Error *err) Object nvim_get_option(String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return get_option_from(NULL, SREQ_GLOBAL, name, err); return get_option_from(NULL, SREQ_GLOBAL, name, err);
} }
@ -479,7 +479,7 @@ Object nvim_get_option(String name, Error *err)
/// @param value New option value /// @param value New option value
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_set_option(String name, Object value, Error *err) void nvim_set_option(String name, Object value, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
set_option_to(NULL, SREQ_GLOBAL, name, value, err); set_option_to(NULL, SREQ_GLOBAL, name, value, err);
} }
@ -488,7 +488,7 @@ void nvim_set_option(String name, Object value, Error *err)
/// ///
/// @param str Message /// @param str Message
void nvim_out_write(String str) void nvim_out_write(String str)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
write_msg(str, false); write_msg(str, false);
} }
@ -497,7 +497,7 @@ void nvim_out_write(String str)
/// ///
/// @param str Message /// @param str Message
void nvim_err_write(String str) void nvim_err_write(String str)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
write_msg(str, true); write_msg(str, true);
} }
@ -508,7 +508,7 @@ void nvim_err_write(String str)
/// @param str Message /// @param str Message
/// @see nvim_err_write() /// @see nvim_err_write()
void nvim_err_writeln(String str) void nvim_err_writeln(String str)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
nvim_err_write(str); nvim_err_write(str);
nvim_err_write((String) { .data = "\n", .size = 1 }); nvim_err_write((String) { .data = "\n", .size = 1 });
@ -518,7 +518,7 @@ void nvim_err_writeln(String str)
/// ///
/// @return List of buffer handles /// @return List of buffer handles
ArrayOf(Buffer) nvim_list_bufs(void) ArrayOf(Buffer) nvim_list_bufs(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
@ -540,7 +540,7 @@ ArrayOf(Buffer) nvim_list_bufs(void)
/// ///
/// @return Buffer handle /// @return Buffer handle
Buffer nvim_get_current_buf(void) Buffer nvim_get_current_buf(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return curbuf->handle; return curbuf->handle;
} }
@ -550,7 +550,7 @@ Buffer nvim_get_current_buf(void)
/// @param id Buffer handle /// @param id Buffer handle
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_set_current_buf(Buffer buffer, Error *err) void nvim_set_current_buf(Buffer buffer, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
@ -572,7 +572,7 @@ void nvim_set_current_buf(Buffer buffer, Error *err)
/// ///
/// @return List of window handles /// @return List of window handles
ArrayOf(Window) nvim_list_wins(void) ArrayOf(Window) nvim_list_wins(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
@ -594,7 +594,7 @@ ArrayOf(Window) nvim_list_wins(void)
/// ///
/// @return Window handle /// @return Window handle
Window nvim_get_current_win(void) Window nvim_get_current_win(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return curwin->handle; return curwin->handle;
} }
@ -603,7 +603,7 @@ Window nvim_get_current_win(void)
/// ///
/// @param handle Window handle /// @param handle Window handle
void nvim_set_current_win(Window window, Error *err) void nvim_set_current_win(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -625,7 +625,7 @@ void nvim_set_current_win(Window window, Error *err)
/// ///
/// @return List of tabpage handles /// @return List of tabpage handles
ArrayOf(Tabpage) nvim_list_tabpages(void) ArrayOf(Tabpage) nvim_list_tabpages(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
@ -647,7 +647,7 @@ ArrayOf(Tabpage) nvim_list_tabpages(void)
/// ///
/// @return Tabpage handle /// @return Tabpage handle
Tabpage nvim_get_current_tabpage(void) Tabpage nvim_get_current_tabpage(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return curtab->handle; return curtab->handle;
} }
@ -657,7 +657,7 @@ Tabpage nvim_get_current_tabpage(void)
/// @param handle Tabpage handle /// @param handle Tabpage handle
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_set_current_tabpage(Tabpage tabpage, Error *err) void nvim_set_current_tabpage(Tabpage tabpage, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
tabpage_T *tp = find_tab_by_handle(tabpage, err); tabpage_T *tp = find_tab_by_handle(tabpage, err);
@ -680,7 +680,7 @@ void nvim_set_current_tabpage(Tabpage tabpage, Error *err)
/// @param channel_id Channel id (passed automatically by the dispatcher) /// @param channel_id Channel id (passed automatically by the dispatcher)
/// @param event Event type string /// @param event Event type string
void nvim_subscribe(uint64_t channel_id, String event) void nvim_subscribe(uint64_t channel_id, String event)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{ {
size_t length = (event.size < METHOD_MAXLEN ? event.size : METHOD_MAXLEN); size_t length = (event.size < METHOD_MAXLEN ? event.size : METHOD_MAXLEN);
char e[METHOD_MAXLEN + 1]; char e[METHOD_MAXLEN + 1];
@ -694,7 +694,7 @@ void nvim_subscribe(uint64_t channel_id, String event)
/// @param channel_id Channel id (passed automatically by the dispatcher) /// @param channel_id Channel id (passed automatically by the dispatcher)
/// @param event Event type string /// @param event Event type string
void nvim_unsubscribe(uint64_t channel_id, String event) void nvim_unsubscribe(uint64_t channel_id, String event)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{ {
size_t length = (event.size < METHOD_MAXLEN ? size_t length = (event.size < METHOD_MAXLEN ?
event.size : event.size :
@ -706,13 +706,13 @@ void nvim_unsubscribe(uint64_t channel_id, String event)
} }
Integer nvim_get_color_by_name(String name) Integer nvim_get_color_by_name(String name)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
return name_to_color((uint8_t *)name.data); return name_to_color((uint8_t *)name.data);
} }
Dictionary nvim_get_color_map(void) Dictionary nvim_get_color_map(void)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Dictionary colors = ARRAY_DICT_INIT; Dictionary colors = ARRAY_DICT_INIT;
@ -754,7 +754,7 @@ ArrayOf(Dictionary) nvim_get_keymap(String mode)
} }
Array nvim_get_api_info(uint64_t channel_id) Array nvim_get_api_info(uint64_t channel_id)
FUNC_API_SINCE(1) FUNC_API_ASYNC FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_ASYNC FUNC_API_REMOTE_ONLY
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
@ -787,7 +787,7 @@ Array nvim_get_api_info(uint64_t channel_id)
/// which resulted in an error, the error type and the error message. If an /// which resulted in an error, the error type and the error message. If an
/// error ocurred, the values from all preceding calls will still be returned. /// error ocurred, the values from all preceding calls will still be returned.
Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err) Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
Array results = ARRAY_DICT_INIT; Array results = ARRAY_DICT_INIT;

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

@ -22,7 +22,7 @@
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Buffer handle /// @return Buffer handle
Buffer nvim_win_get_buf(Window window, Error *err) Buffer nvim_win_get_buf(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -39,7 +39,7 @@ Buffer nvim_win_get_buf(Window window, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return (row, col) tuple /// @return (row, col) tuple
ArrayOf(Integer, 2) nvim_win_get_cursor(Window window, Error *err) ArrayOf(Integer, 2) nvim_win_get_cursor(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -58,7 +58,7 @@ ArrayOf(Integer, 2) nvim_win_get_cursor(Window window, Error *err)
/// @param pos (row, col) tuple representing the new position /// @param pos (row, col) tuple representing the new position
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err) void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -105,7 +105,7 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Height as a count of rows /// @return Height as a count of rows
Integer nvim_win_get_height(Window window, Error *err) Integer nvim_win_get_height(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -123,7 +123,7 @@ Integer nvim_win_get_height(Window window, Error *err)
/// @param height Height as a count of rows /// @param height Height as a count of rows
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_win_set_height(Window window, Integer height, Error *err) void nvim_win_set_height(Window window, Integer height, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -150,7 +150,7 @@ void nvim_win_set_height(Window window, Integer height, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Width as a count of columns /// @return Width as a count of columns
Integer nvim_win_get_width(Window window, Error *err) Integer nvim_win_get_width(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -168,7 +168,7 @@ Integer nvim_win_get_width(Window window, Error *err)
/// @param width Width as a count of columns /// @param width Width as a count of columns
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_win_set_width(Window window, Integer width, Error *err) void nvim_win_set_width(Window window, Integer width, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -196,7 +196,7 @@ void nvim_win_set_width(Window window, Integer width, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Variable value /// @return Variable value
Object nvim_win_get_var(Window window, String name, Error *err) Object nvim_win_get_var(Window window, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -214,7 +214,7 @@ Object nvim_win_get_var(Window window, String name, Error *err)
/// @param value Variable value /// @param value Variable value
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_win_set_var(Window window, String name, Object value, Error *err) void nvim_win_set_var(Window window, String name, Object value, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -231,7 +231,7 @@ void nvim_win_set_var(Window window, String name, Object value, Error *err)
/// @param name Variable name /// @param name Variable name
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_win_del_var(Window window, String name, Error *err) void nvim_win_del_var(Window window, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -291,7 +291,7 @@ Object window_del_var(Window window, String name, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Option value /// @return Option value
Object nvim_win_get_option(Window window, String name, Error *err) Object nvim_win_get_option(Window window, String name, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -310,7 +310,7 @@ Object nvim_win_get_option(Window window, String name, Error *err)
/// @param value Option value /// @param value Option value
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
void nvim_win_set_option(Window window, String name, Object value, Error *err) void nvim_win_set_option(Window window, String name, Object value, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -327,7 +327,7 @@ void nvim_win_set_option(Window window, String name, Object value, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return (row, col) tuple with the window position /// @return (row, col) tuple with the window position
ArrayOf(Integer, 2) nvim_win_get_position(Window window, Error *err) ArrayOf(Integer, 2) nvim_win_get_position(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Array rv = ARRAY_DICT_INIT; Array rv = ARRAY_DICT_INIT;
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -346,7 +346,7 @@ ArrayOf(Integer, 2) nvim_win_get_position(Window window, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Tabpage that contains the window /// @return Tabpage that contains the window
Tabpage nvim_win_get_tabpage(Window window, Error *err) Tabpage nvim_win_get_tabpage(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Tabpage rv = 0; Tabpage rv = 0;
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -364,7 +364,7 @@ Tabpage nvim_win_get_tabpage(Window window, Error *err)
/// @param[out] err Error details, if any /// @param[out] err Error details, if any
/// @return Window number /// @return Window number
Integer nvim_win_get_number(Window window, Error *err) Integer nvim_win_get_number(Window window, Error *err)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
int rv = 0; int rv = 0;
win_T *win = find_window_by_handle(window, err); win_T *win = find_window_by_handle(window, err);
@ -384,7 +384,7 @@ Integer nvim_win_get_number(Window window, Error *err)
/// @param window Window handle /// @param window Window handle
/// @return true if the window is valid, false otherwise /// @return true if the window is valid, false otherwise
Boolean nvim_win_is_valid(Window window) Boolean nvim_win_is_valid(Window window)
FUNC_API_SINCE(1) FUNC_API_SINCE(1)
{ {
Error stub = ERROR_INIT; Error stub = ERROR_INIT;
Boolean ret = find_window_by_handle(window, &stub) != NULL; Boolean ret = find_window_by_handle(window, &stub) != NULL;

2
src/nvim/eval.c
View File

@ -12130,7 +12130,7 @@ void mapblock_fill_dict(dict_T *const dict,
const mapblock_T *const mp, const mapblock_T *const mp,
long buffer_value, long buffer_value,
bool compatible) bool compatible)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
char_u *lhs = str2special_save(mp->m_keys, true); char_u *lhs = str2special_save(mp->m_keys, true);
char *const mapmode = map_mode_to_chars(mp->m_mode); char *const mapmode = map_mode_to_chars(mp->m_mode);

2
src/nvim/ex_getln.c
View File

@ -4073,7 +4073,7 @@ void ExpandGeneric(
/// @param flagsarg is a combination of EW_* flags. /// @param flagsarg is a combination of EW_* flags.
static void expand_shellcmd(char_u *filepat, int *num_file, char_u ***file, static void expand_shellcmd(char_u *filepat, int *num_file, char_u ***file,
int flagsarg) int flagsarg)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
char_u *pat; char_u *pat;
int i; int i;

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

@ -382,7 +382,7 @@ static int nlua_eval_lua_string(lua_State *const lstate)
/// and locations where result and error are saved, respectively. Always /// and locations where result and error are saved, respectively. Always
/// returns nothing (from the lua point of view). /// returns nothing (from the lua point of view).
static int nlua_exec_lua_string_api(lua_State *const lstate) static int nlua_exec_lua_string_api(lua_State *const lstate)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
const String *str = (const String *)lua_touserdata(lstate, 1); const String *str = (const String *)lua_touserdata(lstate, 1);
const Array *args = (const Array *)lua_touserdata(lstate, 2); const Array *args = (const Array *)lua_touserdata(lstate, 2);

3
src/nvim/mark.h
View File

@ -81,7 +81,8 @@ static inline bool equalpos(pos_T, pos_T)
REAL_FATTR_CONST REAL_FATTR_ALWAYS_INLINE; REAL_FATTR_CONST REAL_FATTR_ALWAYS_INLINE;
static inline bool ltoreq(pos_T, pos_T) static inline bool ltoreq(pos_T, pos_T)
REAL_FATTR_CONST REAL_FATTR_ALWAYS_INLINE; REAL_FATTR_CONST REAL_FATTR_ALWAYS_INLINE;
static inline void clearpos(pos_T *) REAL_FATTR_ALWAYS_INLINE; static inline void clearpos(pos_T *)
REAL_FATTR_ALWAYS_INLINE;
/// Return true if position a is before (less than) position b. /// Return true if position a is before (less than) position b.
static inline bool lt(pos_T a, pos_T b) static inline bool lt(pos_T a, pos_T b)

2
src/nvim/os_unix.c
View File

@ -173,7 +173,7 @@ void mch_exit(int r) FUNC_ATTR_NORETURN
/// @returns OK for success or FAIL for error. /// @returns OK for success or FAIL for error.
int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
char_u ***file, int flags) FUNC_ATTR_NONNULL_ARG(3) char_u ***file, int flags) FUNC_ATTR_NONNULL_ARG(3)
FUNC_ATTR_NONNULL_ARG(4) FUNC_ATTR_NONNULL_ARG(4)
{ {
int i; int i;
size_t len; size_t len;

2
src/nvim/terminal.c
View File

@ -637,7 +637,7 @@ static int term_movecursor(VTermPos new, VTermPos old, int visible,
} }
static void buf_set_term_title(buf_T *buf, char *title) static void buf_set_term_title(buf_T *buf, char *title)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
Error err = ERROR_INIT; Error err = ERROR_INIT;
dict_set_var(buf->b_vars, dict_set_var(buf->b_vars,