From 8c4e09dff83847ac7f07bf1da7751e9328006c4d Mon Sep 17 00:00:00 2001 From: Jack Jamison Date: Thu, 30 Jul 2026 20:09:00 -0400 Subject: actual final changes and get rid of junk in lisp dir actually works fine --- .../modes/sly/evil-collection-sly.el | 276 --------------------- 1 file changed, 276 deletions(-) delete mode 100644 .config/emacs/lisp/evil-collection/modes/sly/evil-collection-sly.el (limited to '.config/emacs/lisp/evil-collection/modes/sly') diff --git a/.config/emacs/lisp/evil-collection/modes/sly/evil-collection-sly.el b/.config/emacs/lisp/evil-collection/modes/sly/evil-collection-sly.el deleted file mode 100644 index 0443f2a..0000000 --- a/.config/emacs/lisp/evil-collection/modes/sly/evil-collection-sly.el +++ /dev/null @@ -1,276 +0,0 @@ -;;; evil-collection-sly.el --- Evil bindings for `sly' -*- lexical-binding: t -*- - -;; Copyright (C) 2019 Pierre Neidhardt - -;; Author: James Nguyen -;; Maintainer: James Nguyen -;; Pierre Neidhardt -;; URL: https://github.com/emacs-evil/evil-collection -;; Version: 0.0.1 -;; Package-Requires: ((emacs "26.3")) -;; Keywords: evil, sly, tools - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: -;; Evil bindings for `sly-mode'. - -;;; Code: -;; WARNING: This mirrors evil-collection-slime.el. Keep them in sync! - -(require 'evil-collection) -(require 'sly nil t) - -(declare-function sly-last-expression "sly") -(declare-function sly-eval-print "sly") - -(defvar sly-connection-list-mode-map) -(defvar sly-db-mode-map) -(defvar sly-inspector-mode-map) -(defvar sly-mode-map) -(defvar sly-popup-buffer-mode-map) -(defvar sly-thread-control-mode-map) -(defvar sly-trace-dialog-mode-map) -(defvar sly-stickers--replay-mode-map) -(defvar sly-xref-mode-map) - -(defconst evil-collection-sly-maps '(sly-connection-list-mode-map - sly-db-mode-map - sly-inspector-mode-map - sly-mode-map - sly-popup-buffer-mode-map - sly-stickers--replay-mode-map - sly-thread-control-mode-map - sly-trace-dialog-mode-map - sly-xref-mode-map)) - -;; Same as `evil-collection-slime-last-sexp'. -(defun evil-collection-sly-last-sexp (command &rest args) - "In normal-state or motion-state, last sexp ends at point." - (if (and (not evil-move-beyond-eol) - (or (evil-normal-state-p) (evil-motion-state-p))) - (save-excursion - (unless (or (eobp) (eolp)) (forward-char)) - (apply command args)) - (apply command args))) - -(defun evil-collection-sly-eval-print-last-expression (string) - "Evaluate sexp before point; print value into the current buffer. - -Evil version of `sly-eval-print-last-expression' that accounts for -`evil-move-beyond-eol'." - (interactive - (list (progn - (when (and (not evil-move-beyond-eol) - (or (evil-normal-state-p) (evil-motion-state-p))) - (unless (or (eobp) (eolp)) - (forward-char))) - (sly-last-expression)))) - (insert "\n") - (sly-eval-print string)) - -;;;###autoload -(defun evil-collection-sly-setup () - "Set up `evil' bindings for `sly'." - (unless evil-move-beyond-eol - (advice-add 'sly-eval-last-expression :around 'evil-collection-sly-last-sexp) - (advice-add 'sly-pprint-eval-last-expression :around 'evil-collection-sly-last-sexp) - (advice-add 'sly-mrepl-return :around 'evil-collection-sly-last-sexp) - (advice-add 'sly-eval-print-last-expression :override 'evil-collection-sly-eval-print-last-expression)) - - (evil-collection-define-key 'normal 'sly-db-mode-map - [follow-link] 'mouse-face - "\C-i" 'sly-db-cycle - "g?" 'describe-mode - "S" 'sly-db-show-frame-source - "e" 'sly-db-eval-in-frame - "d" 'sly-db-pprint-eval-in-frame - "D" 'sly-db-disassemble - "i" 'sly-db-inspect-in-frame - "gj" 'sly-db-down - "gk" 'sly-db-up - (kbd "C-j") 'sly-db-down - (kbd "C-k") 'sly-db-up - "]]" 'sly-db-details-down - "[[" 'sly-db-details-up - (kbd "M-j") 'sly-db-details-down - (kbd "M-k") 'sly-db-details-up - "gg" 'sly-db-beginning-of-backtrace - "G" 'sly-db-end-of-backtrace - "t" 'sly-db-toggle-details - "gr" 'sly-db-restart-frame - "I" 'sly-db-invoke-restart-by-name - "R" 'sly-db-return-from-frame - "c" 'sly-db-continue - "s" 'sly-db-step - "n" 'sly-db-next - "o" 'sly-db-out - "b" 'sly-db-break-on-return - "a" 'sly-db-abort - "q" 'sly-db-quit - "A" 'sly-db-break-with-system-debugger - "B" 'sly-db-break-with-default-debugger - "P" 'sly-db-print-condition - "C" 'sly-db-inspect-condition - "g:" 'sly-interactive-eval - "0" 'sly-db-invoke-restart-0 - "1" 'sly-db-invoke-restart-1 - "2" 'sly-db-invoke-restart-2 - "3" 'sly-db-invoke-restart-3 - "4" 'sly-db-invoke-restart-4 - "5" 'sly-db-invoke-restart-5 - "6" 'sly-db-invoke-restart-6 - "7" 'sly-db-invoke-restart-7 - "8" 'sly-db-invoke-restart-8 - "9" 'sly-db-invoke-restart-9) - - (evil-collection-define-key 'normal 'sly-inspector-mode-map - [mouse-6] 'sly-inspector-pop - [mouse-7] 'sly-inspector-next - ;; TODO: `sly-inspector-next' and `sly-inspector-pop' should probably - ;; just be bound to C-i and C-o. - "gk" 'sly-inspector-pop - (kbd "C-k") 'sly-inspector-pop - "[[" 'sly-inspector-pop - (kbd "C-o") 'sly-inspector-pop - "gj" 'sly-inspector-next - (kbd "C-j") 'sly-inspector-next - "]]" 'sly-inspector-next - (kbd "C-i") 'sly-inspector-next - "K" 'sly-inspector-describe-inspectee - "e" 'sly-inspector-eval - "M-p" 'sly-inspector-history - "gr" 'sly-inspector-reinspect - "gv" 'sly-inspector-toggle-verbose - (kbd "") 'forward-button - (kbd "C-i") 'forward-button - (kbd "") 'backward-button ; Emacs translates S-TAB - (kbd "") 'backward-button ; to BACKTAB on X. - "." 'sly-edit-definition - "gd" 'sly-edit-definition - "gR" 'sly-inspector-fetch-all - "q" 'sly-inspector-quit) - - (evil-collection-define-key 'normal 'sly-mode-map - (kbd "K") 'sly-describe-symbol - (kbd "C-t") 'sly-pop-find-definition-stack - ;; goto - "gd" 'sly-edit-definition - "gz" 'sly-mrepl) - - (when evil-collection-want-find-usages-bindings - (evil-collection-define-key 'normal 'sly-mode-map - "gr" 'sly-who-references)) - - (evil-collection-define-key 'normal 'sly-popup-buffer-mode-map - ;; quit - "q" 'quit-window - - (kbd "C-t") 'sly-pop-find-definition-stack - - ;; goto - "gd" 'sly-edit-definition) - - (evil-collection-inhibit-insert-state 'sly-thread-control-mode-map) - (evil-collection-define-key 'normal 'sly-thread-control-mode-map - "a" 'sly-thread-attach - "d" 'sly-thread-debug - "x" 'sly-thread-kill - "gr" 'sly-update-threads-buffer) - - (evil-collection-define-key 'normal 'sly-xref-mode-map - "q" 'quit-window - (kbd "RET") 'sly-xref-goto - (kbd "SPC") 'sly-xref-show - "go" 'sly-show-xref - (kbd "") 'forward-button - (kbd "C-i") 'forward-button - (kbd "") 'backward-button ; Emacs translates S-TAB - (kbd "") 'backward-button ; to BACKTAB on X. - "gj" 'sly-xref-next-line - "gk" 'sly-xref-prev-line - (kbd "C-j") 'sly-xref-next-line - (kbd "C-k") 'sly-xref-prev-line - "]]" 'sly-xref-next-line - "[[" 'sly-xref-prev-line - "gr" 'sly-recompile-xref - "gR" 'sly-recompile-all-xrefs - ;; "r" 'sly-xref-retract ; TODO: Equivalent for Sly? - ) - - (let* ((submit evil-collection-repl-submit-state) - (newline-state (if (eq submit 'normal) 'insert 'normal))) - (evil-collection-define-key submit 'sly-mrepl-mode-map - (kbd "RET") 'sly-mrepl-return) - (evil-collection-define-key newline-state 'sly-mrepl-mode-map - (kbd "RET") 'newline)) - - (evil-collection-define-key 'normal 'sly-mrepl-mode-map - "gj" 'sly-mrepl-next-prompt - "gk" 'sly-mrepl-previous-prompt - (kbd "C-j") 'sly-mrepl-next-prompt - (kbd "C-k") 'sly-mrepl-previous-prompt - "]]" 'sly-mrepl-next-prompt - "[[" 'sly-mrepl-previous-prompt - (kbd "C-p") 'sly-mrepl-previous-input-or-button - (kbd "C-n") 'sly-mrepl-next-input-or-button) - - (evil-collection-define-key 'normal 'sly-trace-dialog-mode-map - "q" 'quit-window - "gr" 'sly-trace-dialog-fetch-status - "gR" 'sly-trace-dialog-fetch-traces) - - (evil-collection-define-key 'normal 'sly-stickers--replay-mode-map - ;; The "n", "p", "x", "h" and "q" key are hard-coded in the description, so - ;; we need to set them to the expected command. - "gg" 'sly-stickers-replay-jump-to-beginning - "G" 'sly-stickers-replay-jump-to-end - "F" 'sly-stickers-forget - "J" 'sly-stickers-replay-next-for-sticker - "K" 'sly-stickers-replay-prev-for-sticker - "N" 'sly-stickers-replay-next-for-sticker - "P" 'sly-stickers-replay-prev-for-sticker - "R" 'sly-stickers-replay-reset-ignore-list - "zv" 'sly-stickers-replay-toggle-pop-to-stickers - "h" 'sly-stickers-replay-toggle-help - "g?" 'sly-stickers-replay-toggle-help - "gd" 'sly-stickers-replay-jump - "j" 'sly-stickers-replay-next - "k" 'sly-stickers-replay-prev - "n" 'sly-stickers-replay-next - "p" 'sly-stickers-replay-prev - "q" 'quit-window - "go" 'sly-stickers-replay-pop-to-current-sticker - "v" 'sly-stickers-replay-pop-to-current-sticker - "x" 'sly-stickers-replay-toggle-ignore-sticker - "zi" 'sly-stickers-replay-toggle-ignore-sticker - "zz" 'sly-stickers-replay-toggle-ignore-zombies) - - (evil-collection-define-key 'normal 'sly-connection-list-mode-map - (kbd "") 'forward-button - (kbd "C-i") 'forward-button - (kbd "") 'backward-button - (kbd "") 'backward-button - (kbd "RET") 'sly-connection-list-default-action - "R" 'sly-restart-connection-at-point - "d" 'sly-connection-list-make-default - "x" 'sly-quit-connection-at-point - "gr" 'sly-update-connection-list - "o" 'tabulated-list-sort - "q" 'quit-window) - - (add-hook 'sly-popup-buffer-mode-hook #'evil-normalize-keymaps)) - -(provide 'evil-collection-sly) -;;; evil-collection-sly.el ends here -- cgit v1.2.3