]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Add windows support for black vim plugin (#123)
authorZsolt Dollenstein <zsol.zsol@gmail.com>
Thu, 12 Apr 2018 02:55:47 +0000 (03:55 +0100)
committerŁukasz Langa <lukasz@langa.pl>
Thu, 12 Apr 2018 02:55:47 +0000 (19:55 -0700)
This is mostly a best effort support, and I only tested it on my
machine.

vim/plugin/black.vim

index d0afdef349826bdf45221d25b54edb6d01ef9823..cd80266a01b111dfb2f9aff59206919645d8f44f 100644 (file)
@@ -35,6 +35,21 @@ python3 << endpython3
 import sys
 import vim
 
 import sys
 import vim
 
+def _find_python_binary(exec_prefix):
+  if sys.platform[:3] == "win":
+    return exec_prefix / 'python.exe'
+  return exec_prefix / 'bin' / 'python3'
+
+def _find_pip(venv_path):
+  if sys.platform[:3] == "win":
+    return venv_path / 'Scripts' / 'pip.exe'
+  return venv_path / 'bin' / 'pip'
+
+def _find_virtualenv_site_packages(venv_path):
+  if sys.platform[:3] == "win":
+    return venv_path / 'Lib' / 'site-packages'
+  return venv_path / 'Lib' / f'python{pyver[0]}.{pyver[1]}' / 'site-packages'
+
 def _initialize_black_env(upgrade=False):
   pyver = sys.version_info[:2]
   if pyver < (3, 6):
 def _initialize_black_env(upgrade=False):
   pyver = sys.version_info[:2]
   if pyver < (3, 6):
@@ -45,15 +60,13 @@ def _initialize_black_env(upgrade=False):
   import subprocess
   import venv
   virtualenv_path = Path(vim.eval("g:black_virtualenv")).expanduser()
   import subprocess
   import venv
   virtualenv_path = Path(vim.eval("g:black_virtualenv")).expanduser()
-  virtualenv_site_packages = str(
-    virtualenv_path / 'lib' / f'python{pyver[0]}.{pyver[1]}' / 'site-packages'
-  )
+  virtualenv_site_packages = str(_find_virtualenv_site_packages(virtualenv_path))
   first_install = False
   if not virtualenv_path.is_dir():
     print('Please wait, one time setup for Black.')
     _executable = sys.executable
     try:
   first_install = False
   if not virtualenv_path.is_dir():
     print('Please wait, one time setup for Black.')
     _executable = sys.executable
     try:
-      sys.executable = str(Path(sys.exec_prefix) / 'bin' / 'python3')
+      sys.executable = str(_find_python_binary(Path(sys.exec_prefix)))
       print(f'Creating a virtualenv in {virtualenv_path}...')
       print('(this path can be customized in .vimrc by setting g:black_virtualenv)')
       venv.create(virtualenv_path, with_pip=True)
       print(f'Creating a virtualenv in {virtualenv_path}...')
       print('(this path can be customized in .vimrc by setting g:black_virtualenv)')
       venv.create(virtualenv_path, with_pip=True)
@@ -65,7 +78,7 @@ def _initialize_black_env(upgrade=False):
   if upgrade:
     print('Upgrading Black with pip...')
   if first_install or upgrade:
   if upgrade:
     print('Upgrading Black with pip...')
   if first_install or upgrade:
-    subprocess.run([str(virtualenv_path / 'bin' / 'pip'), 'install', '-U', 'black'])
+    subprocess.run([str(_find_pip(virtualenv_path)), 'install', '-U', 'black'])
     print('DONE! You are all set, thanks for waiting ✨ 🍰 ✨')
   if first_install:
     print('Pro-tip: to upgrade Black in the future, use the :BlackUpgrade command and restart Vim.\n')
     print('DONE! You are all set, thanks for waiting ✨ 🍰 ✨')
   if first_install:
     print('Pro-tip: to upgrade Black in the future, use the :BlackUpgrade command and restart Vim.\n')