Merge pull request #65 from obcat/improve-K

thinca · web-flow · commit c452d2ce084a · 2021-03-16T12:30:51.000+09:00
Improve &lt;Plug&gt;(ref-keyword)
diff --git a/autoload/ref.vim b/autoload/ref.vim
@@ -99,12 +99,14 @@ endfunction
 function! ref#K(mode)
   try
     call ref#jump(a:mode)
-  catch /^ref:/
+  catch /^ref: The source is not registered:/
     if a:mode ==# 'visual'
       call feedkeys('gvK', 'n')
     else
       call feedkeys('K', 'n')
     endif
+  catch /^ref:/
+    call s:echoerr(v:exception)
   endtry
 endfunction
 
@@ -524,9 +526,18 @@ endfunction
 function! s:get_query(mode, source)
   let [source, query] = [a:source, '']
   if a:mode ==# 'normal'
-    let pos = getpos('.')
-    let res = s:sources[source].get_keyword()
-    call setpos('.', pos)
+    try
+      let pos = getpos('.')
+      let res = s:sources[source].get_keyword()
+    catch
+      let mes = v:exception
+      if mes =~# '^Vim'
+        let mes .= "\n" . v:throwpoint
+      endif
+      throw printf('ref: %s: %s', source, mes)
+    finally
+      call setpos('.', pos)
+    endtry
     if type(res) == s:T.list && len(res) == 2
       let [source, query] = res
     else
diff --git a/doc/ref.jax b/doc/ref.jax
@@ -337,6 +337,8 @@ get_keyword()				*ref-source-attr-get_keyword()*
 			[{source-name}, {keyword}] の形式のリストを返すことも
 			できます。この場合指定されたソースでキーワードが開かれ
 			ます。
+			キーワードが見つからない場合はエラーメッセージと共に例
+			外を投げます。
 
 complete({query})			*ref-source-attr-complete()*
 			任意。コマンドラインの補完リストを返します。
diff --git a/doc/ref.txt b/doc/ref.txt
@@ -342,6 +342,8 @@ get_keyword()				*ref-source-attr-get_keyword()*
 			The list of the form of [{source-name}, {keyword}] can
 			be returned.  In this case, the keyword is opened by
 			the specified source.
+			Throws an exception with an error message if keyword
+			is not found.
 
 complete({query})			*ref-source-attr-complete()*
 			Optional.  Return the completion list for command-line.
