From 5cb34fa15155c6525ceb33a715b6c1944410bad3 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Sun, 29 Jun 2025 17:53:43 +0200
Subject: [PATCH] refactor!: remove highlight-numbers

BREAKING CHANGE: Numerics will no longer be syntax highlighted in major
modes that don't already have their own (or provided by tree-sitter). No
substitute will be provided because it's trivial for the user to install
themselves.

Ref: https://github.com/orgs/doomemacs/projects/5/views/1?pane=issue&itemId=117610783
---
 lisp/doom-editor.el                    | 1 -
 lisp/doom-ui.el                        | 5 -----
 lisp/packages.el                       | 1 -
 modules/completion/ivy/autoload/ivy.el | 4 ++--
 modules/lang/elixir/config.el          | 7 +------
 modules/lang/emacs-lisp/config.el      | 2 --
 6 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/lisp/doom-editor.el b/lisp/doom-editor.el
index 0274f131a..91031ec61 100644
--- a/lisp/doom-editor.el
+++ b/lisp/doom-editor.el
@@ -646,7 +646,6 @@ on."
   (cl-callf append so-long-minor-modes
     '(spell-fu-mode
       eldoc-mode
-      highlight-numbers-mode
       better-jumper-local-mode
       ws-butler-mode
       auto-composition-mode
diff --git a/lisp/doom-ui.el b/lisp/doom-ui.el
index ca1469fb7..00c0f4eee 100644
--- a/lisp/doom-ui.el
+++ b/lisp/doom-ui.el
@@ -479,11 +479,6 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
 (add-hook! '(completion-list-mode-hook Man-mode-hook)
            #'hide-mode-line-mode)
 
-;; Many major modes do no highlighting of number literals, so we do it for them
-(use-package! highlight-numbers
-  :hook ((prog-mode conf-mode) . highlight-numbers-mode)
-  :config (setq highlight-numbers-generic-regexp "\\_<[[:digit:]]+\\(?:\\.[0-9]*\\)?\\_>"))
-
 ;;;###package image
 (setq image-animate-loop t)
 
diff --git a/lisp/packages.el b/lisp/packages.el
index 452b08445..d6e026eb2 100644
--- a/lisp/packages.el
+++ b/lisp/packages.el
@@ -23,7 +23,6 @@
 ;; doom-ui.el
 (package! nerd-icons :pin "d972dee349395ffae8fceae790d22fedc8fe08e8")
 (package! hide-mode-line :pin "ddd154f1e04d666cd004bf8212ead8684429350d")
-(package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307")
 (package! rainbow-delimiters :pin "f40ece58df8b2f0fb6c8576b527755a552a5e763")
 (package! restart-emacs :pin "1607da2bc657fe05ae01f7fdf26f716eafead02c")
 
diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index a48fe9813..e904d06dc 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -56,8 +56,8 @@ Buffers that are considered unreal (see `doom-real-buffer-p') are dimmed with
             (prin1-to-string val))
            ((stringp val)
             (propertize (format "%S" val) 'face 'font-lock-string-face))
-           ((numberp val)
-            (propertize (format "%s" val) 'face 'highlight-numbers-number))
+           ((and (numberp val) (facep 'font-lock-number-face)) ; introduced in 29.1+
+            (propertize (format "%s" val) 'face 'font-lock-number-face))
            ((format "%s" val)))
      t)))
 
diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el
index d49f5d9aa..770dc1544 100644
--- a/modules/lang/elixir/config.el
+++ b/modules/lang/elixir/config.el
@@ -46,12 +46,7 @@
       (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]_build\\'")))
 
   (when (modulep! +tree-sitter)
-    (add-hook 'elixir-mode-local-vars-hook #'tree-sitter! 'append))
-
-  (after! highlight-numbers
-    (puthash 'elixir-mode
-             "\\_<-?[[:digit:]]+\\(?:_[[:digit:]]\\{3\\}\\)*\\_>"
-             highlight-numbers-modelist)))
+    (add-hook 'elixir-mode-local-vars-hook #'tree-sitter! 'append)))
 
 
 (use-package! flycheck-credo
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 0f90fc246..25d525d76 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -166,8 +166,6 @@ See `+emacs-lisp-non-package-mode' for details.")
         (append '(("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)"
                    (1 font-lock-comment-face)
                    (2 font-lock-constant-face)))
-                (when (require 'highlight-numbers nil t)
-                  (highlight-numbers--get-regexp-for-mode 'emacs-lisp-mode))
                 (cl-loop for (matcher . match-highlights)
                          in (append lisp-el-font-lock-keywords-2
                                     lisp-cl-font-lock-keywords-2)