Permalink
Browse files

Merge branch 'master' of github.com:sentientmonkey/vimfiles

Conflicts:
	.gitmodules
  • Loading branch information...
2 parents 59dd7b5 + bf6f963 commit e39cf63975478a626a38c1ebe29e29eb7ea055cd @sentientmonkey committed Oct 23, 2013
Showing with 53 additions and 104 deletions.
  1. +12 −0 .gitmodules
  2. +1 −0 bundle/vim-flog
  3. +1 −0 bundle/vim-markdown
  4. +1 −0 bundle/vim-ruby-minitest
  5. +0 −104 mkd.vim
  6. +38 −0 vimrc
View
@@ -55,6 +55,18 @@
[submodule "bundle/vim-screen"]
path = bundle/vim-screen
url = git://github.com/ervandew/screen.git
+[submodule "vim-ruby-minitest"]
+ path = vim-ruby-minitest
+ url = https://github.com/sunaku/vim-ruby-minitest
+[submodule "bundle/vim-ruby-minitest"]
+ path = bundle/vim-ruby-minitest
+ url = https://github.com/sunaku/vim-ruby-minitest
+[submodule "bundle/vim-markdown"]
+ path = bundle/vim-markdown
+ url = https://github.com/tpope/vim-markdown.git
+[submodule "bundle/vim-flog"]
+ path = bundle/vim-flog
+ url = https://github.com/fousa/vim-flog.git
[submodule "bundle/vim-handlebars"]
path = bundle/vim-handlebars
url = https://github.com/nono/vim-handlebars.git
Submodule vim-flog added at bd0ae9
Submodule vim-markdown added at fccf76
Submodule vim-ruby-minitest added at e77ac7
View
104 mkd.vim
@@ -1,104 +0,0 @@
-" Vim syntax file
-" Language: Markdown
-" Maintainer: Ben Williams <benw@plasticboy.com>
-" URL: http://plasticboy.com/markdown-vim-mode/
-" Version: 9
-" Last Change: 2009 May 18
-" Remark: Uses HTML syntax file
-" Remark: I don't do anything with angle brackets (<>) because that would too easily
-" easily conflict with HTML syntax
-" TODO: Handle stuff contained within stuff (e.g. headings within blockquotes)
-
-
-" Read the HTML syntax to start with
-if version < 600
- so <sfile>:p:h/html.vim
-else
- runtime! syntax/html.vim
- unlet b:current_syntax
-endif
-
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-" don't use standard HiLink, it will not work with included syntax files
-if version < 508
- command! -nargs=+ HtmlHiLink hi link <args>
-else
- command! -nargs=+ HtmlHiLink hi def link <args>
-endif
-
-syn spell toplevel
-syn case ignore
-syn sync linebreaks=1
-
-"additions to HTML groups
-syn region htmlBold start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\*\@!/ end=/\\\@<!\*\@<!\*\*\*\@!\($\|\A\)\@=/ contains=@Spell,htmlItalic
-syn region htmlItalic start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\@!/ end=/\\\@<!\*\@<!\*\*\@!\($\|\A\)\@=/ contains=htmlBold,@Spell
-syn region htmlBold start=/\\\@<!\(^\|\A\)\@=_\@<!___\@!/ end=/\\\@<!_\@<!___\@!\($\|\A\)\@=/ contains=htmlItalic,@Spell
-syn region htmlItalic start=/\\\@<!\(^\|\A\)\@=_\@<!__\@!/ end=/\\\@<!_\@<!__\@!\($\|\A\)\@=/ contains=htmlBold,@Spell
-
-" [link](URL) | [link][id] | [link][]
-syn region mkdLink matchgroup=mkdDelimiter start="\!\?\[" end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite oneline
-syn region mkdID matchgroup=mkdDelimiter start="\[" end="\]" contained
-syn region mkdURL matchgroup=mkdDelimiter start="(" end=")" contained
-
-" Link definitions: [id]: URL (Optional Title)
-" TODO handle automatic links without colliding with htmlTag (<URL>)
-syn region mkdLinkDef matchgroup=mkdDelimiter start="^ \{,3}\zs\[" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
-syn region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]" contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
-syn region mkdLinkTitle matchgroup=mkdDelimiter start=+"+ end=+"+ contained
-syn region mkdLinkTitle matchgroup=mkdDelimiter start=+'+ end=+'+ contained
-syn region mkdLinkTitle matchgroup=mkdDelimiter start=+(+ end=+)+ contained
-
-"define Markdown groups
-syn match mkdLineContinue ".$" contained
-syn match mkdRule /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
-syn match mkdRule /^\s*-\s\{0,1}-\s\{0,1}-$/
-syn match mkdRule /^\s*_\s\{0,1}_\s\{0,1}_$/
-syn match mkdRule /^\s*-\{3,}$/
-syn match mkdRule /^\s*\*\{3,5}$/
-syn match mkdListItem "^\s*[-*+]\s\+"
-syn match mkdListItem "^\s*\d\+\.\s\+"
-syn match mkdCode /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
-syn match mkdLineBreak / \+$/
-syn region mkdCode start=/\\\@<!`/ end=/\\\@<!`/
-syn region mkdCode start=/\s*``[^`]*/ end=/[^`]*``\s*/
-syn region mkdBlockquote start=/^\s*>/ end=/$/ contains=mkdLineBreak,mkdLineContinue,@Spell
-syn region mkdCode start="<pre[^>]*>" end="</pre>"
-syn region mkdCode start="<code[^>]*>" end="</code>"
-
-"HTML headings
-syn region htmlH1 start="^\s*#" end="\($\|#\+\)" contains=@Spell
-syn region htmlH2 start="^\s*##" end="\($\|#\+\)" contains=@Spell
-syn region htmlH3 start="^\s*###" end="\($\|#\+\)" contains=@Spell
-syn region htmlH4 start="^\s*####" end="\($\|#\+\)" contains=@Spell
-syn region htmlH5 start="^\s*#####" end="\($\|#\+\)" contains=@Spell
-syn region htmlH6 start="^\s*######" end="\($\|#\+\)" contains=@Spell
-syn match htmlH1 /^.\+\n=\+$/ contains=@Spell
-syn match htmlH2 /^.\+\n-\+$/ contains=@Spell
-
-"highlighting for Markdown groups
-HtmlHiLink mkdString String
-HtmlHiLink mkdCode String
-HtmlHiLink mkdBlockquote Comment
-HtmlHiLink mkdLineContinue Comment
-HtmlHiLink mkdListItem Identifier
-HtmlHiLink mkdRule Identifier
-HtmlHiLink mkdLineBreak Todo
-HtmlHiLink mkdLink htmlLink
-HtmlHiLink mkdURL htmlString
-HtmlHiLink mkdID Identifier
-HtmlHiLink mkdLinkDef mkdID
-HtmlHiLink mkdLinkDefTarget mkdURL
-HtmlHiLink mkdLinkTitle htmlString
-
-HtmlHiLink mkdDelimiter Delimiter
-
-let b:current_syntax = "mkd"
-
-delcommand HtmlHiLink
-" vim: ts=8
View
38 vimrc
@@ -86,6 +86,14 @@ map ,r :w\|:silent !cat % > repl-command<cr>:redraw!<cr>
vmap ,r :w !cat > repl-command<cr>:redraw!<cr>
map ,l :silent.w !cat > repl-command<cr>:redraw!<cr>
+" flog settings
+let g:flog_enable=0
+map ,f :call ToggleFlog()<cr>
+let g:flog_low_color_hl = "term=standout ctermfg=118 ctermbg=235 guifg=#999999 guibg=#323232"
+let g:flog_medium_color_hl = "term=standout ctermfg=81 ctermbg=235 guifg=#66D9EF guibg=#323232"
+let g:flog_high_color_hl = "term=standout cterm=bold ctermfg=199 ctermbg=16 gui=bold guifg=#F92672 guibg=#232526"
+" let g:flog_high_limit=20
+
" toggle hlsearch with enter
" noremap <cr> :set hlsearch!<cr>
@@ -94,3 +102,33 @@ if has("gui_running")
winpos 100 50
set showtabline=2
end
+
+set completefunc=syntaxcomplete#Complete
+
+" simple-cov settings
+hi MissLine ctermbg=125
+hi HitLine ctermbg=23
+
+let g:simplecov_enable=0
+
+function! ShowCoverage()
+ exe ':so coverage.vim'
+ hi MissSign ctermfg=125 ctermbg=235
+ hi HitSign ctermfg=23 ctermbg=235
+ sign define hit linehl=HitLine texthl=HitSign text=+
+ sign define miss linehl=MissLine texthl=MissSign text=-
+endfunction
+
+function! ToggleCoverage()
+ if g:simplecov_enable
+ exe ':Uncov'
+ autocmd! BufReadPost,BufWritePost,FileReadPost,FileWritePost *.rb
+ let g:simplecov_enable=0
+ else
+ call ShowCoverage()
+ autocmd! BufReadPost,BufWritePost,FileReadPost,FileWritePost *.rb call ShowCoverage()
+ let g:simplecov_enable=1
+ endif
+endfunction
+
+map ,c :call ToggleCoverage()<cr>

0 comments on commit e39cf63

Please sign in to comment.