@@ -1,19 +1,17 @@ h1. Usage -In your home directory, run: -<pre><code> -git clone git://github.com/scrooloose/vimfiles.git .vim -ln -s Projects/vimfiles .vim +Clone this repo into your home directory either as .vim (linux) or vimfiles (MF +Windows). -</code></pre> +Then cd into the repo and run this to get the snippets submodule: -Put this stuff in your ~/.vimrc <pre><code> -source ~/.vim/vimrc +git submodule init +git submodule update +</code></pre> -colorscheme vibrantink -set nu -set sts=2 -set sw=2 -let g:fuzzy_ignore = "gems/*" +Put this in your vimrc along with your personal hacks: +<pre><code> +source ~/.vim/vimrc "linux +source ~/vimfiles/vimrc "windows </code></pre> README.textile @@ -33,8 +33,8 @@ fun! MakeSnip(scope, trigger, content, ...) let {var}[a:scope][a:trigger] = multisnip ? [[a:1, a:content]] : a:content elseif multisnip | let {var}[a:scope][a:trigger] += [[a:1, a:content]] else - echom 'Warning in snipMate.vim: Snippet '.a:trigger.' is already defined.' - \ .' See :h multi_snip for help on snippets with multiple matches.' + "echom 'Warning in snipMate.vim: Snippet '.a:trigger.' is already defined.' + " \ .' See :h multi_snip for help on snippets with multiple matches.' endif endf plugin/snipMate.vim @@ -41,6 +41,11 @@ set statusline+=%{StatuslineTabWarning()} set statusline+=%* set statusline+=%{StatuslineTrailingSpaceWarning()} +set statusline+=%{StatuslineLongLineWarning()} + +set statusline+=%#warningmsg# +set statusline+=%{StatuslineSyntaxWarning()} +set statusline+=%* "display a warning if &paste is set set statusline+=%#error# @@ -103,6 +108,88 @@ function! StatuslineTabWarning() return b:statusline_tab_warning endfunction +"load all the syntax checkers +runtime! syntax_checkers/*.vim + +"recalculate the syntax warning when saving and changing filetype +autocmd bufwritepost,filetype * unlet! b:statusline_syntax_warning + +"return [syntax:X] if syntax errors are detected in the buffer, where X is the +"line number of the first error. +"return '' if no errors or if no syntax checker exists for the current filetype +function! StatuslineSyntaxWarning() + if !exists("b:statusline_syntax_warning") + let b:statusline_syntax_warning = '' + + if exists("*CheckSyntax_" . &ft) && filereadable(expand("%")) + let first_err_line = CheckSyntax_{&ft}() + if first_err_line != 0 + let b:statusline_syntax_warning = '[syntax:' . first_err_line . ']' + endif + endif + endif + return b:statusline_syntax_warning +endfunction + + +"recalculate the long line warning when idle and after saving +autocmd cursorhold,bufwritepost * unlet! b:statusline_long_line_warning + +"return a warning for "long lines" where "long" is either &textwidth or 80 (if +"no &textwidth is set) +" +"return '' if no long lines +"return '[#x,my,$z] if long lines are found, were x is the number of long +"lines, y is the median length of the long lines and z is the length of the +"longest line +function! StatuslineLongLineWarning() + if !exists("b:statusline_long_line_warning") + let long_line_lens = s:LongLines() + + if len(long_line_lens) > 0 + let b:statusline_long_line_warning = "[" . + \ '#' . len(long_line_lens) . "," . + \ 'm' . s:Median(long_line_lens) . "," . + \ '$' . max(long_line_lens) . "]" + else + let b:statusline_long_line_warning = "" + endif + endif + return b:statusline_long_line_warning +endfunction + +"return a list containing the lengths of the long lines in this buffer +function! s:LongLines() + let threshold = (&tw ? &tw : 80) + let spaces = repeat(" ", &ts) + + let long_line_lens = [] + + let i = 1 + while i <= line("$") + let len = strlen(substitute(getline(i), '\t', spaces, 'g')) + if len > threshold + call add(long_line_lens, len) + endif + let i += 1 + endwhile + + return long_line_lens +endfunction + +"find the median of the given array of numbers +function! s:Median(nums) + let nums = sort(a:nums) + let l = len(nums) + + if l % 2 == 1 + let i = (l-1) / 2 + return nums[i] + else + return (nums[l/2] + nums[(l/2)-1]) / 2 + endif +endfunction + "indent settings set shiftwidth=4 set softtabstop=4 @@ -167,11 +254,20 @@ noremap Q gq nnoremap Y y$ "snipmate setup -"source ~/.vim/snippets/support_functions.vim -"autocmd vimenter * call ExtractSnips("~/.vim/snippets/ruby-rails", "ruby") -"autocmd vimenter * call ExtractSnips("~/.vim/snippets/html", "eruby") -"autocmd vimenter * call ExtractSnips("~/.vim/snippets/html", "xhtml") -"autocmd vimenter * call ExtractSnips("~/.vim/snippets/html", "php") +source ~/.vim/snippets/support_functions.vim +autocmd vimenter * call s:SetupSnippets() +function! s:SetupSnippets() + + "if we're in a rails env then read in the rails snippets + if filereadable("./config/environment.rb") + call ExtractSnips("~/.vim/snippets/ruby-rails", "ruby") + call ExtractSnips("~/.vim/snippets/eruby-rails", "eruby") + endif + + call ExtractSnips("~/.vim/snippets/html", "eruby") + call ExtractSnips("~/.vim/snippets/html", "xhtml") + call ExtractSnips("~/.vim/snippets/html", "php") +endfunction "visual search mappings function! s:VSetSearch() @@ -196,16 +292,15 @@ function! SetCursorPosition() end endfunction -"define :HighlightExcessColumns command to highlight the offending parts of -"lines that are "too long". where "too long" is defined by &textwidth or an -"arg passed to the command -command! -nargs=? HighlightExcessColumns call s:HighlightExcessColumns('<args>') -function! s:HighlightExcessColumns(width) - let targetWidth = a:width != '' ? a:width : &textwidth +"define :HighlightLongLines command to highlight the offending parts of +"lines that are longer than the specified length (defaulting to 80) +command! -nargs=? HighlightLongLines call s:HighlightLongLines('<args>') +function! s:HighlightLongLines(width) + let targetWidth = a:width != '' ? a:width : 79 if targetWidth > 0 - exec 'match Todo /\%>' . (targetWidth+1) . 'v/' + exec 'match Todo /\%>' . (targetWidth) . 'v/' else - echomsg "HighlightExcessColumns: set a &textwidth, or pass one in" + echomsg "Usage: HighlightLongLines [natural number]" endif endfunction vimrc f571ba53732c338d99039883b0d937a1dd4d757a Leon Li scorpio_leon@hotmail.com http://github.com/scrooloose/vimfiles/commit/fc47f38ed944e08ae12af767f1d893e3c56dc0ee fc47f38ed944e08ae12af767f1d893e3c56dc0ee 2009-06-28T20:16:11-07:00 2009-06-28T20:16:11-07:00 merge lastest changes from scrooloose fc3d937b69a8f3feb50aa3b6be3a689be60ad676 Leon Li scorpio_leon@hotmail.com