mirror of https://github.com/neovim/neovim.git
Compare commits
7 Commits
41468d6edd
...
d23f031949
Author | SHA1 | Date |
---|---|---|
Justin M. Keyes | d23f031949 | |
zeertzjq | 435dee74bb | |
zeertzjq | 694756252b | |
zeertzjq | e81eb34aa1 | |
zeertzjq | a1568f5df0 | |
zeertzjq | f1f5fb911b | |
Justin M. Keyes | 091bba54ef |
|
@ -1547,24 +1547,6 @@ nvim_strwidth({text}) *nvim_strwidth()*
|
|||
Return: ~
|
||||
Number of cells
|
||||
|
||||
nvim_subscribe({event}) *nvim_subscribe()*
|
||||
Subscribes to event broadcasts.
|
||||
|
||||
Attributes: ~
|
||||
|RPC| only
|
||||
|
||||
Parameters: ~
|
||||
• {event} Event type string
|
||||
|
||||
nvim_unsubscribe({event}) *nvim_unsubscribe()*
|
||||
Unsubscribes to event broadcasts.
|
||||
|
||||
Attributes: ~
|
||||
|RPC| only
|
||||
|
||||
Parameters: ~
|
||||
• {event} Event type string
|
||||
|
||||
|
||||
==============================================================================
|
||||
Vimscript Functions *api-vimscript*
|
||||
|
|
|
@ -8208,6 +8208,10 @@ synconcealed({lnum}, {col}) *synconcealed()*
|
|||
synconcealed(lnum, 5) [1, 'X', 2]
|
||||
synconcealed(lnum, 6) [0, '', 0]
|
||||
|
||||
Note: Doesn't consider |matchadd()| highlighting items,
|
||||
since syntax and matching highlighting are two different
|
||||
mechanisms |syntax-vs-match|.
|
||||
|
||||
synstack({lnum}, {col}) *synstack()*
|
||||
Return a |List|, which is the stack of syntax items at the
|
||||
position {lnum} and {col} in the current window. {lnum} is
|
||||
|
|
|
@ -1375,6 +1375,19 @@ Finally, these constructs are unique to Perl:
|
|||
==============================================================================
|
||||
10. Highlighting matches *match-highlight*
|
||||
|
||||
*syntax-vs-match*
|
||||
Note that the match highlight mechanism is independent
|
||||
of |syntax-highlighting|, which is (usually) a buffer-local
|
||||
highlighting, while matching is window-local, both methods
|
||||
can be freely mixed. Match highlighting functions give you
|
||||
a bit more flexibility in when and how to apply, but are
|
||||
typically only used for temporary highlighting, without strict
|
||||
rules. Both methods can be used to conceal text.
|
||||
|
||||
Thus the matching functions like |matchadd()| won't consider
|
||||
syntax rules and functions like |synconcealed()| and the
|
||||
other way around.
|
||||
|
||||
*:mat* *:match*
|
||||
:mat[ch] {group} /{pattern}/
|
||||
Define a pattern to highlight in the current window. It will
|
||||
|
|
|
@ -3825,7 +3825,9 @@ Whether or not it is actually concealed depends on the value of the
|
|||
'conceallevel' option. The 'concealcursor' option is used to decide whether
|
||||
concealable items in the current line are displayed unconcealed to be able to
|
||||
edit the line.
|
||||
Another way to conceal text is with |matchadd()|.
|
||||
|
||||
Another way to conceal text is with |matchadd()|, but internally this works a
|
||||
bit differently |syntax-vs-match|.
|
||||
|
||||
concealends *:syn-concealends*
|
||||
|
||||
|
@ -3833,7 +3835,9 @@ When the "concealends" argument is given, the start and end matches of
|
|||
the region, but not the contents of the region, are marked as concealable.
|
||||
Whether or not they are actually concealed depends on the setting on the
|
||||
'conceallevel' option. The ends of a region can only be concealed separately
|
||||
in this way when they have their own highlighting via "matchgroup"
|
||||
in this way when they have their own highlighting via "matchgroup". The
|
||||
|synconcealed()| function can be used to retrieve information about conealed
|
||||
items.
|
||||
|
||||
cchar *:syn-cchar*
|
||||
*E844*
|
||||
|
|
|
@ -948,7 +948,7 @@ Syntax and highlighting: *syntax-functions* *highlighting-functions*
|
|||
synIDattr() get a specific attribute of a syntax ID
|
||||
synIDtrans() get translated syntax ID
|
||||
synstack() get list of syntax IDs at a specific position
|
||||
synconcealed() get info about concealing
|
||||
synconcealed() get info about (syntax) concealing
|
||||
diff_hlID() get highlight ID for diff mode at a position
|
||||
matchadd() define a pattern to highlight (a "match")
|
||||
matchaddpos() define a list of positions to highlight
|
||||
|
|
|
@ -9752,6 +9752,10 @@ function vim.fn.synIDtrans(synID) end
|
|||
--- synconcealed(lnum, 5) [1, 'X', 2]
|
||||
--- synconcealed(lnum, 6) [0, '', 0]
|
||||
---
|
||||
--- Note: Doesn't consider |matchadd()| highlighting items,
|
||||
--- since syntax and matching highlighting are two different
|
||||
--- mechanisms |syntax-vs-match|.
|
||||
---
|
||||
--- @param lnum integer
|
||||
--- @param col integer
|
||||
--- @return {[1]: integer, [2]: string, [3]: integer}
|
||||
|
|
|
@ -786,3 +786,23 @@ theend:
|
|||
api_clear_error(&nested_error);
|
||||
return rv;
|
||||
}
|
||||
|
||||
/// @deprecated
|
||||
///
|
||||
/// @param channel_id Channel id (passed automatically by the dispatcher)
|
||||
/// @param event Event type string
|
||||
void nvim_subscribe(uint64_t channel_id, String event)
|
||||
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
|
||||
{
|
||||
// Does nothing. `rpcnotify(0,…)` broadcasts to all channels, there are no "subscriptions".
|
||||
}
|
||||
|
||||
/// @deprecated
|
||||
///
|
||||
/// @param channel_id Channel id (passed automatically by the dispatcher)
|
||||
/// @param event Event type string
|
||||
void nvim_unsubscribe(uint64_t channel_id, String event)
|
||||
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
|
||||
{
|
||||
// Does nothing. `rpcnotify(0,…)` broadcasts to all channels, there are no "subscriptions".
|
||||
}
|
||||
|
|
|
@ -1332,36 +1332,6 @@ void nvim_put(ArrayOf(String) lines, String type, Boolean after, Boolean follow,
|
|||
});
|
||||
}
|
||||
|
||||
/// Subscribes to event broadcasts.
|
||||
///
|
||||
/// @param channel_id Channel id (passed automatically by the dispatcher)
|
||||
/// @param event Event type string
|
||||
void nvim_subscribe(uint64_t channel_id, String event)
|
||||
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
|
||||
{
|
||||
size_t length = (event.size < METHOD_MAXLEN ? event.size : METHOD_MAXLEN);
|
||||
char e[METHOD_MAXLEN + 1];
|
||||
memcpy(e, event.data, length);
|
||||
e[length] = NUL;
|
||||
rpc_subscribe(channel_id, e);
|
||||
}
|
||||
|
||||
/// Unsubscribes to event broadcasts.
|
||||
///
|
||||
/// @param channel_id Channel id (passed automatically by the dispatcher)
|
||||
/// @param event Event type string
|
||||
void nvim_unsubscribe(uint64_t channel_id, String event)
|
||||
FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
|
||||
{
|
||||
size_t length = (event.size < METHOD_MAXLEN
|
||||
? event.size
|
||||
: METHOD_MAXLEN);
|
||||
char e[METHOD_MAXLEN + 1];
|
||||
memcpy(e, event.data, length);
|
||||
e[length] = NUL;
|
||||
rpc_unsubscribe(channel_id, e);
|
||||
}
|
||||
|
||||
/// Returns the 24-bit RGB value of a |nvim_get_color_map()| color name or
|
||||
/// "#rrggbb" hexadecimal string.
|
||||
///
|
||||
|
|
|
@ -47,8 +47,8 @@ typedef struct {
|
|||
#define VALID_VIRTCOL 0x04 // w_virtcol (file col) is valid
|
||||
#define VALID_CHEIGHT 0x08 // w_cline_height and w_cline_folded valid
|
||||
#define VALID_CROW 0x10 // w_cline_row is valid
|
||||
#define VALID_BOTLINE 0x20 // w_botine and w_empty_rows are valid
|
||||
#define VALID_BOTLINE_AP 0x40 // w_botine is approximated
|
||||
#define VALID_BOTLINE 0x20 // w_botline and w_empty_rows are valid
|
||||
#define VALID_BOTLINE_AP 0x40 // w_botline is approximated
|
||||
#define VALID_TOPLINE 0x80 // w_topline is valid (for cursor position)
|
||||
|
||||
// flags for b_flags
|
||||
|
|
|
@ -11621,6 +11621,10 @@ M.funcs = {
|
|||
synconcealed(lnum, 4) [1, 'X', 2]
|
||||
synconcealed(lnum, 5) [1, 'X', 2]
|
||||
synconcealed(lnum, 6) [0, '', 0]
|
||||
|
||||
Note: Doesn't consider |matchadd()| highlighting items,
|
||||
since syntax and matching highlighting are two different
|
||||
mechanisms |syntax-vs-match|.
|
||||
]=],
|
||||
name = 'synconcealed',
|
||||
params = { { 'lnum', 'integer' }, { 'col', 'integer' } },
|
||||
|
|
|
@ -67,8 +67,6 @@ static void log_notify(char *dir, uint64_t channel_id, const char *name)
|
|||
# define log_notify(...)
|
||||
#endif
|
||||
|
||||
static Set(cstr_t) event_strings = SET_INIT;
|
||||
|
||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||
# include "msgpack_rpc/channel.c.generated.h"
|
||||
#endif
|
||||
|
@ -111,9 +109,9 @@ static Channel *find_rpc_channel(uint64_t id)
|
|||
return chan;
|
||||
}
|
||||
|
||||
/// Publishes an event to a channel.
|
||||
/// Publishes an event to a channel (emits a notification to method `name`).
|
||||
///
|
||||
/// @param id Channel id. 0 means "broadcast to all subscribed channels"
|
||||
/// @param id Channel id, or 0 to broadcast to all RPC channels.
|
||||
/// @param name Event name (application-defined)
|
||||
/// @param args Array of event arguments
|
||||
/// @return True if the event was sent successfully, false otherwise.
|
||||
|
@ -204,41 +202,6 @@ Object rpc_send_call(uint64_t id, const char *method_name, Array args, ArenaMem
|
|||
return frame.errored ? NIL : frame.result;
|
||||
}
|
||||
|
||||
/// Subscribes to event broadcasts
|
||||
///
|
||||
/// @param id The channel id
|
||||
/// @param event The event type string
|
||||
void rpc_subscribe(uint64_t id, char *event)
|
||||
{
|
||||
Channel *channel;
|
||||
|
||||
if (!(channel = find_rpc_channel(id))) {
|
||||
abort();
|
||||
}
|
||||
|
||||
const char **key_alloc = NULL;
|
||||
if (set_put_ref(cstr_t, &event_strings, event, &key_alloc)) {
|
||||
*key_alloc = xstrdup(event);
|
||||
}
|
||||
|
||||
set_put(cstr_t, channel->rpc.subscribed_events, *key_alloc);
|
||||
}
|
||||
|
||||
/// Unsubscribes to event broadcasts
|
||||
///
|
||||
/// @param id The channel id
|
||||
/// @param event The event type string
|
||||
void rpc_unsubscribe(uint64_t id, char *event)
|
||||
{
|
||||
Channel *channel;
|
||||
|
||||
if (!(channel = find_rpc_channel(id))) {
|
||||
abort();
|
||||
}
|
||||
|
||||
unsubscribe(channel, event);
|
||||
}
|
||||
|
||||
static void receive_msgpack(Stream *stream, RBuffer *rbuf, size_t c, void *data, bool eof)
|
||||
{
|
||||
Channel *channel = data;
|
||||
|
@ -494,34 +457,24 @@ static void send_error(Channel *chan, MsgpackRpcRequestHandler handler, MessageT
|
|||
api_clear_error(&e);
|
||||
}
|
||||
|
||||
/// Broadcasts a notification to all RPC channels.
|
||||
static void broadcast_event(const char *name, Array args)
|
||||
{
|
||||
kvec_withinit_t(Channel *, 4) subscribed = KV_INITIAL_VALUE;
|
||||
kvi_init(subscribed);
|
||||
kvec_withinit_t(Channel *, 4) chans = KV_INITIAL_VALUE;
|
||||
kvi_init(chans);
|
||||
Channel *channel;
|
||||
|
||||
map_foreach_value(&channels, channel, {
|
||||
if (channel->is_rpc
|
||||
&& set_has(cstr_t, channel->rpc.subscribed_events, name)) {
|
||||
kv_push(subscribed, channel);
|
||||
if (channel->is_rpc) {
|
||||
kv_push(chans, channel);
|
||||
}
|
||||
});
|
||||
|
||||
if (kv_size(subscribed)) {
|
||||
serialize_request(subscribed.items, kv_size(subscribed), 0, name, args);
|
||||
if (kv_size(chans)) {
|
||||
serialize_request(chans.items, kv_size(chans), 0, name, args);
|
||||
}
|
||||
|
||||
kvi_destroy(subscribed);
|
||||
}
|
||||
|
||||
static void unsubscribe(Channel *channel, char *event)
|
||||
{
|
||||
if (!set_has(cstr_t, &event_strings, event)) {
|
||||
WLOG("RPC: ch %" PRIu64 ": tried to unsubscribe unknown event '%s'",
|
||||
channel->id, event);
|
||||
return;
|
||||
}
|
||||
set_del(cstr_t, channel->rpc.subscribed_events, event);
|
||||
kvi_destroy(chans);
|
||||
}
|
||||
|
||||
/// Mark rpc state as closed, and release its reference to the channel.
|
||||
|
@ -551,7 +504,6 @@ void rpc_free(Channel *channel)
|
|||
unpacker_teardown(channel->rpc.unpacker);
|
||||
xfree(channel->rpc.unpacker);
|
||||
|
||||
set_destroy(cstr_t, channel->rpc.subscribed_events);
|
||||
kv_destroy(channel->rpc.call_stack);
|
||||
api_free_dictionary(channel->rpc.info);
|
||||
}
|
||||
|
@ -719,12 +671,6 @@ const char *get_client_info(Channel *chan, const char *key)
|
|||
#ifdef EXITFREE
|
||||
void rpc_free_all_mem(void)
|
||||
{
|
||||
cstr_t key;
|
||||
set_foreach(&event_strings, key, {
|
||||
xfree((void *)key);
|
||||
});
|
||||
set_destroy(cstr_t, &event_strings);
|
||||
|
||||
multiqueue_free(ch_before_blocking_events);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -37,7 +37,6 @@ typedef struct {
|
|||
} RequestEvent;
|
||||
|
||||
typedef struct {
|
||||
Set(cstr_t) subscribed_events[1];
|
||||
bool closed;
|
||||
Unpacker *unpacker;
|
||||
uint32_t next_request_id;
|
||||
|
|
|
@ -2467,6 +2467,7 @@ void win_init_empty(win_T *wp)
|
|||
wp->w_topline = 1;
|
||||
wp->w_topfill = 0;
|
||||
wp->w_botline = 2;
|
||||
wp->w_valid = 0;
|
||||
wp->w_s = &wp->w_buffer->b_s;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
local t = require('test.testutil')
|
||||
local n = require('test.functional.testnvim')()
|
||||
|
||||
local assert_log = t.assert_log
|
||||
local eq, clear, eval, command, next_msg = t.eq, n.clear, n.eval, n.command, n.next_msg
|
||||
local api = n.api
|
||||
local exec_lua = n.exec_lua
|
||||
|
@ -34,18 +33,18 @@ describe('notify', function()
|
|||
end)
|
||||
end)
|
||||
|
||||
describe('passing 0 as the channel id', function()
|
||||
it('sends the notification/args to all subscribed channels', function()
|
||||
api.nvim_subscribe('event2')
|
||||
describe('channel id 0', function()
|
||||
it('broadcasts the notification/args to all channels', function()
|
||||
eval('rpcnotify(0, "event1", 1, 2, 3)')
|
||||
eval('rpcnotify(0, "event2", 4, 5, 6)')
|
||||
eval('rpcnotify(0, "event2", 7, 8, 9)')
|
||||
eq({ 'notification', 'event1', { 1, 2, 3 } }, next_msg())
|
||||
eq({ 'notification', 'event2', { 4, 5, 6 } }, next_msg())
|
||||
eq({ 'notification', 'event2', { 7, 8, 9 } }, next_msg())
|
||||
api.nvim_unsubscribe('event2')
|
||||
api.nvim_subscribe('event1')
|
||||
|
||||
eval('rpcnotify(0, "event2", 10, 11, 12)')
|
||||
eval('rpcnotify(0, "event1", 13, 14, 15)')
|
||||
eq({ 'notification', 'event2', { 10, 11, 12 } }, next_msg())
|
||||
eq({ 'notification', 'event1', { 13, 14, 15 } }, next_msg())
|
||||
end)
|
||||
|
||||
|
@ -78,17 +77,6 @@ describe('notify', function()
|
|||
end)
|
||||
end)
|
||||
|
||||
it('unsubscribe non-existing event #8745', function()
|
||||
clear { env = {
|
||||
NVIM_LOG_FILE = testlog,
|
||||
} }
|
||||
api.nvim_subscribe('event1')
|
||||
api.nvim_unsubscribe('doesnotexist')
|
||||
assert_log("tried to unsubscribe unknown event 'doesnotexist'", testlog, 10)
|
||||
api.nvim_unsubscribe('event1')
|
||||
assert_alive()
|
||||
end)
|
||||
|
||||
it('cancels stale events on channel close', function()
|
||||
local catchan = eval("jobstart(['cat'], {'rpc': v:true})")
|
||||
local catpath = eval('exepath("cat")')
|
||||
|
@ -97,7 +85,6 @@ describe('notify', function()
|
|||
exec_lua(
|
||||
[[
|
||||
vim.rpcnotify(..., "nvim_call_function", 'chanclose', {..., 'rpc'})
|
||||
vim.rpcnotify(..., "nvim_subscribe", "daily_rant")
|
||||
return vim.api.nvim_get_chan_info(...)
|
||||
]],
|
||||
catchan
|
||||
|
|
|
@ -181,8 +181,8 @@ describe('eval-API', function()
|
|||
eq('Vim(call):E117: Unknown function: buffer_get_line', err)
|
||||
|
||||
-- some api functions are only useful from a msgpack-rpc channel
|
||||
err = exc_exec('call nvim_subscribe("fancyevent")')
|
||||
eq('Vim(call):E117: Unknown function: nvim_subscribe', err)
|
||||
err = exc_exec('call nvim_set_client_info()')
|
||||
eq('Vim(call):E117: Unknown function: nvim_set_client_info', err)
|
||||
end)
|
||||
|
||||
it('have metadata accessible with api_info()', function()
|
||||
|
|
|
@ -4105,4 +4105,16 @@ func Test_SwapExists_set_other_buf_modified()
|
|||
bwipe!
|
||||
endfunc
|
||||
|
||||
func Test_BufEnter_botline()
|
||||
set hidden
|
||||
call writefile(range(10), 'Xxx1', 'D')
|
||||
call writefile(range(20), 'Xxx2', 'D')
|
||||
edit Xxx1
|
||||
edit Xxx2
|
||||
au BufEnter Xxx1 call assert_true(line('w$') > 1)
|
||||
edit Xxx1
|
||||
au! BufEnter Xxx1
|
||||
set hidden&vim
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
|
Loading…
Reference in New Issue