From ae67b37b507430e27b94dbd31ae1477484abb752 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sun, 23 Mar 2014 14:24:57 -0400
Subject: [PATCH] no more angle matching

---
 .vim/filetype.vim          |  2 +-
 .vim/snippets/c.snippets   | 87 ----------------------------------------------
 .vim/snippets/cpp.snippets | 27 --------------
 .vim/usnips/c.snippets     | 87 ++++++++++++++++++++++++++++++++++++++++++++++
 .vim/usnips/cpp.snippets   | 27 ++++++++++++++
 .vimrc                     |  2 +-
 .ycm_extra_conf.py         |  1 -
 7 files changed, 116 insertions(+), 117 deletions(-)
 delete mode 100644 .vim/snippets/c.snippets
 delete mode 100644 .vim/snippets/cpp.snippets
 create mode 100644 .vim/usnips/c.snippets
 create mode 100644 .vim/usnips/cpp.snippets

diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index cb65c90..68fbaf1 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -43,7 +43,7 @@ au Filetype html,xml,xsl source ~/.vim/closetag.vim
 
 au BufRead,BufNewFile *.go set filetype=go
 
-au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:},<:>"
+au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:}"
 
 "Settings per filetype
 augroup python
diff --git a/.vim/snippets/c.snippets b/.vim/snippets/c.snippets
deleted file mode 100644
index fa83259..0000000
--- a/.vim/snippets/c.snippets
+++ /dev/null
@@ -1,87 +0,0 @@
-###########################################################################
-#                            TextMate Snippets                            #
-###########################################################################
-
-snippet ifndef "#ifndef ... #define ... #endif" !b
-#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
-#define ${1:SYMBOL} ${2:value}
-#endif
-endsnippet
-
-snippet #if "#if #endif" !b
-#if ${1:0}
-${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
-#endif
-endsnippet
-
-snippet main "main() (main)" !
-int main(int argc, char *argv[]) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-  return 0;
-}
-endsnippet
-
-snippet for "for loop (for)" !
-for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-
-snippet enum "Enumeration" !
-enum ${1:name} { 
-  $0 
-};
-endsnippet
-
-snippet wh "while loop" !
-while(${1:/* condition */}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet do "do...while loop (do)" !
-do {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-} while(${1:/* condition */});
-endsnippet
-
-snippet if "if .. (if)" !
-if (${1:/* condition */}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet el "else .. (else)" !
-else {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet eli "else if .. (eli)" !
-else if (${1:/* condition */}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet ife "if .. else (ife)" !
-if (${1:/* condition */}) {
-  ${2:/* code */}
-} else {
-  ${3:/* else */}
-}
-endsnippet
-
-snippet st "struct" !
-struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
-  ${0:/* data */}
-};
-endsnippet
-
-snippet fun "function" b!
-${1:void} ${2:function_name}(${3}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-# vim:ft=snippets:
diff --git a/.vim/snippets/cpp.snippets b/.vim/snippets/cpp.snippets
deleted file mode 100644
index 556a954..0000000
--- a/.vim/snippets/cpp.snippets
+++ /dev/null
@@ -1,27 +0,0 @@
-extends c
-
-###########################################################################
-#                            TextMate Snippets                            #
-###########################################################################
-snippet beginend "$1.begin(), $1.end() (beginend)"
-${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
-endsnippet
-
-snippet cl "class .. (class)" !
-class ${1:`!p snip.rv = snip.basename or "name"`} {
- public:
-  ${1/(\w+).*/$1/}(${2:arguments});
-  virtual ~${1/(\w+).*/$1/}();
-
- private:
-  ${0:/* data */}
-};
-endsnippet
-
-snippet ns "namespace .. (namespace)" !
-namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}  // namespace $1
-endsnippet
-
-# vim:ft=snippets:
diff --git a/.vim/usnips/c.snippets b/.vim/usnips/c.snippets
new file mode 100644
index 0000000..fa83259
--- /dev/null
+++ b/.vim/usnips/c.snippets
@@ -0,0 +1,87 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+snippet ifndef "#ifndef ... #define ... #endif" !b
+#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
+#define ${1:SYMBOL} ${2:value}
+#endif
+endsnippet
+
+snippet #if "#if #endif" !b
+#if ${1:0}
+${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
+#endif
+endsnippet
+
+snippet main "main() (main)" !
+int main(int argc, char *argv[]) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+  return 0;
+}
+endsnippet
+
+snippet for "for loop (for)" !
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+
+snippet enum "Enumeration" !
+enum ${1:name} { 
+  $0 
+};
+endsnippet
+
+snippet wh "while loop" !
+while(${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet do "do...while loop (do)" !
+do {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+} while(${1:/* condition */});
+endsnippet
+
+snippet if "if .. (if)" !
+if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet el "else .. (else)" !
+else {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet eli "else if .. (eli)" !
+else if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet ife "if .. else (ife)" !
+if (${1:/* condition */}) {
+  ${2:/* code */}
+} else {
+  ${3:/* else */}
+}
+endsnippet
+
+snippet st "struct" !
+struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
+  ${0:/* data */}
+};
+endsnippet
+
+snippet fun "function" b!
+${1:void} ${2:function_name}(${3}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/.vim/usnips/cpp.snippets b/.vim/usnips/cpp.snippets
new file mode 100644
index 0000000..556a954
--- /dev/null
+++ b/.vim/usnips/cpp.snippets
@@ -0,0 +1,27 @@
+extends c
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet beginend "$1.begin(), $1.end() (beginend)"
+${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
+endsnippet
+
+snippet cl "class .. (class)" !
+class ${1:`!p snip.rv = snip.basename or "name"`} {
+ public:
+  ${1/(\w+).*/$1/}(${2:arguments});
+  virtual ~${1/(\w+).*/$1/}();
+
+ private:
+  ${0:/* data */}
+};
+endsnippet
+
+snippet ns "namespace .. (namespace)" !
+namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}  // namespace $1
+endsnippet
+
+# vim:ft=snippets:
diff --git a/.vimrc b/.vimrc
index a632831..a2e1fb4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -182,7 +182,7 @@ let g:ycm_key_invoke_completion = "<Leader><Tab>"
 "let g:ycm_autoclose_preview_window_after_completion = 1
 
 " * UltiSnips
-let g:UltiSnipsSnippetDirectories=["UltiSnips", "snippets"]
+let g:UltiSnipsSnippetDirectories=["UltiSnips", "usnips"]
 let g:UltiSnipsExpandTrigger="<Leader>,"
 let g:UltiSnipsJumpForwardTrigger="<Leader>,"
 let g:UltiSnipsJumpBackwardTrigger="<Leader><s-,>"
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 33ac6f6..06a49f3 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -14,7 +14,6 @@ flags = [
 '-Wno-variadic-macros',
 '-fexceptions',
 '-DNDEBUG',
-'-DUSE_CLANG_COMPLETER',
 # THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
 # language to use when compiling headers. So it will guess. Badly. So C++
 # headers will be compiled as C headers. You don't want that so ALWAYS specify