mirror of https://github.com/amix/vimrc.git
amix
7 years ago
parent
ad875b0e0a
commit
5f6aa8fe09
@ -1,14 +1,15 @@ |
||||
==== ack.vim quick help =============== |
||||
|
||||
*?:* Show/quit this help |
||||
*t:* Open in a new tab |
||||
*T:* Open in a new tab silently |
||||
*o:* Open |
||||
*O:* Open and close result window |
||||
*go:* Preview |
||||
*h:* Horizontal open |
||||
*H:* Horizontal open silently |
||||
*v:* Vertical open |
||||
*gv:* Vertical open silently |
||||
*?:* a quick summary of these keys, repeat to close |
||||
*o:* to open (same as Enter) |
||||
*O:* to open and close the quickfix window |
||||
*go:* to preview file, open but maintain focus on ack.vim results |
||||
*t:* to open in new tab |
||||
*T:* to open in new tab without moving to it |
||||
*h:* to open in horizontal split |
||||
*H:* to open in horizontal split, keeping focus on the results |
||||
*v:* to open in vertical split |
||||
*gv:* to open in vertical split, keeping focus on the results |
||||
*q:* to close the quickfix window |
||||
|
||||
======================================== |
||||
|
||||
@ -0,0 +1,27 @@ |
||||
## 1.6 (unreleased) |
||||
|
||||
FEATURES: |
||||
|
||||
* New `CHANGELOG.md` file (which you're reading now). This will make it easier |
||||
for me to track changes and release versions |
||||
* **`:GoCoverage`**: is now highlighting the current source file for |
||||
covered/uncovered lines. If called again it clears the highlighting. This is |
||||
a pretty good addition to vim-go and I suggest to check out the gif that shows |
||||
it in action: https://twitter.com/fatih/status/716722650383564800 [gh-786] |
||||
* **`:GoCoverageBrowser`**: opens a new annotated HTML page. This is the old |
||||
`:GoCoverage` behavior [gh-786] |
||||
* **`GoDoc`**: uses now `[gogetdoc](https://github.com/zmb3/gogetdoc)` to |
||||
lookup and display the comment documentation for the identifier under the |
||||
cursor. This is more superior as it support looking up dot imports, named |
||||
imports and imports where package name and file name are different [gh-782] |
||||
|
||||
IMPROVEMENTS: |
||||
|
||||
* **`:GoCoverage`** is now executed async when used within Neovim [gh-686] |
||||
|
||||
BUG FIXES: |
||||
|
||||
* Fix not showing documentation for dot, named and package/file name being different imports [gh-332] |
||||
* Term mode: fix closing location list if result is successful after a failed attempt [gh-768] |
||||
* Syntax: fix gotexttmpl identifier highlighting [gh-778] |
||||
|
||||
@ -0,0 +1,13 @@ |
||||
#!/usr/bin/env rake |
||||
|
||||
task :ci => [:dump, :test] |
||||
|
||||
task :dump do |
||||
sh 'vim --version' |
||||
end |
||||
|
||||
# Firstly, `bundle install; bundle install --deployment` |
||||
# Then, `rake test` |
||||
task :test do |
||||
sh 'bundle exec vim-flavor test' |
||||
end |
||||
@ -0,0 +1,251 @@ |
||||
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 |
||||
|
||||
let disabled_term = 0 |
||||
if get(g:, 'go_term_enabled') |
||||
let disabled_term = 1 |
||||
let g:go_term_enabled = 0 |
||||
endif |
||||
|
||||
let id = call('go#cmd#Test', args) |
||||
|
||||
if disabled_term |
||||
let g:go_term_enabled = 1 |
||||
endif |
||||
|
||||
if has('nvim') |
||||
call go#jobcontrol#AddHandler(function('s:coverage_handler')) |
||||
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') |
||||
call go#jobcontrol#AddHandler(function('s:coverage_browser_handler')) |
||||
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" |
||||
|
||||
if !filereadable(fname) |
||||
call go#util#EchoError("couldn't find ".fname) |
||||
return |
||||
endif |
||||
|
||||
" open the alternate file to show the coverage |
||||
exe ":edit ". fnamemodify(fname, ":p") |
||||
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_jobs = {} |
||||
let s:coverage_browser_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 |
||||
|
||||
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 |
||||