summaryrefslogtreecommitdiff
path: root/modules/prog-shell.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-05-03 16:13:21 -0500
committerCraig Jennings <c@cjennings.net>2026-05-03 16:13:21 -0500
commit2c94acd52cc92dc4ebefd999dbca771367cc3090 (patch)
tree2c9ed2df067e736c98c0b7fa36ed3655d8b85e16 /modules/prog-shell.el
parent8ec668d6749b22f47a4c614d0965445dcfa86f50 (diff)
downloaddotemacs-2c94acd52cc92dc4ebefd999dbca771367cc3090.tar.gz
dotemacs-2c94acd52cc92dc4ebefd999dbca771367cc3090.zip
feat(dev-fkeys): add project-aware F4 compile/run dispatcher
I added a new module `modules/dev-fkeys.el` that owns the dev F-key block. F4 prompts via `completing-read` with a candidate set filtered by project type (compiled / interpreted / unknown). C-F4 is the compile-only fast path. M-F4 is clean + rebuild. It runs a heuristic clean command derived from the project markers (go.mod, Cargo.toml, Eask, Makefile, CMakeLists.txt) and chains `projectile-compile-project` on success. S-F4 stays on `recompile` and now lives globally instead of duplicated across prog-general.el and prog-c.el. F6 is bound globally to `projectile-test-project` as a Phase 1 stopgap. Phase 2 replaces it with the polyglot test runner spec'd in todo.org. Project-type detection runs against the projectile root and falls back to `unknown` when no marker matches. Interpreted markers are checked first so a Python or Node project with a Makefile for tasks classifies as interpreted instead of compiled. Compile + Run sequencing uses a one-shot `compilation-finish-functions` hook that self-removes on first invocation and only fires the follow-up when the status string starts with `finished`. Cleanup in the same commit: - Dropped F4/F5/F6 from `prog-general.el`'s prog-mode-hook. They are now global. - Dropped F6→format bindings from prog-c.el / prog-python.el / prog-shell.el. C-; f was already bound in each, so this is pure removal. - Dropped the duplicate S-F4 from prog-c.el. The global binding covers it. - Updated the keybinding header in prog-general.el and the workflow comments in prog-c.el / prog-shell.el. - Wired `(require 'dev-fkeys)` in init.el alongside coverage-core. TDD: 73 tests across 11 files, one per helper. Production code is split into small testable internals (`cj/--detect-project-type`, `cj/--f4-candidates`, `cj/--f4-derive-clean-cmd`, `cj/--f4-make-once-hook`, `cj/--f4-dispatch`, `cj/--f4-compile-and-run-impl`, `cj/--f4-clean-rebuild-impl`, `cj/--f4-project-root`) plus three thin interactive wrappers. Smoke tests confirm bindings register on load. Known limitation: if another `compilation-finish-functions` hook fires between my add-hook and the compile finishing, the chain can fire on the wrong compile. The hook self-removes on first invocation regardless of which compile it sees. Documented in the impl docstring. Acceptable for v1. Phase 2 will replace F6 with the polyglot test runner (tree-sitter queries for Python/Go/TS, sexp scan for Elisp, buffer-local last-test memory).
Diffstat (limited to 'modules/prog-shell.el')
-rw-r--r--modules/prog-shell.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/prog-shell.el b/modules/prog-shell.el
index cb9598db..57347cc6 100644
--- a/modules/prog-shell.el
+++ b/modules/prog-shell.el
@@ -17,9 +17,9 @@
;;
;; Workflow:
;; 1. Open .sh file → LSP auto-starts, ShellCheck runs
-;; 2. <f6> → Format with shfmt
-;; 3. C-c ! l → Show all ShellCheck diagnostics
-;; 4. Save → Auto-set executable bit if script has shebang
+;; 2. C-; f → format with shfmt
+;; 3. C-c ! l → show all ShellCheck diagnostics
+;; 4. Save → auto-set executable bit if script has shebang
;;; Code:
@@ -143,10 +143,8 @@ Overrides default prog-mode keybindings with shell-specific commands."
:if (executable-find shfmt-path)
:hook ((sh-mode bash-ts-mode) . shfmt-on-save-mode)
:bind ((:map sh-mode-map
- ("<f6>" . shfmt-buffer)
("C-; f" . shfmt-buffer))
(:map bash-ts-mode-map
- ("<f6>" . shfmt-buffer)
("C-; f" . shfmt-buffer)))
:custom
(shfmt-arguments '("-i" "2" ;; indent with 2 spaces