emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(word-wrap): add soft-wrapping at fill-column

Browse source 
Using visual-fill-column.

Close: #1906
Co-authored-by: flatwhatson <flatwhatson@users.noreply.github.com>~
This commit is contained in:
Henrik Lissner 2022-11-02 16:27:46 +01:00
parent 4e3b94c602
commit 33db882ae6
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
4 changed files with 63 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

58
modules/editor/word-wrap/autoload.el
View file

@ -4,6 +4,8 @@
(defvar +word-wrap--major-mode-is-text nil)
(defvar +word-wrap--enable-adaptive-wrap-mode nil)
(defvar +word-wrap--enable-visual-line-mode nil)
(defvar +word-wrap--enable-visual-fill-mode nil)
(defvar +word-wrap--disable-auto-fill-mode nil)
(defvar +word-wrap--major-mode-indent-var nil)
(defvar adaptive-wrap-extra-indent)
@ -15,7 +17,7 @@
(defun +word-wrap--calc-extra-indent (p)
"Calculate extra word-wrap indentation at point."
(if (not (or +word-wrap--major-mode-is-text
(sp-point-in-string-or-comment p)))
(doom-point-in-string-or-comment-p p)))
(pcase +word-wrap-extra-indent
('double
(* 2 (symbol-value +word-wrap--major-mode-indent-var)))
@ -30,33 +32,39 @@
(define-minor-mode +word-wrap-mode
"Wrap long lines in the buffer with language-aware indentation.
This mode configures `adaptive-wrap' and `visual-line-mode' to wrap long lines
without modifying the buffer content. This is useful when dealing with legacy
code which contains gratuitously long lines, or running emacs on your
wrist-phone.
This mode configures `adaptive-wrap', `visual-line-mode' and
`visual-fill-column-mode' to wrap long lines without modifying the buffer
content. This is useful when dealing with legacy code which contains
gratuitously long lines, or running emacs on your wrist-phone.
Wrapped lines will be indented to match the preceding line. In code buffers,
lines which are not inside a string or comment will have additional indentation
according to the configuration of `+word-wrap-extra-indent'."
according to the configuration of `+word-wrap-extra-indent'.
Long lines will wrap at the window margin by default, or can optionally be
wrapped at `fill-column' by configuring `+word-wrap-fill-style'."
:init-value nil
(if +word-wrap-mode
(progn
(setq-local +word-wrap--major-mode-is-visual
(memq major-mode +word-wrap-visual-modes))
(setq-local +word-wrap--major-mode-is-text
(memq major-mode +word-wrap-text-modes))
(setq-local +word-wrap--enable-adaptive-wrap-mode
(and (not (bound-and-true-p adaptive-wrap-prefix-mode))
(not +word-wrap--major-mode-is-visual)))
(setq-local +word-wrap--enable-visual-line-mode
(not (bound-and-true-p visual-line-mode)))
(setq-local
+word-wrap--major-mode-is-visual
(memq major-mode +word-wrap-visual-modes)
+word-wrap--major-mode-is-text
(memq major-mode +word-wrap-text-modes)
+word-wrap--enable-adaptive-wrap-mode
(and (not (bound-and-true-p adaptive-wrap-prefix-mode))
(not +word-wrap--major-mode-is-visual))
+word-wrap--enable-visual-line-mode
(not (bound-and-true-p visual-line-mode))
+word-wrap--enable-visual-fill-mode
(and (not (bound-and-true-p visual-fill-column-mode))
(memq +word-wrap-fill-style '(auto soft)))
+word-wrap--disable-auto-fill-mode
(and (bound-and-true-p auto-fill-function)
(eq +word-wrap-fill-style 'soft)))
(unless +word-wrap--major-mode-is-visual
(require 'dtrt-indent) ; for dtrt-indent--search-hook-mapping
(require 'smartparens) ; for sp-point-in-string-or-comment
(setq-local +word-wrap--major-mode-indent-var
(caddr (dtrt-indent--search-hook-mapping major-mode)))
@ -65,7 +73,11 @@ according to the configuration of `+word-wrap-extra-indent'."
(when +word-wrap--enable-adaptive-wrap-mode
(adaptive-wrap-prefix-mode +1))
(when +word-wrap--enable-visual-line-mode
(visual-line-mode +1)))
(visual-line-mode +1))
(when +word-wrap--enable-visual-fill-mode
(visual-fill-column-mode +1))
(when +word-wrap--disable-auto-fill-mode
(auto-fill-mode -1)))
;; disable +word-wrap-mode
(unless +word-wrap--major-mode-is-visual
@ -74,7 +86,11 @@ according to the configuration of `+word-wrap-extra-indent'."
(when +word-wrap--enable-adaptive-wrap-mode
(adaptive-wrap-prefix-mode -1))
(when +word-wrap--enable-visual-line-mode
(visual-line-mode -1))))
(visual-line-mode -1))
(when +word-wrap--enable-visual-fill-mode
(visual-fill-column-mode -1))
(when +word-wrap--disable-auto-fill-mode
(auto-fill-mode +1))))
(defun +word-wrap--enable-global-mode ()
"Enable `+word-wrap-mode' for `+word-wrap-global-mode'.