Fix Agda layer for users without 'agda-mode' executable.

This commit is contained in:
FreeSalad 2016-08-06 22:36:11 +02:00 committed by Eivind Fonn
parent 2651f67c48
commit 5096202b6b
3 changed files with 80 additions and 60 deletions

View File

@ -34,6 +34,11 @@ Then check that =agda= is available on your =$PATH= and seen by Emacs. For
information about setting up =$PATH=, check out the corresponding section in the
FAQ (~SPC h SPC $PATH RET~).
By default the =agda-mode= executable bundled with most agda installations
is used to locate the agda-mode package. If you don't have it and want to use
a local agda-mode package, you can customize the layer variable =agda-mode-path=
to your needs.
* Key bindings
The key bindings of this layer don't follow the Spacemacs conventions,
we opted to a simple transcription of stock Agda mode key bindings to

View File

@ -0,0 +1,15 @@
;;; config.el --- Agda2 Layer config File for Spacemacs
;;
;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
;;
;; Author: FreeSalad <freesalad@noreply.git>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(defvar agda-mode-path 'use-helper
"Indicates the location of the agda-mode package.
If `nil', it is assumed to be already available by Emacs.
If `'use-helper', the `agda-mode' executable is used to find its location.")

View File

@ -13,67 +13,67 @@
'((agda :location local)))
(defun agda/init-agda ()
(unless (executable-find "agda-mode")
(if (and (eq agda-mode-path 'use-helper) (not (executable-find "agda-mode")))
(spacemacs-buffer/warning
(concat "Agda not detected, be sure that Agda binaries are "
"available in your PATH or check the installation "
"instructions in the README file.")))
(concat "Couldn't find `agda-mode', make sure it is "
"available in your PATH or check the installation "
"instructions in the README file."))
(use-package agda2-mode
:if (executable-find "agda-mode")
:defer t
:init (load-file (let ((coding-system-for-read 'utf-8))
(shell-command-to-string "agda-mode locate")))
(mapc
(lambda (x) (add-to-list 'face-remapping-alist x))
'((agda2-highlight-datatype-face . font-lock-type-face)
(agda2-highlight-function-face . font-lock-type-face)
(agda2-highlight-inductive-constructor-face . font-lock-function-name-face)
(agda2-highlight-keyword-face . font-lock-keyword-face)
(agda2-highlight-module-face . font-lock-constant-face)
(agda2-highlight-number-face . nil)
(agda2-highlight-postulate-face . font-lock-type-face)
(agda2-highlight-primitive-type-face . font-lock-type-face)
(agda2-highlight-record-face . font-lock-type-face)))
:config
(progn
(spacemacs|define-transient-state goal-navigation
:title "Goal Navigation Transient State"
:doc "\n[_f_] next [_b_] previous [_q_] quit"
:bindings
("f" agda2-next-goal)
("b" agda2-previous-goal)
("q" nil :exit t))
(spacemacs/set-leader-keys-for-major-mode 'agda2-mode
"f" 'spacemacs/goal-navigation-transient-state/agda2-next-goal
"b" 'spacemacs/goal-navigation-transient-state/agda2-previous-goal)
(when (eq agda-mode-path 'use-helper) (setq agda-mode-path (let ((coding-system-for-read 'utf-8)) (shell-command-to-string "agda-mode locate"))))
(spacemacs/set-leader-keys-for-major-mode 'agda2-mode
"?" 'agda2-show-goals
"." 'agda2-goal-and-context-and-inferred
"," 'agda2-goal-and-context
"=" 'agda2-show-constraints
"SPC" 'agda2-give
"a" 'agda2-auto
"c" 'agda2-make-case
"d" 'agda2-infer-type-maybe-toplevel
"e" 'agda2-show-context
"gg" 'agda2-goto-definition-keyboard
"gG" 'agda2-go-back
"h" 'agda2-helper-function-type
"l" 'agda2-load
"n" 'agda2-compute-normalised-maybe-toplevel
"p" 'agda2-module-contents-maybe-toplevel
"r" 'agda2-refine
"s" 'agda2-solveAll
"t" 'agda2-goal-type
"w" 'agda2-why-in-scope-maybe-toplevel
"xc" 'agda2-compile
"xd" 'agda2-remove-annotations
"xh" 'agda2-display-implicit-arguments
"xq" 'agda2-quit
"xr" 'agda2-restart)
(use-package agda2-mode
:defer t
:init (when agda-mode-path (load-file agda-mode-path))
(mapc
(lambda (x) (add-to-list 'face-remapping-alist x))
'((agda2-highlight-datatype-face . font-lock-type-face)
(agda2-highlight-function-face . font-lock-type-face)
(agda2-highlight-inductive-constructor-face . font-lock-function-name-face)
(agda2-highlight-keyword-face . font-lock-keyword-face)
(agda2-highlight-module-face . font-lock-constant-face)
(agda2-highlight-number-face . nil)
(agda2-highlight-postulate-face . font-lock-type-face)
(agda2-highlight-primitive-type-face . font-lock-type-face)
(agda2-highlight-record-face . font-lock-type-face)))
:config
(progn
(spacemacs|define-transient-state goal-navigation
:title "Goal Navigation Transient State"
:doc "\n[_f_] next [_b_] previous [_q_] quit"
:bindings
("f" agda2-next-goal)
("b" agda2-previous-goal)
("q" nil :exit t))
(spacemacs/set-leader-keys-for-major-mode 'agda2-mode
"f" 'spacemacs/goal-navigation-transient-state/agda2-next-goal
"b" 'spacemacs/goal-navigation-transient-state/agda2-previous-goal)
(with-eval-after-load 'golden-ratio
(add-to-list 'golden-ratio-exclude-buffer-names
"*Agda information*")))))
(spacemacs/set-leader-keys-for-major-mode 'agda2-mode
"?" 'agda2-show-goals
"." 'agda2-goal-and-context-and-inferred
"," 'agda2-goal-and-context
"=" 'agda2-show-constraints
"SPC" 'agda2-give
"a" 'agda2-auto
"c" 'agda2-make-case
"d" 'agda2-infer-type-maybe-toplevel
"e" 'agda2-show-context
"gg" 'agda2-goto-definition-keyboard
"gG" 'agda2-go-back
"h" 'agda2-helper-function-type
"l" 'agda2-load
"n" 'agda2-compute-normalised-maybe-toplevel
"p" 'agda2-module-contents-maybe-toplevel
"r" 'agda2-refine
"s" 'agda2-solveAll
"t" 'agda2-goal-type
"w" 'agda2-why-in-scope-maybe-toplevel
"xc" 'agda2-compile
"xd" 'agda2-remove-annotations
"xh" 'agda2-display-implicit-arguments
"xq" 'agda2-quit
"xr" 'agda2-restart)
(with-eval-after-load 'golden-ratio
(add-to-list 'golden-ratio-exclude-buffer-names
"*Agda information*"))))))