sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix comment detection logic for fortification.

Browse source
This commit is contained in:
Craig Earls 2014-09-28 20:45:13 -07:00
parent a28c32b081
commit 61dd6bf663
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/ledger-fontify.el
View file

@ -36,10 +36,6 @@
:group 'ledger) :group 'ledger)
(defun ledger-fontify-buffer-part (&optional beg end len) (defun ledger-fontify-buffer-part (&optional beg end len)
;; (message (concat "ledger-fontify-buffer-part: ("
;; (int-to-string beg) ", "
;; (int-to-string end)
;; ")"))
(save-excursion (save-excursion
(unless beg (setq beg (point-min))) (unless beg (setq beg (point-min)))
(unless end (setq end (point-max))) (unless end (setq end (point-max)))
@ -58,12 +54,6 @@
(goto-char position) (goto-char position)
(let ((extents (ledger-navigate-find-xact-extents position)) (let ((extents (ledger-navigate-find-xact-extents position))
(state (ledger-transaction-state))) (state (ledger-transaction-state)))
;; (message (concat "ledger-fontify-xact-at: "
;; (int-to-string position)
;; " ("
;; (int-to-string (car extents)) ", "
;; (int-to-string (cadr extents))
;; ")"))
(if (and ledger-fontify-xact-state-overrides state) (if (and ledger-fontify-xact-state-overrides state)
(cond ((eq state 'cleared) (cond ((eq state 'cleared)
(ledger-fontify-set-face extents 'ledger-font-xact-cleared-face)) (ledger-fontify-set-face extents 'ledger-font-xact-cleared-face))
@ -76,11 +66,16 @@
(save-excursion (save-excursion
(ledger-fontify-xact-start (car extents)) (ledger-fontify-xact-start (car extents))
(while (< (point) (cadr extents)) (while (< (point) (cadr extents))
(ledger-fontify-posting (point)) (if (looking-at "[ \t]+;")
(ledger-fontify-set-face (list (point) (progn
(end-of-line)
(point))) 'ledger-font-comment-face)
(ledger-fontify-posting (point)))
(forward-line)))) (forward-line))))
(defun ledger-fontify-xact-start (pos) (defun ledger-fontify-xact-start (pos)
"POS shoul dbe at the beginning of a line starting an xact" "POS should be at the beginning of a line starting an xact.
Fontify the first line of an xact"
(goto-char pos) (goto-char pos)
(beginning-of-line) (beginning-of-line)
(let ((state nil)) (let ((state nil))
@ -102,7 +97,6 @@
(re-search-forward ledger-posting-regex) (re-search-forward ledger-posting-regex)
(if (match-string 1) (if (match-string 1)
(save-match-data (setq state (ledger-state-from-string (s-trim (match-string 1)))))) (save-match-data (setq state (ledger-state-from-string (s-trim (match-string 1))))))
;;; FIX THIS. Pull the COND to the outer level and put the fontify-set-face inside. It will be clearer
(ledger-fontify-set-face (list (match-beginning 0) (match-end 2)) (ledger-fontify-set-face (list (match-beginning 0) (match-end 2))
(cond ((eq state 'cleared) (cond ((eq state 'cleared)
'ledger-font-posting-account-cleared-face) 'ledger-font-posting-account-cleared-face)
@ -113,7 +107,7 @@
(ledger-fontify-set-face (list (match-beginning 4) (match-end 4)) (ledger-fontify-set-face (list (match-beginning 4) (match-end 4))
(cond ((eq state 'cleared) (cond ((eq state 'cleared)
'ledger-font-posting-amount-cleared-face) 'ledger-font-posting-amount-cleared-face)
((eq state 'cleared) ((eq state 'pending)
'ledger-font-posting-amount-pending-face) 'ledger-font-posting-amount-pending-face)
(t (t
'ledger-font-posting-amount-face))) 'ledger-font-posting-amount-face)))