From 3e64fb29354d8e93b6ec6c27e3a1ae42a03df5ef Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Wed, 19 Mar 2014 22:57:05 +0900 Subject: [PATCH] ghc-check-display-errors. --- elisp/ghc-check.el | 33 ++++++++++++++++++++++++++++++--- elisp/ghc-command.el | 3 ++- elisp/ghc.el | 2 +- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/elisp/ghc-check.el b/elisp/ghc-check.el index 1744c21..7736271 100644 --- a/elisp/ghc-check.el +++ b/elisp/ghc-check.el @@ -8,6 +8,13 @@ ;;; Code: +;; other files' errors should go to 0 +;; ghc-flymake-display-errors -> line column +;; ghc-flymake-jump +;; flymake-goto-prev-error +;; flymake-goto-next-error +;; no need to save + (require 'ghc-func) (defvar-local ghc-check-running nil) @@ -85,14 +92,16 @@ (infos (ghc-check-highlight-original-buffer ghc-check-original-buffer infos)) (t - (message "No changes"))) + (with-current-buffer ghc-check-original-buffer + (remove-overlays (point-min) (point-max) 'ghc-check t)) + ;; fixme no changes + )) (setq ghc-check-running nil)))))) (defun ghc-check-process-sentinel () ) (defun ghc-check-highlight-original-buffer (buf infos) - (message "%s" infos) (with-current-buffer buf (remove-overlays (point-min) (point-max) 'ghc-check t) (save-excursion @@ -101,7 +110,8 @@ (let ((line (ghc-hilit-info-get-line info)) (msg (ghc-hilit-info-get-msg info)) beg end ovl) - (goto-line line) + (goto-char (point-min)) + (forward-line (1- line)) (while (eq (char-after) 32) (forward-char)) (setq beg (point)) (forward-line) @@ -131,5 +141,22 @@ "Face used for marking warning lines." :group 'ghc) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defun ghc-check-display-errors () + (interactive) + (let* ((ovls (ghc-check-overlay-here)) + (errs (mapcar (lambda (ovl) (overlay-get ovl 'ghc-msg)) ovls))) + (if (null ovls) + (message "No errors or warnings") + (ghc-display + nil + (lambda () +;; (insert title "\n\n") + (mapc (lambda (x) (insert x "\n")) errs)))))) + +(defun ghc-check-overlay-here () + (let ((ovls (overlays-at (point)))) + (ghc-filter (lambda (ovl) (overlay-get ovl 'ghc-check)) ovls))) (provide 'ghc-check) diff --git a/elisp/ghc-command.el b/elisp/ghc-command.el index f7c8b0c..0873498 100644 --- a/elisp/ghc-command.el +++ b/elisp/ghc-command.el @@ -40,7 +40,8 @@ (defun ghc-save-buffer () (interactive) - (if (buffer-modified-p) (call-interactively 'save-buffer)) + (if (buffer-modified-p) (save-buffer)) +;; (if (buffer-modified-p) (call-interactively 'save-buffer)) (ghc-check-syntax)) (provide 'ghc-command) diff --git a/elisp/ghc.el b/elisp/ghc.el index fe7450e..b4ca4b1 100644 --- a/elisp/ghc.el +++ b/elisp/ghc.el @@ -76,7 +76,7 @@ (define-key haskell-mode-map ghc-import-key 'ghc-import-module) ;; (define-key haskell-mode-map ghc-previous-key 'flymake-goto-prev-error) ;; (define-key haskell-mode-map ghc-next-key 'flymake-goto-next-error) -;; (define-key haskell-mode-map ghc-help-key 'ghc-flymake-display-errors) + (define-key haskell-mode-map ghc-help-key 'ghc-check-display-errors) (define-key haskell-mode-map ghc-insert-key 'ghc-insert-template) (define-key haskell-mode-map ghc-sort-key 'ghc-sort-lines) (define-key haskell-mode-map ghc-check-key 'ghc-save-buffer)