diff --git a/lib/extensions/typescript.el b/lib/extensions/typescript.el index 89777ce..e19bb2e 100644 --- a/lib/extensions/typescript.el +++ b/lib/extensions/typescript.el @@ -10,7 +10,7 @@ ;; Dependencies ---------------------------------- (depends-on 'typescript-mode) -(depends-on 'tide) + (defun typescript-doc () "Something fun.") diff --git a/lib/extensions/typescript/init.el b/lib/extensions/typescript/init.el index f59d8ec..d8d8f21 100644 --- a/lib/extensions/typescript/init.el +++ b/lib/extensions/typescript/init.el @@ -9,18 +9,18 @@ (setq tmp-directory (concat (getenv "HOME") "/.tmp")) ;; aligns annotation to the right hand side (setq company-tooltip-align-annotations t) - - ;; formats the buffer before saving - (add-hook 'before-save-hook 'tide-format-before-save) - (add-hook 'typescript-mode-hook #'setup-tide-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)) + +(defun lsp-typescript-config () + (interactive) + (require 'lsp) + (require 'lsp-clients)) + ;;;###autoload (defun extensions/typescript-initialize () "Initialize the typescript extension." @@ -30,8 +30,9 @@ (add-hook 'web-mode-hook (lambda () (when (string-equal "tsx" (file-name-extension buffer-file-name)) - (setup-tide-mode) - (tide-hl-identifier-mode)))) + (setup-tide-mode)))) + + (add-hook 'typescript-mode-hook #'lsp-typescript-config) ;; enable typescript-tslint checker (flycheck-add-mode 'typescript-tslint 'web-mode)))