Use TS mode for Kotlin

lisp/icejam-base.el

@@ -54,6 +54,7 @@
   (setopt gcmh-verbose nil) ;; Do not log GC messages
   (setopt gcmh-idle-delay 'auto) ;; Compute GC delay based on gcmh-auto-idle-delay-factor
   (setopt gcmh-auto-idle-delay-factor 10) ;; Original value was 10
+  (setopt gcmh-high-cons-threshold (* 128 1024 1024))
   (gcmh-mode t))
 
 ;; #====================== Backup config #==============================

lisp/icejam-blocking.el

@@ -17,6 +17,8 @@
 (setenv "LSP_USE_PLISTS" "true")
 (use-package lsp-mode :ensure t)
 
+;; Finally, wait for installation of these four packages.
+(declare-function elpaca-wait "elpaca")
 (elpaca-wait)
 
 (provide 'icejam-blocking)

lisp/icejam-completing-read.el

@@ -2,7 +2,8 @@
 ;;; Commentary:
 ;;;
 ;;; completing-read is the way of completing things in minibuffer.  This module
-;;; provides all of that functionality, everything related to minbuffer being helpful.
+;;; provides all of that functionality, everything related to minbuffer being
+;;; helpful.
 ;;;
 ;;; Code:
 
@@ -38,6 +39,10 @@
   (setopt vertico-resize t) ;; Grow and shrink the vertico minibufffer
   (setopt vertico-cycle t)  ;; Cycle completion
 
+  ;; Add working page up /down
+  (keymap-set vertico-map "<next>" 'vertico-scroll-up)
+  (keymap-set vertico-map "<prior>" 'vertico-scroll-down)
+
   (declare-function vertico-mode "vertico")
   (vertico-mode t))
 
@@ -62,7 +67,7 @@
 --search-zip --hidden --glob \"!.git/*\"")
   :bind (:map icejam-keys-mode-map
               ("C-c t" . find-file)
-              ("M-g"   . consult-goto-line)
+              ("M-g g" . consult-goto-line)
               ("C-c a" . consult-ripgrep)))
 
 (use-package helpful :ensure t)

lisp/icejam-fonts.el

@@ -18,20 +18,20 @@
 ;; (defconst icejam-font "Input Mono Condensed"
 ;; (defconst icejam-font "SF Mono"
 ;; (defconst icejam-font "Monaco"
-;; (defconst icejam-font "JetBrains Mono"
+;; (defconst icejam-font "JetBrains Mono" "Default font.")
 ;; (defconst icejam-font "JuliaMono"
 ;; (defconst icejam-font "Rec Mono Semicasual"
-;; (defconst icejam-font "Victor Mono"
 ;; (defconst icejam-font "IBM Plex Mono"
 ;; (defconst icejam-font "Berkeley Mono Trial"
 ;; (defconst icejam-font "Inconsolata"
+;; (defconst icejam-font "Victor Mono Medium" "Default font.")
+
+(defconst icejam-font "Iosevka Term" "Default font.")
 
-(defconst icejam-font "Iosevka Term"
-  "Default font.")
 (defconst icejam-font-size 14
   "Default size of then font.
 It is used to calculated the size in relation to the screen
-in icejam-set-font-to-screen.")
+in `icejam-set-font-to-screen`.")
 
 (defcustom icejam-mut-font
   icejam-font
@@ -49,7 +49,7 @@ in icejam-set-font-to-screen.")
 (defvar lsp-ui-doc-frame-hook)
 
 (defun icejam-set-lsp-ui-font-hook ()
-  "Reset LSP IO font to specified icejam-font and icejam-font-size."
+  "Reset LSP IO font to specified `icejam-font` and `icejam-font-size`."
   (setopt lsp-ui-doc-frame-hook nil)
   (add-hook 'lsp-ui-doc-frame-hook
             (lambda (frame _w)

lisp/langs/icejam-lang-elixir.el

@@ -39,7 +39,7 @@
   (icejam-set-indent 2)
   (column-enforce-n 98)
   (lsp)
-  (setq-local flycheck-check-syntax-automatically '(save mode-enabled))
+  ;; (setq-local flycheck-check-syntax-automatically '(save mode-enabled))
   (setq-local lsp-eldoc-enable-hover nil)
   (setq-local lsp-completion-enable-additional-text-edit nil)
   (setq-local company-minimum-prefix-length 3)

lisp/langs/icejam-lang-kotlin.el

@@ -9,10 +9,14 @@
 ;; kotlin does a thing.
 
 ;;; Code:
+(require 'icejam-prog-mode)
+(require 'icejam-blocking)
 
-(use-package kotlin-mode
-	:defer t
-	:ensure t)
+(use-package kotlin-ts-mode :ensure t)
+
+(with-eval-after-load 'kotlin-ts-mode
+  (add-to-list 'auto-mode-alist '("\\.kt\\'" . kotlin-ts-mode))
+  (add-to-list 'auto-mode-alist '("\\.kts\\'" . kotlin-ts-mode)))
 
 (use-package gradle-mode
 	:defer t
@@ -20,15 +24,11 @@
 
 (defun icejam-activate-kotlin-mode ()
   "All things Kotlin."
-  (icejam-set-indent 4)
+  (icejam-set-indent 2)
   (column-enforce-n 100)
-  (lsp)
+  (lsp))
 
-  ;; Company list override
-  (add-to-list (make-local-variable 'company-backends)
-               '(company-capf company-yasnippet)))
-
-(add-hook 'kotlin-mode-hook 'icejam-activate-kotlin-mode)
+(add-hook 'kotlin-ts-mode-hook 'icejam-activate-kotlin-mode)
 
 (provide 'icejam-lang-kotlin)
 ;;; icejam-lang-kotlin.el ends here