Skip to content

Fix insufficient correspondence to python3 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erw7 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix insufficient correspondence to python3 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions autoload/nim.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ endif

if has("python3")
exe 'py3file ' . fnameescape(s:plugin_path) . '/nim_vim.py'
let s:py_cmd = 'py3 '
elseif has("python")
exe 'pyfile ' . fnameescape(s:plugin_path) . '/nim_vim.py'
let s:py_cmd = 'py '
endif

fun! nim#init()
Expand Down Expand Up @@ -53,16 +55,16 @@ augroup NimVim
au!
au BufEnter log://nim call s:UpdateNimLog()
" au QuitPre * :py nimTerminateAll()
au VimLeavePre * :py nimTerminateAll()
exe printf("au VimLeavePre * :%s nimTerminateAll()", s:py_cmd)
augroup END

command! NimLog :e log://nim

command! NimTerminateService
\ :exe printf("py nimTerminateService('%s')", b:nim_project_root)
\ :exe printf("%s nimTerminateService('%s')", s:py_cmd, b:nim_project_root)

command! NimRestartService
\ :exe printf("py nimRestartService('%s')", b:nim_project_root)
\ :exe printf("%s nimRestartService('%s')", s:py_cmd, b:nim_project_root)

fun! s:CurrentNimFile()
let save_cur = getpos('.')
Expand Down Expand Up @@ -116,7 +118,7 @@ fun! NimExec(op)
endif

if b:nim_caas_enabled
exe printf("py nimExecCmd('%s', '%s', False)", b:nim_project_root, cmd)
exe printf("%s nimExecCmd('%s', '%s', False)", s:py_cmd, b:nim_project_root, cmd)
let output = l:py_res
else
let output = system("nim " . cmd)
Expand Down
4 changes: 2 additions & 2 deletions autoload/nim_vim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def nimStartService(project):
return target

def nimTerminateService(project):
if NimProjects.has_key(project):
if project in NimProjects:
NimProjects[project].postNimCmd("quit")
del NimProjects[project]

Expand All @@ -83,7 +83,7 @@ def nimRestartService(project):

def nimExecCmd(project, cmd, async = True):
target = None
if NimProjects.has_key(project):
if project in NimProjects:
target = NimProjects[project]
else:
target = nimStartService(project)
Expand Down