From 159ca7fd1cfe93aabb0ab95844371e350430f530 Mon Sep 17 00:00:00 2001
From: liquidz <liquidz.uo@gmail.com>
Date: Sat, 12 Dec 2020 16:57:12 +0900
Subject: [PATCH] Fix codes to use iced#paredit#get_current_top_form #295

---
 autoload/iced/component/format/native_image.vim | 6 +++---
 autoload/iced/component/format/nrepl.vim        | 6 +++---
 autoload/iced/nrepl/eval.vim                    | 2 +-
 autoload/iced/nrepl/test.vim                    | 2 +-
 autoload/iced/nrepl/var.vim                     | 2 +-
 autoload/iced/socket_repl.vim                   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/autoload/iced/component/format/native_image.vim b/autoload/iced/component/format/native_image.vim
index a2c357f09..71d35eba5 100644
--- a/autoload/iced/component/format/native_image.vim
+++ b/autoload/iced/component/format/native_image.vim
@@ -134,9 +134,9 @@ function! s:__current_form(result) abort
 endfunction
 
 function! s:fmt.current_form() abort
-  " must be captured before iced#paredit#get_current_top_something
+  " must be captured before iced#paredit#get_current_top_form
   let context = iced#util#save_context()
-  let codes = get(iced#paredit#get_current_top_something(), 'code', '')
+  let codes = get(iced#paredit#get_current_top_form(), 'code', '')
 
   if empty(codes)
     call iced#message#warning('finding_code_error')
@@ -209,7 +209,7 @@ function! s:fmt.calculate_indent(lnum) abort
   let reg_save = @@
 
   try
-    let res = iced#paredit#get_current_top_something()
+    let res = iced#paredit#get_current_top_form()
     let code = get(res, 'code', '')
     if trim(code) ==# ''
       return GetClojureIndent()
diff --git a/autoload/iced/component/format/nrepl.vim b/autoload/iced/component/format/nrepl.vim
index 56a714f84..8157287b7 100644
--- a/autoload/iced/component/format/nrepl.vim
+++ b/autoload/iced/component/format/nrepl.vim
@@ -111,10 +111,10 @@ function! s:fmt.current_form() abort
     return
   endif
 
-  " must be captured before get_current_top_something
+  " must be captured before get_current_top_form
   let context = iced#util#save_context()
 
-  let codes = get(iced#paredit#get_current_top_something(), 'code', '')
+  let codes = get(iced#paredit#get_current_top_form(), 'code', '')
   if empty(codes) | return iced#message#warning('finding_code_error') | endif
 
   call winrestview(context.view)
@@ -190,7 +190,7 @@ function! s:fmt.calculate_indent(lnum) abort
   let reg_save = @@
   let ns_name = iced#nrepl#ns#name()
   try
-    let res = iced#paredit#get_current_top_something()
+    let res = iced#paredit#get_current_top_form()
     let code = get(res, 'code', '')
     if trim(code) ==# ''
       return GetClojureIndent()
diff --git a/autoload/iced/nrepl/eval.vim b/autoload/iced/nrepl/eval.vim
index d68f41a37..df39e10ca 100644
--- a/autoload/iced/nrepl/eval.vim
+++ b/autoload/iced/nrepl/eval.vim
@@ -160,7 +160,7 @@ endfunction
 
 function! iced#nrepl#eval#outer_top_list(...) abort
   if ! iced#nrepl#check_session_validity() | return | endif
-  let ret = iced#paredit#get_current_top_object('(', ')')
+  let ret = iced#paredit#get_current_top_form()
   let code = get(ret, 'code')
   if empty(code)
     return iced#message#error('finding_code_error')
diff --git a/autoload/iced/nrepl/test.vim b/autoload/iced/nrepl/test.vim
index e46274581..21ea9d3c0 100644
--- a/autoload/iced/nrepl/test.vim
+++ b/autoload/iced/nrepl/test.vim
@@ -142,7 +142,7 @@ function! s:__fetch_test_vars_by_function_under_cursor(eval_resp, ns_name, callb
 endfunction
 
 function! iced#nrepl#test#fetch_test_vars_by_function_under_cursor(ns_name, callback) abort
-  let ret = iced#paredit#get_current_top_object('(', ')')
+  let ret = iced#paredit#get_current_top_form()
   let code = get(ret, 'code')
   if empty(code) | return iced#message#error('finding_code_error') | endif
 
diff --git a/autoload/iced/nrepl/var.vim b/autoload/iced/nrepl/var.vim
index 45db64681..fa4c6dfe5 100644
--- a/autoload/iced/nrepl/var.vim
+++ b/autoload/iced/nrepl/var.vim
@@ -102,7 +102,7 @@ function! iced#nrepl#var#get(...) abort
 endfunction
 
 function! iced#nrepl#var#extract_by_current_top_list(callback) abort
-  let ret = iced#paredit#get_current_top_object('(', ')')
+  let ret = iced#paredit#get_current_top_form()
   let code = get(ret, 'code')
   if empty(code) | return iced#message#error('finding_code_error') | endif
 
diff --git a/autoload/iced/socket_repl.vim b/autoload/iced/socket_repl.vim
index 0089cad40..0fc825533 100644
--- a/autoload/iced/socket_repl.vim
+++ b/autoload/iced/socket_repl.vim
@@ -198,7 +198,7 @@ function! iced#socket_repl#eval(code, ...) abort
 endfunction
 
 function! iced#socket_repl#eval_outer_top_list(...) abort " {{{
-  let ret = iced#paredit#get_current_top_object('(', ')')
+  let ret = iced#paredit#get_current_top_form()
   let code = get(ret, 'code')
   if empty(code)
     return iced#message#error('finding_code_error')