82fdd9a511
Motivation
While disabling Evil in holy-mode makes its implementation shorter and
sounds elegant on the paper, in practice it puts a big burden on the
configuration parts which need to know if Evil is enable or not. This is
a bad separation of concerns and the bunch of fixes that we were forced
to do in the past weeks shows this issue. Those fixes were about
removing the knowledge of the activation of Evil by implementing new
dispatching functions to be used by layers, this is cumbersome and makes
Spacemacs layer configuration more subtle which is not good. There was
additional bad consequences of the removal of Evil state like the
impossibility to use Evil lisp state or iedit states, or we would have
been forced to implement a temporary activation of Evil which is
awkward.
Instead I reintroduce Evil as the central piece of Spacemacs design thus
Evil is now re-enabled in holy-mode. It provides the abstraction we need
to isolate editing styles and be able to grow the Spacemacs
configuration coverage sanely. Layers don't need to check whether the
holy mode is active or not and they don't need to know if Evil is
available (it is always available). We also don't need to write
additional dispatching functions, this is the job of Evil, and I think
it provides everything for this. Ideally configuration layer should be
implemented with only Evil in mind and the holy-mode (and hybrid-mode)
should magically make it work for Emacs style users, for instance we can
freely use `evil-insert-state` anywhere in the code without any guard.
Evil is now even more part of Spacemacs, we can really say that
Spacemacs is Emacs+Evil which is now an indivisible pair. Spacemacs
needed this stable API to continue on the right track.
While these changes should be rather transparent to the user, I'm sorry
for this experimental period, I failed to see all the implications of
such a change, I was just excited about the possibility to make Evil
optional. The reality is that Spacemacs has to embrace it and keep its
strong position on being Emacs+Evil at the core.
Implementation
- insert, motion and normal states are forced to emacs state using an
advice on `evil-insert-state`, `evil-motion-state` and
`evil-normal-state` respectively. These functions can be used freely in
the layer configuration.
- A new general hook `spacemacs-editing-style-hook` allow to hook any
code that need to be configured based on the editing style. Functions
hooked to this hook takes the current style as parameter, this
basically generalize the hook used to setup hjkl navigation bindings.
- ESC has been removed from the emacs state map.
- Revert unneeded changes
- Revert "evil: enter insert-state only from normal-state"
commit bdd702dfbe.
- Revert "avoid being evil in deft with emacs editing style"
commit f3a16f49ed.
Additional changes
All editing style packages have been moved to a layer called
`spacemacs-editing-styles`
Notes
I did not have time to attack hybrid mode, I should be able to do it
later.
154 lines
4.8 KiB
EmacsLisp
154 lines
4.8 KiB
EmacsLisp
;;; packages.el --- ocaml Layer packages File for Spacemacs
|
|
;;
|
|
;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(setq ocaml-packages
|
|
'(
|
|
;; auto-complete
|
|
company
|
|
;; flycheck
|
|
;; flycheck-ocaml
|
|
merlin
|
|
ocp-indent
|
|
smartparens
|
|
tuareg
|
|
utop
|
|
))
|
|
|
|
(defun ocaml/post-init-company ()
|
|
(spacemacs|add-company-hook merlin-mode))
|
|
|
|
(when (configuration-layer/layer-usedp 'syntax-checking)
|
|
(defun ocaml/post-init-flycheck ()
|
|
(spacemacs/add-flycheck-hook 'merlin-mode))
|
|
(defun ocaml/init-flycheck-ocaml ()
|
|
(use-package flycheck-ocaml
|
|
:if (configuration-layer/package-usedp 'flycheck)
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(with-eval-after-load 'merlin
|
|
(setq merlin-error-after-save nil)
|
|
(flycheck-ocaml-setup))))))
|
|
|
|
(defun ocaml/init-merlin ()
|
|
(use-package merlin
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(add-hook 'tuareg-mode-hook 'merlin-mode)
|
|
;; (set-default 'merlin-use-auto-complete-mode t)
|
|
(set-default 'merlin-use-auto-complete-mode nil)
|
|
(setq merlin-completion-with-doc t)
|
|
(push 'merlin-company-backend company-backends-merlin-mode)
|
|
(spacemacs/set-leader-keys-for-major-mode 'tuareg-mode
|
|
"cp" 'merlin-project-check
|
|
"cr" 'merlin-refresh
|
|
"cv" 'merlin-goto-project-file
|
|
"eC" 'merlin-error-check
|
|
"en" 'merlin-error-next
|
|
"eN" 'merlin-error-prev
|
|
"gb" 'merlin-pop-stack
|
|
"gg" #'(lambda ()
|
|
(interactive)
|
|
(let ((merlin-locate-in-new-window 'never))
|
|
(merlin-locate)))
|
|
"gG" #'(lambda ()
|
|
(interactive)
|
|
(let ((merlin-locate-in-new-window 'always))
|
|
(merlin-locate)))
|
|
"gl" 'merlin-locate-ident
|
|
"gi" 'merlin-switch-to-ml
|
|
"gI" 'merlin-switch-to-mli
|
|
"hh" 'merlin-document
|
|
"ht" 'merlin-type-enclosing
|
|
"hT" 'merlin-type-expr
|
|
"rd" 'merlin-destruct))))
|
|
|
|
(defun ocaml/init-ocp-indent ()
|
|
(use-package ocp-indent
|
|
:defer t
|
|
:init
|
|
(add-hook 'tuareg-mode-hook 'ocp-indent-caml-mode-setup)))
|
|
|
|
(defun ocaml/post-init-smartparens ()
|
|
(with-eval-after-load 'smartparens
|
|
;; don't auto-close apostrophes (type 'a = foo) and backticks (`Foo)
|
|
(sp-local-pair 'tuareg-mode "'" nil :actions nil)
|
|
(sp-local-pair 'tuareg-mode "`" nil :actions nil)))
|
|
|
|
(defun ocaml/init-tuareg ()
|
|
(use-package tuareg
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(spacemacs//init-ocaml-opam)
|
|
(spacemacs/set-leader-keys-for-major-mode 'tuareg-mode
|
|
"ga" 'tuareg-find-alternate-file
|
|
"cc" 'compile)
|
|
;; Make OCaml-generated files invisible to filename completion
|
|
(dolist (ext '(".cmo" ".cmx" ".cma" ".cmxa" ".cmi" ".cmxs" ".cmt" ".annot"))
|
|
(add-to-list 'completion-ignored-extensions ext)))))
|
|
|
|
(defun ocaml/init-utop ()
|
|
(use-package utop
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(add-hook 'tuareg-mode-hook 'utop-minor-mode)
|
|
(spacemacs/register-repl 'utop 'utop "ocaml"))
|
|
:config
|
|
(progn
|
|
;; Setup environment variables using opam
|
|
(if (executable-find "opam")
|
|
(let ((vars (car (read-from-string
|
|
(shell-command-to-string "opam config env --sexp")))))
|
|
(dolist (var vars)
|
|
(setenv (car var) (cadr var))))
|
|
(spacemacs-buffer/warning "Cannot find \"opam\" executable."))
|
|
;; Update the emacs path
|
|
(setq exec-path (append (parse-colon-path (getenv "PATH"))
|
|
(list exec-directory)))
|
|
|
|
(defun spacemacs/utop-eval-phrase-and-go ()
|
|
"Send phrase to REPL and evaluate it and switch to the REPL in
|
|
`insert state'"
|
|
(interactive)
|
|
(utop-eval-phrase)
|
|
(utop)
|
|
(evil-insert-state))
|
|
|
|
(defun spacemacs/utop-eval-buffer-and-go ()
|
|
"Send buffer to REPL and evaluate it and switch to the REPL in
|
|
`insert state'"
|
|
(interactive)
|
|
(utop-eval-buffer)
|
|
(utop)
|
|
(evil-insert-state))
|
|
|
|
(defun spacemacs/utop-eval-region-and-go (start end)
|
|
"Send region to REPL and evaluate it and switch to the REPL in
|
|
`insert state'"
|
|
(interactive "r")
|
|
(utop-eval-region start end)
|
|
(utop)
|
|
(evil-insert-state))
|
|
|
|
(spacemacs/set-leader-keys-for-major-mode 'tuareg-mode
|
|
"'" 'utop
|
|
"sb" 'utop-eval-buffer
|
|
"sB" 'spacemacs/utop-eval-buffer-and-go
|
|
"si" 'utop
|
|
"sp" 'utop-eval-phrase
|
|
"sP" 'spacemacs/utop-eval-phrase-and-go
|
|
"sr" 'utop-eval-region
|
|
"sR" 'spacemacs/utop-eval-region-and-go))
|
|
(define-key utop-mode-map (kbd "C-j") 'utop-history-goto-next)
|
|
(define-key utop-mode-map (kbd "C-k") 'utop-history-goto-prev)))
|