merge

shell/zsh/zshrc

@@ -19,3 +19,10 @@ if [ -f ~/.zshrc_local ]
 then
   source ~/.zshrc_local
 fi
+
+# The next line updates PATH for CLI.
+if [ -f '/Users/dmchumak/yandex-cloud/path.bash.inc' ]; then source '/Users/dmchumak/yandex-cloud/path.bash.inc'; fi
+
+# The next line enables shell command completion for yc.
+if [ -f '/Users/dmchumak/yandex-cloud/completion.zsh.inc' ]; then source '/Users/dmchumak/yandex-cloud/completion.zsh.inc'; fi
+

vim/coc-lsp/coc-settings-cloudia.json

@@ -0,0 +1,14 @@
+{
+  "inlayHints.enable": false,
+  "pyright.inlayHints.functionReturnTypes": false,
+  "pyright.inlayHints.variableTypes": false,
+  "go.goplsOptions": {
+    "standaloneTags": ["ignore"],
+    "arcadiaIndexDirs": [
+      "cli/",
+      "api/",
+      "gateway/"
+    ]
+  },
+  "go.goplsPath": "/Users/dmchumak/.ya/tools/v4/gopls-darwin-arm64/gopls"
+}

vim/coc-lsp/coc.vim

@@ -43,6 +43,11 @@ nmap <silent> gy <Plug>(coc-type-definition)
 nmap <silent> gi <Plug>(coc-implementation)
 nmap <silent> gr <Plug>(coc-references)
 
+" Remap keys for applying refactor code actions
+nmap <silent> <leader>re <Plug>(coc-codeaction-refactor)
+xmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
+nmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
+
 "set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
 
 " Applying codeAction to the selected region.

vim/vimrc

@@ -39,6 +39,8 @@ noremap <silent> <C-Down> :resize -3<CR>
 set backspace=indent,eol,start
 filetype plugin indent on
 
+let hostname = substitute(system('hostname'), '\n', '', '')
+
 if empty(glob('~/.vim/autoload/plug.vim')) "Если vim-plug не стоит
   silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs 
     \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim 
@@ -179,6 +181,11 @@ let g:ansible_yamlKeyName = 'yamlKey'
 "
 " CoC plugin settings
 "
+if hostname == "i113855042"
+  let g:coc_user_config = '~/.vim/coc-lsp/coc-settings-cloudia.json'
+else
+  let g:coc_user_config = '~/.vim/coc-lsp/coc-settings.json'
+endif
 let g:coc_global_extensions = ['coc-pyright', 'coc-sh', 'coc-go']
 function! s:enable_coc_for_type()
         let l:filesuffix_whitelist = ['py', 'sh', 'go', 'gd', 'gdscript']
@@ -187,7 +194,7 @@ function! s:enable_coc_for_type()
         endif
 endfunction
 autocmd BufRead,BufNewFile * call s:enable_coc_for_type()
-source ~/.vim/coc.vim
+source ~/.vim/coc-lsp/coc.vim
 
 "
 " vim-sneak plugin settings