update to emacs 29 (mostly working)

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "elispfl"]
 	path = extensions/elispfl
 	url = [email protected]:cireu/elispfl.git
-[submodule "apheleia"]
-	path = extensions/apheleia
-	url = [email protected]:raxod502/apheleia.git
 [submodule "emacs-application-framework"]
 	path = extensions/emacs-application-framework
 	url = [email protected]:manateelazycat/emacs-application-framework.git

init.el

@@ -81,7 +81,7 @@
 (require 'init-help)
 (require 'init-read)
 
-;; (require 'init-flycheck)
+(require 'init-flycheck)
 (require 'init-vc)
 (require 'init-git)
 (require 'init-compile)

modes/init-buffer.el

@@ -73,7 +73,7 @@ current window."
 (defun jester/copy-buffer-name ()
   "Copy the buffer name, show it in minibuffer."
   (interactive)
-  (message (kill-new (buffer-name))))
+  (kill-new (message (buffer-name))))
 
 ;;----------------------------------------------------------------------------
 ;; switch major mode

modes/init-evil.el

@@ -644,10 +644,8 @@
 (dolist (cmd '(evil-yank evil-delete lispyville-yank lispyville-delete))
   (advice-add cmd :after 'jester/evil-portal-jump-advice))
 
-(evil-define-command jester/cycle-line-beginning-end ()
+(evil-define-motion jester/cycle-line-beginning-end (count)
   "Go to line text beginning, line end, line very beginning, in turn."
-  :repeat nil
-  (interactive)
   (cl-block 'my-return
     (when (and (looking-at "[^\s]") (looking-back "^\s*")) (evil-end-of-line) (cl-return-from 'my-return)) ; at beg of line text
     (when (looking-at (if evil-move-beyond-eol "$" ".$")) (evil-beginning-of-line) (cl-return-from 'my-return)) ; at end of line

modes/init-face.el

@@ -66,7 +66,7 @@
                       ;; :family "JetBrains Mono"
                       ;; :family "Fira Code"
                       :height jester-small-font-size
-                      :weight 'normal
+                      :weight 'medium
                       :width 'normal)
   (jester/set-fallback-fonts))
 
@@ -78,7 +78,7 @@
                       ;; :family "JetBrains Mono"
                       ;; :family "Fira Code"
                       :height jester-large-font-size
-                      :weight 'normal
+                      :weight 'medium
                       :width 'normal)
   (jester/set-fallback-fonts))
 

modes/init-file.el

@@ -28,9 +28,9 @@
 (defun jester/save-all-buffers ()
   "Save all buffers."
   ;; yas overlay and company-select-next has problem with this.
-  (when (and (not yas--active-snippets)
+  (when (and (or (not (boundp 'yas--active-snippets)) (not yas--active-snippets))
              ;; (not company-candidates)
-             (not acm-mode)
+             (or (not (boundp 'acm-mode)) (not acm-mode))
              (not (eq major-mode 'snippet-mode)))
     ;; https://github.com/manateelazycat/lazycat-emacs/commit/da13a688ef89f8ab2c577a3e9d2a7bcf0ef9b71d
     ;; https://emacs-china.org/t/topic/7687/30?u=jjpandari
@@ -147,7 +147,7 @@
   ;; list-buffers-directory is the variable set in dired buffers
   (let ((file-name (or (buffer-file-name) list-buffers-directory)))
     (if file-name
-        (message (kill-new file-name))
+        (kill-new (message file-name))
       (error "Buffer not visiting a file"))))
 
 

modes/init-flycheck.el

@@ -1,12 +1,13 @@
 (use-package flycheck
-  :hook (prog-mode . flycheck-mode)
+  ;; using lsp-bridge now, but still require this file since flycheck-* is used in many places
+  ;; :hook (prog-mode . flycheck-mode)
   :config
   (setq flycheck-idle-change-delay 1)
   (evil-set-initial-state 'flycheck-error-list-mode 'motion)
-  (jester/with-leader
-   "e l" 'flycheck-list-errors
-   "e p" 'flycheck-previous-error
-   "e n" 'flycheck-next-error)
+  ;; (jester/with-leader
+  ;;  "e l" 'flycheck-list-errors
+  ;;  "e p" 'flycheck-previous-error
+  ;;  "e n" 'flycheck-next-error)
   (general-define-key
    :states '(motion)
    :keymaps 'flycheck-error-list-mode-map

modes/init-formatter.el

@@ -1,7 +1,5 @@
-(push (expand-file-name "apheleia" jester-submodules-dir) load-path)
+;; (push (expand-file-name "apheleia" jester-submodules-dir) load-path)
 (use-package apheleia
-  :ensure nil
-  :straight nil
   :init
   (jester/with-major-leader '(js2-mode-map web-mode-map typescript-mode-map)
     "f" 'apheleia-format-buffer)

modes/init-ivy.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: t -*-
 (use-package ivy
   :demand t
   :custom
@@ -207,10 +208,12 @@ If called interactively, let the user select start directory first."
   :demand t
   :after ivy
   :config
-  (defhydra+ hydra-ivy ()
-    ("a" nil)
-    ("<escape>" keyboard-escape-quit :exit t)
-    ("q" keyboard-escape-quit :exit t)))
+  ;; TODO eager macro expansion error
+  ;; (defhydra+ hydra-ivy ()
+  ;;   ("a" nil)
+  ;;   ("<escape>" keyboard-escape-quit :exit t)
+  ;;   ("q" keyboard-escape-quit :exit t))
+  )
 
 
 (use-package wgrep

modes/init-javascript.el

@@ -192,7 +192,7 @@
                           ".test.jsx" ".spec.jsx"
                           ".test.ts" ".spec.ts"
                           ".test.tsx" ".spec.tsx")))
-      (setq jester-test-command (format "(cd %s && node node_modules/.bin/jest %s --collectCoverageOnlyFrom '')" (projectile-project-root) file-name)))))
+      (setq jester-test-command (format "(cd %s && node node_modules/.bin/jest --detectOpenHandles --forceExit %s --collectCoverageOnlyFrom '')" (projectile-project-root) file-name)))))
 
 (add-hook! '(js2-mode-hook typescript-mode-hook web-mode-hook) 'jester/set-js-ts-test-command)
 
@@ -207,12 +207,12 @@
     (condition-case err
         (js2-jump-to-definition)
       (error (citre-jump)))))
-(general-define-key
- :states '(normal motion)
- :keymaps '(js2-mode-map)
- "g d" 'jester/js2-jump-or-citre-jump
- ;; "g r" 'jester/xref-find-references-at-point
- )
+;; (general-define-key
+;;  :states '(normal motion)
+;;  :keymaps '(js2-mode-map)
+;;  "g d" 'jester/js2-jump-or-citre-jump
+;;  ;; "g r" 'jester/xref-find-references-at-point
+;;  "g p" 'xref-pop-marker-stack)
 
 
 (provide 'init-javascript)

modes/init-jump.el

@@ -27,12 +27,10 @@
  :states '(normal motion)
  :keymaps '(typescript-mode-map web-mode-map js2-mode-map)
  "g d" 'lsp-bridge-find-def
- "g p" 'lsp-bridge-find-def-return)
-(general-define-key
- :states 'normal
- :keymaps '(typescript-mode-map web-mode-map js2-mode-map)
+ "g p" 'lsp-bridge-find-def-return
  "g r" 'lsp-bridge-find-references
  "g t" 'lsp-bridge-find-type-def)
+
 (jester/with-major-leader '(typescript-mode-map web-mode-map js2-mode-map)
   "r" 'lsp-bridge-rename)
 (jester/with-leader
@@ -65,11 +63,11 @@
   (setq xref-show-xrefs-function #'ivy-xref-show-xrefs))
 
 
-(use-package citre
-  :custom ((citre-enable-imenu-integration nil)
-           (citre-tags-file-names '("tagz" ".tags" "tags")))
-  :init
-  (require 'citre-config))
+;; (use-package citre
+;;   :custom ((citre-enable-imenu-integration nil)
+;;            (citre-tags-file-names '("tagz" ".tags" "tags")))
+;;   :init
+;;   (require 'citre-config))
 ;; TODO try `citre-peek'
 
 

modes/init-lsp-bridge.el

@@ -4,6 +4,7 @@
   :straight (lsp-bridge :type git :host github :repo "manateelazycat/lsp-bridge"
                         :files ("*" (:exclude ".git" "test")))
   :init
+  ;; TODO a new face to inherit markdown mode
   (setq acm-enable-tabnine nil
         ;; TODO acm-enable-codeium
         acm-enable-yas nil
@@ -12,6 +13,7 @@
         acm-candidate-match-function 'orderless-flex
         acm-enable-quick-access t ; select candidate with number key
         acm-quick-access-use-number-select t
+        lsp-bridge-enable-signature-help nil
         lsp-bridge-signature-show-function 'lsp-bridge-signature-show-with-frame
         lsp-bridge-signature-show-with-frame-position "top-left"
         lsp-bridge-enable-hover-diagnostic t)
@@ -21,6 +23,9 @@
 
   (evil-set-initial-state 'lsp-bridge-ref-mode 'emacs)
 
+  ;; TODO what's the face for error pop?
+  (set-face-attribute 'lsp-bridge-ref-font-lock-diagnostic nil :foreground (face-attribute 'error :foreground))
+
   (jester/with-minor-leader 'lsp-bridge-mode
     "d" 'lsp-bridge-popup-documentation)
 

modes/init-markdown.el

@@ -5,7 +5,9 @@
   :commands markdown-mode
   :mode "\\.md\\.html\\'"
   :config
-  (set-face-attribute 'markdown-code-face nil :family "Fira Code"))
+  (set-face-attribute 'markdown-code-face nil
+                      :family "Fira Code"
+                      :height 140))
 
 
 (provide 'init-markdown)

modes/init-misc.el

@@ -57,6 +57,10 @@
     (add-to-list 'recentf-exclude no-littering-var-directory)
     (add-to-list 'recentf-exclude no-littering-etc-directory)))
 
+
+;; (use-package emacs-gc-stats
+;;   )
+
 ;; TODO remember layout when ediff
 
 

modes/init-org.el

@@ -304,7 +304,8 @@ typical word processor."
    :states '(insert emacs)
    :keymaps 'org-mode-map
    "<tab>" 'org-cycle
-   "C-d" 'backward-char))
+   "C-d" 'org-metaleft
+   "C-f" 'org-metaright))
 
 ;; TODO org-superstar
 (use-package org-bullets
@@ -321,7 +322,8 @@ typical word processor."
   (general-define-key
    :states '(insert)
    :keymaps 'evil-org-mode-map
-   "C-d" 'backward-char))
+   "C-d" 'org-metaleft
+   "C-f" 'org-metaright))
 
 
 (provide 'init-org)

modes/init-themes.el

@@ -13,7 +13,14 @@
               'solarized-light)
             t)
 
+;; TODO duplicate with theme hook, how to dedup?
+(when (memq 'solarized-light custom-enabled-themes)
+  (custom-set-faces '(web-mode-keyword-face ((t (:inherit font-lock-keyword-face
+                                                          :foreground unspecified
+                                                          :weight unspecified))))))
+
 
+;; TODO `enable-theme-functions' when 29
 ;; https://gist.github.com/hlissner/1ace77658c772cf150a43dc9396fa2ed
 (defvar load-theme-hook nil
   "Hook run after the theme is loaded with `load-theme'.")
@@ -25,12 +32,11 @@
 
 (advice-add #'load-theme :after #'run-load-theme-hooks)
 
-;; TODO `enable-theme-functions' when 29
 (add-hook! 'load-theme-hook
   (when (memq 'solarized-light custom-enabled-themes)
-    (custom-theme-set-faces
-     'solarized-light
-     '(web-mode-keyword-face ((t (:inherit 'font-lock-keyword-face)))))))
+    (custom-set-faces '(web-mode-keyword-face ((t (:inherit font-lock-keyword-face
+                                                            :foreground unspecified
+                                                            :weight unspecified)))))))
 
 
 (provide 'init-themes)

snippets/js2-mode/import

@@ -2,4 +2,4 @@
 # name: import
 # key: imp
 # --
-import ${2:\{ $0 \}} from '$1';
+import ${2:\{ $0 \} from }'$1';

snippets/js2-mode/useEffect

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: useEffect
+# key: ue
+# --
+useEffect(() => {
+  $0
+}${1:, [$2]});