[elpa] externals/company 48976b7 2/2: Merge pull request #1154 from yugaego/refactor

[ELPA Syncer]

branch: externals/company
commit 48976b701763fe93576ef8cf1c8cd98359d084c9
Merge: 7b731e7 be8e346
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>

    Merge pull request #1154 from yugaego/refactor
    
    Merge variables declaration and assignment
---
 company.el | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/company.el b/company.el
index dd15fb5..a0313b1 100644
--- a/company.el
+++ b/company.el
@@ -2526,24 +2526,6 @@ With ARG, move by that many elements."
         (company-set-selection (- company-selection
                                   company-tooltip-limit))))))
 
-(defvar company-pseudo-tooltip-overlay)
-
-(defvar company-tooltip-offset)
-
-(defun company--inside-tooltip-p (event-col-row row height)
-  (let* ((ovl company-pseudo-tooltip-overlay)
-         (column (overlay-get ovl 'company-column))
-         (width (overlay-get ovl 'company-width))
-         (evt-col (car event-col-row))
-         (evt-row (cdr event-col-row)))
-    (and (>= evt-col column)
-         (< evt-col (+ column width))
-         (if (> height 0)
-             (and (> evt-row row)
-                  (<= evt-row (+ row height) ))
-           (and (< evt-row row)
-                (>= evt-row (+ row height)))))))
-
 (defun company--event-col-row (event)
   (company--posn-col-row (event-start event)))
 
@@ -2677,6 +2659,11 @@ See `company-quick-access-keys' for more details."
   (when row
     (company--complete-nth row)))
 
+(defvar-local company-tooltip-offset 0
+  "Current scrolling state of the tooltip.
+Represented by the index of the first visible completion candidate
+from the candidates list.")
+
 (defun company--complete-nth (row)
   "Insert a candidate visible on the tooltip's zero-based ROW."
   (when (company-manual-begin)
@@ -2931,13 +2918,6 @@ If SHOW-VERSION is non-nil, show the version in the echo 
area."
 
 ;;; pseudo-tooltip 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defvar-local company-pseudo-tooltip-overlay nil)
-
-(defvar-local company-tooltip-offset 0
-  "Current scrolling state of the tooltip.
-Represented by the index of the first visible completion candidate
-from the candidates list.")
-
 (defvar-local company--tooltip-current-width 0)
 
 (defun company-tooltip--lines-update-offset (selection num-lines limit)
@@ -3385,6 +3365,22 @@ Value of SELECTED determines the added face."
 
 ;; show
 
+(defvar-local company-pseudo-tooltip-overlay nil)
+
+(defun company--inside-tooltip-p (event-col-row row height)
+  (let* ((ovl company-pseudo-tooltip-overlay)
+         (column (overlay-get ovl 'company-column))
+         (width (overlay-get ovl 'company-width))
+         (evt-col (car event-col-row))
+         (evt-row (cdr event-col-row)))
+    (and (>= evt-col column)
+         (< evt-col (+ column width))
+         (if (> height 0)
+             (and (> evt-row row)
+                  (<= evt-row (+ row height) ))
+           (and (< evt-row row)
+                (>= evt-row (+ row height)))))))
+
 (defun company--pseudo-tooltip-height ()
   "Calculate the appropriate tooltip height.
 Returns a negative number if the tooltip should be displayed above point."