fix(typescript) fix ts init process with .tsx files (syl20bnr#15885)

fixes syl20bnr#15217 fixes syl20bnr#15412
real-or-random · Jan 13, 2023 · d9457ca · d9457ca
1 parent c958ca5
commit d9457ca
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/layers/+lang/typescript/packages.el b/layers/+lang/typescript/packages.el
@@ -101,7 +101,6 @@
 (defun typescript/post-init-web-mode ()
   (define-derived-mode typescript-tsx-mode web-mode "TypeScript-tsx")
   (add-to-list 'auto-mode-alist '("\\.tsx\\'" . typescript-tsx-mode))
-  (spacemacs/typescript-mode-init 'typescript-tsx-mode-local-vars-hook)
   (spacemacs/typescript-mode-config 'typescript-tsx-mode))
 
 (defun typescript/init-typescript-mode ()
@@ -110,7 +109,9 @@
     :init
     (progn
       (spacemacs/typescript-safe-local-variables '(lsp tide))
-      (spacemacs/typescript-mode-init 'typescript-mode-local-vars-hook))
+      (spacemacs/typescript-mode-init 'typescript-mode-local-vars-hook)
+      ;; init tsx locals here to get proper order 
+      (spacemacs/typescript-mode-init 'typescript-tsx-mode-local-vars-hook))
     :config (spacemacs/typescript-mode-config 'typescript-mode)))
 
 (defun typescript/pre-init-import-js ()