diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-04-05 09:42:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-05 09:42:00 +0800 |
| commit | e8785c2e94508eeabf6ff63e1fe1bcaecceef946 (patch) | |
| tree | 95550a4242171634e6fda593be9c757ffeb70ecc /runtime/lua/vim | |
| parent | 1e1384b6dd29c071ed76e4e2ed233511404bae72 (diff) | |
| download | rneovim-e8785c2e94508eeabf6ff63e1fe1bcaecceef946.tar.gz rneovim-e8785c2e94508eeabf6ff63e1fe1bcaecceef946.tar.bz2 rneovim-e8785c2e94508eeabf6ff63e1fe1bcaecceef946.zip | |
vim-patch:9.1.1276: inline word diff treats multibyte chars as word char (#33323)
Problem: inline word diff treats multibyte chars as word char
(after 9.1.1243)
Solution: treat all non-alphanumeric characters as non-word characters
(Yee Cheng Chin)
Previously inline word diff simply used Vim's definition of keyword to
determine what is a word, which leads to multi-byte character classes
such as emojis and CJK (Chinese/Japanese/Korean) characters all
classifying as word characters, leading to entire sentences being
grouped as a single word which does not provide meaningful information
in a diff highlight.
Fix this by treating all non-alphanumeric characters (with class number
above 2) as non-word characters, as there is usually no benefit in using
word diff on them. These include CJK characters, emojis, and also
subscript/superscript numbers. Meanwhile, multi-byte characters like
Cyrillic and Greek letters will still continue to considered as words.
Note that this is slightly inconsistent with how words are defined
elsewhere, as Vim usually considers any character with class >=2 to be
a "word".
related: vim/vim#16881 (diff inline highlight)
closes: vim/vim#17050
https://github.com/vim/vim/commit/9aa120f7ada592ed03b37f4de8ee413c5385f123
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
Diffstat (limited to 'runtime/lua/vim')
| -rw-r--r-- | runtime/lua/vim/_meta/options.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index 0fc8518aa4..c032edf43c 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -1729,7 +1729,10 @@ vim.go.dex = vim.go.diffexpr --- difference. --- word Use internal diff to perform a --- `word`-wise diff and highlight the ---- difference. +--- difference. Non-alphanumeric +--- multi-byte characters such as emoji +--- and CJK characters are considered +--- individual words. --- --- internal Use the internal diff library. This is --- ignored when 'diffexpr' is set. *E960* |