diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | build | 2 | ||||
| -rw-r--r-- | ftplugin/gdscript3.vim | 107 | ||||
| -rw-r--r-- | ftplugin/gsl.vim | 5 |
4 files changed, 2 insertions, 114 deletions
@@ -81,7 +81,7 @@ If you need full functionality of any plugin, please use it directly with your p - [fish](https://github.com/georgewitteman/vim-fish) (syntax, indent, compiler, autoload, ftplugin) - [flatbuffers](https://github.com/dcharbon/vim-flatbuffers) (syntax) - [fsharp](https://github.com/ionide/Ionide-vim) (syntax, indent) -- [gdscript](https://github.com/calviken/vim-gdscript3) (syntax, indent, ftplugin) +- [gdscript](https://github.com/calviken/vim-gdscript3) (syntax, indent) - [git](https://github.com/tpope/vim-git) (syntax, indent, ftplugin) - [glsl](https://github.com/tikhomirov/vim-glsl) (syntax, indent) - [gmpl](https://github.com/maelvalais/gmpl.vim) (syntax) @@ -173,7 +173,7 @@ PACKS=" fish:georgewitteman/vim-fish flatbuffers:dcharbon/vim-flatbuffers fsharp:ionide/Ionide-vim:_BASIC - gdscript:calviken/vim-gdscript3 + gdscript:calviken/vim-gdscript3:_SYNTAX git:tpope/vim-git glsl:tikhomirov/vim-glsl:_NOAFTER gmpl:maelvalais/gmpl.vim diff --git a/ftplugin/gdscript3.vim b/ftplugin/gdscript3.vim deleted file mode 100644 index 3e5451f1..00000000 --- a/ftplugin/gdscript3.vim +++ /dev/null @@ -1,107 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1 - -setlocal commentstring=#\ %s - -if exists("g:gdscript3_loaded") - finish -endif -let g:gdscript3_loaded=1 - -if !has("python3") && !has("python") - finish -endif - -if has("python3") - let s:pyfile_cmd = "py3file" - let s:py_cmd = "py3" -else - let s:pyfile_cmd = "pyfile" - let s:py_cmd = "py" -endif - -execute s:pyfile_cmd . " " . expand('<sfile>:p:h') . "/../python/init.py" - -fun! GDScriptComplete(findstart, base) - if a:findstart == 1 - let line = getline('.') - let start = col('.') - 1 - " Treat '-' as part of the word when completing in a string. - if synIDattr(synID(line('.'), col('.')-1, 1), 'name') ==# "gdString" - let pattern = '[-a-zA-Z0-9_]' - else - let pattern = '[a-zA-Z0-9_]' - endif - while start > 0 && line[start - 1] =~ pattern - let start -= 1 - endwhile - return start - else - execute s:py_cmd . " gdscript_complete()" - if exists("gdscript_completions") - return gdscript_completions - else - return [] - endif - endif -endfun -set omnifunc=GDScriptComplete - -" Configure for common completion frameworks. - -" Deoplete -if &rtp =~ 'deoplete.nvim' - call deoplete#custom#option('sources', { - \ 'gdscript3': ['omni'], - \ }) - call deoplete#custom#var('omni', 'input_patterns', { - \ 'gdscript3': [ - \ '\.|\w+', - \ '\bextends\s+', - \ '\bexport\(', - \ '\bfunc\s+', - \ '"res://[^"]*' - \ ] - \ }) -endif - -" SuperTab -let g:SuperTabDefaultCompletionType = "<c-x><c-o>" - -" YouCompleteMe -if !exists('g:ycm_semantic_triggers') - let g:ycm_semantic_triggers = {} -endif -let g:ycm_semantic_triggers.gdscript3 = [ - \'re!\w+', - \'.', - \'re!\bextends\s+', - \'re!\bexport\(', - \'re!\bfunc\s+', - \'re!"res://[^"]*' - \] - - - -" Configure echodoc -if &rtp =~ 'echodoc' - let s:echodoc_dict = { "name": "gdscript3", "rank": 9 } - fun! s:echodoc_dict.search(text) - execute s:py_cmd . " echodoc_search()" - if exists("echodoc_search_result") - return echodoc_search_result - else - return [] - endif - endfun - call echodoc#register('gdscript3', s:echodoc_dict) - - " Reset echodoc cache when exiting insert mode. - " This fixes an issue where the function signature wouldn't re-appear - " after exiting and re-entering insert mode. - au InsertLeave * let b:prev_echodoc = [] -endif - -" Configure Syntastic checker -let g:syntastic_gdscript3_checkers = ['godot_server'] - -endif diff --git a/ftplugin/gsl.vim b/ftplugin/gsl.vim deleted file mode 100644 index de18da43..00000000 --- a/ftplugin/gsl.vim +++ /dev/null @@ -1,5 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1 - -setlocal commentstring=//\ %s - -endif |