diff options
| -rw-r--r-- | cmake.deps/deps.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/luvref.txt | 112 | ||||
| -rw-r--r-- | runtime/queries/query/highlights.scm | 8 | ||||
| -rw-r--r-- | src/nvim/drawline.c | 3 | ||||
| -rw-r--r-- | test/functional/ui/statuscolumn_spec.lua | 12 |
5 files changed, 132 insertions, 7 deletions
diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt index ad5a98f16e..cda8ba57a4 100644 --- a/cmake.deps/deps.txt +++ b/cmake.deps/deps.txt @@ -22,8 +22,8 @@ LIBTERMKEY_SHA256 6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb30146 LIBVTERM_URL https://github.com/neovim/deps/raw/aa004f1b2b6470a92363cba8e1cc1874141dacc4/opt/libvterm-0.3.1.tar.gz LIBVTERM_SHA256 25a8ad9c15485368dfd0a8a9dca1aec8fea5c27da3fa74ec518d5d3787f0c397 -LUV_URL https://github.com/luvit/luv/archive/093a977b82077591baefe1e880d37dfa2730bd54.tar.gz -LUV_SHA256 222b38b6425f0926218e14e7da81481fdde6f9660c1feac25a53e6fb52e886e6 +LUV_URL https://github.com/luvit/luv/archive/c1497c0ffd3e1400a137ac99a614159a685f716b.tar.gz +LUV_SHA256 fc8c8c777454b78e09c06bd177860da9b79804affc967b015ecccb75b3af6893 LPEG_URL https://github.com/neovim/deps/raw/aa004f1b2b6470a92363cba8e1cc1874141dacc4/opt/lpeg-1.0.2.tar.gz LPEG_SHA256 48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt index 2be75d5b0c..79dd1248aa 100644 --- a/runtime/doc/luvref.txt +++ b/runtime/doc/luvref.txt @@ -3499,6 +3499,65 @@ uv.thread_equal({thread}, {other_thread}) *uv.thread_equal()* This function is equivalent to the `__eq` metamethod. Returns: `boolean` + *uv.thread_setaffinity()* +uv.thread_setaffinity({thread}, {affinity} [, {get_old_affinity}]) + + > method form `thread:setaffinity(affinity, [get_old_affinity])` + + Parameters: + - `thread`: `luv_thread_t userdata` + - `affinity`: `table` + - `[1, 2, 3, ..., n]` : `boolean` + - `get_old_affinity`: `boolean` + + Sets the specified thread's affinity setting. `affinity` must + be an array-like table where each of the keys correspond to a + CPU number and the values are booleans that represent whether + the `thread` should be eligible to run on that CPU. The length + of the `affinity` table must be greater than or equal to + `uv.cpumask_size()`. If `get_old_affinity` is `true`, the + previous affinity settings for the `thread` will be returned. + Otherwise, `true` is returned after a successful call. + + Note: Thread affinity setting is not atomic on Windows. + Unsupported on macOS. + + Returns: `table` or `boolean` or `fail` + - `[1, 2, 3, ..., n]` : `boolean` + + +uv.thread_getaffinity({thread} [, {mask_size}]) *uv.thread_getaffinity()* + + > method form `thread:getaffinity([mask_size])` + + Parameters: + - `thread`: `luv_thread_t userdata` + - `mask_size`: `integer` + + Gets the specified thread's affinity setting. + + If `mask_size` is provided, it must be greater than or equal + to `uv.cpumask_size()`. If the `mask_size` parameter is + omitted, then the return of `uv.cpumask_size()` will be used. + Returns an array-like table where each of the keys correspond + to a CPU number and the values are booleans that represent + whether the `thread` is eligible to run on that CPU. + + Note: Thread affinity getting is not atomic on Windows. + Unsupported on macOS. + + Returns: `table` or `fail` + - `[1, 2, 3, ..., n]` : `boolean` + +uv.thread_getcpu() *uv.thread_getcpu()* + + Gets the CPU number on which the calling thread is running. + + Note: The first CPU will be returned as the number 1, not 0. + This allows for the number to correspond with the table keys + used in `uv.thread_getaffinity` and `uv.thread_setaffinity`. + + Returns: `integer` or `fail` uv.thread_self() *uv.thread_self()* @@ -3588,6 +3647,16 @@ uv.get_constrained_memory() *uv.get_constrained_memory()* Returns: `number` +uv.get_available_memory() *uv.get_available_memory()* + + Gets the amount of free memory that is still available to the + process (in bytes). This differs from `uv.get_free_memory()` + in that it takes into account any limits imposed by the OS. If + there is no such constraint, or the constraint is unknown, the + amount returned will be identical to `uv.get_free_memory()`. + + Returns: `number` + uv.resident_set_memory() *uv.resident_set_memory()* Returns the resident set size (RSS) for the current process. @@ -3652,6 +3721,14 @@ uv.cpu_info() *uv.cpu_info()* - `idle` : `number` - `irq` : `number` +uv.cpumask_size() *uv.cpumask_size()* + + Returns the maximum size of the mask used for process/thread + affinities, or `ENOTSUP` if affinities are not supported on + the current platform. + + Returns: `integer` or `fail` + uv.getpid() *uv.getpid()* DEPRECATED: Please use |uv.os_getpid()| instead. @@ -3708,6 +3785,25 @@ uv.hrtime() *uv.hrtime()* Returns: `number` +uv.clock_gettime({clock_id}) *uv.clock_gettime()* + + Parameters: + - `clock_id`: `string` + + Obtain the current system time from a high-resolution + real-time or monotonic clock source. `clock_id` can be the + string `"monotonic"` or `"realtime"`. + + The real-time clock counts from the UNIX epoch (1970-01-01) + and is subject to time adjustments; it can jump back in time. + + The monotonic clock counts from an arbitrary point in the past + and never jumps back in time. + + Returns: `table` or `fail` + - `sec`: `integer` + - `nsec`: `integer` + uv.uptime() *uv.uptime()* Returns the current system uptime in seconds. @@ -3979,6 +4075,22 @@ uv.metrics_idle_time() *uv.metrics_idle_time()* Returns: `number` +uv.metrics_info() *uv.metrics_info()* + + Get the metrics table from current set of event loop metrics. + + Returns: `table` + + The table contains event loop metrics. It is recommended to + retrieve these metrics in a uv_prepare_cb in order to make + sure there are no inconsistencies with the metrics counters. + + - `loop_count` : `integer` + - `events` : `integer` + - `events_waiting` : `integer` + + Note: New in libuv version 1.45.0. + ============================================================================== CREDITS *luv-credits* diff --git a/runtime/queries/query/highlights.scm b/runtime/queries/query/highlights.scm index ee31a7e7ef..f2d2ef6c7f 100644 --- a/runtime/queries/query/highlights.scm +++ b/runtime/queries/query/highlights.scm @@ -27,8 +27,8 @@ ((parameters (identifier) @number) (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$")) -((program . (comment) @include) - (#match? @include "^;\ +inherits\ *:")) +((program . (comment)* . (comment) @include) + (#lua-match? @include "^;+ *inherits *:")) -((program . (comment) @preproc) - (#match? @preproc "^; +extends")) +((program . (comment)* . (comment) @preproc) + (#lua-match? @preproc "^;+ *extends")) diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index e6cdf3d60d..dc90be36be 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -2,7 +2,7 @@ // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com // drawline.c: Functions for drawing window lines on the screen. -// This is the middle level, drawscreen.c is the top and grid.c/screen.c the lower level. +// This is the middle level, drawscreen.c is the top and grid.c the lower level. #include <assert.h> #include <limits.h> @@ -1594,6 +1594,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange, // Draw the 'statuscolumn' if option is set. if (statuscol.draw) { if (statuscol.textp == NULL) { + v = (ptr - line); get_statuscol_str(wp, lnum, wlv.row - startrow - wlv.filler_lines, &statuscol); if (!end_fill) { // Get the line again as evaluating 'statuscolumn' may free it. diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua index 3b41d3684a..3d68246ba9 100644 --- a/test/functional/ui/statuscolumn_spec.lua +++ b/test/functional/ui/statuscolumn_spec.lua @@ -674,4 +674,16 @@ describe('statuscolumn', function() ]]) eq(2, eval('g:stcnr')) end) + + it('does not wrap multibyte characters at the end of a line', function() + screen:try_resize(33, 4) + command([[set spell stc=%l\ ]]) + command('call setline(8, "This is a line that contains ᶏ multibyte character.")') + screen:expect([[ + 8 ^This is a line that contains ᶏ| + multibyte character. | + 9 aaaaa | + | + ]]) + end) end) |