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

Merge pull request #22 from bleshik/feature/use-tags

Browse Source 
Fixed bugs in source file searching using tags + added an option
This commit is contained in:
Idan Arye 2015-09-06 11:30:29 +03:00
commit ee298e7390
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
autoload/vebugger/jdb.vim
View File

@ -60,7 +60,7 @@ function! s:getTagContainingString(tag, str)
let l:tags = taglist(a:tag) let l:tags = taglist(a:tag)
if (len(l:tags) > 0) if (len(l:tags) > 0)
for l:tag in l:tags for l:tag in l:tags
if (filereadable(l:tag.filename) && (len(a:str) == 0 || match(readfile(l:tag.filename), a:str))) if (filereadable(l:tag.filename) && match(readfile(l:tag.filename), a:str) >= 0)
return l:tag return l:tag
endif endif
endfor endfor
@ -68,18 +68,22 @@ function! s:getTagContainingString(tag, str)
return {} return {}
endfunction endfunction
function! s:findFolderFromStackTrace(src,nameFromStackTrace) function! s:findFolderFromStackTrace(src,nameFromStackTrace,frameNumber)
" Remove method name. " Remove method name.
let l:canonicalClassName = strpart(a:nameFromStackTrace, 0, strridx(a:nameFromStackTrace, ".")) let l:canonicalClassName = strpart(a:nameFromStackTrace, 0, strridx(a:nameFromStackTrace, "."))
" Remove package name. " Remove package name.
let l:simpleClassName = strridx(l:canonicalClassName, ".") >= 0 ? strpart(l:canonicalClassName, strridx(l:canonicalClassName, ".")) : l:canonicalClassName let l:simpleClassName = strridx(l:canonicalClassName, ".") >= 0 ? strpart(l:canonicalClassName, strridx(l:canonicalClassName, ".") + 1) : l:canonicalClassName
" Remove class name. " Remove class name.
let l:package = strridx(l:canonicalClassName, ".") >= 0 ? strpart(l:canonicalClassName, 0, strridx(l:canonicalClassName, ".")) : "" let l:package = strridx(l:canonicalClassName, ".") >= 0 ? strpart(l:canonicalClassName, 0, strridx(l:canonicalClassName, ".")) : ""
" Now first try to find a tag for the class from the required package. " We don't really use callstack, so we use tags only for the current location.
let l:classTag = s:getTagContainingString(l:simpleClassName, l:package) " Otherwise it makes everything too slow.
if (has_key(l:classTag, "filename")) if exists('g:vebugger_use_tags') && g:vebugger_use_tags && a:frameNumber == 1
return fnamemodify(l:classTag.filename, ":h") " Now first try to find a tag for the class from the required package.
let l:classTag = s:getTagContainingString(l:simpleClassName, l:package)
if (has_key(l:classTag, "filename"))
return fnamemodify(l:classTag.filename, ":h")
endif
endif endif
" If no such tag was found, try to find it using the src path. " If no such tag was found, try to find it using the src path.
@ -98,9 +102,9 @@ function! vebugger#jdb#_readWhere(pipeName,line,readResult,debugger)
if 'out'==a:pipeName if 'out'==a:pipeName
let l:matches=matchlist(a:line,'\v\s*\[(\d+)]\s*(\S+)\s*\(([^:]*):(\d*)\)') let l:matches=matchlist(a:line,'\v\s*\[(\d+)]\s*(\S+)\s*\(([^:]*):(\d*)\)')
if 4<len(l:matches) if 4<len(l:matches)
let l:file=s:findFolderFromStackTrace(a:debugger.state.jdb.srcpath,l:matches[2]).'/'.l:matches[3]
let l:file=fnamemodify(l:file,':~:.')
let l:frameNumber=str2nr(l:matches[1]) let l:frameNumber=str2nr(l:matches[1])
let l:file=s:findFolderFromStackTrace(a:debugger.state.jdb.srcpath,l:matches[2],l:frameNumber).'/'.l:matches[3]
let l:file=fnamemodify(l:file,':~:.')
if 1==l:frameNumber " first stackframe is the current location if 1==l:frameNumber " first stackframe is the current location
let a:readResult.std.location={ let a:readResult.std.location={
\'file':(l:file), \'file':(l:file),

8
doc/vebugger.txt
View File

@ -101,6 +101,14 @@ Example: >
let g:vebugger_view_source_cmd='edit' let g:vebugger_view_source_cmd='edit'
< <
Some debuggers (currently jdb only) may use vim tags to find required source
files. This is disabled by default, to enable this set *g:vebugger_use_tags*
option:
Example: >
let g:vebugger_use_tags=1
<
LAUNCHING DEBUGGERS *vebugger-launching* LAUNCHING DEBUGGERS *vebugger-launching*
A debugger's implementation is responsible for starting it. The standard is to A debugger's implementation is responsible for starting it. The standard is to