From 3eeb9a8e9537cf617a8f205986e81bbd59e68146 Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Thu, 25 Aug 2022 17:31:04 +0000 Subject: [PATCH] Kotlin --- vim/.vim/prefs/google.vim | 4 +++- vim/.vim/prefs/google_comments.vim | 3 +-- vim/.vim/prefs/vimimp.vim | 10 ++++++++++ zsh/.bash_profile.google | 1 + 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 vim/.vim/prefs/vimimp.vim diff --git a/vim/.vim/prefs/google.vim b/vim/.vim/prefs/google.vim index fc9136f..dde882f 100644 --- a/vim/.vim/prefs/google.vim +++ b/vim/.vim/prefs/google.vim @@ -15,6 +15,7 @@ let g:signify_skip_filename_pattern = ['\.pipertmp.*'] Glug alert Glug csearch +Glug codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]` Glug codefmt-google Glug languages " applies google coding style settings to files whitelisted as google code. probably also want @@ -26,6 +27,7 @@ Glug googlepaths " core syntax and filetype settings for google-internal filetypes. Glug google-filetypes Glug ft-java +Glug ft-kotlin Glug ft-proto Glug critique Glug piper @@ -116,7 +118,7 @@ augroup autoformat_settings autocmd FileType textpb AutoFormatBuffer text-proto-format autocmd FileType proto AutoFormatBuffer protofmt autocmd FileType sql AutoFormatBuffer format_sql - autocmd FileType kt AutoFormatBuffer ktfmt + autocmd FileType kotlin AutoFormatBuffer ktfmt " autocmd FileType html,css,json AutoFormatBuffer js-beautify augroup END diff --git a/vim/.vim/prefs/google_comments.vim b/vim/.vim/prefs/google_comments.vim index 2924ccd..7188b9c 100644 --- a/vim/.vim/prefs/google_comments.vim +++ b/vim/.vim/prefs/google_comments.vim @@ -3,8 +3,7 @@ lua << EOF require('google.comments').setup { -- The command for fetching comments, refer to `get_comments.par --help` to -- see all the options. - -- command = {'/google/bin/releases/editor-devtools/get_comments.par', '--nofull', '-u', '--json', "-x=''"}, - command = {'/google/bin/releases/editor-devtools/get_comments.par', '--nofull', '--json', '--noresolved', '--cl_comments', '--file_comments', '--unreplied_only'}, + command = {'/google/bin/releases/editor-devtools/get_comments.par', '--json', '--full', '--noresolved', '--cl_comments', '--file_comments', ' -x ""'}, -- Define your own icon by `vim.fn.sign_define('ICON_NAME', {text = ' '})`. -- See :help sign_define -- The sign property passed to setup should be the 'ICON_NAME' in the define diff --git a/vim/.vim/prefs/vimimp.vim b/vim/.vim/prefs/vimimp.vim new file mode 100644 index 0000000..d23b464 --- /dev/null +++ b/vim/.vim/prefs/vimimp.vim @@ -0,0 +1,10 @@ +" silent call system('gcertstatus') +" if !v:shell_error +" set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/vim-imp +" set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch +" endif +" +" set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/vim-imp +" set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch + +" Glaive imp Suggest[default]=ripgrep,csearch,prompt Report[default]=popupnotify Location[default]=packageroot diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google index dec1377..60b734f 100644 --- a/zsh/.bash_profile.google +++ b/zsh/.bash_profile.google @@ -76,3 +76,4 @@ source /etc/bash_completion.d/hgd alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshort/hgd.sh' export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh +export PATH=$PATH:/usr/local/google/home/cnieves/.local/binexport PATH=$PATH:/usr/local/google/home/cnieves/.local/bin