Fix opening paths on Windows

python3/vimspector/installer.py

@@ -201,9 +201,24 @@ def MakeSymlink( in_folder, link, pointing_to ):
   RemoveIfExists( os.path.join( in_folder, link ) )
 
   in_folder = os.path.abspath( in_folder )
-  pointing_to = os.path.relpath( os.path.abspath( pointing_to ),
+  pointing_to_relative = os.path.relpath( os.path.abspath( pointing_to ),
                                           in_folder )
-  os.symlink( pointing_to, os.path.join( in_folder, link ) )
+  link_path = os.path.join( in_folder, link )
+
+  if install.GetOS() == 'windows':
+    # While symlinks do exist on Windows, they require elevated privileges, so
+    # let's use a directory junction which is all we need.
+    link_path = os.path.abspath( link_path )
+    if os.path.isdir( link_path ):
+      os.rmdir( link_path )
+    subprocess.check_call( [ 'cmd.exe',
+                             '/c',
+                             'mklink',
+                             '/J',
+                             link_path,
+                             pointing_to ] )
+  else:
+    os.symlink( pointing_to_relative, link_path )
 
 
 def CloneRepoTo( url, ref, destination ):

python3/vimspector/utils.py

@@ -42,7 +42,7 @@ SetUpLogging( _logger )
 
 
 def BufferNumberForFile( file_name ):
-  return int( vim.eval( 'bufnr( "{0}", 1 )'.format( file_name ) ) )
+  return int( vim.eval( "bufnr( '{0}', 1 )".format( Escape( file_name ) ) ) )
 
 
 def BufferForFile( file_name ):
@@ -52,7 +52,7 @@ def BufferForFile( file_name ):
 def OpenFileInCurrentWindow( file_name ):
   buffer_number = BufferNumberForFile( file_name )
   try:
-    vim.command( 'bu {0}'.format( buffer_number ) )
+    vim.current.buffer = vim.buffers[ buffer_number ]
   except vim.error as e:
     if 'E325' not in str( e ):
       raise