diff --git a/misc/fuel/fuel-debug-uses.el b/misc/fuel/fuel-debug-uses.el index eecdfa7044..2e94258c28 100644 --- a/misc/fuel/fuel-debug-uses.el +++ b/misc/fuel/fuel-debug-uses.el @@ -141,8 +141,7 @@ (defun fuel-debug--uses-display (uses) (let* ((inhibit-read-only t) (old (with-current-buffer (find-file-noselect fuel-debug--uses-file) - (fuel-syntax--usings))) - (old (sort old 'string<)) + (sort (fuel-syntax--find-usings t) 'string<))) (new (sort uses 'string<))) (erase-buffer) (fuel-debug--uses-insert-title) diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el index 8234f9fcc8..036ac7cbd0 100644 --- a/misc/fuel/fuel-syntax.el +++ b/misc/fuel/fuel-syntax.el @@ -301,21 +301,9 @@ (funcall fuel-syntax--current-vocab-function)) (defun fuel-syntax--find-in () - (let* ((vocab) - (ip - (save-excursion - (when (re-search-backward fuel-syntax--current-vocab-regex nil t) - (setq vocab (match-string-no-properties 1)) - (point))))) - (when ip - (let ((pp (save-excursion - (when (re-search-backward fuel-syntax--sub-vocab-regex ip t) - (point))))) - (when (and pp (> pp ip)) - (let ((sub (match-string-no-properties 1))) - (unless (save-excursion (search-backward (format "%s>" sub) pp t)) - (setq vocab (format "%s.%s" vocab (downcase sub)))))))) - vocab)) + (save-excursion + (when (re-search-backward fuel-syntax--current-vocab-regex nil t) + (match-string-no-properties 1)))) (make-variable-buffer-local (defvar fuel-syntax--usings-function 'fuel-syntax--find-usings)) @@ -323,13 +311,19 @@ (defsubst fuel-syntax--usings () (funcall fuel-syntax--usings-function)) -(defun fuel-syntax--find-usings () +(defun fuel-syntax--find-usings (&optional no-private) (save-excursion (let ((usings)) (goto-char (point-max)) (while (re-search-backward fuel-syntax--using-lines-regex nil t) (dolist (u (split-string (match-string-no-properties 1) nil t)) (push u usings))) + (goto-char (point-min)) + (when (and (not no-private) + (re-search-forward "\\_<" nil t) + (re-search-forward "\\_\\_>" nil t)) + (goto-char (point-max)) + (push (concat (fuel-syntax--find-in) ".private") usings)) usings)))