From de1fd38481ef653c0f9456b0bdea414aba97cdb2 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 1 Aug 2023 01:35:36 +0100 Subject: [PATCH] fix(language/typescript): ensure it loads correctly --- core/siren-core-modules.el | 5 +---- modules/languages/siren-typescript.el | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el index b46726c..07b7054 100644 --- a/core/siren-core-modules.el +++ b/core/siren-core-modules.el @@ -229,15 +229,12 @@ (require 'siren-terraform) (require 'siren-thrift) (require 'siren-toml) +(require 'siren-typescript) (require 'siren-vue) (require 'siren-web-mode) (require 'siren-x509) (require 'siren-xml) (require 'siren-yaml) -;; Languages that require Emacs' 29.x built-in treesit functionality. -(when (fboundp 'treesit-ready-p) - (require 'siren-typescript)) - (provide 'siren-core-modules) ;;; siren-core-modules.el ends here diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el index 1fc1d64..708ce9c 100644 --- a/modules/languages/siren-typescript.el +++ b/modules/languages/siren-typescript.el @@ -7,7 +7,7 @@ ;;; Code: ;; Requires Emacs 29.x or later for built-in treesit support. -(when (fboundp 'treesit-ready-p) +(when (fboundp 'typescript-ts-mode) (require 'siren-flycheck) (require 'siren-lsp) (require 'siren-treesit)