From 18faa0ba32c9ce751c16960b2a39b3880b523272 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Sat, 2 Apr 2022 02:19:54 +0200 Subject: Suggestive patch for simplified completion NOTE: The patch is largely untested. Modifications: - Update readme.org - Remove geiser-company - Move Company extensions to geiser-completion Omissions: - geiser-company--inhibit-autodoc has been removed. Eldoc handling should be implemented in the frontend, not in the backend. See for example: https://github.com/minad/corfu/blob/04fbfce3d7e9c125a7fd22a34455a508247a522b/corfu.el#L1212 - The quickhelp-string action and geiser-company--docstring have been removed. company-quickhelp can use `:company-doc-buffer` instead with minimal overhead. See: https://github.com/company-mode/company-quickhelp/blob/3ca2708b4e5190205aca01d65fe1b391963a53f9/company-quickhelp.el#L138 - The automatic Company setup has been removed. Personally I am not a fan of such auto configuration. It is better if completion is configured consistently in the user configuration. You may want to restore the auto configuration for backward compatibility. It depends on your backward compatibility story. I am fine with rare breaking changes from time to time. - There is a cyclic dependency between geiser-edit/geiser-doc and geiser-completion, which should be untangled. --- elisp/geiser-mode.el | 7 ------- 1 file changed, 7 deletions(-) (limited to 'elisp/geiser-mode.el') diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el index a7f49a1..2354bf2 100644 --- a/elisp/geiser-mode.el +++ b/elisp/geiser-mode.el @@ -17,7 +17,6 @@ (require 'geiser-doc) (require 'geiser-compile) (require 'geiser-completion) -(require 'geiser-company) (require 'geiser-xref) (require 'geiser-edit) (require 'geiser-autodoc) @@ -53,11 +52,6 @@ active when `geiser-mode' is activated in a buffer." :group 'geiser-autodoc :type 'boolean) -(geiser-custom--defcustom geiser-mode-company-p t - "Whether to use company-mode for completion, if available." - :group 'geiser-mode - :type 'boolean) - (geiser-custom--defcustom geiser-mode-smart-tab-p nil "Whether `geiser-smart-tab-mode' gets enabled by default in Scheme buffers." :group 'geiser-mode @@ -391,7 +385,6 @@ interacting with the Geiser REPL is at your disposal. (when geiser-mode (geiser-impl--set-buffer-implementation nil t)) (setq geiser-autodoc-mode-string "/A") (setq geiser-smart-tab-mode-string "/T") - (geiser-company--setup (and geiser-mode geiser-mode-company-p)) (geiser-completion--setup geiser-mode) (when geiser-mode-autodoc-p (geiser-autodoc-mode (if geiser-mode 1 -1))) -- cgit v1.2.3