fix: define minor mode before the functions that need to check for it

emacs-lsp · Nov 27, 2024 · 49895b7 · 49895b7
1 parent 231b867
commit 49895b7
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/lsp-inline-completion.el b/lsp-inline-completion.el
@@ -390,10 +390,23 @@ lsp-inline-completion-mode is active"
   :type '(repeat function)
   :group 'lsp-mode)
 
-
 (defvar-local lsp-inline-completion--idle-timer nil
   "The idle timer used by lsp-inline-completion-mode")
 
+(define-minor-mode lsp-inline-completion-mode
+  "Mode automatically displaying inline completions."
+  :lighter nil
+  (cond
+   ((and lsp-inline-completion-mode lsp--buffer-workspaces)
+    (add-hook 'lsp-on-change-hook #'lsp-inline-completion--after-change nil t))
+   (t
+    (when lsp-inline-completion--idle-timer
+      (cancel-timer lsp-inline-completion--idle-timer))
+
+    (lsp-inline-completion-cancel)
+
+    (remove-hook 'lsp-on-change-hook #'lsp-inline-completion--after-change t))))
+
 (defun lsp-inline-completion--maybe-display (buffer)
   (when (and (buffer-live-p buffer)
              (eq (current-buffer) buffer)
@@ -413,21 +426,6 @@ lsp-inline-completion-mode is active"
                             #'lsp-inline-completion--maybe-display
                             buffer)))))
 
-(define-minor-mode lsp-inline-completion-mode
-  "Mode automatically displaying inline completions."
-  :lighter nil
-  (cond
-   ((and lsp-inline-completion-mode lsp--buffer-workspaces)
-    (add-hook 'lsp-on-change-hook #'lsp-inline-completion--after-change nil t))
-   (t
-    (when lsp-inline-completion--idle-timer
-      (cancel-timer lsp-inline-completion--idle-timer))
-
-    (lsp-inline-completion-cancel)
-
-    (remove-hook 'lsp-on-change-hook #'lsp-inline-completion--after-change t))))
-
-
 ;;;###autoload
 (add-hook 'lsp-configure-hook (lambda ()
                                 (when (and lsp-inline-completion-enable