workaround for php autoindent turned off

https://github.com/nvim-treesitter/nvim-treesitter/issues/462

after/indent/php.vim

@@ -0,0 +1,4 @@
+" https://github.com/nvim-treesitter/nvim-treesitter/issues/462#issuecomment-700278736
+setlocal indentexpr =
+setlocal autoindent
+setlocal smartindent

after/syntax/gitcommit.vim

@@ -1,3 +0,0 @@
-syn match     gitCommitNumber      "\<\d\+\>"     containedin=gitCommitComment
-syn keyword   gitCommitAhead        ahead         containedin=gitCommitOnBranch
-syn keyword   gitCommitBehind       behind        containedin=gitCommitOnBranch

after/syntax/html.vim

@@ -1,79 +0,0 @@
-syn clear htmlArg
-syn clear htmlCssDefinition
-
-" css classes
-syn region cssClassRegion contained start=+class="+hs=s+7 end=+"+he=e-1 contains=htmlSpecialChar,cssClassAttr,cssAttrNoise,cssClassName containedin=htmlTag,htmlTagN keepend
-syn region cssClassRegion contained start=+class='+hs=s+7 end=+'+he=e-1 contains=htmlSpecialChar,cssClassAttr,cssAttrNoise,cssClassName containedin=htmlTag,htmlTagN keepend
-syn region cssClassName  contained start=+"+hs=s+1 end=+"+he=e-1 contains=cssAttrNoise keepend
-syn region cssClassName  contained start=+'+hs=s+1 end=+'+he=e-1 contains=cssAttrNoise keepend
-syn match cssClassAttr "class" contained
-
-" css IDs
-syn region cssIdRegion contained start=+id="+hs=s+4 end=+"+he=e-1 contains=htmlSpecialChar,cssIdentifierAttr,cssAttrNoise,cssIdentifier containedin=htmlTag,htmlTagN keepend
-syn region cssIdRegion  contained start=+id='+hs=s+4 end=+'+he=e-1 contains=htmlSpecialChar,cssIdentifierAttr,cssAttrNoise,cssIdentifier containedin=htmlTag,htmlTagN keepend
-syn region cssIdentifier  contained start=+"+hs=s+1 end=+"+he=s-1 contains=cssAttrNoise keepend
-syn region cssIdentifier  contained start=+'+hs=s+1 end=+'+he=s-1 contains=cssAttrNoise keepend
-syn match cssIdentifierAttr "id" contained
-
-" img arguments
-syn region htmlArgRegion contained start=+src="+hs=s+5 end=+"+he=e-1 contains=htmlSpecialChar,cssAttrNoise,htmlSrcArg,htmlSrcValue containedin=htmlTag,htmlTagN keepend
-syn region htmlArgRegion contained start=+src='+hs=s+5 end=+'+he=e-1 contains=htmlSpecialChar,cssAttrNoise,htmlSrcArg,htmlSrcValue containedin=htmlTag,htmlTagN keepend
-syn region htmlSrcValue contained start=+"+hs=s+1 end=+"+he=s-1 contains=cssAttrNoise keepend
-syn region htmlSrcValue contained start=+'+hs=s+1 end=+'+he=s-1 contains=cssAttrNoise keepend
-syn match htmlSrcArg "src" contained
-
-syn region htmlArgRegion contained start=+srcset="+hs=s+8 end=+"+he=e-1 contains=htmlSpecialChar,htmlSrcsetArg,htmlSrcsetValue,cssAttrNoise containedin=htmlTag,htmlTagN keepend
-syn region htmlArgRegion contained start=+srcset='+hs=s+8 end=+'+he=e-1 contains=htmlSpecialChar,htmlSrcsetArg,htmlSrcsetValue,cssAttrNoise containedin=htmlTag,htmlTagN keepend
-syn region htmlSrcsetValue contained start=+"+hs=s+1 end=+"+he=s-1 contains=cssAttrNoise keepend
-syn region htmlSrcsetValue contained start=+'+hs=s+1 end=+'+he=s-1 contains=cssAttrNoise keepend
-syn match htmlSrcsetArg "srcset" contained
-
-syn region htmlArgRegion contained start=+\<alt="+hs=s+5 end=+"+he=e-1 contains=htmlSpecialChar,htmlAltArg,htmlAltValue,cssAttrNoise containedin=htmlTag,htmlTagN keepend
-syn region htmlArgRegion contained start=+\<alt='+hs=s+5 end=+'+he=e-1 contains=htmlSpecialChar,htmlAltArg,htmlAltValue,cssAttrNoise containedin=htmlTag,htmlTagN keepend
-syn region htmlAltValue contained start=+"+hs=s+1 end=+"+he=s-1 contains=cssAttrNoise keepend
-syn region htmlAltValue contained start=+'+hs=s+1 end=+'+he=s-1 contains=cssAttrNoise keepend
-syn match htmlAltArg "alt" contained
-
-" data-*
-syn region htmlArgRegion contained start=+data.*="+ end=+"+ contains=htmlDataArg,htmlDataValue,cssAttrNoise,htmlTag containedin=htmlTag,htmlTagN keepend
-syn region htmlArgRegion contained start=+data.*='+ end=+'+ contains=htmlDataArg,htmlDataValue,cssAttrNoise,htmlTag containedin=htmlTag,htmlTagN keepend
-syn region htmlDataValue contained start=+"+hs=s+1 end=+"+me=e-1 contains=cssAttrNoise keepend
-syn region htmlDataValue contained start=+'+hs=s+1 end=+'+me=e-1 contains=cssAttrNoise keepend
-syn match htmlDataArg +data.*="+me=e-2 contained
-
-" href
-syn region htmlArgRegion contained start=+href="+hs=s+7 end=+"+he=e-1 contains=htmlSpecialChar,htmlHrefArg,htmlHrefValue,cssAttrNoise containedin=htmlTag,htmlTagN keepend
-syn region htmlArgRegion contained start=+href='+hs=s+7 end=+'+he=e-1 contains=htmlSpecialChar,htmlHrefArg,htmlHrefValue,cssAttrNoise containedin=htmlTag,htmlTagN keepend
-syn region htmlHrefValue contained start=+"+hs=s+1 end=+"+he=s-1 contains=cssAttrNoise keepend
-syn region htmlHrefValue contained start=+'+hs=s+1 end=+'+he=s-1 contains=cssAttrNoise keepend
-syn match htmlHrefArg "href" contained
-
-syn match cssAttrNoise +=+ contained
-
-syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc,htmlArgRegion
-
-
-
-
-
-"TODO better group links
-hi def link cssAttrNoise htmlTag
-hi def link cssClassName Identifier
-hi def link cssClassAttr Type
-hi def link cssIdentifier Identifier
-hi def link cssIdentifierAttr Type
-hi def link htmlSrcValue htmlImgValue
-hi def link htmlSrcArg htmlImgArg
-hi def link htmlSrcsetValue htmlImgValue
-hi def link htmlSrcsetArg htmlImgArg
-hi def link htmlAltValue htmlImgValue
-hi def link htmlAltArg htmlImgArg
-hi def link htmlImgValue Identifier
-hi def link htmlImgArg Type
-hi def link htmlDataValue Identifier
-hi def link htmlDataArg Special
-hi def link htmlHrefValue Identifier
-hi def link htmlHrefArg Type
-
-
-

after/syntax/i3config.vim

@@ -1,2 +0,0 @@
-hi! def link ArbitraryCommand Identifier
-

after/syntax/python.vim

@@ -1,2 +0,0 @@
-syn match pythonBrackets      "[(){}\[\]]"    containedin=ALL
-syn match pythonNoise         "[,:]"             containedin=ALL

after/syntax/scss.vim

@@ -1,2 +0,0 @@
-" syn region cssURL contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline
-syn region cssURL containedin=scssDefinition matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline

after/syntax/vim.vim

@@ -1,2 +0,0 @@
-syn match vimDefLink "def\(ine\)\= link" containedin=vimHiGroup,vimGroup
-syn match vimFoldMarker "{{{\|}}}" containedin=vimComment,vimLineComment

after/syntax/vue.html

@@ -1,61 +0,0 @@
-runtime! after/syntax/html.vim
-
-syn keyword vueComponentTag     contained template containedin=htmlSpecialTagName
-
-syn match   vueDirective "\(^\|\s\)\zs[v:][-:.0-9_a-z]*"   containedin=htmlTag,vueTag,htmlTagN contains=vueDirectiveClass nextgroup=vueDirectiveValue
-syn match   vueEvent        "\(^\|\s\)\zs[@][-:.0-9_a-z]*" containedin=htmlTag,vueTag,htmlTagN nextgroup=vueEventValue
-syn match   vueConditional  "\<v-else"                     containedin=htmlTag,vueTag,htmlTagN
-syn match   vueConditional  "\<v-else-if"                     containedin=htmlTag,vueTag,htmlTagN nextgroup=vueConditionalValue
-syn match   vueConditional  "\<v-if\|\<v-show"             containedin=htmlTag,vueTag,htmlTagN nextgroup=vueConditionalValue
-syn match   vueSlot         +\<slot=+he=e-1               containedin=htmlTag,vueTag,htmlTagN nextgroup=vueSlotValue
-syn match   vueFor          "\<v-for"                      containedin=htmlTag,vueTag,htmlTagN nextgroup=vueForValue
-syn match   vueRef          "\(^\|\s\)\zs:\?ref"           containedin=htmlTag,vueTag,htmlTagN nextgroup=vueRefValue
-
-syn region vueMustache  start="{{"hs=s+2 end="}}"he=e-2
-syn region vueDirectiveClass      contained start=+class="+hs=s+7 end=+"+he=e-1 contains=vueObjectKey
-syn region vueDirectiveValue      contained start=+="+hs=s+2 end=+"+he=e-1
-" syn region vueDirectiveValue      contained start=+='+hs=s+2 end=+'+he=e-1
-
-syntax match   vueObjectKey         contained /\<\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=vueObjectValue
-syntax region  vueObjectKey   contained start=+\z([']\)+hs=s+1  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+he=e-1  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=vueObjectValue
-syntax region  vueObjectValue       contained matchgroup=jsNoise start=/:/ end=/[,}]\@=/ contains=@jsExpression extend
-" TODO match vueObjectValue with a javascript expression
-
-syn region vueEventValue          contained start=+="+hs=s+2 end=+"+he=e-1
-syn region vueEventValue          contained start=+='+hs=s+2 end=+'+he=e-1
-syn region vueConditionalValue    contained start=+="+hs=s+2 end=+"+he=e-1
-syn region vueConditionalValue    contained start=+='+hs=s+2 end=+'+he=e-1
-syn region vueForValue            contained start=+="+hs=s+2 end=+"+he=e-1
-syn region vueForValue            contained start=+='+hs=s+2 end=+'+he=e-1
-syn match vueRefValue             contained +="[-:.0-9_a-z]*"+hs=s+2,he=e-1
-syn match vueRefValue             contained +='[-:.0-9_a-z]*'+hs=s+2,he=e-1
-syn match vueSlotValue            contained +"[-:.0-9_a-z]*"+hs=s+1,he=e-1
-syn match vueSlotValue            contained +'[-:.0-9_a-z]*'+hs=s+1,he=e-1
-
-syn match vueComponentName contained "\(<\|</\)\zsvue-[0-9A-Za-z\-]\+\|\(<\|</\)\zs\u\+[0-9A-Za-z]\+\ze\(\s\|>\)" containedin=htmlTag,vueTag,htmlTagN
-syn region vueLink start="<router-link\>[^>]*" end="</router-link>"me=e-14 contains=@Spell,vueTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc,vueComponentName
-syn region  vueTag                start=+<[^/]+   end=+>+ fold contained contains=htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,vueDynamicComponent
-syn match vueComponentName contained "router-link" containedin=vueTag,htmlEndTag
-hi! def link vueLink htmlLink
-
-syn match vueDynamicComponent contained "\<component\>\|\<keep-alive\>\|\<router-link\>" containedin=htmlTag,vueTag,htmlTagN
-syn match  vueTransitionComponent contained "\<transition\>" containedin=htmlTag,vueTag,htmlTagN nextgroup=vueTransitionName,vueTransitionMode
-syn region vueTransitionName contained start=+\sname="+hs=s+7 end=+"+he=e-1 containedin=htmlTag,vueTag,htmlTagN
-syn region vueTransitionMode contained start=+\smode="+hs=s+7 end=+"+he=e-1 containedin=htmlTag,vueTag,htmlTagN
-
-syn keyword vueTagSpecial  contained template script style containedin=htmlTagN
-syn keyword htmlArg        contained scoped ts
-
-" syn region cssClassRegion contained start=+classes="+hs=s+9 end=+"+he=e-1 contains=htmlSpecialChar,cssClassAttr,cssAttrNoise,cssClassName containedin=htmlTag,htmlTagN keepend
-" syn region cssClassRegion contained start=+classes='+hs=s+9 end=+'+he=e-1 contains=htmlSpecialChar,cssClassAttr,cssAttrNoise,cssClassName containedin=htmlTag,htmlTagN keepend
-
-syn match cssClassesAttr contained "\<[-a-zA-z0-9]*class[-a-zA-z0-9]*=" contains=htmlSpecialChar,cssClassAttr,cssAttrNoise,cssClassName containedin=htmlTag,vueTag,htmlTagN keepend nextgroup=vueClassesName
-
-syn region vueClassesName contained start=+"+hs=s+1 end=+"+he=e-1
-
-hi def link cssClassesAttr cssClassAttr
-hi def link vueClassesname cssClassName
-hi def link vueObjectKey   cssClassName
-hi def link vueDirectiveClass Noise
-hi def link vueDirectiveClassName vueClassesName
-hi def link vueMustache Identifier

coc-settings.json

@@ -1,40 +0,0 @@
-{
-  "suggest.triggerAfterInsertEnter": false,
-  "suggest.autoTrigger": "always",
-  "suggest.noselect": true,
-  "suggest.snippetIndicator": "►",
-  "suggest.timeout": 1000,
-  "suggest.echodocSupport": true,
-  "signature.enable": true,
-  "diagnostic.enable": true,
-  "diagnostic.warningSign": "λ",
-  "diagnostic.errorSign": "Λ",
-  "diagnostic.infoSign": "λ",
-  "diagnostic.hintSign": "λ",
-  "coc.source.buffer.ignoreGitignore": true,
-  "javascript.validate.enable": false,
-  "vetur.format.defaultFormatter.js": "prettier-eslint",
-  "vetur.format.defaultFormatter.html": "prettier",
-  "vetur.format.defaultFormatter.scss": "prettier",
-  "scss.validate": true,
-  "python.linting.flake8Enabled": true,
-  "python.linting.flake8Path": "/home/ray/.local/bin/flake8",
-  "python.linting.lintOnSave": true,
-  "python.formatting.provider": "black",
-  "python.formatting.blackPath": "/home/ray/.local/bin/black",
-  "coc.preferences.formatOnSaveFiletypes": ["python", "vue"],
-  "sh.enable": true,
-  "sh.highlightParsingErrors": true,
-
-  "css.validate": true,
-  "stylelint.enable": true,
-  "stylelint.autoFixOnSave": true,
-  "prettier.requireConfig": true,
-
-  "eslint.enable": true,
-  "eslint.autoFixOnSave": true,
-  "eslint.filetypes": [
-    "javascript",
-    "vue"
-  ]
-}

init.plugins.vim

@@ -6,7 +6,7 @@ endif
 call plug#begin('~/.config/nvim/bundle')
 
 " colorscheme (temporary)
-Plug 'https://github.com/marko-cerovac/material.nvim'
+Plug 'https://github.com/marko-cerovac/material.nvim', { 'branch': 'main' }
 let g:material_style = 'lighter'
 
 " colorscheme in develpment paper-tonic
@@ -54,10 +54,10 @@ Plug '~/nvim-paper-tonic'
 "   #nvim-cmp {{{
 	" https://github.com/hrsh7th/nvim-cmp/
   " completion
-	Plug 'hrsh7th/nvim-cmp'
+	Plug 'hrsh7th/nvim-cmp', { 'branch': 'main' }
-	Plug 'hrsh7th/cmp-nvim-lsp'
+	Plug 'hrsh7th/cmp-nvim-lsp', { 'branch': 'main' }
-	Plug 'hrsh7th/cmp-buffer'
+	Plug 'hrsh7th/cmp-buffer', { 'branch': 'main' }
-	Plug 'hrsh7th/cmp-path'
+	Plug 'hrsh7th/cmp-path', { 'branch': 'main' }
 	" Plug 'hrsh7th/cmp-nvim-ultisnips'
 
   "}}}
@@ -284,15 +284,6 @@ let g:vim_markdown_fenced_languages = ['bash=sh']
   " https://github.com/tpope/vim-dispatch
   Plug 'tpope/vim-dispatch'
 
-  "}}}
-"   #phpcomplete.vim{{{
-"   improved php completion
-  " https://github.com/shawncplus/phpcomplete.vim
-  Plug 'shawncplus/phpcomplete.vim'
-  " https://github.com/dsawardekar/wordpress.vim
-  " For up to date Wordpress Files see:
-  "   https://github.com/joseluis/wordpress.vim-generator
-
   "}}}
 "   #vim-floaterm{{{
 " https://github.com/voldikss/floaterm

init.vim

@@ -269,7 +269,10 @@ set softtabstop=-1
 set shiftwidth=0
 set shiftround
 set noexpandtab
+
 set autoindent
+set breakindent
+set showbreak=\ \ ↳\
 
 set formatoptions=cq
 set wrapmargin=0
@@ -298,10 +301,6 @@ set foldlevelstart=99
 
 set showmode
 
-set autoindent
-set breakindent
-set showbreak=\ \ ↳\
-
 set mouse=a
 
 set listchars=eol:¬,tab:│\ ,trail:~,extends:>,precedes:<,space:·

syntax/cst.vim

@@ -1,179 +0,0 @@
-" Vim syntax file
-" Language:     cst
-" Maintainer:   Thomas R. Kimpton <tkimpton@gooberdude.com>
-" URL:          http://www.gooberdude.com/~tkimpton/vim/syntax/cst.vim
-" Last Change:  5/14/2003
-" Remark:       Used to test color schemes: edit your color scheme file, and
-" to see what each color assignment does, set the color scheme to your color
-" scheme then type the command ':setf cst'. As you continue to make changes
-" save your changes, and switch to another color scheme and back to your own
-" to see changes.
-
-" Quit when a syntax file was already loaded
-if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-    finish
-  endif
-  " we define it here so that included files can test for it
-  let main_syntax='cst'
-endif
-
-" don't use standard HiLink, it will not work with included syntax files
-if version < 508
-  command! -nargs=+ CSTHiLink hi link <args>
-else
-  command! -nargs=+ CSTHiLink hi def link <args>
-endif
-
-syntax case ignore
-
-" match definitions
-syn match CSTSpecialKey       /\<SpecialKey\>/
-syn match CSTNonText          /\<NonText\>/
-syn match CSTDirectory        /\<Directory\>/
-syn match CSTErrorMsg         /\<ErrorMsg\>/
-syn match CSTIncSearch        /\<IncSearch\>/
-syn match CSTSearch           /\<Search\>/
-syn match CSTMoreMsg          /\<MoreMsg\>/
-syn match CSTModeMsg          /\<ModeMsg\>/
-syn match CSTLineNr           /\<LineNr\>/
-syn match CSTQuestion         /\<Question\>/
-syn match CSTStatusLineNC     /\<StatusLineNC\>/
-syn match CSTStatusLine       /\<StatusLine\>/
-syn match CSTVertSplit        /\<VertSplit\>/
-syn match CSTTitle            /\<Title\>/
-syn match CSTVisualNOS        /\<VisualNOS\>/
-syn match CSTVisual           /\<Visual\>/
-syn match CSTWarningMsg       /\<WarningMsg\>/
-syn match CSTWildMenu         /\<WildMenu\>/
-syn match CSTFolded           /\<Folded\>/
-syn match CSTFoldColumn       /\<FoldColumn\>/
-syn match CSTSignColumn       /\<SignColumn\>/
-syn match CSTDiffAdd          /\<DiffAdd\>/
-syn match CSTDiffChange       /\<DiffChange\>/
-syn match CSTDiffDelete       /\<DiffDelete\>/
-syn match CSTDiffText         /\<DiffText\>/
-syn match CSTCursor           /\<Cursor\>/
-syn match CSTComment          /\<Comment\>/
-syn match CSTConstant         /\<Constant\>/
-syn match CSTString           /\<String\>/
-syn match CSTCharacter        /\<Character\>/
-syn match CSTNumber           /\<Number\>/
-syn match CSTBoolean          /\<Boolean\>/
-syn match CSTFloat            /\<Float\>/
-syn match CSTIdentifier       /\<Identifier\>/
-syn match CSTFunction         /\<Function\>/
-syn match CSTStatement        /\<Statement\>/
-syn match CSTConditional      /\<Conditional\>/
-syn match CSTRepeat           /\<Repeat\>/
-syn match CSTLabel            /\<Label\>/
-syn match CSTOperator         /\<Operator\>/
-syn match CSTKeyword          /\<Keyword\>/
-syn match CSTException        /\<Exception\>/
-syn match CSTPreProc          /\<PreProc\>/
-syn match CSTInclude          /\<Include\>/
-syn match CSTDefine           /\<Define\>/
-syn match CSTMacro            /\<Macro\>/
-syn match CSTPreCondit        /\<PreCondit\>/
-syn match CSTType             /\<Type\>/
-syn match CSTStorageClass     /\<StorageClass\>/
-syn match CSTStructure        /\<Structure\>/
-syn match CSTTypeDef          /\<TypeDef\>/
-syn match CSTSpecial          /\<Special\>/
-syn match CSTSpecialChar      /\<SpecialChar\>/
-syn match CSTTag              /\<Tag\>/
-syn match CSTDelimiter        /\<Delimiter\>/
-syn match CSTSpecialComment   /\<SpecialComment\>/
-syn match CSTDebug            /\<Debug\>/
-syn match CSTUnderlined       /\<Underlined\>/
-syn match CSTIgnore           /\<Ignore\>/
-syn match CSTError            /\<Error\>/
-syn match CSTSpellBad         /\<SpellBad\>/
-syn match CSTSpellCap         /\<SpellCap\>/
-syn match CSTSpellLocal       /\<SpellLocal\>/
-syn match CSTSpellRare        /\<SpellRare\>/
-syn match CSTTodo             /\<Todo\>/
-
-" The default highlighting.
-if version >= 508 || !exists("did_CST_syn_inits")
-  if version < 508
-    let did_CST_syn_inits = 1
-  endif
-  CSTHiLink CSTSpecialKey      SpecialKey
-  CSTHiLink CSTNonText         NonText
-  CSTHiLink CSTDirectory       Directory
-  CSTHiLink CSTErrorMsg        ErrorMsg
-  CSTHiLink CSTIncSearch       IncSearch
-  CSTHiLink CSTSearch          Search
-  CSTHiLink CSTMoreMsg         MoreMsg
-  CSTHiLink CSTModeMsg         ModeMsg
-  CSTHiLink CSTLineNr          LineNr
-  CSTHiLink CSTQuestion        Question
-  CSTHiLink CSTStatusLineNC    StatusLineNC
-  CSTHiLink CSTStatusLine      StatusLine
-  CSTHiLink CSTVertSplit       VertSplit
-  CSTHiLink CSTTitle           Title
-  CSTHiLink CSTVisualNOS       VisualNOS
-  CSTHiLink CSTVisual          Visual
-  CSTHiLink CSTWarningMsg      WarningMsg
-  CSTHiLink CSTWildMenu        WildMenu
-  CSTHiLink CSTFolded          Folded
-  CSTHiLink CSTFoldColumn      FoldColumn
-  CSTHiLink CSTSignColumn      SignColumn
-  CSTHiLink CSTDiffAdd         DiffAdd
-  CSTHiLink CSTDiffChange      DiffChange
-  CSTHiLink CSTDiffDelete      DiffDelete
-  CSTHiLink CSTDiffText        DiffText
-  CSTHiLink CSTCursor          Cursor
-  CSTHiLink CSTComment         Comment
-  CSTHiLink CSTConstant        Constant
-  CSTHiLink CSTString          String
-  CSTHiLink CSTCharacter       Character
-  CSTHiLink CSTNumber          Number
-  CSTHiLink CSTBoolean         Boolean
-  CSTHiLink CSTFloat           Float
-  CSTHiLink CSTIdentifier      Identifier
-  CSTHiLink CSTFunction        Function
-  CSTHiLink CSTStatement       Statement
-  CSTHiLink CSTConditional     Conditional
-  CSTHiLink CSTRepeat          Repeat
-  CSTHiLink CSTLabel           Label
-  CSTHiLink CSTOperator        Operator
-  CSTHiLink CSTKeyword         Keyword
-  CSTHiLink CSTException       Exception
-  CSTHiLink CSTPreProc         PreProc
-  CSTHiLink CSTInclude         Include
-  CSTHiLink CSTDefine          Define
-  CSTHiLink CSTMacro           Macro
-  CSTHiLink CSTPreCondit       PreCondit
-  CSTHiLink CSTType            Type
-  CSTHiLink CSTStorageClass    StorageClass
-  CSTHiLink CSTStructure       Structure
-  CSTHiLink CSTTypedef         Typedef
-  CSTHiLink CSTSpecial         Special
-  CSTHiLink CSTSpecialChar     SpecialChar
-  CSTHiLink CSTTag             Tag
-  CSTHiLink CSTDelimiter       Delimiter
-  CSTHiLink CSTSpecialComment  SpecialComment
-  CSTHiLink CSTDebug           Debug
-  CSTHiLink CSTUnderlined      Underlined
-  CSTHiLink CSTIgnore          Ignore
-  CSTHiLink CSTError           Error
-  CSTHiLink CSTSpellBad        SpellBad
-  CSTHiLink CSTSpellCap        SpellCap
-  CSTHiLink CSTSpellLocal      SpellLocal
-  CSTHiLink CSTSpellRare       SpellRare
-  CSTHiLink CSTTodo            Todo
-endif
-
-delcommand CSTHiLink
-
-let b:current_syntax = "cst"
-
-if main_syntax == 'cst'
-  unlet main_syntax
-endif
-
-" vim: set filetype=cst:

syntax/octobercms.vim

@@ -1,18 +0,0 @@
-if exists("b:current_syntax")
-  finish
-endif
-
-" changing order of following 4 lines breaks highlighting TODO - why?
-syntax include @octoberPHP syntax/php.vim
-unlet! b:current_syntax
-syntax include @octoberConfig syntax/dosini.vim
-runtime! syntax/jinja.vim
-
-syntax region octoberConfig start=@\%^\([a-zA-z]\+[a-zA-Z0-9]\+\s*=\s*\("\|'\)\)\|\[\s*[a-zA-Z0-9]\+\s*\]@ end=+^==$+me=e-2 contains=@octoberConfig
-syntax region octoberPHP start=+^==$+ms=s+2 end=+^==$+me=e-2 contains=@octoberPHP
-
-" FIXME - why these no work!
-" syntax match octobercmsSectionDelimiter "^==$"
-" highlight link octobercmsSectionDelimiter Comment
-
-let b:current_syntax = "octobercms"