coverage: improvements and integration into vim-go

Author: fatih

Gemfile

@@ -57,8 +57,6 @@ People have asked for this for a long time, now you can be a fully supporter by
 
 [https://www.patreon.com/fatih](https://www.patreon.com/fatih)
 
-![ss-vim-go-coverlay](https://cloud.githubusercontent.com/assets/3804806/5319001/81a3b89a-7ce8-11e4-9fbd-2f0fd00ce1c7.gif)
-
 ## Install
 
 Vim-go follows the standard runtime path structure, so I highly recommend to
@@ -219,15 +217,8 @@ By default when `:GoInstallBinaries` is called, the binaries are installed to
 `$GOBIN` or `$GOPATH/bin`. To change it:
 
 ```vim
-<<<<<<< HEAD
 let g:go_bin_path = expand("~/.gotools")
 let g:go_bin_path = "/home/fatih/.mypath"      "or give absolute path
-=======
-au FileType go nmap <leader>c <Plug>(go-coverlay) "test coverage then overlay covered lines
-au FileType go nmap <leader>C <Plug>(go-clearlay) "clear overlay
-
-au BufWritePost *.go call go#coverlay#Coverlay() "run test and cover on file save
->>>>>>> 70c8cf8... code cleanup
 ```
 
 ### Using with Neovim (beta)

README.md

@@ -290,47 +290,6 @@ function! go#cmd#TestFunc(bang, ...)
     call call('go#cmd#Test', args)
 endfunction
 
-let s:coverage_handler_id = ''
-let s:coverage_handler_jobs = {}
-
-function! s:coverage_handler(job, exit_status, data)
-    if !has_key(s:coverage_handler_jobs, a:job.id)
-        return
-    endif
-    let l:tmpname = s:coverage_handler_jobs[a:job.id]
-    if a:exit_status == 0
-        let openHTML = 'go tool cover -html='.l:tmpname
-        call go#tool#ExecuteInDir(openHTML)
-    endif
-    call delete(l:tmpname)
-    unlet s:coverage_handler_jobs[a:job.id]
-endfunction
-
-" Coverage creates a new cover profile with 'go test -coverprofile' and opens
-" a new HTML coverage page from that profile.
-function! go#cmd#Coverage(bang, ...)
-    let l:tmpname=tempname()
-    let args = [a:bang, 0, "-coverprofile", l:tmpname]
-
-    if a:0
-        call extend(args, a:000)
-    endif
-    let id = call('go#cmd#Test', args)
-    if has('nvim')
-        if s:coverage_handler_id == ''
-            let s:coverage_handler_id = go#jobcontrol#AddHandler(function('s:coverage_handler'))
-        endif
-        let s:coverage_handler_jobs[id] = l:tmpname
-        return
-    endif
-    if !v:shell_error
-        let openHTML = 'go tool cover -html='.l:tmpname
-        call go#tool#ExecuteInDir(openHTML)
-    endif
-
-    call delete(l:tmpname)
-endfunction
-
 " Generate runs 'go generate' in similar fashion to go#cmd#Build()
 function! go#cmd#Generate(bang, ...)
     let default_makeprg = &makeprg

autoload/go/cmd.vim

@@ -0,0 +1,239 @@
+let s:toggle = 0
+
+" Buffer creates a new cover profile with 'go test -coverprofile' and changes
+" teh current buffers highlighting to show covered and uncovered sections of
+" the code. If run again it clears the annotation
+function! go#coverage#Buffer(bang, ...)
+    if s:toggle
+        call go#coverage#Clear()
+        return
+    endif
+
+    let s:toggle = 1
+    let l:tmpname=tempname()
+    let args = [a:bang, 0, "-coverprofile", l:tmpname]
+
+    if a:0
+        call extend(args, a:000)
+    endif
+    "TODO: add -coverpkg options based on current buf list
+    let id = call('go#cmd#Test', args)
+    if has('nvim')
+        if s:coverage_handler_id == ''
+            let s:coverage_handler_id = go#jobcontrol#AddHandler(function('s:coverage_handler'))
+        endif
+        let s:coverage_handler_jobs[id] = l:tmpname
+        return
+    endif
+    if !v:shell_error
+        call go#coverage#overlay(l:tmpname)
+    endif
+    call delete(l:tmpname)
+endfunction
+
+" Clear clears and resets the buffer annotation matches
+function! go#coverage#Clear()
+    if exists("g:syntax_on") | syntax enable | endif
+
+    if exists("s:toggle") | let s:toggle = 0 | endif
+
+    " remove the autocmd we defined 
+    if exists("#BufWinLeave#<buffer>") 
+        autocmd! BufWinLeave <buffer>
+    endif
+
+    call clearmatches()
+endfunction
+
+" Browser creates a new cover profile with 'go test -coverprofile' and opens
+" a new HTML coverage page from that profile in a new browser
+function! go#coverage#Browser(bang, ...)
+    let l:tmpname=tempname()
+    let args = [a:bang, 0, "-coverprofile", l:tmpname]
+
+    if a:0
+        call extend(args, a:000)
+    endif
+    let id = call('go#cmd#Test', args)
+    if has('nvim')
+        if s:coverage_browser_handler_id == ''
+            let s:coverage_browser_handler_id = go#jobcontrol#AddHandler(function('s:coverage_browser_handler'))
+        endif
+        let s:coverage_browser_handler_jobs[id] = l:tmpname
+        return
+    endif
+    if !v:shell_error
+        let openHTML = 'go tool cover -html='.l:tmpname
+        call go#tool#ExecuteInDir(openHTML)
+    endif
+
+    call delete(l:tmpname)
+endfunction
+
+" Parses a single line from the cover file generated via go test -coverprofile
+" and returns a single coverage profile block.
+function! go#coverage#parsegocoverline(line)
+    " file:startline.col,endline.col numstmt count
+    let mx = '\([^:]\+\):\(\d\+\)\.\(\d\+\),\(\d\+\)\.\(\d\+\)\s\(\d\+\)\s\(\d\+\)'
+    let tokens = matchlist(a:line, mx)
+    let ret = {}
+    let ret.file = tokens[1]
+    let ret.startline  = str2nr(tokens[2])
+    let ret.startcol = str2nr(tokens[3])
+    let ret.endline = str2nr(tokens[4])
+    let ret.endcol = str2nr(tokens[5])
+    let ret.numstmt = tokens[6]
+    let ret.cnt = tokens[7]
+    return ret
+endfunction
+
+" Generates matches to be added to matchaddpos for the given coverage profile
+" block
+function! go#coverage#genmatch(cov)
+    let color = 'covered'
+    if a:cov.cnt == 0
+        let color = 'uncover'
+    endif
+
+    let matches = []
+
+    " if start and end are the same, also specify the byte length
+    " example: foo.go:92.2,92.65 1 0
+    if a:cov.startline == a:cov.endline
+        call add(matches, {
+                    \ 'group': color, 
+                    \ 'pos': [[a:cov.startline, a:cov.startcol, a:cov.endcol - a:cov.startcol]], 
+                    \ 'priority': 2,
+                    \ })
+        return matches
+    endif
+
+    " add start columns. Because we don't know the length of the of
+    " the line, we assume it is at maximum 200 bytes. I know this is hacky,
+    " but that's only way of fixing the issue
+    call add(matches, {
+                \ 'group': color, 
+                \ 'pos': [[a:cov.startline, a:cov.startcol, 200]], 
+                \ 'priority': 2,
+                \ })
+
+    " and then the remaining lines
+    let start_line = a:cov.startline
+    while start_line < a:cov.endline
+        let start_line += 1
+        call add(matches, {
+                    \ 'group': color, 
+                    \ 'pos': [[start_line]], 
+                    \ 'priority': 2,
+                    \ })
+    endwhile
+
+    " finally end columns
+    call add(matches, {
+                \ 'group': color, 
+                \ 'pos': [[a:cov.endline, a:cov.endcol-1]], 
+                \ 'priority': 2,
+                \ })
+
+    return matches
+endfunction
+
+" Reads the given coverprofile file and annotates the current buffer
+function! go#coverage#overlay(file)
+    if !filereadable(a:file)
+        return
+    endif
+    let lines = readfile(a:file)
+
+    " cover mode, by default it's 'set'. Just here for debugging purposes
+    let mode = lines[0]
+
+    " contains matches for matchaddpos()
+    let matches = []
+
+    " first mark all lines as normaltext. We use a custom group to not
+    " interfere with other buffers highlightings. Because the priority is
+    " lower than the cover and uncover matches, it'll be overriden.
+    let cnt = 1
+    while cnt <= line('$')
+        call add(matches, {'group': 'normaltext', 'pos': [cnt], 'priority': 1})
+        let cnt += 1
+    endwhile
+
+    let fname = expand('%:t')
+
+    " when called for a _test.go file, run the coverage for the actuall file
+    " file
+    if fname =~# '^\f\+_test\.go$'
+        let l:root = split(fname, '_test.go$')[0]
+        let fname = l:root . ".go"
+
+        " open the alternate file to show the coverage
+        exe ":edit ". fname 
+    endif
+
+    for line in lines[1:]
+        let cov = go#coverage#parsegocoverline(line)
+
+        " TODO(arslan): for now only include the coverage for the current
+        " buffer
+        if fname != fnamemodify(cov.file, ':t')
+            continue
+        endif
+
+        call extend(matches, go#coverage#genmatch(cov))
+    endfor
+
+    syntax manual
+    highlight normaltext term=bold ctermfg=59 guifg=#75715E
+    highlight covered term=bold ctermfg=118 guifg=#A6E22E
+    highlight uncover term=bold ctermfg=197 guifg=#F92672
+
+    " clear the matches if we leave the buffer
+    autocmd BufWinLeave <buffer> call go#coverage#Clear()
+
+    for m in matches
+        call matchaddpos(m.group, m.pos)
+    endfor
+endfunction
+
+
+" -----------------------
+" | Neovim job handlers |
+" -----------------------
+
+let s:coverage_handler_id = ''
+let s:coverage_handler_jobs = {}
+
+function! s:coverage_handler(job, exit_status, data)
+    if !has_key(s:coverage_handler_jobs, a:job.id)
+        return
+    endif
+    let l:tmpname = s:coverage_handler_jobs[a:job.id]
+    if a:exit_status == 0
+        call go#coverage#overlay(l:tmpname)
+    endif
+
+    call delete(l:tmpname)
+    unlet s:coverage_handler_jobs[a:job.id]
+endfunction
+
+
+let s:coverage_browser_handler_id = ''
+let s:coverage_browser_handler_jobs = {}
+
+function! s:coverage_browser_handler(job, exit_status, data)
+    if !has_key(s:coverage_browser_handler_jobs, a:job.id)
+        return
+    endif
+    let l:tmpname = s:coverage_browser_handler_jobs[a:job.id]
+    if a:exit_status == 0
+        let openHTML = 'go tool cover -html='.l:tmpname
+        call go#tool#ExecuteInDir(openHTML)
+    endif
+    call delete(l:tmpname)
+    unlet s:coverage_browser_handler_jobs[a:job.id]
+endfunction
+
+
+" vim:ts=4:sw=4:et