1c4f685b13
TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
36 lines
1.6 KiB
EmacsLisp
36 lines
1.6 KiB
EmacsLisp
;;; core-configuration-layer-ftest.el --- Spacemacs Functional Test File
|
|
;;
|
|
;; 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
|
|
(require 'core-configuration-layer)
|
|
|
|
;; ---------------------------------------------------------------------------
|
|
;; configuration-layer//declare-used-layers
|
|
;; ---------------------------------------------------------------------------
|
|
|
|
(ert-deftest test-declare-layers--bootstrap-layer-always-first ()
|
|
(let ((dotspacemacs-distribution 'spacemacs)
|
|
(dotspacemacs-configuration-layers '(emacs-lisp
|
|
(git :variables foo 'bar)))
|
|
configuration-layer--used-layers
|
|
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
|
|
(configuration-layer/discover-layers)
|
|
(configuration-layer//declare-used-layers)
|
|
(should (eq 'spacemacs-bootstrap
|
|
(first configuration-layer--used-layers)))))
|
|
|
|
(ert-deftest test-declare-layers--distribution-layer-is-second ()
|
|
(let ((dotspacemacs-distribution 'spacemacs-base)
|
|
(dotspacemacs-configuration-layers '(emacs-lisp
|
|
(git :variables foo 'bar)))
|
|
configuration-layer--used-layers
|
|
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
|
|
(configuration-layer/discover-layers)
|
|
(configuration-layer//declare-used-layers)
|
|
(should (eq 'spacemacs-base (second configuration-layer--used-layers)))))
|