Skip to content
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.

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

style: use two spaces for all files #915

Merged
merged 1 commit into from
Jun 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions autoload/ctrlp/decls.vim
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,4 @@ function! ctrlp#decls#cmd(mode, ...)
return s:id
endfunction

" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions autoload/go/alternate.vim
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ function! go#alternate#Switch(bang, cmd)
execute ":" . a:cmd . " " . alt_file
endif
endfunction

" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions autoload/go/asmfmt.vim
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ function! go#asmfmt#Format()
" Restore the cursor/window positions.
call winrestview(l:curw)
endfunction

" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/cmd.vim
Original file line number Diff line number Diff line change
Expand Up @@ -356,4 +356,4 @@ function! s:test_compile_handler(job, exit_status, data)
unlet s:test_compile_handlers[a:job.id]
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/complete.vim
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,4 @@ function! go#complete#Complete(findstart, base)
endif
endf

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
3 changes: 1 addition & 2 deletions autoload/go/coverage.vim
Original file line number Diff line number Diff line change
Expand Up @@ -282,5 +282,4 @@ function! s:coverage_browser_handler(job, exit_status, data)
unlet s:coverage_browser_handler_jobs[a:job.id]
endfunction


" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
1 change: 1 addition & 0 deletions autoload/go/def.vim
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,4 @@ function! go#def#Stack(...)
endif
endfunction

" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/doc.vim
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ function! s:GodocView(newposition, position, content)
noremap <buffer> <silent> <Esc> :<C-U>close<CR>
endfunction

" vim:ts=2:sw=2:et
" vim: sw=2 ts=2 et
3 changes: 1 addition & 2 deletions autoload/go/fmt.vim
Original file line number Diff line number Diff line change
Expand Up @@ -207,5 +207,4 @@ function! go#fmt#Format(withGoimport)
endif
endfunction


" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/guru.vim
Original file line number Diff line number Diff line change
Expand Up @@ -301,4 +301,4 @@ function! go#guru#SameIds(selected)
echo same_ids
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions autoload/go/impl.vim
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,5 @@ function! go#impl#Complete(arglead, cmdline, cursorpos)
return []
endif
endfunction

" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/import.vim
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,4 @@ function! s:Error(s)
endfunction


" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/jobcontrol.vim
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,4 @@ function! s:abort(path)
endfor
endfunction

" vim:ts=2:sw=2:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/lint.vim
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,4 @@ function! go#lint#Errcheck(...) abort

endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/list.vim
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@ function! go#list#Type(listtype)
endif
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/package.vim
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ function! go#package#Complete(ArgLead, CmdLine, CursorPos)
return sort(keys(ret))
endfunction

" vim:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/path.vim
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ function! go#path#CheckBinPath(binpath)
return go_bin_path . go#util#PathSep() . basename
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
3 changes: 1 addition & 2 deletions autoload/go/play.vim
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,4 @@ function! s:get_browser_command()
return go_play_browser_command
endfunction


" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
3 changes: 1 addition & 2 deletions autoload/go/rename.vim
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,4 @@ function! go#rename#Rename(bang, ...)
silent execute ":e"
endfunction

" vim:ts=4:sw=4:et
"
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/term.vim
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ function! s:on_exit(job_id, exit_status)
unlet s:jobs[a:job_id]
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/textobj.vim
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,4 @@ function! go#textobj#FunctionJump(mode, direction)
keepjumps call cursor(info.func.line, 1)
endfunction

" vim:ts=2:sw=2:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/tool.vim
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,4 @@ function! go#tool#OpenBrowser(url)
endif
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
1 change: 1 addition & 0 deletions autoload/go/ui.vim
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,4 @@ function! go#ui#OpenDefinition(filter)
norm! zz
endfunction

" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion autoload/go/util.vim
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,4 @@ function! go#util#EchoProgress(msg)
redraws! | echon "vim-go: " | echohl Identifier | echon a:msg | echohl None
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion compiler/go.vim
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ CompilerSet errorformat+=%-G%.%# " All lines not matching a
let &cpo = s:save_cpo
unlet s:save_cpo

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion ftdetect/gofiletype.vim
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ au BufReadPost *.s call s:gofiletype_post()

au BufRead,BufNewFile *.tmpl set filetype=gohtmltmpl

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions ftplugin/asm.vim
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ setlocal commentstring=//\ %s
setlocal noexpandtab

command! -nargs=0 AsmFmt call go#asmfmt#Format()

" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion ftplugin/go.vim
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ if get(g:, "go_auto_type_info", 0)
setlocal updatetime=800
endif

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion ftplugin/go/commands.vim
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ endif
" -- impl
command! -nargs=* -buffer -complete=customlist,go#impl#Complete GoImpl call go#impl#Impl(<f-args>)

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions ftplugin/go/mappings.vim
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ nnoremap <silent> <Plug>(go-vet) :<C-u>call go#lint#Vet(!g:go_jump_to_error)<CR>
nnoremap <silent> <Plug>(go-alternate-edit) :<C-u>call go#alternate#Switch(0, "edit")<CR>
nnoremap <silent> <Plug>(go-alternate-vertical) :<C-u>call go#alternate#Switch(0, "vsplit")<CR>
nnoremap <silent> <Plug>(go-alternate-split) :<C-u>call go#alternate#Switch(0, "split")<CR>

" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions ftplugin/go/snippets.vim
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ if g:go_snippet_engine == "ultisnips"
elseif g:go_snippet_engine == "neosnippet"
call s:GoNeosnippet()
endif

" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions ftplugin/go/tagbar.vim
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ endfunction


call s:SetTagbar()

" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions ftplugin/gohtmltmpl.vim
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ endif
let b:did_ftplugin = 1

setlocal commentstring=<!--\ %s\ -->

" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion indent/go.vim
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ function! GoIndent(lnum)
return ind
endfunction

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions indent/gohtmltmpl.vim
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ function! GetGoHTMLTmplIndent(lnum)

return ind
endfunction

" vim: sw=2 ts=2 et
3 changes: 1 addition & 2 deletions plugin/go.vim
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,4 @@ augroup vim-go
endif
augroup END


" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions syntax/go.vim
Original file line number Diff line number Diff line change
Expand Up @@ -376,3 +376,5 @@ endif
syn sync minlines=500

let b:current_syntax = "go"

" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions syntax/godefstack.vim
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ hi def link godefStackComment Comment
hi def link godefStackCurrentPosition Special
hi def link godefStackFilename Directory
hi def link godefStackEntryLocationNumber LineNr

" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion syntax/gohtmltmpl.vim
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ unlet b:current_syntax

let b:current_syntax = "gohtmltmpl"

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 1 addition & 1 deletion syntax/gotexttmpl.vim
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ hi def link goTplComment Comment

let b:current_syntax = "gotexttmpl"

" vim:ts=4:sw=4:et
" vim: sw=2 ts=2 et
2 changes: 2 additions & 0 deletions syntax/vimgo.vim
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ syn region goTitle start="\%1l" end=":"

hi def link goInterface Type
hi def link goTitle Label

" vim: sw=2 ts=2 et