Fix syntax occasionally not working in popup, and custom vimrc crashing in neovim
This commit is contained in:
parent
476300f815
commit
0810d7154c
4 changed files with 7 additions and 3 deletions
|
|
@ -279,6 +279,7 @@ function! s:CreateNeovimTooltip( body ) abort
|
||||||
call nvim_buf_set_option( buf_id, 'modifiable', v:false )
|
call nvim_buf_set_option( buf_id, 'modifiable', v:false )
|
||||||
let s:popup_win_id = nvim_open_win( buf_id, v:false, opts )
|
let s:popup_win_id = nvim_open_win( buf_id, v:false, opts )
|
||||||
|
|
||||||
|
" Apparently none of these work, when 'style' is 'minimal'
|
||||||
call nvim_win_set_option( s:popup_win_id, 'wrap', v:false )
|
call nvim_win_set_option( s:popup_win_id, 'wrap', v:false )
|
||||||
call nvim_win_set_option( s:popup_win_id, 'cursorline', v:true )
|
call nvim_win_set_option( s:popup_win_id, 'cursorline', v:true )
|
||||||
call nvim_win_set_option( s:popup_win_id, 'signcolumn', 'no' )
|
call nvim_win_set_option( s:popup_win_id, 'signcolumn', 'no' )
|
||||||
|
|
|
||||||
|
|
@ -707,7 +707,7 @@ def SetSyntax( current_syntax, syntax, *args ):
|
||||||
syntax = ''
|
syntax = ''
|
||||||
|
|
||||||
if current_syntax == syntax:
|
if current_syntax == syntax:
|
||||||
return
|
return syntax
|
||||||
|
|
||||||
# We use set syn= because just setting vim.Buffer.options[ 'syntax' ]
|
# We use set syn= because just setting vim.Buffer.options[ 'syntax' ]
|
||||||
# doesn't actually trigger the Syntax autocommand, and i'm not sure that
|
# doesn't actually trigger the Syntax autocommand, and i'm not sure that
|
||||||
|
|
|
||||||
|
|
@ -301,8 +301,7 @@ class VariablesView( object ):
|
||||||
with utils.RestoreCursorPosition():
|
with utils.RestoreCursorPosition():
|
||||||
with utils.ModifiableScratchBuffer( view.buf ):
|
with utils.ModifiableScratchBuffer( view.buf ):
|
||||||
utils.ClearBuffer( view.buf )
|
utils.ClearBuffer( view.buf )
|
||||||
# FIXME: This probably doesn't work reliably
|
view.syntax = utils.SetSyntax( view.syntax,
|
||||||
view.syntax = utils.SetSyntax( None,
|
|
||||||
self._current_syntax,
|
self._current_syntax,
|
||||||
view.buf )
|
view.buf )
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,10 @@ function! s:CustomiseUI()
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function s:SetUpTerminal()
|
function s:SetUpTerminal()
|
||||||
|
if !has_key( g:vimspector_session_windows, 'terminal' )
|
||||||
|
" There's a neovim bug which means that this doesn't work in neovim
|
||||||
|
return
|
||||||
|
endif
|
||||||
let terminal_win = g:vimspector_session_windows.terminal
|
let terminal_win = g:vimspector_session_windows.terminal
|
||||||
|
|
||||||
" Make the terminal window at most 80 columns wide, ensuring there is enough
|
" Make the terminal window at most 80 columns wide, ensuring there is enough
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue