Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(doom): unescape/escape org src blocks before formatting

Browse source
This commit is contained in:
Infinidoge 2023-02-13 14:13:55 -05:00
parent de80eb6174
commit 07ed8315f4
1 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

42
users/infinidoge/config/doom/config/org.el
View file

@ -37,6 +37,48 @@
(add-hook 'before-save-hook 'infinidoge/format-org-src-blocks) (add-hook 'before-save-hook 'infinidoge/format-org-src-blocks)
;; Unescape and Escape code in org src blocks before/after formatting to prevent org's escaping from messing with formatting
(defun infinidoge/before-format--org-region (beg end)
(let ((element (org-element-at-point)))
(save-excursion
(let* ((block-beg (save-excursion
(goto-char (org-babel-where-is-src-block-head element))
(line-beginning-position 2)))
(block-end (save-excursion
(goto-char (org-element-property :end element))
(skip-chars-backward " \t\n")
(line-beginning-position)))
(beg (if beg (max beg block-beg) block-beg))
(end (if end (min end block-end) block-end))
(lang (org-element-property :language element))
(major-mode (org-src-get-lang-mode lang)))
(if (eq major-mode 'org-mode)
(user-error "Cannot reformat an org src block in org-mode")
(org-unescape-code-in-region beg end)))))
)
(defun infinidoge/after-format--org-region (beg end)
(let ((element (org-element-at-point)))
(save-excursion
(let* ((block-beg (save-excursion
(goto-char (org-babel-where-is-src-block-head element))
(line-beginning-position 2)))
(block-end (save-excursion
(goto-char (org-element-property :end element))
(skip-chars-backward " \t\n")
(line-beginning-position)))
(beg (if beg (max beg block-beg) block-beg))
(end (if end (min end block-end) block-end))
(lang (org-element-property :language element))
(major-mode (org-src-get-lang-mode lang)))
(if (eq major-mode 'org-mode)
(user-error "Cannot reformat an org src block in org-mode")
(org-escape-code-in-region beg end)))))
)
(advice-add '+format--org-region :before #'infinidoge/before-format--org-region)
(advice-add '+format--org-region :after #'infinidoge/after-format--org-region)
;; Automatically tangle src blocks on save ;; Automatically tangle src blocks on save
(defun infinidoge/tangle-on-save () (defun infinidoge/tangle-on-save ()
(when (eq major-mode 'org-mode) (when (eq major-mode 'org-mode)