Revert #705 (#707)

* Move require lsp-ui to each separat files

* Remove predefined

* rev indentation

* First revert for now

Author: jcs090218

lsp-ui-doc.el

@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(require 'lsp-ui-util)
+
 (require 'lsp-protocol)
 (require 'lsp-mode)
 (require 'dash)
@@ -52,9 +54,6 @@
 (declare-function xwidget-webkit-execute-script-rv "ext:xwidget" (xwidget script &optional default))
 (declare-function xwidget-resize "ext:xwidget" (xwidget new-width new-height))
 
-(declare-function lsp-ui-kill-timer 'lsp-ui)
-(declare-function lsp-ui-delete-overlay 'lsp-ui)
-
 (defgroup lsp-ui-doc nil
   "Display informations of the current line."
   :group 'tools
@@ -65,8 +64,7 @@
 
 (defcustom lsp-ui-doc-enable t
   "Whether or not to enable lsp-ui-doc.
-Displays documentation of the symbol at point on hover. This only takes effect
-when a buffer is started."
+Displays documentation of the symbol at point on hover. This only takes effect when a buffer is started."
   :type 'boolean
   :group 'lsp-ui)
 
@@ -183,31 +181,31 @@ Only the `background' is used in this face."
   :group 'lsp-ui-doc)
 
 (defvar lsp-ui-doc-frame-parameters
-  '((left                     . -1)
-    (no-focus-on-map          . t)
-    (min-width                . 0)
-    (width                    . 0)
-    (min-height               . 0)
-    (height                   . 0)
-    (internal-border-width    . 1)
-    (vertical-scroll-bars     . nil)
-    (horizontal-scroll-bars   . nil)
-    (right-fringe             . 0)
-    (menu-bar-lines           . 0)
-    (tool-bar-lines           . 0)
-    (tab-bar-lines            . 0)
+  '((left . -1)
+    (no-focus-on-map . t)
+    (min-width  . 0)
+    (width  . 0)
+    (min-height  . 0)
+    (height  . 0)
+    (internal-border-width . 1)
+    (vertical-scroll-bars . nil)
+    (horizontal-scroll-bars . nil)
+    (right-fringe . 0)
+    (menu-bar-lines . 0)
+    (tool-bar-lines . 0)
+    (tab-bar-lines . 0)
     (tab-bar-lines-keep-state . 0)
-    (line-spacing             . 0)
-    (unsplittable             . t)
-    (undecorated              . t)
-    (top                      . -1)
-    (visibility               . nil)
-    (mouse-wheel-frame        . nil)
-    (no-other-frame           . t)
+    (line-spacing . 0)
+    (unsplittable . t)
+    (undecorated . t)
+    (top . -1)
+    (visibility . nil)
+    (mouse-wheel-frame . nil)
+    (no-other-frame . t)
     (inhibit-double-buffering . t)
-    (drag-internal-border     . t)
-    (no-special-glyphs        . t)
-    (desktop-dont-save        . t))
+    (drag-internal-border . t)
+    (no-special-glyphs . t)
+    (desktop-dont-save . t))
   "Frame parameters used to create the frame.")
 
 (defvar lsp-ui-doc-render-function nil
@@ -246,8 +244,6 @@ Because some variables are buffer local.")
 (defvar-local lsp-ui-doc--from-mouse-current nil
   "Non nil when the current call is triggered by a mouse event")
 
-(defvar-local lsp-ui-doc--unfocus-frame-timer nil)
-
 (defconst lsp-ui-doc--buffer-prefix " *lsp-ui-doc-")
 
 (defmacro lsp-ui-doc--with-buffer (&rest body)
@@ -426,8 +422,8 @@ We don't extract the string that `lps-line' is already displaying."
   "Hide the frame."
   (setq lsp-ui-doc--bounds nil
         lsp-ui-doc--from-mouse nil)
-  (lsp-ui-delete-overlay lsp-ui-doc--inline-ov)
-  (lsp-ui-delete-overlay lsp-ui-doc--highlight-ov)
+  (lsp-ui-util-safe-delete-overlay lsp-ui-doc--inline-ov)
+  (lsp-ui-util-safe-delete-overlay lsp-ui-doc--highlight-ov)
   (when-let ((frame (lsp-ui-doc--get-frame)))
     (when (frame-visible-p frame)
       (make-frame-invisible frame))))
@@ -893,15 +889,15 @@ HEIGHT is the documentation number of lines."
     (run-hook-with-args 'lsp-ui-doc-frame-hook frame window)
     (when lsp-ui-doc-use-webkit
       (define-key (current-global-map) [xwidget-event]
-                  (lambda ()
-                    (interactive)
-                    (let ((xwidget-event-type (nth 1 last-input-event)))
-                      ;; (when (eq xwidget-event-type 'load-changed)
-                      ;;   (lsp-ui-doc--move-frame (lsp-ui-doc--get-frame)))
-                      (when (eq xwidget-event-type 'javascript-callback)
-                        (let ((proc (nth 3 last-input-event))
-                              (arg (nth 4 last-input-event)))
-                          (funcall proc arg))))))
+        (lambda ()
+          (interactive)
+          (let ((xwidget-event-type (nth 1 last-input-event)))
+            ;; (when (eq xwidget-event-type 'load-changed)
+            ;;   (lsp-ui-doc--move-frame (lsp-ui-doc--get-frame)))
+            (when (eq xwidget-event-type 'javascript-callback)
+              (let ((proc (nth 3 last-input-event))
+                    (arg (nth 4 last-input-event)))
+                (funcall proc arg))))))
       (lsp-ui-doc--webkit-run-xwidget))
     frame))
 
@@ -924,7 +920,7 @@ HEIGHT is the documentation number of lines."
                          (and (looking-at "[[:graph:]]") (cons (point) (1+ (point))))))
         (unless (equal lsp-ui-doc--bounds bounds)
           (lsp-ui-doc--hide-frame)
-          (lsp-ui-kill-timer lsp-ui-doc--timer)
+          (lsp-ui-util-safe-kill-timer lsp-ui-doc--timer)
           (setq lsp-ui-doc--timer
                 (run-with-idle-timer
                  lsp-ui-doc-delay nil
@@ -1171,6 +1167,7 @@ It is supposed to be called from `lsp-ui--toggle'"
   (interactive)
   (lsp-ui-doc--hide-frame))
 
+(defvar-local lsp-ui-doc--unfocus-frame-timer nil)
 (defun lsp-ui-doc--glance-hide-frame ()
   "Hook to hide hover information popup for `lsp-ui-doc-glance'."
   (when (or (overlayp lsp-ui-doc--inline-ov)

lsp-ui-imenu.el

@@ -35,8 +35,7 @@
 
 (require 'lsp-mode)
 (require 'dash)
-
-(declare-function lsp-ui-kill-timer 'lsp-ui)
+(require 'lsp-ui-util)
 
 (defgroup lsp-ui-imenu nil
   "Display imenu entries."
@@ -380,7 +379,7 @@ ITEMS are used when the kind position is 'left."
 
 (defun lsp-ui-imenu--start-refresh (&rest _)
   "Starts the auto refresh timer."
-  (lsp-ui-kill-timer lsp-ui-imenu--refresh-timer)
+  (lsp-ui-util-safe-kill-timer lsp-ui-imenu--refresh-timer)
   (setq lsp-ui-imenu--refresh-timer
         (run-with-idle-timer lsp-ui-imenu-auto-refresh-delay nil #'lsp-ui-imenu--refresh)))
 

lsp-ui-peek.el

@@ -39,8 +39,6 @@
 (require 'xref)
 (require 'dash)
 
-(declare-function lsp-ui--mute-apply 'lsp-ui)
-
 (defgroup lsp-ui-peek nil
   "Improve version of xref with peek feature."
   :group 'tools
@@ -183,12 +181,12 @@ will cause performances issues.")
   (eval '(progn
            (evil-define-motion lsp-ui-peek-jump-backward (count)
                                (lsp-ui-peek--with-evil-jumps
-                                   (evil--jump-backward count)
-                                 (run-hooks 'xref-after-return-hook)))
+                                (evil--jump-backward count)
+                                (run-hooks 'xref-after-return-hook)))
            (evil-define-motion lsp-ui-peek-jump-forward (count)
                                (lsp-ui-peek--with-evil-jumps
-                                   (evil--jump-forward count)
-                                 (run-hooks 'xref-after-return-hook))))
+                                (evil--jump-forward count)
+                                (run-hooks 'xref-after-return-hook))))
         t))
 
 (defmacro lsp-ui-peek--prop (prop &optional string)
@@ -348,8 +346,10 @@ XREFS is a list of references/definitions."
   (with-temp-buffer
     (insert string)
     (delay-mode-hooks
-      (lsp-ui--mute-apply (funcall major))
-      (ignore-errors (font-lock-ensure)))
+      (let ((inhibit-message t))
+        (funcall major))
+      (ignore-errors
+        (font-lock-ensure)))
     (buffer-string)))
 
 (defun lsp-ui-peek--peek ()
@@ -635,8 +635,7 @@ EXTRA is a plist of extra parameters."
                            (append extra (lsp--text-document-position-params))))
 
 (defun lsp-ui-peek--extract-chunk-from-buffer (pos start end)
-  "Return the chunk of code pointed to by POS (a Position object) in the current
-buffer.
+  "Return the chunk of code pointed to by POS (a Position object) in the current buffer.
 START and END are delimiters."
   (let* ((point (lsp--position-to-point pos))
          (inhibit-field-text-motion t)

lsp-ui-sideline.el

@@ -30,6 +30,7 @@
 
 ;;; Code:
 
+(require 'lsp-ui-util)
 (require 'lsp-protocol)
 (require 'lsp-mode)
 (require 'flycheck nil 'noerror)
@@ -43,8 +44,6 @@
 (declare-function flycheck-error-format-message-and-id "ext:flycheck.el")
 (declare-function flycheck-error-level "ext:flycheck.el")
 
-(declare-function lsp-ui-line-number-display-width 'lsp-ui)
-
 (defgroup lsp-ui-sideline nil
   "Display information for the current line."
   :group 'tools
@@ -326,8 +325,8 @@ CURRENT is non-nil when the point is on the symbol."
      (propertize str 'display (lsp-ui-sideline--compute-height)))))
 
 (defun lsp-ui-sideline--check-duplicate (symbol info)
-  "Check if there's already a SYMBOL containing INFO, unless
-`lsp-ui-sideline-ignore-duplicate' is set to t."
+  "Check if there's already a SYMBOL containing INFO, unless `lsp-ui-sideline-ignore-duplicate'
+is set to t."
   (not (when lsp-ui-sideline-ignore-duplicate
          (--any (and (string= (overlay-get it 'symbol) symbol)
                      (string= (overlay-get it 'info) info))
@@ -350,7 +349,7 @@ CURRENT is non-nil when the point is on the symbol."
      (if (< emacs-major-version 27)
          ;; This was necessary with emacs < 27, recent versions take
          ;; into account the display-line width with :align-to
-         (lsp-ui-line-number-display-width)
+         (lsp-ui-util-line-number-display-width)
        0)
      (if (or
           (bound-and-true-p whitespace-mode)
@@ -364,7 +363,7 @@ CURRENT is non-nil when the point is on the symbol."
      (or (and (>= emacs-major-version 27)
               ;; We still need this number when calculating available space
               ;; even with emacs >= 27
-              (lsp-ui-line-number-display-width))
+              (lsp-ui-util-line-number-display-width))
          0)))
 
 (defun lsp-ui-sideline--valid-tag-p (tag mode)
@@ -436,8 +435,7 @@ CURRENT is non-nil when the point is on the symbol."
           (lsp-ui-sideline--toggle-current ov nil))))))
 
 (defun lsp-ui-sideline--split-long-lines (lines)
-  "Fill LINES so that they are not longer than
-`lsp-ui-sideline-diagnostic-max-line-length' characters."
+  "Fill LINES so that they are not longer than `lsp-ui-sideline-diagnostic-max-line-length' characters."
   (cl-mapcan (lambda (line)
                (if (< (length line) lsp-ui-sideline-diagnostic-max-line-length)
                    (list line)
@@ -451,8 +449,7 @@ CURRENT is non-nil when the point is on the symbol."
 (defun lsp-ui-sideline--diagnostics (buffer bol eol)
   "Show diagnostics belonging to the current line.
 Loop over flycheck errors with `flycheck-overlay-errors-in'.
-Find appropriate position for sideline overlays with
-`lsp-ui-sideline--find-line'.
+Find appropriate position for sideline overlays with `lsp-ui-sideline--find-line'.
 Push sideline overlays on `lsp-ui-sideline--ovs'."
   (when (and (bound-and-true-p flycheck-mode)
              (bound-and-true-p lsp-ui-sideline-mode)

lsp-ui-util.el

@@ -0,0 +1,71 @@
+;;; lsp-ui-util.el --- Utility module for Lsp-Ui  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2020 Shen, Jen-Chieh
+
+;; Author: Jen-Chieh Shen <[email protected]>
+;; URL: https://github.com/emacs-lsp/lsp-ui
+;; Keywords: languages, tools
+;; Version: 6.2
+
+;;; License
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;;
+;; Utility module for Lsp-Ui.
+;;
+
+;;; Code:
+
+(require 'face-remap)
+
+(defun lsp-ui-util-safe-kill-timer (timer)
+  "Safely kill the TIMER."
+  (when (timerp timer) (cancel-timer timer)))
+
+(defun lsp-ui-util-safe-delete-overlay (overlay)
+  "Safely delete the OVERLAY."
+  (when (overlayp overlay) (delete-overlay overlay)))
+
+(defun lsp-ui-util-line-number-display-width ()
+  "Safe way to get value from function `line-number-display-width'."
+  (if (bound-and-true-p display-line-numbers-mode)
+      ;; For some reason, function `line-number-display-width' gave
+      ;; us error `args-out-of-range' even we do not pass anything towards
+      ;; to it function. See the following links,
+      ;;
+      ;; - https://github.com/emacs-lsp/lsp-ui/issues/294
+      ;; - https://github.com/emacs-lsp/lsp-ui/issues/533 (duplicate)
+      (+ (or (ignore-errors (line-number-display-width)) 0) 2)
+    0))
+
+(defun lsp-ui-util-line-string (pos)
+  "Return string at POS."
+  (when (integerp pos) (save-excursion (goto-char pos) (thing-at-point 'line))))
+
+(defun lsp-ui-util-column (&optional pos)
+  "Return column at POS."
+  (setq pos (or pos (point)))
+  (save-excursion (goto-char pos) (current-column)))
+
+(defun lsp-ui-util-text-scale-factor ()
+  "Return the factor effect by `text-scale-mode'."
+  (or (plist-get (cdr text-scale-mode-remapping) :height) 1))
+
+(provide 'lsp-ui-util)
+;;; lsp-ui-util.el ends here

lsp-ui.el

@@ -81,14 +81,6 @@
       (+ (or (ignore-errors (line-number-display-width)) 0) 2)
     0))
 
-;;
-;;; Core
-
-(require 'lsp-ui-sideline)
-(require 'lsp-ui-peek)
-(require 'lsp-ui-imenu)
-(require 'lsp-ui-doc)
-
 (defconst lsp-ui-resources-dir
   (--> (or load-file-name (buffer-file-name))
        (file-name-directory it)