Update GetIcedIndent to fallback to GetClojureIndent #64

autoload/iced/format.vim

@@ -90,7 +90,7 @@ endfunction
 
 function! iced#format#calculate_indent(lnum) abort
   if !iced#nrepl#is_connected()
-    return -1
+    return GetClojureIndent()
   endif
 
   if ! s:is_indentation_rule_setted
@@ -104,18 +104,19 @@ function! iced#format#calculate_indent(lnum) abort
     let res = iced#paredit#get_current_top_list(2)
     let code = res['code']
     if iced#compat#trim(code) ==# ''
-      return 0
+      return GetClojureIndent()
     endif
 
     let start_line = res['curpos'][1]
     let start_column = res['curpos'][2] - 1
     let target_lnum = a:lnum - start_line
 
     let resp = iced#nrepl#op#iced#sync#calculate_indent_level(code, target_lnum, iced#nrepl#ns#alias_dict(ns_name))
+    echom printf('FIXME %s', resp)
     if has_key(resp, 'indent-level') && type(resp['indent-level']) == type(1)
       return resp['indent-level'] + start_column
     else
-      return -1
+      return GetClojureIndent()
     endif
   finally
     let @@ = reg_save

indent/clojure.vim

@@ -1,19 +1,10 @@
-let g:iced_enable_auto_indent = get(g:, 'iced_enable_auto_indent', v:true)
-if exists('b:did_indent') || !g:iced_enable_auto_indent
-  finish
-endif
-
-setlocal autoindent
-setlocal indentexpr=GetIcedIndent()
-setlocal indentkeys=!^F,o,O
-
-setlocal expandtab
-setlocal tabstop<
-setlocal softtabstop=2
-setlocal shiftwidth=2
+let s:save_cpo = &cpo
+set cpo&vim
 
+" NOTE: setting indentexpr is executed at nREPL connection
 function! GetIcedIndent()
   return iced#format#calculate_indent(v:lnum)
 endfunction
 
-let b:did_indent = 1
+let &cpo = s:save_cpo
+unlet s:save_cpo

test/format.vim

@@ -3,6 +3,10 @@ let s:assert = themis#helper('assert')
 let s:ch = themis#helper('iced_channel')
 let s:buf = themis#helper('iced_buffer')
 
+function! GetClojureIndent() abort
+  return -1
+endfunction
+
 function! s:format_code_relay(msg, formatted) abort
   if a:msg['op'] ==# 'iced-format-code-with-indents'
     return {'status': ['done'], 'formatted': a:formatted}
@@ -82,7 +86,7 @@ function! s:suite.calculate_indent_without_corresponding_form_test() abort
         \ '|',
         \ ])
   let result = iced#format#calculate_indent(line('.'))
-  call s:assert.equals(result, 0)
+  call s:assert.equals(result, GetClojureIndent())
 
   call s:buf.stop_dummy()
 endfunction