Skip to content
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

Jump to bottom

compatible gf-user. #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

compatible gf-user. #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adc2763
compatible gf-user.
Dec 6, 2014
fd00a2f
fixes E746
Dec 9, 2014
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
50 changes: 39 additions & 11 deletions autoload/node.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
let node#suffixesadd = [".js", ".json"]
let node#filetypes = ["javascript", "json"]
if !exists('g:node#suffixesadd')
let g:node#suffixesadd = [".js", ".json"]
endif
if !exists('g:node#filetypes')
let g:node#filetypes = ["javascript", "json"]
endif
if !exists('g:node#enable_gf_user')
let g:node#enable_gf_user = 0
endif

function! node#initialize(root)
let b:node_root = a:root
Expand All @@ -8,6 +15,14 @@ function! node#initialize(root)
silent doautocmd User Node
endfunction

function! node#gf_find()
let path = s:path(expand('<cfile>'), bufname('%'))
if empty(path)
return 0
endif
return path
endfunction

function! s:initializeCommands()
command! -bar -bang -nargs=1 -buffer -complete=customlist,s:complete Nedit
\ exe s:nedit(<q-args>, bufname("%"), "edit<bang>")
Expand All @@ -30,7 +45,7 @@ function! s:initializeJavaScript()
let &l:include = '\<require(\(["'']\)\zs[^\1]\+\ze\1'
let &l:includeexpr = "node#lib#find(v:fname, bufname('%'))"

if !hasmapto("<Plug>NodeGotoFile")
if !g:node#enable_gf_user && !hasmapto("<Plug>NodeGotoFile")
" Split gotofiles don't take a count for the new window's width, but for
" opening the nth file. Though Node.vim doesn't support counts atm.
nmap <buffer> gf <Plug>NodeGotoFile
Expand All @@ -42,15 +57,8 @@ endfunction

function! s:edit(name, from, ...)
if empty(a:name) | return | endif
let dir = isdirectory(a:from) ? a:from : fnamemodify(a:from, ":h")
let command = a:0 == 1 ? a:1 : "edit"

" If just a plain filename with no directory part, check if it exists:
if a:name !~# '^\v(/|\./|\.\./)' && filereadable(dir . "/" . a:name)
let path = dir . "/" . a:name
else
let path = node#lib#find(a:name, dir)
end
let path = s:path(a:name, a:from)

if empty(path)
return s:error("E447: Can't find file \"" . a:name . "\" in path")
Expand Down Expand Up @@ -85,6 +93,21 @@ function! s:complete(arg, cmd, cursor)
return filter(matches, filter)
endfunction

function! s:path(name, from)
if empty(a:name) | return | endif
let dir = isdirectory(a:from) ? a:from : fnamemodify(a:from, ":h")

" If just a plain filename with no directory part, check if it exists:
if a:name !~# '^\v(/|\./|\.\./)' && filereadable(dir . "/" . a:name)
let path = dir . "/" . a:name
else
let path = node#lib#find(a:name, dir)
end

return path
endfunction


function! s:dirname(path)
let dirname = fnamemodify(a:path, ":h")
if dirname == "." | return "" | endif
Expand All @@ -102,3 +125,8 @@ function! s:error(msg)
echohl NONE
let v:errmsg = a:msg
endfunction

if g:node#enable_gf_user
" initialize gf-user
call gf#user#extend('node#gf_find', 1000)
endif