Update packages

lisp/icejam-lsp.el

@@ -6,6 +6,10 @@
 
 ;; (use-package lsp-mode :ensure (:depth 5) :requires (company))
 (with-eval-after-load 'lsp-mode
+  (add-to-list 'lsp-disabled-clients '(typescript-ts-mode . vue-semantic-server))
+  (add-to-list 'lsp-disabled-clients '(js-mode . vue-semantic-server))
+  (add-to-list 'lsp-disabled-clients '(css-mode . vue-semantic-server))
+
   (setq-default lsp-file-watch-threshold 10000
                 lsp-restart 'auto-restart
                 lsp-prefer-capf t
@@ -15,19 +19,9 @@
                 lsp-diagnostics-provider :flymake
                 lsp-lens-mode nil
                 read-process-output-max (* 1024 1024 4)
-                ;; Disable the piece of shit vue LSP server. It activates itself in every
-                ;; project with .js, .ts or .json file due to something called 'takeover
-                ;; mode' or 'hybrid mode' or some such.
-                ;; It would be okay, but it also doesn't work 99% of the time.
-
-                ;; When needed, enable this hot garbage in dir-locals.el
-                lsp-disabled-clients '(vue-semantic-server
-                                       vls
-                                       ;; Ruby LSP servers, none of which actually work.
-                                       ruby-ls
-                                       rubocop-ls
-                                       typeprof-ls)
                 lsp-log-io nil
+                ;; Do not use Vue language server for everything .JS/TS/TSX
+                lsp-volar-take-over-mode nil
                 lsp-enable-file-watchers nil)
   (unbind-key "s-l =" lsp-mode-map)
   (unbind-key "s-l G" lsp-mode-map)

lisp/langs/icejam-lang-elixir.el

@@ -14,10 +14,11 @@
   :after (elixir-mode lsp-mode lsp-ui)
   :defer t)
 
-(with-eval-after-load 'elixir-ts-mode
+(with-eval-after-load 'elixir-mode
   (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode))
   (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode)))
 
+
 (transient-define-prefix icejam-elixir-lang-menu ()
   "Elixir Buffer Commands."
   [""

lisp/langs/icejam-lang-javascript.el

@@ -9,7 +9,18 @@
 (use-package js2-mode :ensure t :defer t
   :after (web-mode company lsp-mode lsp-ui))
 
-(use-package typescript-mode :ensure t :defer t)
+(use-package typescript-ts-mode :ensure nil :defer t)
+
+(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode))
+(add-to-list 'auto-mode-alist '("\\.tsx\\'" . typescript-ts-mode))
+
+(defun icejam-activate-typescript-ts-mode ()
+  "Typescript mode overrides."
+  (icejam-set-indent 2)
+  (lsp-deferred)
+  (column-enforce-n 100))
+
+(add-hook 'typescript-ts-mode-hook 'icejam-activate-typescript-ts-mode)
 
 ;; (use-package vue-mode
 ;;   :ensure t

lisp/langs/icejam-lang-kotlin.el

@@ -10,17 +10,19 @@
 
 ;;; Code:
 (require 'icejam-prog-mode)
-(require 'icejam-blocking)
 
-(use-package kotlin-ts-mode :ensure t)
+(declare-function lsp "lsp-mode" nil)
+(declare-function column-enforce-n "column-enforce-mode" (number))
 
-(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 kotlin-ts-mode
+  :ensure t
+  :after (lsp-mode lsp-ui)
+  :defer t)
 
-(use-package gradle-mode
-	:defer t
-	:ensure t)
+(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 :ensure t)
 
 (defun icejam-activate-kotlin-mode ()
   "All things Kotlin."

lisp/langs/icejam-lang-web.el

@@ -31,14 +31,6 @@
 	(setq-local web-mode-markup-indent-offset 2)
   (setq-local lsp-eldoc-enable-hover nil)
   (setq-local flycheck-check-syntax-automatically '(save mode-enabled))
-
-  (add-to-list (make-local-variable 'company-backends)
-               '(company-capf company-yasnippet))
-
-	(when (string-match-p ".jsx" (buffer-file-name))
-		(lsp))
-	(when (string-match-p ".tsx" (buffer-file-name))
-		(lsp))
 	(when (string-match-p ".vue" (buffer-file-name))
 		(lsp)))