Rename hide_on_intersect to hide_on_float_intersect

Author: dstein64

autoload/scrollview.vim

@@ -36,8 +36,12 @@ let g:scrollview_signs_hidden_for_insert =
       \ get(g:, 'scrollview_signs_hidden_for_insert', [])
 let g:scrollview_hide_bar_for_insert =
       \ get(g:, 'scrollview_hide_bar_for_insert', v:false)
-let g:scrollview_hide_on_intersect =
-      \ get(g:, 'scrollview_hide_on_intersect', v:false)
+" Use the old option, scrollview_hide_on_intersect, if it's set.
+if has_key(g:, 'scrollview_hide_on_intersect')
+  let g:scrollview_hide_on_float_intersect = g:scrollview_hide_on_intersect
+endif
+let g:scrollview_hide_on_float_intersect =
+      \ get(g:, 'scrollview_hide_on_float_intersect', v:false)
 let g:scrollview_hover = get(g:, 'scrollview_hover', v:true)
 let g:scrollview_include_end_region =
       \ get(g:, 'scrollview_include_end_region', v:false)

doc/scrollview.txt

@@ -251,7 +251,7 @@ scrollview_hide_bar_for_insert             *scrollview_hide_bar_for_insert*
                        the current window for insert mode. Defaults to |v:false|.
                        See |scrollview_signs_hidden_for_insert| for hiding signs.
 
-scrollview_hide_on_intersect               *scrollview_hide_on_intersect*
+scrollview_hide_on_float_intersect         *scrollview_hide_on_float_intersect*
                        |Boolean| specifying whether each scrollbar or sign
                        becomes hidden (not shown) when it would otherwise
                        intersect with a floating window. Defaults to |v:false|.

doc/tags

@@ -79,7 +79,7 @@ scrollview_floating_windows	scrollview.txt	/*scrollview_floating_windows*
 scrollview_folds_priority	scrollview.txt	/*scrollview_folds_priority*
 scrollview_folds_symbol	scrollview.txt	/*scrollview_folds_symbol*
 scrollview_hide_bar_for_insert	scrollview.txt	/*scrollview_hide_bar_for_insert*
-scrollview_hide_on_intersect	scrollview.txt	/*scrollview_hide_on_intersect*
+scrollview_hide_on_float_intersect	scrollview.txt	/*scrollview_hide_on_float_intersect*
 scrollview_hover	scrollview.txt	/*scrollview_hover*
 scrollview_include_end_region	scrollview.txt	/*scrollview_include_end_region*
 scrollview_indent_spaces_condition	scrollview.txt	/*scrollview_indent_spaces_condition*

lua/scrollview.lua

@@ -1376,7 +1376,7 @@ local show_scrollbar = function(winid, bar_winid)
       and winid == api.nvim_get_current_win() then
     return -1
   end
-  if to_bool(vim.g.scrollview_hide_on_intersect) then
+  if to_bool(vim.g.scrollview_hide_on_float_intersect) then
     local winrow0 = wininfo.winrow - 1
     local wincol0 = wininfo.wincol - 1
     local float_overlaps = get_float_overlaps(
@@ -1708,7 +1708,7 @@ local show_signs = function(winid, sign_winids, bar_winid)
       end
       total_width = total_width + sign_width
       local show = is_valid_column(winid, col, sign_width)
-      if to_bool(vim.g.scrollview_hide_on_intersect)
+      if to_bool(vim.g.scrollview_hide_on_float_intersect)
           and show then
         local winrow0 = wininfo.winrow - 1
         local wincol0 = wininfo.wincol - 1
@@ -2900,8 +2900,8 @@ local handle_mouse = function(button, primary)
             -- already been processed. The current window (from prior to
             -- scrolling) is not changed.
             -- Refresh scrollbars to handle the scenario where
-            -- scrollview_hide_on_intersect is enabled and dragging resulted in
-            -- a scrollbar overlapping a floating window.
+            -- scrollview_hide_on_float_intersect is enabled and dragging
+            -- resulted in a scrollbar overlapping a floating window.
             refresh_bars()
             -- We only restore the cursor after dragging is finished. The
             -- cursor position can't be changed while dragging (but it stays in