From 0f62bfa83fe7a68cf77ddef7e662811bd0e498ad Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 16:14:14 +0100 Subject: [PATCH 1/4] delete unused files --- after/syntax/gitcommit.vim | 3 - after/syntax/html.vim | 79 ---------------- after/syntax/i3config.vim | 2 - after/syntax/python.vim | 2 - after/syntax/scss.vim | 2 - after/syntax/vim.vim | 2 - after/syntax/vue.html | 61 ------------- coc-settings.json | 40 --------- syntax/cst.vim | 179 ------------------------------------- syntax/octobercms.vim | 18 ---- 10 files changed, 388 deletions(-) delete mode 100644 after/syntax/gitcommit.vim delete mode 100644 after/syntax/html.vim delete mode 100644 after/syntax/i3config.vim delete mode 100644 after/syntax/python.vim delete mode 100644 after/syntax/scss.vim delete mode 100644 after/syntax/vim.vim delete mode 100644 after/syntax/vue.html delete mode 100644 coc-settings.json delete mode 100644 syntax/cst.vim delete mode 100644 syntax/octobercms.vim diff --git a/after/syntax/gitcommit.vim b/after/syntax/gitcommit.vim deleted file mode 100644 index 11db794..0000000 --- a/after/syntax/gitcommit.vim +++ /dev/null @@ -1,3 +0,0 @@ -syn match gitCommitNumber "\<\d\+\>" containedin=gitCommitComment -syn keyword gitCommitAhead ahead containedin=gitCommitOnBranch -syn keyword gitCommitBehind behind containedin=gitCommitOnBranch diff --git a/after/syntax/html.vim b/after/syntax/html.vim deleted file mode 100644 index eb0b8bf..0000000 --- a/after/syntax/html.vim +++ /dev/null @@ -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=+\\)" containedin=htmlTag,vueTag,htmlTagN -syn region vueLink start="[^>]*" end=""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 "\\|\\|\" containedin=htmlTag,vueTag,htmlTagN -syn match vueTransitionComponent contained "\" 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 diff --git a/coc-settings.json b/coc-settings.json deleted file mode 100644 index b60e06b..0000000 --- a/coc-settings.json +++ /dev/null @@ -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" - ] -} diff --git a/syntax/cst.vim b/syntax/cst.vim deleted file mode 100644 index eb1efbe..0000000 --- a/syntax/cst.vim +++ /dev/null @@ -1,179 +0,0 @@ -" Vim syntax file -" Language: cst -" Maintainer: Thomas R. Kimpton -" 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 -else - command! -nargs=+ CSTHiLink hi def link -endif - -syntax case ignore - -" match definitions -syn match CSTSpecialKey /\/ -syn match CSTNonText /\/ -syn match CSTDirectory /\/ -syn match CSTErrorMsg /\/ -syn match CSTIncSearch /\/ -syn match CSTSearch /\/ -syn match CSTMoreMsg /\/ -syn match CSTModeMsg /\/ -syn match CSTLineNr /\/ -syn match CSTQuestion /\/ -syn match CSTStatusLineNC /\/ -syn match CSTStatusLine /\/ -syn match CSTVertSplit /\/ -syn match CSTTitle /\/ -syn match CSTVisualNOS /\/ -syn match CSTVisual /\/ -syn match CSTWarningMsg /\/ -syn match CSTWildMenu /\/ -syn match CSTFolded /\/ -syn match CSTFoldColumn /\/ -syn match CSTSignColumn /\/ -syn match CSTDiffAdd /\/ -syn match CSTDiffChange /\/ -syn match CSTDiffDelete /\/ -syn match CSTDiffText /\/ -syn match CSTCursor /\/ -syn match CSTComment /\/ -syn match CSTConstant /\/ -syn match CSTString /\/ -syn match CSTCharacter /\/ -syn match CSTNumber /\/ -syn match CSTBoolean /\/ -syn match CSTFloat /\/ -syn match CSTIdentifier /\/ -syn match CSTFunction /\/ -syn match CSTStatement /\/ -syn match CSTConditional /\/ -syn match CSTRepeat /\/ -syn match CSTLabel /\/ -syn match CSTOperator /\/ -syn match CSTKeyword /\/ -syn match CSTException /\/ -syn match CSTPreProc /\/ -syn match CSTInclude /\/ -syn match CSTDefine /\/ -syn match CSTMacro /\/ -syn match CSTPreCondit /\/ -syn match CSTType /\/ -syn match CSTStorageClass /\/ -syn match CSTStructure /\/ -syn match CSTTypeDef /\/ -syn match CSTSpecial /\/ -syn match CSTSpecialChar /\/ -syn match CSTTag /\/ -syn match CSTDelimiter /\/ -syn match CSTSpecialComment /\/ -syn match CSTDebug /\/ -syn match CSTUnderlined /\/ -syn match CSTIgnore /\/ -syn match CSTError /\/ -syn match CSTSpellBad /\/ -syn match CSTSpellCap /\/ -syn match CSTSpellLocal /\/ -syn match CSTSpellRare /\/ -syn match CSTTodo /\/ - -" 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: diff --git a/syntax/octobercms.vim b/syntax/octobercms.vim deleted file mode 100644 index a2f1706..0000000 --- a/syntax/octobercms.vim +++ /dev/null @@ -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" From fad1f15ad4a5ffeaf7779a4f4266b7b80526276f Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 16:43:54 +0100 Subject: [PATCH 2/4] fix vim-plug error for non-master branches --- init.plugins.vim | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/init.plugins.vim b/init.plugins.vim index 91b708b..cd854f4 100644 --- a/init.plugins.vim +++ b/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/cmp-nvim-lsp' - Plug 'hrsh7th/cmp-buffer' - Plug 'hrsh7th/cmp-path' + Plug 'hrsh7th/nvim-cmp', { 'branch': 'main' } + Plug 'hrsh7th/cmp-nvim-lsp', { 'branch': 'main' } + Plug 'hrsh7th/cmp-buffer', { 'branch': 'main' } + 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 From 6847f5b91546a9a31acef94d82821984e4fe5ddb Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 16:44:08 +0100 Subject: [PATCH 3/4] restructure --- init.vim | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/init.vim b/init.vim index 54b90d6..38450e0 100644 --- a/init.vim +++ b/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:· From 6af0c102978641f807ad86a83be9c0ac47a70c91 Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 8 Sep 2021 16:44:42 +0100 Subject: [PATCH 4/4] workaround for php autoindent turned off https://github.com/nvim-treesitter/nvim-treesitter/issues/462 --- after/indent/php.vim | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 after/indent/php.vim diff --git a/after/indent/php.vim b/after/indent/php.vim new file mode 100644 index 0000000..2d98542 --- /dev/null +++ b/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