Fix syntax occasionally not working in popup, and custom vimrc crashing in neovim

python3/vimspector/utils.py

@@ -707,7 +707,7 @@ def SetSyntax( current_syntax, syntax, *args ):
     syntax = ''
 
   if current_syntax == syntax:
-    return
+    return 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

python3/vimspector/variables.py

@@ -301,8 +301,7 @@ class VariablesView( object ):
     with utils.RestoreCursorPosition():
       with utils.ModifiableScratchBuffer( view.buf ):
         utils.ClearBuffer( view.buf )
-        # FIXME: This probably doesn't work reliably
-        view.syntax = utils.SetSyntax( None,
+        view.syntax = utils.SetSyntax( view.syntax,
                                        self._current_syntax,
                                        view.buf )