From 238e37a1714b71c30b386e0e5a7f978fab46fc93 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <accounts@v0.io>
Date: Sun, 29 Jul 2018 17:22:01 +0200
Subject: [PATCH] lang/racket: refactor and cleanup

+ Removed highlight-quoted block because `highlight-quoted-mode` is already autoloaded by the package
+ Removed org-babel-do-load-languages because lang/org/+babel already has a built-in autoloader for ob-* packages.
+ Removed flycheck-mode from racket-mode hook because it is enabled globally in :feature syntax-checker
+ Removed highlight-numbers-mode from racket-mode-hook because it is enabled on prog-mode-hook in core-ui (as of #770)
+ Fix racket popup rule regexp
+ Remove popup rules that were redundant with the defaults
+ Remove racket-mode-specific company-frontends value, looks like personal preference, otherwise should be set in a separate hook function that is easily recognized and disabled, if the user desires.
+ Remove :interpreter and :mode properties because they are already registered by the racket-mode package.
+ Move racket-unicode-input-method-enable into :hook property (to defer the config)
---
 modules/lang/racket/config.el | 47 ++++++-----------------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/modules/lang/racket/config.el b/modules/lang/racket/config.el
index f62a69597..7367fa8f8 100644
--- a/modules/lang/racket/config.el
+++ b/modules/lang/racket/config.el
@@ -1,17 +1,9 @@
 ;;; lang/racket/config.el -*- lexical-binding: t; -*-
 
 (def-package! racket-mode
-  :mode "\\.rkt$"
-  :interpreter "racket"
-  :init
-  (add-hook 'racket-repl-mode-hook 'racket-unicode-input-method-enable)
+  :hook ((racket-mode racket-repl-mode) . racket-unicode-input-method-enable)
   :config
-  (set-popup-rule! "*Racket REPL*"
-    :size 10
-    :select t
-    :modeline nil
-    :quit t
-    :transient 3)
+  (set-popup-rule! "^\\*Racket REPL" :size 10 :select t)
   (set-repl-handler! 'racket-mode #'+racket/repl)
   (set-eval-handler! 'racket-mode "racket")
   (set-company-backend! 'racket-mode '(company-abbrev
@@ -19,7 +11,7 @@
                                        company-dabbrev
                                        company-files))
   (set-lookup-handlers! 'racket-mode
-    :definition    #'racket-describe
+    :definition     #'racket-describe
     :documentation #'racket-doc)
   (set-docset! 'racket-mode "Racket")
   (set-pretty-symbols! 'racket-mode
@@ -28,24 +20,15 @@
     :dot     ".")
   (set-rotate-patterns! 'racket-mode
     :symbols '(("#true" "#false")))
-
+  
   (add-hook! racket-mode
-    #'(;; Internals
-       racket-unicode-input-method-enable
-       ;; 3rd-party functionality
+    #'(;; 3rd-party functionality
        doom|enable-delete-trailing-whitespace
        ;; fontification
        rainbow-delimiters-mode
-       highlight-quoted-mode
-       highlight-numbers-mode
-       ;; initialization
-       flycheck-mode))
+       highlight-quoted-mode))
 
-  (setq-hook! racket-mode
-      racket-smart-open-bracket-enable t
-      company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
-                          company-preview-if-just-one-frontend
-                          company-preview-common-frontend))
+  (setq-hook! racket-mode racket-smart-open-bracket-enable t)
 
   (map! :map racket-mode-map
         :localleader
@@ -85,19 +68,3 @@
         :n "A"   #'racket-unalign
         :nv ";"  #'comment-dwim
         :nv "\\" #'indent-region))
-
-
-;;
-;; Plugins
-;;
-
-(def-package! highlight-quoted
-  :commands highlight-quoted-mode)
-
-(after! org
-    (org-babel-do-load-languages
-     'org-babel-load-languages
-     (append org-babel-load-languages
-             '((racket   . t)
-               ;; (scribble . t)
-               ))))