lsp-javascript: add cjs extension and js-ts-mode in ts-ls (#4121)

emacs-lsp · Aug 23, 2023 · f8ed844 · f8ed844
1 parent 2e6683f
commit f8ed844
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/clients/lsp-javascript.el b/clients/lsp-javascript.el
@@ -50,8 +50,8 @@
 
 (defun lsp-typescript-javascript-tsx-jsx-activate-p (filename &optional _)
   "Check if the js-ts lsp server should be enabled based on FILENAME."
-  (or (string-match-p "\\.mjs\\|\\.[jt]sx?\\'" filename)
-      (and (derived-mode-p 'js-mode 'typescript-mode 'typescript-ts-mode)
+  (or (string-match-p "\\.[cm]js\\|\\.[jt]sx?\\'" filename)
+      (and (derived-mode-p 'js-mode 'js-ts-mode 'typescript-mode 'typescript-ts-mode)
            (not (derived-mode-p 'json-mode)))))
 
 ;; Unmaintained sourcegraph server