-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Multiple sign columns; remove signs on line deletion #9295
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
xterm-compatible terminals support reporting their configured colors back to the application. Use this to obtain the current background color, compute its luminance to classify it as light or dark, and set 'bg' accordingly. Also set the default for 'bg', so that `:set bg&` will revert to that detected default.
Should this use/implement namespaces, like bufhl/eol-annotations? I haven't thought this through, but seems to make sense to me as it is a "text decoration" in the broader sense. |
Hmm, this is |
No. Pick a reasonable default.
Is that something that needs to be decided now? Would be better to get this PR in a mergeable state, and leave other enhancements for the future. cc @teto |
There are so many possibilities regarding the columns that it would be good to define the scope beforehand (which is also what stopped me from pushing this forward), also anticipating on externalising columns ? Like can we merge different columns (folds/signs) ? shouldn't we put a limit on the number of signs ? |
577e12f
to
1aaf397
Compare
Those examples don't seem like decisions that matter right now. "merging columns" is an enhancement that doesn't change the shape of the current work here. And limits can be decided later. So my suggestion @da-x is to add some tests here and let's plan it for 0.3.3 (and please, anyone who cares about this functionality: review this PR). Otherwise let's forget it, because it's a lot of wasted effort to review PRs that don't get merged. |
@justinmk to get this forward, I suggest to keep the removal of all signs excepts marks on line deletion by default (i.e. keep marks because those are usually manually added by users), and sort signs by id before drawing them. If this sounds reasonable I can implement and move to testing. |
Sounds good to me. One question that might be out of scope: what happens if line is deleted then restored by undo? @timeyyy does extmarks address that case (for marks, not signs)? |
After more checking, marks are already removed by deleted lines, so there's no need to preserved the signs for them. Seems that undo restores them, vim-signature plugin, responsible for the mark's signs, restores the signs as well. I've added the change for sort by Id. |
@justinmk extmark does restore marks after delete/undo. Changing sign implementation from linked list to extmark data structure is a low-hanging fruit after extmark is merged. |
It came to my attention that we may need to reverse the sort order for To sum it, turns out plugins really "fought over each other" due to this non-determinism of the "who gets to put his sign in the column". I'm glad we are beginning to sort that out :) |
I propose the following enhanced semantics for
In addition, a new setting:
As for sorting, we would do so by sign type. However, once we are activating it with the PR's qsort changes, insert order is lost. So to completely preserve the current behavior, we can add a monotonic Hopefully I have not missed anything, and having this ends "sign war" between plugins, and makes the meaning of the sign Id number private to each plugin. |
|
@justinmk ok, I'll keep it for an additional PR :) Sign types are currently a global list of names, controlled with There may be something else to keep for an additional PR, for which namespaces may be fitting. I noticed that sign Ids from different plugins can conflict, and the commands to manage them are not supportive of avoiding that. The Alternatively to that change, we can add an optional BTW, currently these commands don't behave according to the documentation - |
Trying to cram namespaces, either explicitly or implicitly (how would |
Is this waiting on feedback or what's left to do? |
a812574
to
7eaa662
Compare
CI failures |
With this change, having more than one sign on a line, and with the 'auto' setting on 'signcolumn', extra columns will shown automatically to accomodate all the existing signs. For example, suppose we have this view: 5147 } 5148 5149 return sign->typenr; 5150 } 5151 } 5152 return 0; 5153 } 5154 We have GitGutter installed, so it tells su about modified lines that are not commmited. So let's change line 5152: 5147 } 5148 5149 return sign->typenr; 5150 } 5151 } ~ 5152 return 0; 5153 } 5154 Now we add a mark over line 5152 using 'ma' in normal mode: 5147 } 5148 5149 return sign->typenr; 5150 } 5151 } a ~ 5152 return 0; 5153 } 5154 Previously, VIM and Neovim would have picked only one of the signs, because there was no support for having multiple signs in a line. Implements issue neovim#990. TBD: This feature requires more discussion and documentation.
Suppose we have highlights on a group of lines and we delete them: + 6 use std::ops::Deref; --+ 7 use std::borrow::Cow; --+ 8 use std::io::{Cursor}; 9 use proc_macro2::TokenStream; 10 use syn::export::ToTokens; --+ 11 use std::io::Write; >> 12 use std::ops::Deref; Without this change, these signs will momentarily accumulate in the sign column until the plugins wake up to refresh them. + --+ --+ --+ >> 6 Discussion: It may be better to extend the API a bit and allow this to happen for only certain types of signs. For example, VIM marks and vim-gitgutter removal signs may want to be presreved, unlike line additions and linter highlights.
In wrapped lines, the wrapped parts of a line did not include the extra columns if they existed. The result was a misdrawing of the wrapped parts. This fixes the issue, by 1) initializing the signcol counter back to 0 when we are on a wrap boundary, and 2) allowing for the draw of spaces in that case.
Nvim doesn't expect a window-changing command on an created-window event. autocmd WinNew * wincmd p help help - A snapshot for window 1000 is created. - The window is split and the cursor changes to the new window 1001. - The autocmd kicks in and switches back to 1000. - The help buffer is opened. - On closing the help window 1000, it tries to go back to the snapshotted window which is... 1000. - wp1000->w_buffer == NULL - w_buffer is used by check_cursor() - 🧨 -> 💥 Fixes neovim#9773
Problem: Defining function in sandbox is inconsistent, cannot use :function but can define a lambda. Solution: Allow defining a function in the sandbox, but also use the sandbox when executing it. (closes vim/vim#3182) vim/vim@9334372
Problem: Function defined in sandbox not tested. Solution: Add a text. vim/vim@d90a144
…command Problem: Evaluating a modeline might invoke using a shell command. (Paul Huber) Solution: Set the sandbox flag when setting options from a modeline. vim/vim@5958f95
…ffer Problem: E315 ml_get error when using Python and hidden buffer. Solution: Make sure the cursor position is valid. (Ben Jackson, closes vim/vim#4153, closes vim/vim#4154) vim/vim@63dbfd3
prevwin can be set to the current window. Then we can't jump to it after closing a float.
window: don't crash when closing two floats in a row
floating-window.c: fix crash when using inccommand
This comment has been minimized.
This comment has been minimized.
@@ -5234,7 +5233,7 @@ int buf_getsigntype(buf_T *buf, linenr_T lnum, SignType type, | |||
matches[nr_matches] = sign; | |||
nr_matches++; | |||
|
|||
if (nr_matches == max_sign_matches) { | |||
if (nr_matches == ARRAY_SIZE(matches)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nr_matches
could also be size_t
I merged this into master and pushed it here, to check CI again.
|
Merged. Thanks for following through with this @da-x . I squashed the commits (preserving the commit messages) since most of the intermediate commits were fixups. |
I've noticed that with Oh, that's due to it using 2 as a multiplier (via win_signcol_width - https://github.com/blueyed/neovim/blob/8138e0be874f112a9800325bd275c6dee3e22b9e/src/nvim/screen.c#L1536-L1549) I think it should not really use a space after each sign, but rather only a single space at the end maybe. But just using I think From an API point of view |
I'll give this a shot - drawing all signs at once in win_line. |
win_signcol_width was added in 0848add - and its purpose appears to be like I've understood it. OTOH sign text is always 2 chars long.. the help says that it must fit into 1-2 cells. Does it make sense to trim a trailing space here? |
=> #9788 |
This release represents ~2700 commits since v0.3.4, the previous non-maintenance release. Besides the highlights listed below, this release features vast improvements to documentation, internal subsystems and test/CI infrastructure, and 700+ patches merged from Vim. FEATURES: New API functions: nvim_create_buf: create various kinds of buffers nvim_get_context, nvim_load_context 8e6b0a7 #10619 API: Context: save/restore/inspect editor state nvim_input_mouse: perform mouse actions nvim_open_win: create floating windows (and external, for supporting UIs) nvim_paste: paste text at cursor nvim_put: put text at cursor nvim_select_popupmenu_item: perform popupmenu actions nvim_set_keymap: create/delete mappings nvim_set_vvar: set v: variables nvim_ui_pum_set_height nvim_ui_try_resize_grid nvim_win_close: close windows nvim_win_get_config: get window configuration nvim_win_set_config: reconfigure windows New UI events: redraw.grid_destroy redraw.hl_group_set 8a3f858 #10504 UI/highlight: expose builtin highlight groups using hl_group_set event redraw.msg_clear redraw.msg_history_show redraw.msg_ruler redraw.msg_set_pos redraw.msg_show redraw.msg_showcmd redraw.msg_showmode redraw.win_close redraw.win_external_pos redraw.win_float_pos redraw.win_hide redraw.win_pos API f5c56f0 #9170 API/Lua: nvim_buf_attach: support Lua callback 82d48c0 #9896 API: emit nvim_error_event on failed async request b9ad12e #9992 UI/nvim_ui_attach(): add `override` option 3d1ed7c #9993 UI/ext_messages: learn more message kinds 8ed54bb #9547 proper multiline error message for rpcrequest, API wrappers Lua This release introduces "Nvim-Lua standard library". See ":help lua-stdlib". 89d7e24 #9463 Lua stdlib: vim.inspect, string functions 8e941c5 #9740 Lua: generate documentation from docstrings 1cbe014 #9301 lua/stdlib: Introduce vim.shared c83926c #10123 Lua: introduce vim.loop (expose libuv event-loop) 81e1dbc #10120 Lua: vim.schedule(cb) 1f54f68 #10688 Lua: minimal UTF-16 support needed for LSP 6fb0020 #10513 Lua encoding support c0993ed Lua: support getting UTF-32 and UTF-16 sizes of replaced text b0e2619 Lua: add {old_byte_size} to on_lines buffer change event UI: - The Nvim 0.3.4 UI protocol introduced line-based updates instead of legacy char-based updates. Nvim 0.4 continues to evolve the UI protocol. See ":help ui". Legacy UI clients are supported. See ":help api-contract". 9a1675b #6619 Floating windows - Can be (re)positioned, anchored, external. - Are real windows showing real buffers. No shortcuts, hacks, or compromises. - Support all features and API of normal windows, plus more. 6427894 #8455 Multigrid: "windows drawn on separate grids" - Windows are logically isolated internally. - Windows are sent to UIs as distinct objects, so that UIs can control layout instead of being stuck with the classic TUI layout. - Per-window font-size, dimenions, line-spacing. - Compositor: Internal subsystem for composing grids. 3855204 #6917 UIEnter, UILeave 788bcbb #9923 ui: ":syn blend=", 'winblend' 7cf7c0a #9575 ui: 'redrawdebug' option for flexible debugging of redrawing 5c836d2 #9607 wildoptions=pum (enabled by default) 37f8df8 #9571 UI: 'pumblend' option for semi-transparent popupmenu c403a95 #9446 Visual: highlight char-at-cursor - Traditionally Vim's visual selection does "reverse mode", which perhaps conflicts with the non-blinking block cursor. But 'guicursor' defaults to a vertical bar for selection=exclusive, and this confuses users who expect to see the text highlighted. :terminal fc27dc9 #8550 autocmds: TermEnter, TermLeave d13803f #9810 keymap, terminal: more keycodes 3b56f59 #9535 :terminal : Fix F1-F4 key codes 2d4a37e #10370 :ls : show "R", "F" for terminal-jobs fd0fd75 #9966 terminal: swap priority of terminal, editor highlights 7bb858c #9494 libvterm 0.1 TUI 3afb397 syntax, TUI: support "strikethrough" ccbcd39 #9408 TUI: "title stacking" unconditionally 298608f #9509 TUI: detect background color, set bg=dark/light 42f492a #9097 TUI: handle Smulx extension capability (extended underline) 424ddd0 #10205 TUI: support rgba background detection 9b43832 #9601 TUI: italics in tmux, Terminal.app f6fb370 #9793 keymap: support more (keypad) keycodes 3340e08 #9423 TUI: Konsole DECSCUSR fixup :checkhealth d0fd66b health/provider.vim: check curl HTTPS support c38862a #10490 checkhealth: try yarn if npm is missing 43356a4 #9929 health: check if tmux enabled true colors ec5a4d8 #9548 checkhealth: validate locale providers (clipboard, python, etc.): 96be8a2 #10161 Allow reloading providers (useful for UIs/clients) db3c797 #9487 provider: improve error message if provider is missing Various: 36762a0 #9295 signs: support multiple columns 801fe79 #10382 eval: wait() (wait for any condition) 9df3a67 #10400 MsgArea highlight; message grid a9bea8c #10790 keymap: allow modifiers to multibyte chars, like <m-ä> 25e0a44 #10878 #4448 paste: redesign (10x+ faster pasting; extensible vim.paste Lua hook) ef5037e #9706 autocmd: introduce "++once" feature 175398f #9616 add CompleteChanged autocmd 7fcf2f9 #9717 TextYankPost: add v:event["inclusive"] 3a699a7 #8364 termdebug.vim plugin ca1ce59 #9709 performance: use os_copy to create backups ed0e96c man.vim: set 'linebreak' 70f6939 #9564 events: add "Signal" event f89d0d8 #9568 inccommand: auto-disable if folding is slow FIXES: 41bb68b #10584 process_stop: uv: do not close stdin first/explicitly e50aa2a #10117 normal: Don't exit CTRL-O mode after processing K_EVENT 95fa71c #9504 :recover : Fix crash on non-existent *.swp 5a836d4 #9507 screen: don't unconditionally clear messages on window scroll 149dcbf #10021 channel: refactor events, prevent recursive invocation of events d19ff73 #10107 Fix multiple c_CTRL-D showing statusline b65a7b7 #10103 Fix wildmode=list,full and display+=msgsep interaction 0be6d3c #9634 fsync: Ignore ENOTSUP. Fix writing to SMB. b247c6f #10025 kbtree: pointer UB and unitialized value fixes 018e0d5 #9643 API/buffer-updates: always detach on buf-reload 400ee59 #9961 API: fix cursor position when lines are added 769f44e #9911 win/defaults: Use "…/nvim-data/site" in 'runtimepath' 83d5716 #9911 spellfile.vim: store files in stdpath('data') 8dbf231 #9887 RPC: conform message-id type to msgpack-RPC spec 5f996e3 #9894 options: properly reset directories on 'autochdir' 4c4a570 #9807 various CursorMoved fixes 943bedf #9853 event-loop: do not set CA_COMMAND_BUSY 9d207fd #9693 dictwatcheradd(): support b:changedtick 2d50bf3 #9789 mac: fix locale detection c563133 #9754 :mksession : restore tab-local working directories 092e7e6 #9703 #9703 executable(): return false if user is not owner 11a481f #9686 env var fixes/improvements 8e54847 #9666 #7920 os/env: Fix completion of multibyte env var names 5193826 #10468 Fix is_executable_in_path() on Windows 8eaa452 #9516 win: exepath(), executable() fixes f55c1e4 #10544 reltimefloat(): allow negative result b08dc3e #10561 win: jobstart(), system(): $PATHEXT-resolve exe 7cc2b72 #10392 TextYankPost: spurious/too-early dispatch during delete 6e01ed6 OpenBSD: stop jobs/processes properly 58dd5fc #10522 jobstop(): close channel before process_stop() 8363202 #10959 improved resize behavior (all UIs) c6eb1f4 #10830 API: fix nvim_command_output buffer overflow cbfd18c #10763 startup: handle 'guicursor' after user config b8f2436 #10915 jobwait(): fix race if job exits quickly 2fafed6 #10765 clipboard: handle/avoid SIGTERM with previous owner 8aca932 #9954 clipboard: setreg("*") with clipboard=unnamed 3f10c5b #9480 performance: clipboard/macOS: assume that pbcopy works 48efafc #10398 screen: disable redrawing inside VimResized 5e4b93a #10389 API/Lua: make nvim_execute_lua use native lua floats, not special tables 8c6f5b7 #9934 Spurious quote mark in command line when typing <C-R> a8a38f3 Lua 5.2/5.3 compat :terminal 47b7b47 #10700 :terminal : update buffer when switching tabpage 5225c1e #9605 terminal: Fix potential invalid local 'scrollback' 894f6be #8325 :terminal : set topline based on window height 8171e96 #9551 Improve :terminal resize d928b03 #9856 :stopinsert should leave terminal-mode 3f71218 #9926 :terminal : fix: Using `:stopinsert` while in normal mode 5020daa #9883 ui/terminal: make terminal state redraw like any other state TUI: 9f19e8d #9443 TUI: Do not disable BCE for builtin terminfos a4076e5 #9474 win/TUI: fix text overrides line numbers 533d4a3 #9645 TUI: do not resize host-terminal on startup b51e5d8 #9688 tui_tk_ti_getstr: handle weird value 1f5eac1 #10785 TUI: fix data-race during resize CHANGES: 9697c7f #8194 fix menu_get() 7f2e43c #9520 improve Lua error messages c234318 #9526 Remove jemalloc baf93d9 #9581 UI: always use concrete colors for default_colors_set 91688b4 #9563 defaults: set 'scrollback' to -1 by default bb24fec #10136 defaults: exclude "S" from 'shortmess' ddd0eb6 #8540 startup: -es/-Es (silent/batch mode): skip swapfile 3536249 #9805 jumplist: avoid extra tail entry 939d905 #10573 channels: reflect exit due to signals in exit status code 45c34bd #10689 :doautocmd : Never show "No matching autocommands" fb19aee #9110 API: make nvim_win_set_option() set window-global, not buffer-local abfc8b3 #10778 emsg_multiline: log Vim errors 06d9cc7 #10657 exists("$FOO"): return false for empty env var 6616d1d #10743 win/env: Vim-compat: Empty string deletes env var 7d66483 #10662 win: expand nested env var in $HOME 2816bc8 #8349 edit.c: Disable indent during completion 58f505d #9829 startup: remove TUI init special-case Historically Vim/Nvim does backflips to handle input and show messages before a UI is available. This logical contradiction was already fixed for remote UIs (#9024 c236e80). Fixing it also for the TUI avoids problems on Windows, simplifies the logic, and avoids races like #9959.
To continue the discussion in #990
Multiple sign columns:
signcolumn=auto
be preserved? If so, II think we may enact the new behavior with a different setting, e.g.signcolumn=flexible-count
, or something similar.["ALE*", "GitGutter*"]
will determine the order of signs such so that ALE signs will always appear left to GitGutter signs?originator
, e.g. matched byGitGutter*
, appear all aligned on the same column? (It's not so trivial to implement, I think).Removal of signs on line deletion:
To Do: