Switch from company to corfu for completion

README.md

@@ -27,7 +27,7 @@ in the approximate order of how much I use them, from most to least:
 * Erlang
 
 In particular, there's a nice config for *autocompletion* with
-[company](https://company-mode.github.io/), and
+[corfu](https://github.com/minad/corfu), and
 `flymake` (re-using backends from [flycheck](http://www.flycheck.org))
 is used to immediately highlight syntax errors in Ruby, Python,
 Javascript, Haskell and a number of other languages.

init.el

@@ -66,7 +66,7 @@
 (require 'init-recentf)
 (require 'init-minibuffer)
 (require 'init-hippie-expand)
-(require 'init-company)
+(require 'init-corfu)
 (require 'init-windows)
 (require 'init-sessions)
 (require 'init-mmm)

lisp/init-corfu.el

@@ -0,0 +1,31 @@
+;;; init-corfu.el --- Interactive completion in buffers -*- lexical-binding: t -*-
+;;; Commentary:
+;;; Code:
+
+;; WAITING: haskell-mode sets tags-table-list globally, breaks tags-completion-at-point-function
+;; TODO Default sort order should place [a-z] before punctuation
+
+(setq tab-always-indent 'complete)
+(require-package 'orderless)
+(with-eval-after-load 'vertico
+  (require 'orderless))
+(setq completion-styles '(orderless basic)
+      completion-category-defaults nil
+      completion-category-overrides nil)
+(setq completion-cycle-threshold 4)
+
+(when (maybe-require-package 'corfu)
+  (setq-default corfu-auto t)
+  (setq-default corfu-quit-no-match 'separator)
+  (add-hook 'after-init-hook 'global-corfu-mode)
+
+  (when (maybe-require-package 'corfu-doc)
+    (with-eval-after-load 'corfu
+      (add-hook 'corfu-mode-hook #'corfu-doc-mode)))
+
+  ;; TODO: https://github.com/jdtsmith/kind-icon
+  )
+
+
+(provide 'init-corfu)
+;;; init-corfu.el ends here

lisp/init-nix.el

@@ -8,18 +8,8 @@
   (maybe-require-package 'nix-buffer)
 
   (when (maybe-require-package 'nixos-options)
-    (when (maybe-require-package 'company-nixos-options)
-      (with-eval-after-load 'company
-        (with-eval-after-load 'nix-mode
-          ;; Patch pending https://github.com/travisbhartwell/nix-emacs/pull/46
-          (with-eval-after-load 'company-nixos-options
-            (defun company-nixos--in-nix-context-p ()
-              (unless (executable-find "nix-build")
-                (or (derived-mode-p 'nix-mode 'nix-repl-mode)
-                    (let ((file-name (buffer-file-name (current-buffer))))
-                      (and file-name (equal "nix" (file-name-extension file-name))))))))
-
-          (add-to-list 'company-backends 'company-nixos-options))))))
+    ;; TODO: write a CAPF backend based on company-nixos-options
+    ))
 
 
 (provide 'init-nix)

lisp/init-php.el

@@ -3,11 +3,7 @@
 ;;; Code:
 
 (when (maybe-require-package 'php-mode)
-  (maybe-require-package 'smarty-mode)
-
-  (when (maybe-require-package 'company-php)
-    (with-eval-after-load 'company
-      (add-to-list 'company-backends 'company-ac-php-backend))))
+  (maybe-require-package 'smarty-mode))
 
 (provide 'init-php)
 ;;; init-php.el ends here

lisp/init-ruby.el

@@ -57,10 +57,7 @@
 ;;; Robe
 (when (maybe-require-package 'robe)
   (with-eval-after-load 'ruby-mode
-    (add-hook 'ruby-mode-hook 'robe-mode))
-  (with-eval-after-load 'robe
-    (with-eval-after-load 'company
-      (add-to-list 'company-backends 'company-robe))))
+    (add-hook 'ruby-mode-hook 'robe-mode)))
 
 
 

lisp/init-slime.el

@@ -5,21 +5,13 @@
 (require-package 'slime)
 (push (expand-file-name "contrib" (file-name-directory (locate-library "slime"))) load-path)
 
-(when (maybe-require-package 'slime-company)
-  (setq slime-company-completion 'fuzzy
-        slime-company-after-completion 'slime-company-just-one-space)
-  (with-eval-after-load 'slime-company
-    (add-to-list 'company-backends 'company-slime)))
-
 
 ;;; Lisp buffers
 
 (with-eval-after-load 'slime
   (setq slime-protocol-version 'ignore)
   (setq slime-net-coding-system 'utf-8-unix)
   (let ((features '(slime-fancy slime-repl slime-fuzzy)))
-    (when (require 'slime-company nil t)
-      (push 'slime-company features))
     (slime-setup features)) )
 
 

lisp/init-terraform.el

@@ -5,15 +5,13 @@
 ;;; Terraform
 
 (when (maybe-require-package 'terraform-mode)
-  (when (maybe-require-package 'company-terraform)
-    (with-eval-after-load 'terraform-mode
-      (company-terraform-init)
-
-      ;; I find formatters based on "reformatter" to be more reliable
-      ;; so I redefine `terraform-format-on-save-mode' here.
-      (when (maybe-require-package 'reformatter)
-        (reformatter-define terraform-format
-          :program "terraform" :args '("fmt" "-"))))))
+  ;; TODO: find/write a replacement for company-terraform
+  (with-eval-after-load 'terraform-mode
+    ;; I find formatters based on "reformatter" to be more reliable
+    ;; so I redefine `terraform-format-on-save-mode' here.
+    (when (maybe-require-package 'reformatter)
+      (reformatter-define terraform-format
+        :program "terraform" :args '("fmt" "-")))))
 
 (provide 'init-terraform)
 ;;; init-terraform.el ends here