Fiddle with tide stuff

.emacs.d/custom.el

@@ -17,7 +17,7 @@
  '(comint-prompt-read-only t)
  '(comint-scroll-to-bottom-on-input t)
  '(company-backends
-   '(company-bbdb company-nxml company-css company-eclim company-semantic company-clang company-xcode company-cmake company-capf company-files
+   '(company-bbdb company-nxml company-css company-semantic company-clang company-cmake company-capf company-files
                   (company-dabbrev-code company-gtags company-etags company-keywords)
                   company-oddmuse company-dabbrev company-flow))
  '(css-indent-offset 2)
@@ -58,7 +58,7 @@
  '(org-odd-levels-only t)
  '(org-todo-keywords '((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED")))
  '(package-selected-packages
-   '(zig-mode modus-operandi-theme esup gnu-elpa-keyring-update lsp-hack hack-mode rust-mode filladapt lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode tss switch-window python-mode paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi tide elm-mode monky))
+   '(prettier-js zig-mode modus-operandi-theme esup gnu-elpa-keyring-update lsp-hack hack-mode rust-mode filladapt lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode tss switch-window python-mode paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi tide elm-mode monky))
  '(reb-re-syntax 'string)
  '(rmail-mail-new-frame t)
  '(safe-local-variable-values

.emacs.d/init.el

@@ -252,7 +252,7 @@
 (setq w32-use-w32-font-dialog t)
 
 ;; Adaptive fill for everybody!
-(use-package filladapt :ensure
+(use-package filladapt :ensure t
   :init (setq-default filladapt-mode t))
 
 (require 'ido)
@@ -284,10 +284,17 @@
 
 (add-hook 'text-mode-hook 'my-text-mode-hook)
 
+;; =================================================================
+;; Company?
+;; =================================================================
+(use-package company :ensure t
+  :commands company-mode
+  :hook (typescript-mode . company-mode))
+
 ;; =================================================================
 ;; LSP-mode. Common configuration for LSP-based systems.
 ;; =================================================================
-(use-package lsp-mode :ensure
+(use-package lsp-mode :ensure t
   :commands lsp-mode
   :config
   (use-package company-lsp
@@ -631,7 +638,6 @@
 ;; JavaScript Support
 ;; =================================================================
 ;; (require 'rjsx-mode)
-(require 'prettier-js)
 (require 'flycheck-flow)
 (require 'flow-minor-mode)
 
@@ -644,11 +650,11 @@
 ;; (add-to-list 'auto-mode-alist '("\\.js$" . rjsx-mode))
 ;; (add-to-list 'auto-mode-alist '("\\.jsx$" . rjsx-mode))
 
-(defun my-js-mode-hook ()
+;; (defun my-js-mode-hook ()
-  "My custom javascript mode hook."
+;;   "My custom javascript mode hook."
-  (add-node-modules-path)
+;;   (add-node-modules-path)
-  (flow-minor-enable-automatically)
+;;   (flow-minor-enable-automatically)
-  (prettier-js-mode))
+;;   (prettier-js-mode))
 
 ;; (add-hook 'rjsx-mode-hook #'my-js-mode-hook)
 
@@ -707,7 +713,7 @@
 ;; =================================================================
 ;; Go (#golang) Mode
 ;; =================================================================
-(use-package go-mode :ensure
+(use-package go-mode :ensure t
   :mode "\\.go\\'")
 
 ;; (require 'auto-complete-config)
@@ -744,24 +750,18 @@
 ;; =================================================================
 ;; Typescript-Mode
 ;; =================================================================
-(defun setup-tide-mode ()
+(use-package typescript-mode :ensure t)
-  "Common hooks for tide.
 
-(See more at https://github.com/ananthakumaran/tide.)"
+(use-package add-node-modules-path :ensure t
-  (interactive)
+  :hook typescript-mode)
-  (tide-setup)
-  (flycheck-mode +1)
-  (setq flycheck-check-syntax-automatically '(save mode-enabled))
-  (eldoc-mode +1)
-  (tide-hl-identifier-mode +1)
-  (company-mode +1))
 
-;; ;; aligns annotation to the right hand side
+(use-package prettier-js :ensure t
-;; (setq company-tooltip-align-annotations t)
+  :hook (typescript-mode . prettier-js-mode))
 
-;; formats the buffer before saving
+(use-package tide :ensure t
-(add-hook 'before-save-hook 'tide-format-before-save)
+  :hook ((typescript-mode . eldoc-mode)
-(add-hook 'typescript-mode-hook #'setup-tide-mode)
+         (typescript-mode . tide-setup)
+         (typescript-mode . tide-hl-identifier-mode)))
 
 ;; =================================================================
 ;; Archive mode for appx
@@ -818,7 +818,7 @@
 (setq vc-handled-backends (remove 'Hg vc-handled-backends))
 ;; But I have monky enabled so I can use it instead.
 (use-package monky
-  :ensure
+  :ensure t
   :config
   (setq monky-process-type 'cmdserver)
   :bind
@@ -895,7 +895,7 @@
 ;; =================================================================
 ;; Clojure
 ;; =================================================================
-(use-package clojure-mode :ensure
+(use-package clojure-mode :ensure t
     :mode (("\\.clj\\'" . clojure-mode)
            ("\\.edn\\'" . clojure-mode))
     :config
@@ -923,7 +923,7 @@
 ;; ================================================================
 ;; Zig
 ;; ================================================================
-(use-package zig-mode :ensure
+(use-package zig-mode :ensure t
     :mode (("\\.zig\\'" . zig-mode))
     :config
     (require 'lsp) ;; There's a use-package somewhere else...?