[elpa] 37/52: company-pseudo-tooltip-edit: update company-width

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit 8af882a94821787ccca987d926c7d26e7b2870e0
Author: Dmitry Gutov <address@hidden>
Date:   Fri Jun 13 18:50:27 2014 +0300

    company-pseudo-tooltip-edit: update company-width
    
    #138
---
 company-tests.el |   18 ++++++++++++++++++
 company.el       |    7 +++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/company-tests.el b/company-tests.el
index c4e4668..ea77b61 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -392,6 +392,24 @@
         (should (string= (overlay-get ov 'company-after)
                          "  123 \nc 45  c\nddd\n")))))))
 
+(ert-deftest company-pseudo-tooltip-edit-updates-width ()
+  :tags '(interactive)
+  (with-temp-buffer
+    (set-window-buffer nil (current-buffer))
+    (let ((company-candidates-length 5)
+          (company-candidates '("123" "45" "67" "89" "1011"))
+          (company-backend 'ignore)
+          (company-tooltip-limit 4)
+          (company-tooltip-offset-display 'scrollbar))
+      (company-pseudo-tooltip-show (company--row)
+                                   (company--column)
+                                   0)
+      (should (eq (overlay-get company-pseudo-tooltip-overlay 'company-width)
+                  6))
+      (company-pseudo-tooltip-edit 4)
+      (should (eq (overlay-get company-pseudo-tooltip-overlay 'company-width)
+                  7)))))
+
 (ert-deftest company-preview-show-with-annotations ()
   :tags '(interactive)
   (with-temp-buffer
diff --git a/company.el b/company.el
index 3e34519..c810100 100644
--- a/company.el
+++ b/company.el
@@ -2340,10 +2340,13 @@ Returns a negative number if the tooltip should be 
displayed above point."
     (company-pseudo-tooltip-show (1+ row) col company-selection)))
 
 (defun company-pseudo-tooltip-edit (selection)
-  (let ((height (overlay-get company-pseudo-tooltip-overlay 'company-height)))
+  (let* ((height (overlay-get company-pseudo-tooltip-overlay 'company-height))
+         (lines  (company--create-lines selection (abs height))))
+    (overlay-put company-pseudo-tooltip-overlay 'company-width
+                 (string-width (car lines)))
     (overlay-put company-pseudo-tooltip-overlay 'company-after
                  (apply 'company--replacement-string
-                        (company--create-lines selection (abs height))
+                        lines
                         (overlay-get company-pseudo-tooltip-overlay
                                      'company-replacement-args)))))