From 4f9fe753244f8671f3b0381fcb1edff065501c6f Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Mon, 23 Oct 2023 22:58:52 +0200
Subject: [PATCH] development(coverage): switch from coverlay to cov (#245)

---
 init.org                    | 35 +++++++++++------------------------
 lisp/readable-mono-theme.el |  6 +++---
 lock/flake.lock             | 35 ++++++++++++++++++++++++++---------
 lock/flake.nix              | 12 +++++++++---
 4 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/init.org b/init.org
index 2db21706..6d9cc24e 100644
--- a/init.org
+++ b/init.org
@@ -2111,37 +2111,24 @@ Support for Docker related files.
 
 ** Coverage
 #+begin_src emacs-lisp :tangle yes
-(use-package coverlay
+(use-package cov
   :ensure t
   :commands
-  (coverlay-minor-mode
-   coverlay-watch-file)
+  (cov-mode)
   :preface
-  (defun init-coverlay ()
-    "Setup `coverlay-mode'."
-    (setq-local
-     coverlay:base-path
-     (expand-file-name (locate-dominating-file (file-name-directory (buffer-file-name))
-                                               "coverage"))))
-
-  (defun coverlay-mode-toggle ()
-    "Turn on `coverlay-mode'."
+  (defun cov-mode-toggle ()
+    "Turn on `cov-mode'."
     (interactive)
-    (if (bound-and-true-p coverlay-minor-mode)
-        (coverlay-minor-mode 0)
-      (coverlay-minor-mode 1)
-      (when (and (buffer-file-name) (not (bound-and-true-p coverlay--loaded-filepath)))
-        (let ((coverage-file (expand-file-name "coverage/lcov.info" coverlay:base-path)))
-          (when (file-exists-p coverage-file)
-            (coverlay-watch-file coverage-file))))))
-  :hook
-  (coverlay-minor-mode-hook . init-coverlay)
+    (require 'cov)
+    (if (bound-and-true-p cov-mode)
+        (cov-mode 0)
+      (unless cov-lcov-file-name
+        (setq cov-lcov-file-name (expand-file-name "coverage/lcov.info" (project-root (project-current)))))
+      (cov-mode 1)))
   :general
   (:prefix
    local-leader-key
-   "v" 'coverlay-mode-toggle)
-  :init
-  (setq coverlay:mark-tested-lines nil))
+   "v" 'cov-mode-toggle))
 #+end_src
 
 ** Docs
diff --git a/lisp/readable-mono-theme.el b/lisp/readable-mono-theme.el
index 2836a50f..7a4a1177 100644
--- a/lisp/readable-mono-theme.el
+++ b/lisp/readable-mono-theme.el
@@ -566,12 +566,12 @@ For example links."
                                  `[,l-fg ,(face-foreground 'readable-mono-theme-emphasis) ,l-fg ,l-fg ,l-fg ,l-fg ,l-fg ,l-fg])
                                 ('dark
                                  `[,d-fg ,(face-foreground 'readable-mono-theme-emphasis) ,d-fg ,d-fg ,d-fg ,d-fg ,d-fg ,d-fg])))
-;;;;; coverlay
-   `(coverlay:untested-line-background-color
+;;;;; cov
+   `(cov-coverage-not-run-face
      ,(pcase (frame-parameter nil 'background-mode)
         ('light l-red)
         ('dark d-red)))
-   `(coverlay:tested-line-background-color
+   `(cov-coverage-run-face
      ,(pcase (frame-parameter nil 'background-mode)
         ('light l-green)
         ('dark d-green)))
diff --git a/lock/flake.lock b/lock/flake.lock
index 97378217..a307e74c 100644
--- a/lock/flake.lock
+++ b/lock/flake.lock
@@ -496,19 +496,19 @@
         "type": "github"
       }
     },
-    "coverlay": {
+    "cov": {
       "flake": false,
       "locked": {
-        "lastModified": 1555234820,
-        "narHash": "sha256-ELeyaw8BiMfwsjKu6C7y5p9bhKUStAVKd8vYkxLQweE=",
-        "owner": "twada",
-        "repo": "coverlay.el",
-        "rev": "0beae208d0e7d746a94385428bd61aa5cd7ea828",
+        "lastModified": 1696647290,
+        "narHash": "sha256-GdzYPpHVrg8mv3yAmbyWLwoMoxADrAYl97TXwLzjk8s=",
+        "owner": "AdamNiederer",
+        "repo": "cov",
+        "rev": "42bf07c6ab51ceb45753c798bcbc3327a9230ed5",
         "type": "github"
       },
       "original": {
-        "owner": "twada",
-        "repo": "coverlay.el",
+        "owner": "AdamNiederer",
+        "repo": "cov",
         "type": "github"
       }
     },
@@ -896,6 +896,22 @@
         "type": "github"
       }
     },
+    "elquery": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648691001,
+        "narHash": "sha256-ZGgMeVmUV95Y+IIdI47SfP7HMCDR5peysFfxCJpFMZk=",
+        "owner": "AdamNiederer",
+        "repo": "elquery",
+        "rev": "38f3bd41096cb270919b06095da0b9ac1add4598",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AdamNiederer",
+        "repo": "elquery",
+        "type": "github"
+      }
+    },
     "emacsql": {
       "flake": false,
       "locked": {
@@ -3137,7 +3153,7 @@
         "consult-compile-multi": "consult-compile-multi",
         "consult-git-log-grep": "consult-git-log-grep",
         "corfu": "corfu",
-        "coverlay": "coverlay",
+        "cov": "cov",
         "crystal-mode": "crystal-mode",
         "ctrlf": "ctrlf",
         "ctrlxo": "ctrlxo",
@@ -3162,6 +3178,7 @@
         "elisp-refs": "elisp-refs",
         "elixir-mode": "elixir-mode",
         "elm-mode": "elm-mode",
+        "elquery": "elquery",
         "emacsql": "emacsql",
         "embark": "embark",
         "embark-consult": "embark-consult",
diff --git a/lock/flake.nix b/lock/flake.nix
index 2dfa0806..2f817861 100644
--- a/lock/flake.nix
+++ b/lock/flake.nix
@@ -187,10 +187,10 @@
       repo = "corfu";
       type = "github";
     };
-    coverlay = {
+    cov = {
       flake = false;
-      owner = "twada";
-      repo = "coverlay.el";
+      owner = "AdamNiederer";
+      repo = "cov";
       type = "github";
     };
     crystal-mode = {
@@ -337,6 +337,12 @@
       repo = "elm-mode";
       type = "github";
     };
+    elquery = {
+      flake = false;
+      owner = "AdamNiederer";
+      repo = "elquery";
+      type = "github";
+    };
     emacsql = {
       flake = false;
       owner = "magit";