From 81386a54279b202dc220cec545d563b6d4b6ebe0 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 13 Feb 2025 00:22:14 -0800 Subject: [PATCH] oni-scheme: Add function that will try to hide imports --- oni-scheme.el | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/oni-scheme.el b/oni-scheme.el index f7d0b6c..b15b011 100644 --- a/oni-scheme.el +++ b/oni-scheme.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2024.1217.235035 +;; Version: 2025.0212.234333 ;; Package-Requires: (oni-company oni-paredit rainbow-delimiters geiser geiser-guile) ;; This program is free software; you can redistribute it and/or modify @@ -30,6 +30,11 @@ (require 'geiser-impl) (require 'geiser-repl) +(defvar oni-scheme-hidden-imports-keymap + (let ((keymap (make-sparse-keymap))) + (define-key keymap (kbd "TAB") 'oni-scheme-toggle-import-display) + keymap)) + (defun oni-scheme--auto-fill-mode () "Enable ‘auto-fill-mode’ only for comments." (setq-local comment-auto-fill-only-comments t) @@ -45,11 +50,44 @@ (make-local-variable 'minor-mode-overriding-map-alist) (push `(paredit-mode . ,newmap) minor-mode-overriding-map-alist))) +(defun oni-scheme-toggle-import-display () + (interactive) + (let ((start (get-text-property (point) 'oni-scheme-import-start)) + (end (get-text-property (point) 'oni-scheme-import-end)) + (visiblep (not (string= " ..." (get-text-property (point) 'display))))) + (with-silent-modifications + (unwind-protect + (progn + (buffer-disable-undo) + (put-text-property start end 'display (if visiblep " ..." nil))) + (buffer-enable-undo))))) + +(defun oni-scheme-hide-guile-imports () + "Hide the imports in ‘define-module’." + (save-excursion + (let (start end) + (goto-char (point-min)) + (when (search-forward "(define-module" nil t) + (forward-char -14) + (setq start (line-end-position)) + (forward-sexp) + (setq end (1- (point))) + (with-silent-modifications + (unwind-protect + (progn + (buffer-disable-undo) + (set-text-properties start end `(display " ..." + keymap ,oni-scheme-hidden-imports-keymap + oni-scheme-import-start ,start + oni-scheme-import-end ,end))) + (buffer-enable-undo))))))) + (add-hook 'scheme-mode-hook 'company-mode) (add-hook 'scheme-mode-hook 'display-fill-column-indicator-mode) (add-hook 'scheme-mode-hook 'oni-scheme--auto-fill-mode) (add-hook 'scheme-mode-hook 'paredit-mode) (add-hook 'scheme-mode-hook 'rainbow-delimiters-mode) +(add-hook 'scheme-mode-hook 'oni-scheme-hide-guile-imports) (add-hook 'geiser-repl-mode-hook 'paredit-mode) ;;; Make sure this gets added _after_ ‘paredit-mode’ so that it gets executed