vim/vim-autoformat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #254 from Mattias1/fix-formatterpath-on-windows-253

Browse Source 
#253 Fix formatterpath seperator char on windows
This commit is contained in:
Chiel ten Brinke 2018-10-21 18:45:59 +02:00 committed by GitHub
commit 9ecbae7220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/autoformat.vim
View File

@ -185,7 +185,7 @@ function! s:TryFormatterPython()
let verbose = &verbose || g:autoformat_verbosemode == 1 let verbose = &verbose || g:autoformat_verbosemode == 1
python << EOF python << EOF
import vim, subprocess, os import vim, subprocess, os, platform
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
text = os.linesep.join(vim.current.buffer[:]) + os.linesep text = os.linesep.join(vim.current.buffer[:]) + os.linesep
formatprg = vim.eval('b:formatprg') formatprg = vim.eval('b:formatprg')
@ -194,7 +194,8 @@ verbose = bool(int(vim.eval('verbose')))
env = os.environ.copy() env = os.environ.copy()
if int(vim.eval('exists("g:formatterpath")')): if int(vim.eval('exists("g:formatterpath")')):
extra_path = vim.eval('g:formatterpath') extra_path = vim.eval('g:formatterpath')
env['PATH'] = ':'.join(extra_path) + ':' + env['PATH'] pathsep = ';' if platform.system() == 'Windows' else ':'
env['PATH'] = pathsep.join(extra_path) + pathsep + env['PATH']
# When an entry is unicode, Popen can't deal with it in Python 2. # When an entry is unicode, Popen can't deal with it in Python 2.
# As a pragmatic fix, we'll omit that entry. # As a pragmatic fix, we'll omit that entry.
@ -241,7 +242,7 @@ function! s:TryFormatterPython3()
let verbose = &verbose || g:autoformat_verbosemode == 1 let verbose = &verbose || g:autoformat_verbosemode == 1
python3 << EOF python3 << EOF
import vim, subprocess, os import vim, subprocess, os, platform
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
# The return code is `failure`, unless otherwise specified # The return code is `failure`, unless otherwise specified
@ -253,7 +254,8 @@ verbose = bool(int(vim.eval('verbose')))
env = os.environ.copy() env = os.environ.copy()
if int(vim.eval('exists("g:formatterpath")')): if int(vim.eval('exists("g:formatterpath")')):
extra_path = vim.eval('g:formatterpath') extra_path = vim.eval('g:formatterpath')
env['PATH'] = ':'.join(extra_path) + ':' + env['PATH'] pathsep = ';' if platform.system() == 'Windows' else ':'
env['PATH'] = pathsep.join(extra_path) + pathsep + env['PATH']
try: try:
p = subprocess.Popen(formatprg, env=env, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE) p = subprocess.Popen(formatprg, env=env, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)