mirror of
https://github.com/jimeh/.emacs.d.git
synced 2026-02-19 13:46:41 +00:00
refactor(folding): Improve siren-folding module
- Add a siren-folding function which enables all folding-related modes, and change other modules to use this new function.
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'siren-folding)
|
||||
(require 'siren-projectile)
|
||||
|
||||
(use-package dart-mode
|
||||
@@ -22,10 +23,9 @@
|
||||
:init
|
||||
(defun siren-dart-mode-setup ()
|
||||
(company-mode +1)
|
||||
(lsp)
|
||||
(highlight-symbol-mode -1)
|
||||
(hs-minor-mode 1)
|
||||
(hideshowvis-enable)
|
||||
(lsp)
|
||||
(siren-folding)
|
||||
(subword-mode +1))
|
||||
|
||||
(with-eval-after-load "projectile"
|
||||
|
||||
@@ -39,8 +39,7 @@
|
||||
(highlight-symbol-mode -1)
|
||||
(company-mode +1)
|
||||
(lsp)
|
||||
(hs-minor-mode 1)
|
||||
(hideshowvis-enable)
|
||||
(siren-folding)
|
||||
(subword-mode +1))
|
||||
|
||||
:config
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'siren-prettier-js)
|
||||
(require 'siren-folding)
|
||||
(require 'siren-prettier-js)
|
||||
|
||||
(use-package js-mode
|
||||
:ensure nil ;; loaded from emacs built-ins
|
||||
@@ -15,6 +15,10 @@
|
||||
"\\.js\\'"
|
||||
"\\.pac\\'"
|
||||
|
||||
:bind (:map js-mode-map
|
||||
("C-j" . newline-and-indent)
|
||||
("C-c C-h" . siren-toggle-hiding))
|
||||
|
||||
:hook
|
||||
(js-mode . siren-js-mode-setup)
|
||||
|
||||
@@ -27,15 +31,10 @@
|
||||
tab-width width))
|
||||
|
||||
(prettier-js-mode)
|
||||
(company-mode +1)
|
||||
(company-mode)
|
||||
(lsp)
|
||||
(subword-mode +1)
|
||||
(hs-minor-mode 1)
|
||||
(hideshowvis-enable)
|
||||
|
||||
(let ((map js-mode-map))
|
||||
(define-key map (kbd "C-j") 'newline-and-indent)
|
||||
(define-key map (kbd "C-c C-h") 'siren-toggle-hiding))))
|
||||
(subword-mode)
|
||||
(siren-folding)))
|
||||
|
||||
(provide 'siren-js)
|
||||
;;; siren-js.el ends here
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
:bind (:map json-mode-map
|
||||
("C-j" . newline-and-indent)
|
||||
("C-c C-h" . siren-toggle-hiding))
|
||||
("C-c C-h" . siren-folding-toggle))
|
||||
|
||||
:hook
|
||||
(json-mode . siren-json-mode-setup)
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'siren-folding)
|
||||
(require 'siren-prettier-js)
|
||||
|
||||
(use-package rjsx-mode
|
||||
@@ -18,8 +19,7 @@
|
||||
(prettier-js-mode +1)
|
||||
(company-mode +1)
|
||||
(subword-mode +1)
|
||||
(hs-minor-mode +1)
|
||||
(hideshowvis-enable)))
|
||||
(siren-folding)))
|
||||
|
||||
(provide 'siren-jsx)
|
||||
;;; siren-jsx.el ends here
|
||||
|
||||
@@ -20,8 +20,7 @@
|
||||
(rainbow-mode +1)
|
||||
(company-mode +1)
|
||||
(subword-mode +1)
|
||||
(hs-minor-mode 1)
|
||||
(hideshowvis-enable)))
|
||||
(siren-folding)))
|
||||
|
||||
(provide 'siren-php)
|
||||
;;; siren-php.el ends here
|
||||
|
||||
@@ -59,8 +59,7 @@
|
||||
tab-width 2)
|
||||
|
||||
(company-mode +1)
|
||||
(hs-minor-mode 1)
|
||||
(hideshowvis-enable)
|
||||
(siren-folding)
|
||||
(subword-mode +1))
|
||||
|
||||
:config
|
||||
|
||||
@@ -25,8 +25,7 @@
|
||||
|
||||
(company-mode +1)
|
||||
(lsp-mode)
|
||||
(hs-minor-mode 1)
|
||||
(hideshowvis-enable)
|
||||
(siren-folding)
|
||||
(subword-mode +1)))
|
||||
|
||||
(use-package cargo
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
;;; Code:
|
||||
|
||||
(require 'siren-company)
|
||||
(require 'siren-folding)
|
||||
(require 'siren-flycheck)
|
||||
(require 'siren-folding)
|
||||
(require 'siren-prettier-js)
|
||||
(require 'siren-web-mode)
|
||||
|
||||
@@ -16,8 +16,11 @@
|
||||
:hook
|
||||
(typescript-mode . siren-typescript-mode-setup)
|
||||
|
||||
:init
|
||||
:bind (:map typescript-mode-map
|
||||
("C-j" . newline-and-indent)
|
||||
("C-c C-h" . siren-folding-toggle))
|
||||
|
||||
:init
|
||||
(defun siren-typescript-mode-setup ()
|
||||
(let ((width 2))
|
||||
(setq typescript-indent-level width
|
||||
@@ -27,12 +30,7 @@
|
||||
(company-mode +1)
|
||||
(lsp)
|
||||
(subword-mode +1)
|
||||
(hs-minor-mode 1)
|
||||
(hideshowvis-enable)
|
||||
|
||||
(let ((map typescript-mode-map))
|
||||
(define-key map (kbd "C-j") 'newline-and-indent)
|
||||
(define-key map (kbd "C-c C-h") 'siren-toggle-hiding))))
|
||||
(siren-folding)))
|
||||
|
||||
(use-package tide
|
||||
:hook
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
:bind (:map web-mode-map
|
||||
("C-j" . newline-and-indent)
|
||||
("C-c C-h" . siren-toggle-hiding))
|
||||
("C-c C-h" . siren-folding-toggle))
|
||||
|
||||
:hook
|
||||
(web-mode . siren-web-mode-setup)
|
||||
@@ -37,8 +37,7 @@
|
||||
|
||||
(company-mode +1)
|
||||
(fci-mode -1)
|
||||
(hideshowvis-enable)
|
||||
(hs-minor-mode +1)
|
||||
(siren-folding)
|
||||
(subword-mode +1)))
|
||||
|
||||
(use-package web-beautify
|
||||
|
||||
Reference in New Issue
Block a user