Use advice to allow focus instead of removing hook

Author: Sorixelle

lsp-ui-doc.el

@@ -87,6 +87,11 @@ This only takes effect when `lsp-ui-doc-position' is 'top or 'bottom."
                  (const :tag "Window" window))
   :group 'lsp-ui-doc)
 
+(defcustom lsp-ui-doc-border "white"
+  "Border color of the frame."
+  :type 'color
+  :group 'lsp-ui-doc)
+
 (defcustom lsp-ui-doc-max-width 150
   "Maximum number of columns of the frame."
   :type 'integer
@@ -469,7 +474,10 @@ FN is the function to call on click."
            (url-hexify-string lsp-ui-doc--render-string))
           'lsp-ui-doc--webkit-resize-callback))
      (erase-buffer)
-     (insert (s-trim lsp-ui-doc--render-string))
+     (let ((inline-p (lsp-ui-doc--inline-p)))
+       (insert (concat (unless inline-p (propertize "\n" 'face '(:height 0.2)))
+                       (s-trim lsp-ui-doc--render-string)
+                       (unless inline-p (propertize "\n\n" 'face '(:height 0.3))))))
      (lsp-ui-doc--make-clickable-link))
    (setq-local face-remapping-alist `((header-line lsp-ui-doc-header)))
    (setq-local window-min-height 1)
@@ -624,12 +632,14 @@ The structure of INFO is defined in the documentation of `posframe-show'."
                     ('(bottom window) #'posframe-poshandler-window-bottom-right-corner)
                     ('(at-point frame) #'lsp-ui-doc--posframe-poshandler-point-top-left-corner)
                     ('(at-point window) #'lsp-ui-doc--posframe-poshandler-point-top-left-corner)))
-        (border-width (if lsp-ui-doc-use-webkit 0 8))
         (frame (posframe-show buffer
                               :width lsp-ui-doc-max-width
                               :height lsp-ui-doc-max-height
                               :poshandler position
-                              :internal-border-width border-width
+                              :internal-border-width 1
+                              :internal-border-color lsp-ui-doc-border
+                              :left-fringe t
+                              :right-fringe t
                               :background-color (face-background 'lsp-ui-doc-background nil t)
                               :override-parameters params))
         (window (frame-root-window frame)))
@@ -762,12 +772,16 @@ before, or if the new window is the minibuffer."
         (push '(lsp-ui-doc-frame . :never) frameset-filter-alist)))
     (add-hook 'post-command-hook 'lsp-ui-doc--make-request nil t)
     (add-hook 'delete-frame-functions 'lsp-ui-doc--on-delete nil t)
-    (remove-hook 'focus-in-hook 'posframe--redirect-posframe-focus t))
+    (advice-add #'posframe--redirect-posframe-focus
+                :before-until (lambda (&rest _)
+                                lsp-ui-doc-frame-mode)
+                '((name . lsp-ui-doc--dont-redirect-posframe))))
    (t
     (lsp-ui-doc-hide)
     (remove-hook 'post-command-hook 'lsp-ui-doc--make-request t)
     (remove-hook 'delete-frame-functions 'lsp-ui-doc--on-delete t)
-    (add-hook 'focus-in-hook 'posframe--redirect-posframe-focus nil t))))
+    (advice-remove #'posframe--redirect-posframe-focus
+                   'lsp-ui-doc--dont-redirect-posframe))))
 
 (defun lsp-ui-doc-enable (enable)
   "Enable/disable ‘lsp-ui-doc-mode’.
@@ -810,9 +824,7 @@ It is supposed to be called from `lsp-ui--toggle'"
   :init-value nil
   :lighter ""
   :group lsp-ui-doc
-  :keymap `(([?q] . lsp-ui-doc-unfocus-frame))
-  (when lsp-ui-doc-frame-mode
-    (remove-hook 'focus-in-hook 'posframe--redirect-posframe-focus t)))
+  :keymap `(([?q] . lsp-ui-doc-unfocus-frame)))
 
 (defun lsp-ui-doc-focus-frame ()
   "Focus into lsp-ui-doc-frame."