Some minor fixes

This commit is contained in:
IdanArye 2014-05-14 21:52:55 +03:00
parent ac5be406e9
commit d0d7fd827e
3 changed files with 24 additions and 28 deletions

View File

@ -53,7 +53,7 @@ function! s:f_debugger.invokeReading() dict
endfunction
function! s:f_debugger.handleLine(pipeName,line) dict
call self.logLine(a:pipeName,a:line)
call self.addLineToTerminal(a:pipeName,a:line)
let l:readResult=deepcopy(self.readResultTemplate,1)
@ -84,24 +84,24 @@ function! s:f_debugger.performWriteActions() dict
call self.generateWriteActionsFromTemplate()
endfunction
function! s:f_debugger.showLogBuffer() dict
if has_key(self,'logBuffer')
if -1<bufwinnr(self.logBuffer)
function! s:f_debugger.showTerminalBuffer() dict
if has_key(self,'terminalBuffer')
if -1<bufwinnr(self.terminalBuffer)
return
endif
endif
new
setlocal buftype=nofile
setlocal bufhidden=wipe
let self.logBuffer=bufnr('')
let self.terminalBuffer=bufnr('')
silent file Vebugger\ Console
wincmd p
endfunction
function! s:f_debugger.closeLogBuffer() dict
if has_key(self,'logBuffer')
if -1<bufwinnr(self.logBuffer)
let l:bufwin=bufwinnr(self.logBuffer)
function! s:f_debugger.closeTerminalBuffer() dict
if has_key(self,'terminalBuffer')
if -1<bufwinnr(self.terminalBuffer)
let l:bufwin=bufwinnr(self.terminalBuffer)
exe l:bufwin.'wincmd w'
wincmd c
wincmd p
@ -109,26 +109,26 @@ function! s:f_debugger.closeLogBuffer() dict
endif
endfunction
function! s:f_debugger.isLogBufferOpen() dict
if has_key(self,'logBuffer')
if -1<bufwinnr(self.logBuffer)
function! s:f_debugger.isTerminalBufferOpen() dict
if has_key(self,'terminalBuffer')
if -1<bufwinnr(self.terminalBuffer)
return 1
endif
endif
return 0
endfunction
function! s:f_debugger.toggleLogBuffer() dict
if self.isLogBufferOpen()
call self.closeLogBuffer()
function! s:f_debugger.toggleTerminalBuffer() dict
if self.isTerminalBufferOpen()
call self.closeTerminalBuffer()
else
call self.showLogBuffer()
call self.showTerminalBuffer()
endif
endfunction
function! s:f_debugger.logLine(pipeName,line) dict
if has_key(self,'logBuffer')
let l:bufwin=bufwinnr(self.logBuffer)
function! s:f_debugger.addLineToTerminal(pipeName,line) dict
if has_key(self,'terminalBuffer')
let l:bufwin=bufwinnr(self.terminalBuffer)
if -1<l:bufwin
exe l:bufwin.'wincmd w'
if 'out'==a:pipeName
@ -237,7 +237,7 @@ function! vebugger#killDebugger()
autocmd!
augroup END
if exists('s:debugger')
call s:debugger.closeLogBuffer()
call s:debugger.closeTerminalBuffer()
call s:debugger.kill()
unlet s:debugger
endif
@ -255,9 +255,9 @@ function! vebugger#invokeReading()
endif
endfunction
function! vebugger#toggleLogBuffer()
function! vebugger#toggleTerminalBuffer()
if exists('s:debugger')
call s:debugger.toggleLogBuffer()
call s:debugger.toggleTerminalBuffer()
endif
endfunction

View File

@ -5,8 +5,6 @@ function! vebugger#rdebug#start(entryFile,args)
\: 'ruby -rdebug')
\.' '.a:entryFile)
let l:debugger.state.rdebug={}
call l:debugger.showLogBuffer()
call l:debugger.addReadHandler(function('s:readWhere'))
call l:debugger.addReadHandler(function('s:readEvaluatedExpressions'))
@ -20,8 +18,6 @@ function! vebugger#rdebug#start(entryFile,args)
call l:debugger.std_addAllBreakpointActions(g:vebugger_breakpoints)
VBGtoggleLogBuffer
return l:debugger
endfunction

View File

@ -10,7 +10,7 @@ command! -nargs=0 VBGstepOver call vebugger#setWriteActionAndPerform('std','flow
command! -nargs=0 VBGstepOut call vebugger#setWriteActionAndPerform('std','flow','stepout')
command! -nargs=0 VBGcontinue call vebugger#setWriteActionAndPerform('std','flow','continue')
command! -nargs=0 VBGtoggleLogBuffer call vebugger#toggleLogBuffer()
command! -nargs=0 VBGtoggleTerminalBuffer call vebugger#toggleTerminalBuffer()
command! -nargs=+ VBGtoggleBreakpoint call vebugger#std#toggleBreakpoint(<f-args>)
command! -nargs=0 VBGtoggleBreakpointThisLine call vebugger#std#toggleBreakpoint(expand('%:~:.'),line('.'))
command! -nargs=0 VBGclearBreakpints call vebugger#std#clearBreakpoints()
@ -39,7 +39,7 @@ if exists('g:vebugger_leader')
\'o':'VBGstepOver',
\'O':'VBGstepOut',
\'c':'VBGcontinue',
\'l':'VBGtoggleLogBuffer',
\'t':'VBGtoggleTerminalBuffer',
\'b':'VBGtoggleBreakpointThisLine',
\'e':'VBGevalWordUnderCursor'})
exe 'nnoremap '.g:vebugger_leader.s:mapping[0].' :'.s:mapping[1].'<Cr>'