From 276f557e530d8568d437dd6efc3b99a2297b7318 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Sat, 19 Sep 2020 18:25:51 +0300
Subject: [PATCH] Update typescript settings

---
 05lsp.el                | 2 +-
 languages/erlang.el     | 2 +-
 languages/javascript.el | 2 +-
 languages/web.el        | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/05lsp.el b/05lsp.el
index e9cf732..1992a0d 100644
--- a/05lsp.el
+++ b/05lsp.el
@@ -8,7 +8,7 @@
   :defer t
   :requires (company)
   :config (setq-default lsp-file-watch-threshold 10000
-                        lsp-restart 'interactive
+                        lsp-restart 'auto-restart
                         lsp-prefer-capf t
                         lsp-completion-provider :capf
                         lsp-server-trace nil
diff --git a/languages/erlang.el b/languages/erlang.el
index 8a76d8e..5e06ed4 100644
--- a/languages/erlang.el
+++ b/languages/erlang.el
@@ -73,7 +73,7 @@
                       (plist-get erlang/current-erlang :erlang-path)))
 
   (require 'erlang-start)
-  (set-indent 2)
+  (set-indent 4)
   (column-enforce-n 80)
 
   ;; Set specific ctags command
diff --git a/languages/javascript.el b/languages/javascript.el
index 67ff050..86fe9a6 100644
--- a/languages/javascript.el
+++ b/languages/javascript.el
@@ -15,7 +15,7 @@
 (add-to-list 'auto-mode-alist '("\\.json\\'" . js2-mode))
 
 ;; Use js2-mode for typescript editing
-(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode))
+(add-to-list 'auto-mode-alist '("\\.ts\\'" . js2-mode))
 
 (defun activate-js2-mode ()
 	"JS2 mode overrides."
diff --git a/languages/web.el b/languages/web.el
index c7efc82..c7cc46b 100644
--- a/languages/web.el
+++ b/languages/web.el
@@ -40,6 +40,8 @@
                '(company-yasnippet capf))
 
 	(when (string-match-p "jsx" (buffer-file-name))
+		(lsp))
+	(when (string-match-p "tsx" (buffer-file-name))
 		(lsp)))
 
 (add-hook 'web-mode-hook 'activate-web-mode)