Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Helm-spacemacs facelift #3769

Merged
merged 1 commit into from
Nov 12, 2015
Merged

Helm-spacemacs facelift #3769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions layers/+distribution/spacemacs-base/local/helm-spacemacs/helm-spacemacs.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
(require 'cl)
(require 'ht)
(require 'helm)
(require 'helm-command)
(require 'helm-org)
(require 'core-configuration-layer)

Expand Down Expand Up @@ -164,7 +165,10 @@
"Return the sorted candidates for package source."
(let (result)
(dolist (pkg helm-spacemacs-all-packages)
(push (format "(%S) package: %S" (oref pkg :owner) (oref pkg :name))
(push (format "%s (%S layer)"
(propertize (symbol-name (oref pkg :name))
'face 'font-lock-type-face)
(oref pkg :owner))
result))
(sort result 'string<)))

Expand All @@ -182,7 +186,19 @@
(dolist (toggle spacemacs-toggles)
(let* ((toggle-symbol (symbol-name (car toggle)))
(toggle-name (capitalize (replace-regexp-in-string "-" " " toggle-symbol)))
(toggle-doc (format "%s: %s" toggle-name (plist-get (cdr toggle) :documentation))))
(toggle-doc (format "%s: %s"
toggle-name
(propertize
(or (plist-get (cdr toggle) :documentation) "")
'face 'font-lock-doc-face))))
(when (plist-member (cdr toggle) :evil-leader)
(let ((key (key-description
(kbd (concat dotspacemacs-leader-key " "
(plist-get (cdr toggle) :evil-leader))))))
(setq toggle-doc
(format "%s (%s)"
toggle-doc
(propertize key 'face 'helm-M-x-key)))))
(if (plist-member (cdr toggle) :documentation)
(push `(,toggle-doc . ,toggle-symbol) result)
(push `(,toggle-name . ,toggle-symbol) result))))
Expand Down Expand Up @@ -276,20 +292,26 @@
(candidate-number-limit)
(action . (("Go to question" . helm-spacemacs//faq-goto-marker)))))

(defun helm-spacemacs//faq-candidate (cand)
(let ((str (substring-no-properties (car cand))))
(when (string-match "\\`\\([^/]*\\)/\\(.*\\)\\'" str)
(cons (concat (propertize
(match-string 1 str)
'face 'font-lock-type-face)
": " (match-string 2 str))
(cdr cand)))))

(defun helm-spacemacs//faq-candidates ()
(delq nil (mapcar (lambda (c)
(let ((str (substring-no-properties (car c))))
(when (string-match "\\`\\([^/]*\\)/\\(.*\\)\\'" str)
(cons (concat (match-string 1 str) ": "
(match-string 2 str))
(cdr c)))))
(with-temp-buffer
(insert-file-contents helm-spacemacs--faq-filename)
(org-mode)
(mapcar '(lambda (candidate)
`(,(car candidate) . ,(marker-position (cdr candidate))))
(helm-get-org-candidates-in-file (current-buffer) 1 8 nil t))
))))
(delq nil
(mapcar 'helm-spacemacs//faq-candidate
(with-temp-buffer
(insert-file-contents helm-spacemacs--faq-filename)
(org-mode)
(mapcar (lambda (candidate)
(cons (car candidate)
(marker-position (cdr candidate))))
(helm-get-org-candidates-in-file
(current-buffer) 1 8 nil t))))))

(defun helm-spacemacs//faq-goto-marker (marker)
(find-file helm-spacemacs--faq-filename)
Expand Down