Added documentation buffer.

[gnu-emacs-elpa] / company-semantic.el

diff --git a/company-semantic.el b/company-semantic.el
index 0b4906cd11e8a534db200e22953102e556d57b75..960e69bc7c87d6399992df5778af1791135c9648 100644 (file)
--- a/company-semantic.el
+++ b/company-semantic.el
@@ -2,9 +2,40 @@
 (require 'semantic-ia)
 (eval-when-compile (require 'cl))
 
+(defcustom company-semantic-metadata-function 'company-semantic-summary-and-doc
+  "*"
+  :group 'company
+  :type 'function)
+
 (defvar company-semantic-context-regexp
   "\\(->\\|\\.\\|\\_<\\)\\(\\(\\s_\\|\\sw\\)+\\_>\\=\\)")
 
+(defun company-semantic-doc-or-summary (tag)
+  (or (semantic-documentation-for-tag tag)
+      (funcall semantic-idle-summary-function tag nil t)))
+
+(defun company-semantic-summary-and-doc (tag)
+  (let ((doc (semantic-documentation-for-tag tag))
+        (summary (funcall semantic-idle-summary-function tag nil t)))
+    (and (stringp doc)
+         (string-match "\n*\\(.*\\)$" doc)
+         (setq doc (match-string 1 doc)))
+    (concat (funcall semantic-idle-summary-function tag nil t)
+            (when doc
+                  (if (< (+ (length doc) (length summary) 4) (window-width))
+                      " -- "
+                    "\n"))
+            doc)))
+
+(defun company-semantic-doc-buffer (tag)
+  (let ((doc (semantic-documentation-for-tag tag)))
+    (when doc
+      (with-current-buffer (company-doc-buffer)
+        (insert (funcall semantic-idle-summary-function tag nil t)
+                "\n"
+                doc)
+        (current-buffer)))))
+
 (defsubst company-semantic-completions (prefix)
   (ignore-errors
     (let ((completion-ignore-case nil)
@@ -18,7 +49,11 @@
                   (or (company-grab company-semantic-context-regexp 2) "")))
     ('candidates (or (company-semantic-completions arg)
                      (mapcar 'semantic-tag-name
-                             (semantic-analyze-find-tags-by-prefix arg))))))
+                             (semantic-analyze-find-tags-by-prefix arg))))
+    ('meta (funcall company-semantic-metadata-function
+                    (semantic-analyze-find-tag arg)))
+    ('doc-buffer (company-semantic-doc-buffer (semantic-analyze-find-tag arg)))
+    ))
 
 (provide 'company-semantic)
 ;;; company-semantic.el ends here