Merge de68c14312 into 7121983c45

runtime/colors/vim.lua

@@ -60,7 +60,7 @@ hi('PmenuMatch',     { link = 'Pmenu' })
 hi('PmenuMatchSel',  { link = 'PmenuSel' })
 hi('PmenuExtra',     { link = 'Pmenu' })
 hi('PmenuExtraSel',  { link = 'PmenuSel' })
-hi('ComplMatchIns',  {})
+hi('ComplMatchIns',  { link = 'Normal' })
 hi('Substitute',     { link = 'Search' })
 hi('Whitespace',     { link = 'NonText' })
 hi('MsgSeparator',   { link = 'StatusLine' })

src/nvim/drawline.c

@@ -955,7 +955,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s
   bool area_highlighting = false;       // Visual or incsearch highlighting in this line
   int vi_attr = 0;                      // attributes for Visual and incsearch highlighting
   int area_attr = 0;                    // attributes desired by highlighting
-  int search_attr = 0;                  // attributes desired by 'hlsearch' or ComplMatchIns
+  int search_attr = 0;                  // attributes desired by 'hlsearch'
   int vcol_save_attr = 0;               // saved attr for 'cursorcolumn'
   int decor_attr = 0;                   // attributes desired by syntax and extmarks
   bool has_syntax = false;              // this buffer has syntax highl.
@@ -969,7 +969,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s
   int spell_attr = 0;                   // attributes desired by spelling
   int word_end = 0;                     // last byte with same spell_attr
   int cur_checked_col = 0;              // checked column for current line
-  bool extra_check = false;             // has extra highlighting
+  bool extra_check = 0;                 // has syntax or linebreak
   int multi_attr = 0;                   // attributes desired by multibyte
   int mb_l = 1;                         // multi-byte byte length
   int mb_c = 0;                         // decoded multi-byte character
@@ -1495,10 +1495,6 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s
     ptr = line + v;  // "line" may have been updated
   }
 
-  if ((State & MODE_INSERT) && in_curline && ins_compl_active()) {
-    area_highlighting = true;
-  }
-
   win_line_start(wp, &wlv);
   bool draw_cols = true;
   int leftcols_width = 0;
@@ -1744,14 +1740,6 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s
         if (*ptr == NUL) {
           has_match_conc = 0;
         }
-
-        // Check if ComplMatchIns highlight is needed.
-        if ((State & MODE_INSERT) && in_curline && ins_compl_active()) {
-          int ins_match_attr = ins_compl_col_range_attr((int)(ptr - line));
-          if (ins_match_attr > 0) {
-            search_attr = hl_combine_attr(search_attr, ins_match_attr);
-          }
-        }
       }
 
       if (wlv.diff_hlf != (hlf_T)0) {
@@ -1799,6 +1787,16 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s
       wlv.char_attr = hl_combine_attr(char_attr_base, char_attr_pri);
     }
 
+    // Apply ComplMatchIns highlight if needed.
+    if (wlv.filler_todo <= 0
+        && (State & MODE_INSERT) && in_curline && ins_compl_active()) {
+      int ins_match_attr = ins_compl_col_range_attr((int)(ptr - line));
+      if (ins_match_attr > 0) {
+        char_attr_pri = hl_combine_attr(char_attr_pri, ins_match_attr);
+        wlv.char_attr = hl_combine_attr(char_attr_base, char_attr_pri);
+      }
+    }
+
     if (draw_folded && has_foldtext && wlv.n_extra == 0 && wlv.col == win_col_offset) {
       const int v = (int)(ptr - line);
       linenr_T lnume = lnum + foldinfo.fi_lines - 1;

src/nvim/highlight_group.c

@@ -173,7 +173,7 @@ static const char *highlight_init_both[] = {
   "default link PmenuKind        Pmenu",
   "default link PmenuKindSel     PmenuSel",
   "default link PmenuSbar        Pmenu",
-  "default link ComplMatchIns    NONE",
+  "default link ComplMatchIns    Normal",
   "default link Substitute       Search",
   "default link StatusLineTerm   StatusLine",
   "default link StatusLineTermNC StatusLineNC",

src/nvim/insexpand.c

@@ -958,7 +958,7 @@ static void ins_compl_insert_bytes(char *p, int len)
   }
   assert(len >= 0);
   ins_bytes_len(p, (size_t)len);
-  compl_ins_end_col = curwin->w_cursor.col;
+  compl_ins_end_col = curwin->w_cursor.col - 1;
 }
 
 /// Checks if the column is within the currently inserted completion text
@@ -2147,8 +2147,6 @@ static bool ins_compl_stop(const int c, const int prev_mode, bool retval)
       && pum_visible()) {
     word = xstrdup(compl_shown_match->cp_str);
     retval = true;
-    // May need to remove ComplMatchIns highlight.
-    redrawWinline(curwin, curwin->w_cursor.lnum);
   }
 
   // CTRL-E means completion is Ended, go back to the typed text.
@@ -3650,7 +3648,6 @@ void ins_compl_delete(bool new_leader)
       return;
     }
     backspace_until_column(col);
-    compl_ins_end_col = curwin->w_cursor.col;
   }
 
   // TODO(vim): is this sufficient for redrawing?  Redrawing everything

src/nvim/terminal.c

@@ -641,6 +641,9 @@ bool terminal_enter(void)
   curwin->w_p_so = 0;
   curwin->w_p_siso = 0;
 
+  // Save the existing cursor entry since it may be modified by the application
+  cursorentry_T save_cursorentry = shape_table[SHAPE_IDX_TERM];
+
   // Update the cursor shape table and flush changes to the UI
   s->term->pending.cursor = true;
   refresh_cursor(s->term);
@@ -671,8 +674,8 @@ bool terminal_enter(void)
   RedrawingDisabled = s->save_rd;
   apply_autocmds(EVENT_TERMLEAVE, NULL, NULL, false, curbuf);
 
-  // Restore the terminal cursor to what is set in 'guicursor'
-  (void)parse_shape_opt(SHAPE_CURSOR);
+  shape_table[SHAPE_IDX_TERM] = save_cursorentry;
+  ui_mode_info_set();
 
   if (save_curwin == curwin->handle) {  // Else: window was closed.
     curwin->w_p_cul = save_w_p_cul;

test/functional/terminal/cursor_spec.lua

@@ -15,20 +15,9 @@ local skip = t.skip
 describe(':terminal cursor', function()
   local screen
 
-  local terminal_mode_idx ---@type number
-
   before_each(function()
     clear()
     screen = tt.setup_screen()
-
-    if terminal_mode_idx == nil then
-      for i, v in ipairs(screen._mode_info) do
-        if v.name == 'terminal' then
-          terminal_mode_idx = i
-        end
-      end
-      assert(terminal_mode_idx)
-    end
   end)
 
   it('moves the screen cursor when focused', function()
@@ -154,6 +143,13 @@ describe(':terminal cursor', function()
 
   it('can be modified by application #3681', function()
     skip(is_os('win'), '#31587')
+    local idx ---@type number
+    for i, v in ipairs(screen._mode_info) do
+      if v.name == 'terminal' then
+        idx = i
+      end
+    end
+    assert(idx)
 
     local states = {
       [1] = { blink = true, shape = 'block' },
@@ -175,13 +171,13 @@ describe(':terminal cursor', function()
       ]],
         condition = function()
           if v.blink then
-            eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-            eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
+            eq(500, screen._mode_info[idx].blinkon)
+            eq(500, screen._mode_info[idx].blinkoff)
           else
-            eq(0, screen._mode_info[terminal_mode_idx].blinkon)
-            eq(0, screen._mode_info[terminal_mode_idx].blinkoff)
+            eq(0, screen._mode_info[idx].blinkon)
+            eq(0, screen._mode_info[idx].blinkoff)
           end
-          eq(v.shape, screen._mode_info[terminal_mode_idx].cursor_shape)
+          eq(v.shape, screen._mode_info[idx].cursor_shape)
         end,
       })
     end
@@ -195,13 +191,20 @@ describe(':terminal cursor', function()
     ]])
 
     -- Cursor returns to default on TermLeave
-    eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-    eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-    eq('block', screen._mode_info[terminal_mode_idx].cursor_shape)
+    eq(500, screen._mode_info[idx].blinkon)
+    eq(500, screen._mode_info[idx].blinkoff)
+    eq('block', screen._mode_info[idx].cursor_shape)
   end)
 
   it('can be modified per terminal', function()
     skip(is_os('win'), '#31587')
+    local idx ---@type number
+    for i, v in ipairs(screen._mode_info) do
+      if v.name == 'terminal' then
+        idx = i
+      end
+    end
+    assert(idx)
 
     -- Set cursor to vertical bar with blink
     tt.feed_csi('5 q')
@@ -213,9 +216,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('vertical', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('vertical', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -228,9 +231,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('vertical', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('vertical', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -253,9 +256,9 @@ describe(':terminal cursor', function()
     ]],
       condition = function()
         -- New terminal, cursor resets to defaults
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('block', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('block', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -272,9 +275,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(0, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(0, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('horizontal', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(0, screen._mode_info[idx].blinkon)
+        eq(0, screen._mode_info[idx].blinkoff)
+        eq('horizontal', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -291,9 +294,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('vertical', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('vertical', screen._mode_info[idx].cursor_shape)
       end,
     })
   end)
@@ -323,32 +326,6 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]])
   end)
-
-  it('preserves guicursor value on TermLeave #31612', function()
-    eq(3, screen._mode_info[terminal_mode_idx].hl_id)
-
-    -- Change 'guicursor' while terminal mode is active
-    command('set guicursor+=t:Error')
-
-    local error_hl_id = call('hlID', 'Error')
-
-    screen:expect({
-      condition = function()
-        eq(error_hl_id, screen._mode_info[terminal_mode_idx].hl_id)
-      end,
-    })
-
-    -- Exit terminal mode
-    feed([[<C-\><C-N>]])
-
-    screen:expect([[
-      tty ready                                         |
-      ^                                                  |
-                                                        |*5
-    ]])
-
-    eq(error_hl_id, screen._mode_info[terminal_mode_idx].hl_id)
-  end)
 end)
 
 describe('buffer cursor position is correct in terminal without number column', function()
@@ -373,6 +350,12 @@ describe('buffer cursor position is correct in terminal without number column',
     }, {
       cols = 70,
     })
+    screen:set_default_attr_ids({
+      [1] = { foreground = 253, background = 11 },
+      [2] = { reverse = true },
+      [3] = { bold = true },
+      [4] = { background = 11 },
+    })
     -- Also check for real cursor position, as it is used for stuff like input methods
     screen._handle_busy_start = function() end
     screen._handle_busy_stop = function() end
@@ -684,6 +667,13 @@ describe('buffer cursor position is correct in terminal with number column', fun
     }, {
       cols = 70,
     })
+    screen:set_default_attr_ids({
+      [1] = { foreground = 253, background = 11 },
+      [2] = { reverse = true },
+      [3] = { bold = true },
+      [4] = { background = 11 },
+      [7] = { foreground = 130 },
+    })
     -- Also check for real cursor position, as it is used for stuff like input methods
     screen._handle_busy_start = function() end
     screen._handle_busy_stop = function() end

test/functional/ui/mode_spec.lua

@@ -94,7 +94,7 @@ describe('ui mode_change event', function()
     }
   end)
 
-  -- oldtest: Test_mouse_shape_indent_norm_with_gq()
+  -- oldtest: Test_indent_norm_with_gq()
   it('is restored to Normal mode after "gq" indents using :normal #12309', function()
     screen:try_resize(60, 6)
     n.exec([[

test/functional/ui/popupmenu_spec.lua

@@ -1162,8 +1162,6 @@ describe('builtin popupmenu', function()
         [6] = { foreground = Screen.colors.White, background = Screen.colors.Red },
         [7] = { background = Screen.colors.Yellow }, -- Search
         [8] = { foreground = Screen.colors.Red },
-        [9] = { foreground = Screen.colors.Yellow, background = Screen.colors.Green },
-        [10] = { foreground = Screen.colors.White, background = Screen.colors.Green },
         ks = { foreground = Screen.colors.Red, background = Screen.colors.Grey },
         kn = { foreground = Screen.colors.Red, background = Screen.colors.Plum1 },
         xs = { foreground = Screen.colors.Black, background = Screen.colors.Grey },
@@ -5627,114 +5625,6 @@ describe('builtin popupmenu', function()
           {2:-- INSERT --}                    |
         ]])
         feed('<Esc>')
-
-        -- text after the inserted text shouldn't be highlighted
-        feed('0ea <C-X><C-O>')
-        screen:expect([[
-          αβγ {8:foo}^ foo                     |
-          {1:~  }{s: foo            }{1:             }|
-          {1:~  }{n: bar            }{1:             }|
-          {1:~  }{n: 你好           }{1:             }|
-          {1:~                               }|*15
-          {2:-- }{5:match 1 of 3}                 |
-        ]])
-        feed('<C-P>')
-        screen:expect([[
-          αβγ ^ foo                        |
-          {1:~  }{n: foo            }{1:             }|
-          {1:~  }{n: bar            }{1:             }|
-          {1:~  }{n: 你好           }{1:             }|
-          {1:~                               }|*15
-          {2:-- }{8:Back at original}             |
-        ]])
-        feed('<C-P>')
-        screen:expect([[
-          αβγ {8:你好}^ foo                    |
-          {1:~  }{n: foo            }{1:             }|
-          {1:~  }{n: bar            }{1:             }|
-          {1:~  }{s: 你好           }{1:             }|
-          {1:~                               }|*15
-          {2:-- }{5:match 3 of 3}                 |
-        ]])
-        feed('<C-Y>')
-        screen:expect([[
-          αβγ 你好^ foo                    |
-          {1:~                               }|*18
-          {2:-- INSERT --}                    |
-        ]])
-        feed('<Esc>')
-      end)
-
-      -- oldtest: Test_pum_matchins_highlight_combine()
-      it('with ComplMatchIns, Normal and CursorLine highlights', function()
-        exec([[
-          func Omni_test(findstart, base)
-            if a:findstart
-              return col(".")
-            endif
-            return [#{word: "foo"}, #{word: "bar"}, #{word: "你好"}]
-          endfunc
-          set omnifunc=Omni_test
-          hi Normal guibg=blue
-          hi CursorLine guibg=green guifg=white
-          set cursorline
-          call setline(1, 'aaa bbb')
-        ]])
-
-        -- when ComplMatchIns is not set, CursorLine applies normally
-        feed('0ea <C-X><C-O>')
-        screen:expect([[
-          {10:aaa foo^ bbb                     }|
-          {1:~  }{s: foo            }{1:             }|
-          {1:~  }{n: bar            }{1:             }|
-          {1:~  }{n: 你好           }{1:             }|
-          {1:~                               }|*15
-          {2:-- }{5:match 1 of 3}                 |
-        ]])
-        feed('<C-E>')
-        screen:expect([[
-          {10:aaa ^ bbb                        }|
-          {1:~                               }|*18
-          {2:-- INSERT --}                    |
-        ]])
-        feed('<BS><Esc>')
-
-        -- when ComplMatchIns is set, it is applied over CursorLine
-        command('hi ComplMatchIns guifg=Yellow')
-        feed('0ea <C-X><C-O>')
-        screen:expect([[
-          {10:aaa }{9:foo}{10:^ bbb                     }|
-          {1:~  }{s: foo            }{1:             }|
-          {1:~  }{n: bar            }{1:             }|
-          {1:~  }{n: 你好           }{1:             }|
-          {1:~                               }|*15
-          {2:-- }{5:match 1 of 3}                 |
-        ]])
-        feed('<C-P>')
-        screen:expect([[
-          {10:aaa ^ bbb                        }|
-          {1:~  }{n: foo            }{1:             }|
-          {1:~  }{n: bar            }{1:             }|
-          {1:~  }{n: 你好           }{1:             }|
-          {1:~                               }|*15
-          {2:-- }{8:Back at original}             |
-        ]])
-        feed('<C-P>')
-        screen:expect([[
-          {10:aaa }{9:你好}{10:^ bbb                    }|
-          {1:~  }{n: foo            }{1:             }|
-          {1:~  }{n: bar            }{1:             }|
-          {1:~  }{s: 你好           }{1:             }|
-          {1:~                               }|*15
-          {2:-- }{5:match 3 of 3}                 |
-        ]])
-        feed('<C-E>')
-        screen:expect([[
-          {10:aaa ^ bbb                        }|
-          {1:~                               }|*18
-          {2:-- INSERT --}                    |
-        ]])
-        feed('<Esc>')
       end)
     end
   end

test/old/testdir/test_indent.vim

@@ -308,7 +308,7 @@ endfunc
 
 " Test that mouse shape is restored to Normal mode after using "gq" when
 " 'indentexpr' executes :normal.
-func Test_mouse_shape_indent_norm_with_gq()
+func Test_indent_norm_with_gq()
   CheckFeature mouseshape
   CheckCanRunGui
 

test/old/testdir/test_popup.vim

@@ -1747,67 +1747,13 @@ func Test_pum_matchins_highlight()
   call TermWait(buf)
   call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>\<C-Y>")
   call VerifyScreenDump(buf, 'Test_pum_matchins_04', {})
-  call term_sendkeys(buf, "\<Esc>")
+  call term_sendkeys(buf, "\<C-E>\<Esc>")
 
   " restore after cancel completion
   call TermWait(buf)
   call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>\<Space>")
   call VerifyScreenDump(buf, 'Test_pum_matchins_05', {})
-  call term_sendkeys(buf, "\<Esc>")
-
-  " text after the inserted text shouldn't be highlighted
-  call TermWait(buf)
-  call term_sendkeys(buf, "0ea \<C-X>\<C-O>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_07', {})
-  call term_sendkeys(buf, "\<C-P>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_08', {})
-  call term_sendkeys(buf, "\<C-P>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_09', {})
-  call term_sendkeys(buf, "\<C-Y>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_10', {})
-  call term_sendkeys(buf, "\<Esc>")
-
-  call StopVimInTerminal(buf)
-endfunc
-
-func Test_pum_matchins_highlight_combine()
-  CheckScreendump
-  let lines =<< trim END
-    func Omni_test(findstart, base)
-      if a:findstart
-        return col(".")
-      endif
-      return [#{word: "foo"}, #{word: "bar"}, #{word: "你好"}]
-    endfunc
-    set omnifunc=Omni_test
-    hi Normal ctermbg=blue
-    hi CursorLine cterm=underline ctermbg=green
-    set cursorline
-    call setline(1, 'aaa bbb')
-  END
-  call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
-
-  " when ComplMatchIns is not set, CursorLine applies normally
-  call term_sendkeys(buf, "0ea \<C-X>\<C-O>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_combine_01', {})
-  call term_sendkeys(buf, "\<C-E>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_combine_02', {})
-  call term_sendkeys(buf, "\<BS>\<Esc>")
-
-  " when ComplMatchIns is set, it is applied over CursorLine
-  call TermWait(buf)
-  call term_sendkeys(buf, ":hi ComplMatchIns ctermbg=red ctermfg=yellow\<CR>")
-  call TermWait(buf)
-  call term_sendkeys(buf, "0ea \<C-X>\<C-O>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_combine_03', {})
-  call term_sendkeys(buf, "\<C-P>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_combine_04', {})
-  call term_sendkeys(buf, "\<C-P>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_combine_05', {})
-  call term_sendkeys(buf, "\<C-E>")
-  call VerifyScreenDump(buf, 'Test_pum_matchins_combine_06', {})
-  call term_sendkeys(buf, "\<Esc>")
+  call term_sendkeys(buf, "\<C-E>\<Esc>")
 
   call StopVimInTerminal(buf)
 endfunc