Better status

2 files changed, 16 insertions, 4 deletions

diff --git a/metals.vim b/metals.vim
index f482278..8315637 100644
--- a/metals.vim
+++ b/metals.vim
@@ -22,6 +22,7 @@ nnoremap <silent> <space>d    <cmd>lua vim.lsp.diagnostic.set_loclist()<CR>
 "
 :lua << EOF
   metals_config = require'metals'.bare_config()
+  metals_config.init_options.statusBarProvider = "on"
   metals_config.settings = {
      showImplicitArguments = true,
      excludedPackages = {
diff --git a/vimrc b/vimrc
index 8852748..fa88dde 100644
--- a/vimrc
+++ b/vimrc
@@ -75,17 +75,30 @@ end
 call plug#end()
 
 " crystaline conf
+
+" metals status
+function! MetalsStatus() abort
+  return get(g:, 'metals_status', '')
+endfunction
+
 function! StatusLine(current, width)
   let l:s = ''
 
   if a:current
     let l:s .= crystalline#mode() . crystalline#right_mode_sep('')
+  else
+    let l:s .= '%#CrystallineInactive#'
+  endif
+  let l:s .= ' %<%f%h%w%m%r '
+
+  if a:current
+    let l:s .= crystalline#right_sep('', 'Fill') . ' %{fugitive#head()}'
   endif
-  let l:s .= '%#Crystalline# %<%f%h%w%m%r %{fugitive#statusline()}'
 
   let l:s .= '%='
   if a:current
-    let l:s .= ' %{&paste ?"PASTE ":""}%{&spell?"SPELL ":""}'
+    let l:s .= ' %{MetalsStatus()} '
+    let l:s .= crystalline#left_sep('', 'Fill') . ' %{&paste ?"PASTE ":""}%{&spell?"SPELL ":""}'
     let l:s .= crystalline#left_mode_sep('')
   endif
   if a:width > 80
@@ -188,5 +201,3 @@ highlight link lscDiagnosticWarning GruvboxYellowSign
 " haskell syntax
 let g:haskell_classic_highlighting = 1
 
-" add you lsc_server_commands and lsc_auto_map locally
-