awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-09-06 15:13:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(javascript): merge js-mode & js-ts-mode configs

Browse Source 
They are both defined in the same package (named `js`).
This commit is contained in:
Henrik Lissner
2025-09-02 16:03:19 +02:00
parent 58e2e2d8f7
commit f5c6c2a1bd
1 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/lang/javascript/config.el
View File

@@ -31,39 +31,34 @@
(when (modulep! +lsp) (when (modulep! +lsp)
(add-hook (intern (format "%s-local-vars-hook" mode)) #'lsp! 'append))) (add-hook (intern (format "%s-local-vars-hook" mode)) #'lsp! 'append)))
(pcase mode (if (not (memq mode '(typescript-mode typescript-ts-mode)))
((or 'js-mode 'js-ts-mode 'nodejs-repl-mode)
(set-docsets! mode "JavaScript" (set-docsets! mode "JavaScript"
"AngularJS" "Backbone" "BackboneJS" "Bootstrap" "D3JS" "EmberJS" "Express" "AngularJS" "Backbone" "BackboneJS" "Bootstrap" "D3JS" "EmberJS" "Express"
"ExtJS" "JQuery" "JQuery_Mobile" "JQuery_UI" "KnockoutJS" "Lo-Dash" "ExtJS" "JQuery" "JQuery_Mobile" "JQuery_UI" "KnockoutJS" "Lo-Dash"
"MarionetteJS" "MomentJS" "NodeJS" "PrototypeJS" "React" "RequireJS" "MarionetteJS" "MomentJS" "NodeJS" "PrototypeJS" "React" "RequireJS"
"SailsJS" "UnderscoreJS" "VueJS" "ZeptoJS")) "SailsJS" "UnderscoreJS" "VueJS" "ZeptoJS")
((or 'typescript-mode 'typescript-ts-mode)
(set-docsets! mode :add "TypeScript" "AngularTS") (set-docsets! mode :add "TypeScript" "AngularTS")
(set-electric! mode :chars '(?\} ?\)) :words '("||" "&&"))))) (set-electric! mode :chars '(?\} ?\)) :words '("||" "&&"))))
(use-package! js-mode (use-package! js
:mode "\\.[mc]?js\\'" :mode ("\\.[mc]?js\\'" . js-mode)
:mode "\\.es6\\'" :mode ("\\.es6\\'" . js-mode)
:mode "\\.pac\\'" :mode ("\\.pac\\'" . js-mode)
:config
(setq js-chain-indent t)
(+javascript-common-config 'js-mode))
(use-package! js-ts-mode ; 29.1+ only
:when (modulep! +tree-sitter)
:defer t
:init :init
(when (modulep! +tree-sitter) ; 29.1+ only
(set-tree-sitter! 'js-mode 'js-ts-mode (set-tree-sitter! 'js-mode 'js-ts-mode
`((javascript :url "https://github.com/tree-sitter/tree-sitter-javascript" `((javascript :url "https://github.com/tree-sitter/tree-sitter-javascript"
:rev ,(if (< (treesit-library-abi-version) 15) "v0.23.0" "v0.25.0")) :rev ,(if (< (treesit-library-abi-version) 15) "v0.23.0" "v0.25.0"))
(jsdoc :url "https://github.com/tree-sitter/tree-sitter-jsdoc" (jsdoc :url "https://github.com/tree-sitter/tree-sitter-jsdoc"
:rev "v0.23.2"))) :rev "v0.23.2"))))
:config :config
(+javascript-common-config 'js-mode)
(when (modulep! +tree-sitter)
(+javascript-common-config 'js-ts-mode)) (+javascript-common-config 'js-ts-mode))
(setq js-chain-indent t))
(use-package! typescript-mode (use-package! typescript-mode
:unless (modulep! +tree-sitter) :unless (modulep! +tree-sitter)