.conduit.yaml

@@ -0,0 +1,2 @@
+---
+- location: ~/.vim

.gitignore

@@ -1,2 +1,2 @@
 .netrwhist
-plugs/*
+bundle/*

UltiSnips/all.snippets

@@ -86,7 +86,3 @@ endsnippet
 snippet *[ "GitHub style checkbox"
 * [${1: }] $0
 endsnippet
-
-snippet [[ "lit named ID match" i
-[[${1:name}:%[a-zA-Z0-9]+]]
-endsnippet

UltiSnips/cpp.snippets

@@ -32,13 +32,13 @@ class ${1:name} {
 endsnippet
 
 snippet template "Template"
-template <class ${1:T}$2>$0
+template <class ${1:type}>$0
 endsnippet
 
 snippet namespace "Named or anonymous namespace"
 namespace $1${1/(\w+)/ /}{
 $0
-}  // namespace${1/(\w*)/(?1: $1:)/}
+}  // ${1/(\w*)/(?1:$1:anonymous)/}
 endsnippet
 
 snippet const_cast "Const cast" i

after/ftdetect/python.vim

@@ -1,7 +0,0 @@
-function! s:set_lit_cfg_filetype()
-  set filetype=python
-  ALEDisableBuffer
-endfunction
-
-au BufNewFile,BufReadPost lit.cfg call s:set_lit_cfg_filetype()
-au BufNewFile,BufReadPost lit.local.cfg call s:set_lit_cfg_filetype()

after/syntax/markdown.vim

@@ -5,7 +5,6 @@ hi link markdownHeadingDelimiter PreProc
 hi link markdownLinkDelimiter PreProc
 hi link markdownLinkTextDelimiter PreProc
 hi link markdownUrl Include
-hi link markdownError None
 
 " Add match for GitHub style check boxes
 syn match markdownCheckboxTick '\[\zsx\ze\]' contained

after/syntax/zsh.vim

@@ -1,6 +1,3 @@
-syn region zshParentheses matchgroup=Delimiter start='(' skip='\\)' end=')' transparent fold
-syn region zshParentheses matchgroup=Delimiter start="{" end="}" transparent fold
-
-" TODO: Correctly highlight associative array assignment, see zshVariableDef.
-
-hi link zshOperator Operator
+syn keyword zshOption interactivecomments INTERACTIVE_COMMENTS
+syn region zshBlock matchgroup=zshParans start="{" end="}" transparent fold
+hi link zshParans Delimiter

autoload/do.vim

@@ -20,8 +20,6 @@ function! do#rstrip_lines()
   call cursor(l:line, l:column)
 endfunction
 
-" TODO: Strip white space from left of all lines, retains relative indentation.
-
 " Set the tab width for the current filetype
 function! do#set_tab_width(width)
   execute 'setlocal tabstop='.a:width

colors/fresh.vim

@@ -95,7 +95,7 @@ if has('gui_running') || &t_Co == 256
   call s:hi('Cursor', '', '', 'reverse')
   call s:hi('CursorIM', '', '', '')
   call s:hi('CursorColumn', '235', '', '')
-  call s:hi('CursorLine', '', '0', '')
+  call s:hi('CursorLine', '', '', '')
   call s:hi('Directory', '', '', '')
   call s:hi('DiffAdd', '2', '', '')
   call s:hi('DiffChange', '', '', '')

ftdetect/llvm.vim

@@ -1,3 +1,2 @@
 " Set .ll files to LLVM IR filetype
 au BufNewFile,BufReadPost *.ll set filetype=llvm
-au BufNewFile,BufReadPost *.test set filetype=llvm

plugin/commands.vim

@@ -5,8 +5,6 @@ command! ISort call do#isort()
 " TODO: Make RStripLines work on a range
 command! RStripLines call do#rstrip_lines()
 
-" TODO: Strip white space from left of all lines, retains relative indentation.
-
 " Set tab width
 command! -nargs=1 TabWidth call do#set_tab_width(<f-args>)
 

plugin/settings.vim

@@ -21,8 +21,6 @@ endif
 set laststatus=2
 " Show the line and colum number of a cursor position
 set ruler
-" Show the current line with different highlighting
-set cursorline
 
 " Enhanced command line completion
 set wildmenu
@@ -93,7 +91,7 @@ set noshowmode
 
 " Show relative line numbers & current line number
 set number
-if exists('+relativenumber')
+if has('relativenumber')
   set relativenumber
 endif
 

syntax/cpp.vim

@@ -37,9 +37,6 @@ syn keyword cppConstant __cplusplus
 
 " C++11
 if !exists('cpp_no_cpp11')
-  " Identifiers with special meaning: override final
-  " TODO: These should not be keyword's, instead highlight based on context
-  " since these can be used as regular identifiers outside of those contexts.
   syn keyword cppModifier override final
   syn keyword cppType char16_t char32_t nullptr_t
   syn keyword cppExceptions noexcept
@@ -54,55 +51,11 @@ if !exists('cpp_no_cpp11')
   " however if the match starts before the beginning of the keyword it will be
   " chosen instead so we can specialze for this case.
   syn match cppStatement '=\s*\(delete\|default\)\>\ze\s*;\?' contains=cOperator display
-
-  " Attribute Specifier Sequence
-  " Match: [[attribute-list]]
-  syn region cppAttributeDelimiter matchgroup=cppDelimiter start='\[\[' skip='\[\[' end='\]\]' transparent contains=cppAttribute,cppNamespace,cppAttributeUsing,cppAttributeUsingNamespace,cDelimiter,cString,cOperator,cNumber,cppFunction,cFunction
-
-  " Standard Attributes
-  syn keyword cppAttribute noreturn carries_dependency contained
 endif
 
 " C++14
 if !exists('cpp_no_cpp14')
   syn match cppNumber display '\<0b[01]\+\(u\=l\{0,2}\|ll\=u\)\>'
-  " Standard Attributes
-  syn keyword cppAttribute deprecated contained
-endif
-
-" C++17
-if !exists('cpp_no_cpp17')
-  " Attribute Specifier Sequence
-  " Match: [[using attribute-namespace: attribute-list]]
-  syn match cppAttributeUsingNamespace '\s\+\zs\w\+\ze\s*:' contained contains=cppAttributeUsing
-  syn keyword cppAttributeUsing using contained
-
-  " Standard Attributes
-  syn keyword cppAttribute fallthrough nodiscard maybe_unused contained
-
-  hi def link cppAttributeUsing cppStatement
-  hi def link cppAttributeUsingNamespace cInclude
-  hi def link cppAttributeUsingDelimiter cppDelimiter
-endif
-
-" C++20
-if !exists('cpp_no_cpp20')
-  syn keyword cppStatement concept requires
-
-  " TODO: Attribute Specifier Sequence
-  " Match: [[contract-attribute-token contract-level(opt) identifier(opt): expression]]
-  "
-  " Standard Attributes
-  syn keyword cppAttribute likely unlikely no_unique_address contained
-  syn keyword cppAttribute expects ensures assert contained
-
-  " Contract Levels
-  syn keyword cppAttribute default audit axiom contained
-  "
-  " TODO: These should not be keyword's, instead highlight based on context
-  " since these can be used as regular identifiers outside of those contexts.
-  " These only occur inside an contracts generalised attribute.
-  syn keyword cppModifier audit axiom
 endif
 
 if !exists('cpp_no_function')
@@ -120,14 +73,14 @@ if !exists('cpp_no_delimiters')
 
   " Match: nested namespace expressions: expr::
   "                                      ^^^^
-  syn match cppNamespace '\w\+::' display contains=cppDelimiter
+  syn match cppNestedName '\w\+::' display contains=cppDelimiter
 
   " Match: label: as a Label and public: protected: private: as a Statement
   "        ^^^^^                 ^^^^^^  ^^^^^^^^^  ^^^^^^^
   syn match cUserCont "^\s*\I\i*\s*:$" contains=cUserLabel,cppAccess display
 
   hi default link cppDelimiter cDelimiter
-  hi default link cppNamespace cInclude
+  hi default link cppNestedName cInclude
 endif
 
 if !exists('cpp_no_operators') && !exists('cpp_no_delimiters')
@@ -161,6 +114,5 @@ hi def link cppConstant Constant
 hi def link cppRawStringDelimiter Delimiter
 hi def link cppRawString String
 hi def link cppNumber Number
-hi def link cppAttribute Keyword
 
 let b:current_syntax = 'cpp'

vimrc

@@ -48,7 +48,7 @@ if !platform#is_windows()
   let g:ycm_warning_symbol = '▸'
   let g:ycm_goto_buffer_command = 'horizontal-split'
 endif
-if has('python')
+if has('python') || has('python3')
   " ultisnips - snippet engine
   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 endif
@@ -175,11 +175,8 @@ let g:sh_fold_enabled = 1
 " xterm-color-table.vim - view term and hex colors
 Plug 'guns/xterm-color-table.vim'
 
-" SPIR-V syntax
-Plug 'kbenzie/vim-spirv'
-let g:spirv_current_id_highlight = 'ctermbg=234, guibg=#1c1c1c'
-
 " CMake, GLSL, HLSL, OpenCL C syntax
+Plug 'kbenzie/vim-spirv'
 Plug 'rperier/vim-cmake-syntax'
 Plug 'tikhomirov/vim-glsl'
 Plug 'beyondmarc/hlsl.vim'