emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ui/treemacs: fix SPC o P (treemacs-find-file)

Browse source 
Would create a blank treemacs window when invoked before a treemacs
window was first initialized.
This commit is contained in:
Henrik Lissner 2018-08-29 02:04:12 +02:00
parent be8eedc296
commit cab0ee33d1
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/config/default/+bindings.el
View file

@ -703,7 +703,7 @@
:desc "Find file in project sidebar" :n "P" #'+neotree/find-this-file) :desc "Find file in project sidebar" :n "P" #'+neotree/find-this-file)
(:when (featurep! :ui treemacs) (:when (featurep! :ui treemacs)
:desc "Project sidebar" :n "p" #'+treemacs/toggle :desc "Project sidebar" :n "p" #'+treemacs/toggle
:desc "Find file in project sidebar" :n "P" #'treemacs-find-file) :desc "Find file in project sidebar" :n "P" #'+treemacs/find-file)
:desc "Imenu sidebar" :nv "i" #'imenu-list-smart-toggle :desc "Imenu sidebar" :nv "i" #'imenu-list-smart-toggle
:desc "Terminal" :n "t" #'+term/open :desc "Terminal" :n "t" #'+term/open
:desc "Terminal in popup" :n "T" #'+term/open-popup-in-project :desc "Terminal in popup" :n "T" #'+term/open-popup-in-project

46
modules/ui/treemacs/autoload.el
View file

@ -1,27 +1,39 @@
;;; ui/treemacs/autoload.el -*- lexical-binding: t; -*- ;;; ui/treemacs/autoload.el -*- lexical-binding: t; -*-
(defun +treemacs--init ()
(require 'treemacs)
(let ((origin-buffer (current-buffer)))
(cl-letf (((symbol-function 'treemacs-workspace->is-empty?)
(symbol-function 'ignore)))
(treemacs--init))
(dolist (project (treemacs-workspace->projects (treemacs-current-workspace)))
(treemacs-do-remove-project-from-workspace project))
(with-current-buffer origin-buffer
(treemacs-do-add-project-to-workspace
(treemacs--canonical-path (doom-project-root 'nocache))
(doom-project-name 'nocache))
(setq treemacs--ready-to-follow t)
(when (or treemacs-follow-after-init treemacs-follow-mode)
(treemacs--follow)))))
;;;###autoload ;;;###autoload
(defun +treemacs/toggle () (defun +treemacs/toggle ()
"Initialize or toggle treemacs. "Initialize or toggle treemacs.
Ensures that only the current project is present and all other projects have Ensures that only the current project is present and all other projects have
been removed." been removed.
Use `treemacs' command for old functionality."
(interactive) (interactive)
(require 'treemacs) (pcase (treemacs-current-visibility)
(`visible (delete-window (treemacs-get-local-window)))
(_ (+treemacs--init))))
;;;###autoload
(defun +treemacs/find-file (arg)
"Open treemacs (if necessary) and find current file."
(interactive "P")
(let ((origin-buffer (current-buffer))) (let ((origin-buffer (current-buffer)))
(cl-letf (((symbol-function 'treemacs-workspace->is-empty?) (+treemacs--init)
(symbol-function 'ignore)))
(treemacs--init))
;;
(dolist (project (treemacs-workspace->projects (treemacs-current-workspace)))
(treemacs-do-remove-project-from-workspace project))
;;
(with-current-buffer origin-buffer (with-current-buffer origin-buffer
(treemacs-do-add-project-to-workspace (treemacs-find-file arg))))
(treemacs--canonical-path (doom-project-root 'nocache))
(doom-project-name 'nocache)))
;;
(setq treemacs--ready-to-follow t)
(when (or treemacs-follow-after-init treemacs-follow-mode)
(with-current-buffer origin-buffer
(treemacs--follow)))))