From 43d76ebe42702418595bb7cbde5c3344a963f105 Mon Sep 17 00:00:00 2001 From: lawrsp <7957003+lawrsp@users.noreply.github.com> Date: Tue, 10 Jan 2023 07:14:49 +0800 Subject: [PATCH] fix(typescript) fix ts init process with .tsx files (#15885) fixes https://github.com/syl20bnr/spacemacs/issues/15217 fixes https://github.com/syl20bnr/spacemacs/issues/15412 --- layers/+lang/typescript/packages.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layers/+lang/typescript/packages.el b/layers/+lang/typescript/packages.el index 5a84710a1..418970d63 100644 --- 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 ()