Pārlūkot izejas kodu

using ultisnips now!

Kevin Heinicke 10 gadi atpakaļ
vecāks
revīzija
c0bbce9ff7

+ 3 - 0
.vim/snippets/cpp.snippets

@@ -5,6 +5,9 @@ snippet main
 		${1}
 		return 0;
 	}
+endsnippet
+
 # std::cout
 snippet cout
 	std::cout << ${1} << std::endl;
+endsnippet

+ 1 - 0
.vim/snippets/latex.snippets

@@ -0,0 +1 @@
+extends tex

+ 1 - 0
.vim/snippets/plaintex.snippets

@@ -0,0 +1 @@
+extends tex

+ 43 - 1
.vim/snippets/tex.snippets

@@ -3,18 +3,26 @@
 snippet sec
 	\section{${1}}
 	\label{sec:${2}}
+endsnippet
+
 # Subsection
 snippet subsec
 	\subsection{${1}}
 	\label{subsec:${2}}
+endsnippet
+
 # Paragraph
 snippet par
 	\paragraph{${1}}
+endsnippet
+
 # Figure
 snippet fig
 	\begin{figure}
 		${0}
 	\end{figure}
+endsnippet
+
 # Image
 snippet img
 	\begin{figure}
@@ -23,64 +31,98 @@ snippet img
 		\caption{${3}}
 		\label{fig:${4}}
 	\end{figure}
+endsnippet
+
 # Environment
 snippet be
 	\begin{${1:env}}
 		${0}
 	\end{$1}
+endsnippet
+
 # Equation
 snippet eq
 	\begin{equation}
 	\label{eq:${2}}
 			${0}
 	\end{equation}
+endsnippet
+
 # Equation
 snippet eq*
 	\begin{equation*}
 		${0}
 	\end{equation*}
+endsnippet
+
 # Equation array
 snippet eqnarray
 	\begin{eqnarray}
 		${0}
 	\end{eqnarray}
+endsnippet
+
 # Fraction
 snippet frac
 	\frac{${1}}{${2}}${0}
 # ()
+endsnippet
+
+# []
 snippet ()
 	\left(${0}\right)
-# []
+endsnippet
+
 snippet []
 	\left[${0}\right]
+endsnippet
+
 # Label
 snippet lab
 	\label{${1}}
+endsnippet
+
 # Reference
 snippet ref
 	\ref{${1}}
+endsnippet
+
 # Itemize
 snippet itemize
 	\begin{itemize}
 		\item ${0}
 	\end{itemize}
+endsnippet
+
 # Endless new item
 snippet item
 	\item ${1}
 	item
+endsnippet
+
 # electronvolt per c squared
 snippet evc
 	\electronvolt \per \clight \squared
+endsnippet
+
 # siunitx maaan
 snippet si
 	\SI{${1}}{${2}}
+endsnippet
+
 snippet ss
 	\si{${1}}
+endsnippet
+
 snippet n
 	\num{${1}}
+endsnippet
+
 ## beamer
 # frame
 snippet frame
 	\begin{frame}{${1:frametitle}}
 		${0}
 	\end{frame}
+endsnippet
+

+ 12 - 14
.vimrc

@@ -27,11 +27,11 @@ Plugin 'tpope/vim-markdown'
 Plugin 'KabbAmine/vCoolor.vim'
 Plugin 'nvie/vim-flake8'
 Plugin 'Raimondi/delimitMate'
-" Plugin 'Townk/vim-autoclose'
+Plugin 'SirVer/ultisnips'
 " all three following plugins are needed for vim-snipmate
-Bundle "MarcWeber/vim-addon-mw-utils"
-Bundle "tomtom/tlib_vim"
-Bundle "garbas/vim-snipmate"
+"Bundle "MarcWeber/vim-addon-mw-utils"
+"Bundle "tomtom/tlib_vim"
+"Bundle "garbas/vim-snipmate"
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -59,13 +59,11 @@ map <C-n> :NERDTreeToggle<CR>
 "open Tagbar with CTRL+m
 map <C-m> :TagbarToggle<CR>
 
-" trigger snipmate
-imap <C-J> <esc>a<Plug>snipMateNextOrTrigger
-smap <C-J> <Plug>snipMateNextOrTrigger
-
 " :w for :W
 command W w
-command Wq w
+command Wq wq
+command Q q
+command WQ wq
 
 "configure for guivim if its active
 if has("gui_macvim")
@@ -112,11 +110,11 @@ let g:multi_cursor_prev_key='<C-p>'
 let g:multi_cursor_skip_key='<C-x>'
 let g:multi_cursor_quit_key='<Esc>'
 
-" configure snipmate
-let g:snipMate = {}
-let g:snipMate.scope_aliases = {}
-let g:snipMate.scope_aliases['latextex'] = 'tex'
-let g:snipMate.scope_aliases['plaintex'] = 'tex'
+" configure UltiSnips
+let g:UltiSnipsExpandTrigger='<C-j>'
+let g:UltiSnipsJumpForwardTrigger='<C-j>'
+let g:UltiSnipsJumpBackwardTrigger='<C-k>'
+let g:UltiSnipsSnippetsDir='~/.vim/snippets'
 
 " vCoolor config
 let g:vcoolor_map = '<C-c>'