Skip to content

Default missing files to use normal gf (and hence don't force the 'gf' mapping on users. #6

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
idearat wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Default missing files to use normal gf (and hence don't force the 'gf' mapping on users. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef14fda
Fallback to using normal gf to leverage user's path/suffixadds.
idearat Mar 21, 2014
10cb4c0
Don't force a mapping, export commands the user can map.
idearat Mar 21, 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
34 changes: 12 additions & 22 deletions autoload/node.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,31 @@ let node#filetypes = ["javascript", "json"]

function! node#initialize(root)
let b:node_root = a:root
call s:initializeCommands()
if index(g:node#filetypes, &ft) > -1 | call s:initializeJavaScript() | en
silent doautocmd User Node
endfunction

function! s:initializeCommands()
function! node#initializeCommands()
command! -bar -bang -nargs=1 -buffer -complete=customlist,s:complete Nedit
\ exe s:nedit(<q-args>, bufname("%"), "edit<bang>")
command! -bar -bang -nargs=1 -buffer -complete=customlist,s:complete Nopen
\ exe s:nopen(<q-args>, bufname("%"), "edit<bang>")

nnoremap <buffer><silent> <Plug>NodeGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"))<CR>
nnoremap <buffer><silent> <Plug>NodeSplitGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"), "split")<CR>
nnoremap <buffer><silent> <Plug>NodeVSplitGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"), "vsplit")<CR>
nnoremap <buffer><silent> <Plug>NodeTabGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"), "tab split")<CR>
command! -nargs=0 -complete=customlist,s:complete NodeGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"))
command! -nargs=0 -complete=customlist,s:complete NodeSplitGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"), "split")
command! -nargs=0 -complete=customlist,s:complete NodeVSplitGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"), "vsplit")
command! -nargs=0 -complete=customlist,s:complete NodeTabGotoFile
\ :call <SID>edit(expand("<cfile>"), bufname("%"), "tab split")
endfunction

function! s:initializeJavaScript()
setl path-=/usr/include
let &l:suffixesadd .= "," . join(g:node#suffixesadd, ",")
let &l:include = '\<require(\(["'']\)\zs[^\1]\+\ze\1'
let &l:includeexpr = "node#lib#find(v:fname, bufname('%'))"

if !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
nmap <buffer> <C-w>f <Plug>NodeSplitGotoFile
nmap <buffer> <C-w><C-f> <Plug>NodeSplitGotoFile
nmap <buffer> <C-w>gf <Plug>NodeTabGotoFile
endif
endfunction

function! s:edit(name, from, ...)
Expand All @@ -53,10 +43,10 @@ function! s:edit(name, from, ...)
end

if empty(path)
return s:error("E447: Can't find file \"" . a:name . "\" in path")
normal gf
else
exe command . " " . fnameescape(path)
endif

exe command . " " . fnameescape(path)
endfunction

function! s:nedit(name, from, ...)
Expand Down
1 change: 1 addition & 0 deletions plugin/node.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ function! s:detect(path)
let is_node = is_node || filereadable(path . "/package.json")
let is_node = is_node || isdirectory(path . "/node_modules")
if is_node | return node#initialize(path) | endif
call node#initializeCommands()

let parent = fnamemodify(path, ":h")
if parent == path | return | endif
Expand Down