From 0e6f2856c4177a3612be5aea35fcb540882fb0df Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Mon, 15 Mar 2021 23:10:08 +0000
Subject: [PATCH] chore(lsp): move lsp-ui config into siren-lsp module

There's no need for having lsp-ui setup in a separate siren-lsp-ui
module, as there's little to no reason to ever use lsp-mode without
lsp-ui.
---
 core/siren-core-modules.el  |  1 -
 modules/lsp/siren-lsp-ui.el | 37 -------------------------------------
 modules/lsp/siren-lsp.el    | 25 +++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 38 deletions(-)
 delete mode 100644 modules/lsp/siren-lsp-ui.el

diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index d389ec3..7a5523d 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -74,7 +74,6 @@
 
 ;; Language Servers
 (require 'siren-lsp)
-(require 'siren-lsp-ui)
 (require 'siren-helm-lsp)
 
 ;; Debugging
diff --git a/modules/lsp/siren-lsp-ui.el b/modules/lsp/siren-lsp-ui.el
deleted file mode 100644
index 8964368..0000000
--- a/modules/lsp/siren-lsp-ui.el
+++ /dev/null
@@ -1,37 +0,0 @@
-;;; siren-lsp-ui.el --- jimeh's Emacs Siren: lsp-ui configuration.
-
-;;; Commentary:
-
-;; Basic configuration for lsp-ui.
-
-;;; Code:
-
-(require 'siren-lsp)
-
-(use-package lsp-ui
-  :defer t
-  :bind (:map lsp-ui-mode-map
-              ("C-c C-d" . lsp-ui-doc-glance)
-              ("C-c d" . lsp-ui-doc-show)
-              ("M-?" . lsp-ui-peek-find-references)
-              ("C-c C-j" . lsp-ui-peek-find-definitions))
-
-  :custom
-  (lsp-ui-doc-alignment 'window)
-  (lsp-ui-doc-delay 0.2)
-  (lsp-ui-doc-enable t)
-  (lsp-ui-doc-header nil)
-  (lsp-ui-doc-include-signature t)
-  (lsp-ui-doc-max-height 45)
-  (lsp-ui-doc-position 'at-point)
-  (lsp-ui-doc-show-with-cursor nil)
-  (lsp-ui-doc-show-with-mouse t)
-  (lsp-ui-doc-use-webkit nil)
-  (lsp-ui-peek-always-show nil)
-  (lsp-ui-sideline-enable t)
-  (lsp-ui-sideline-show-code-actions t)
-  (lsp-ui-sideline-show-diagnostics t)
-  (lsp-ui-sideline-show-hover t))
-
-(provide 'siren-lsp-ui)
-;;; siren-lsp-ui.el ends here
diff --git a/modules/lsp/siren-lsp.el b/modules/lsp/siren-lsp.el
index 751e325..257a6a5 100644
--- a/modules/lsp/siren-lsp.el
+++ b/modules/lsp/siren-lsp.el
@@ -46,5 +46,30 @@
     (setq-local company-idle-delay 0.3
                 company-minimum-prefix-length 1)))
 
+(use-package lsp-ui
+  :defer t
+  :bind (:map lsp-ui-mode-map
+              ("C-c C-d" . lsp-ui-doc-glance)
+              ("C-c d" . lsp-ui-doc-show)
+              ("M-?" . lsp-ui-peek-find-references)
+              ("C-c C-j" . lsp-ui-peek-find-definitions))
+
+  :custom
+  (lsp-ui-doc-alignment 'window)
+  (lsp-ui-doc-delay 0.2)
+  (lsp-ui-doc-enable t)
+  (lsp-ui-doc-header nil)
+  (lsp-ui-doc-include-signature t)
+  (lsp-ui-doc-max-height 45)
+  (lsp-ui-doc-position 'at-point)
+  (lsp-ui-doc-show-with-cursor nil)
+  (lsp-ui-doc-show-with-mouse t)
+  (lsp-ui-doc-use-webkit nil)
+  (lsp-ui-peek-always-show nil)
+  (lsp-ui-sideline-enable t)
+  (lsp-ui-sideline-show-code-actions t)
+  (lsp-ui-sideline-show-diagnostics t)
+  (lsp-ui-sideline-show-hover t))
+
 (provide 'siren-lsp)
 ;;; siren-lsp.el ends here