From 8760979fb52dfedb9575f28a9aca2d5cbe6f2a04 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 1 Sep 2025 17:51:05 +0200 Subject: [PATCH] fix(javascript): tsx-ts-mode config & lsp activation Because the `tsx-ts-mode` major mode is housed in the `typescript-ts-mode` package (there is no `tsx-ts-mode` package). Fix: #8478 --- modules/lang/javascript/config.el | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index fd89d28d6..c4ee96049 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -77,25 +77,18 @@ (use-package! typescript-ts-mode ; 29.1+ only :when (modulep! +tree-sitter) :mode "\\.ts\\'" + :mode ("\\.[tj]sx\\'" . tsx-ts-mode) :init (set-tree-sitter! 'typescript-mode 'typescript-ts-mode '((typescript :url "https://github.com/tree-sitter/tree-sitter-typescript" :commit "8e13e1db35b941fc57f2bd2dd4628180448c17d5" :source-dir "typescript/src"))) - :config - (+javascript-common-config 'typescript-ts-mode)) - - -(use-package! tsx-ts-mode ; 29.1+ only - :when (modulep! +tree-sitter) - :mode "\\.[tj]sx\\'" - :defer t - :init (set-tree-sitter! nil 'tsx-ts-mode '((tsx :url "https://github.com/tree-sitter/tree-sitter-typescript" :commit "8e13e1db35b941fc57f2bd2dd4628180448c17d5" :source-dir "tsx/src"))) :config + (+javascript-common-config 'typescript-ts-mode) (+javascript-common-config 'tsx-ts-mode))