Extend JS/TS LS to work with any web-mode derived mode (#788)

* Extend JS/TS LS to work with any web-mode derived mode

* Check file suffix only

* Update JS/TS check to use regex

* Integrate review suggestions

Author: d4ncer

lsp-clients.el

@@ -97,13 +97,9 @@ finding the executable with variable `exec-path'."
   :risky t
   :type '(repeat string))
 
-(defun lsp-typescript-javascript-tsx-jsx-activate-p (filename mode)
-  "Check if the javascript-typescript language server should be enabled
-based on FILE-NAME and MAJOR-MODE"
-  (or (member mode '(typescript-mode typescript-tsx-mode js-mode js-jsx-mode js2-mode js2-jsx-mode rjsx-mode))
-      (and (eq major-mode 'web-mode)
-           (or (string-suffix-p ".tsx" filename t)
-               (string-suffix-p ".jsx" filename t)))))
+(defun lsp-typescript-javascript-tsx-jsx-activate-p (filename &optional _)
+  "Check if the javascript-typescript language server should be enabled based on FILENAME."
+  (string-match-p (rx (one-or-more char) "." (or "ts" "js") (opt "x") string-end) filename))
 
 (lsp-register-client
  (make-lsp-client :new-connection (lsp-stdio-connection (lambda ()

test/lsp-clients-test.el

@@ -75,4 +75,14 @@
   (let ((major-mode 'js-mode))
     (should (not (lsp-clients-flow-activate-p (concat test-location "fixtures/SampleTypeScriptProject/src/sample.ts") nil)))))
 
+(ert-deftest lsp-typescript-javascript-activates-based-on-file-extension ()
+  (should (lsp-typescript-javascript-tsx-jsx-activate-p "abc.js"))
+  (should (lsp-typescript-javascript-tsx-jsx-activate-p "abc.jsx"))
+  (should (lsp-typescript-javascript-tsx-jsx-activate-p "abc.ts"))
+  (should (lsp-typescript-javascript-tsx-jsx-activate-p "abc.tsx"))
+  (should (lsp-typescript-javascript-tsx-jsx-activate-p "a1.ts"))
+  (should (lsp-typescript-javascript-tsx-jsx-activate-p "a1.d.ts"))
+  (should (not (lsp-typescript-javascript-tsx-jsx-activate-p "abc.tsxx")))
+  (should (not (lsp-typescript-javascript-tsx-jsx-activate-p "abc.jss"))))
+
 ;;; lsp-clients-test.el ends here