From 5c05b03e8a5c450f7358ceec7ea602f29c49d54e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 30 Aug 2020 14:01:47 +0200
Subject: Use flycheck-guile package.

---
 Makefile                     |  2 +-
 guile-studio-configure.scm   | 37 +------------------------------------
 guix/rekado/guile-studio.scm |  5 +++--
 3 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/Makefile b/Makefile
index b3c7fbc..43fc140 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.0.2
+VERSION = 0.0.3
 
 SOURCES = \
   guile-studio-configure.scm \
diff --git a/guile-studio-configure.scm b/guile-studio-configure.scm
index fd75dc6..f13d860 100644
--- a/guile-studio-configure.scm
+++ b/guile-studio-configure.scm
@@ -203,42 +203,7 @@ with the "
 
     ;; Check syntax on the fly
     (require 'flycheck)
-    (flycheck-define-checker guile
-                             "A Guile syntax checker with `guild compile'."
-                             :command ("guild" "compile" "--to=cps"
-                                       "--warn=unused-variable"
-                                       "--warn=unused-toplevel"
-                                       "--warn=unbound-variable"
-                                       "--warn=macro-use-before-definition"
-                                       "--warn=arity-mismatch"
-                                       "--warn=duplicate-case-datum"
-                                       "--warn=bad-case-datum"
-                                       "--warn=format"
-                                       source)
-                             :predicate
-                             (lambda ()
-                               (and (boundp 'geiser-impl--implementation)
-                                    (eq geiser-impl--implementation 'guile)))
-                             :verify
-                             (lambda (checker)
-                               (let ((geiser-impl (bound-and-true-p geiser-impl--implementation)))
-                                 (list
-                                  (flycheck-verification-result-new
-                                   :label "Geiser Implementation"
-                                   :message (cond
-                                             ((eq geiser-impl 'guile) "Guile")
-                                             (geiser-impl (format "Other: %s" geiser-impl))
-                                             (t "Geiser not active"))
-                                   :face (cond
-                                          ((or (eq geiser-impl 'guile)) 'success)
-                                          (t '(bold error)))))))
-                             :error-patterns
-                             ((warning
-                               line-start (file-name) ":" line ":" column ": warning:" (message) line-end)
-                              (error
-                               line-start (file-name) ":" line ":" column ":" (message) line-end))
-                             :modes (scheme-mode geiser-mode))
-    (add-to-list 'flycheck-checkers 'guile)
+    (require 'flycheck-guile)
     (global-flycheck-mode 1)
 
     ;; Remember location in buffers
diff --git a/guix/rekado/guile-studio.scm b/guix/rekado/guile-studio.scm
index 5592853..d19258a 100644
--- a/guix/rekado/guile-studio.scm
+++ b/guix/rekado/guile-studio.scm
@@ -14,8 +14,8 @@
 (define-public guile-studio
   (package
     (name "guile-studio-devel")
-    (version "0.0.2")
-    (source (local-file (string-append "../../guile-studio-" version ".tar.gz")))
+    (version "0.0.3")
+    (source (local-file (string-append "guile-studio-" version ".tar.gz")))
     (build-system gnu-build-system)
     (arguments
      `(#:modules
@@ -52,6 +52,7 @@
        ("emacs-geiser" ,emacs-geiser)
        ("emacs-company" ,emacs-company)
        ("emacs-flycheck" ,emacs-flycheck)
+       ("emacs-flycheck-guile" ,emacs-flycheck-guile)
        ("emacs-smart-mode-line" ,emacs-smart-mode-line)
        ("emacs-paren-face" ,emacs-paren-face)
        ("adwaita-icon-theme" ,adwaita-icon-theme)))
-- 
cgit v1.2.3