Merge pull request #28 from thomasf/helm

Simplified helm-eproject
jrockway · Oct 3, 2012 · 1986e36 · 1986e36
2 parents 145c756 + 1b49883
commit 1986e36
Showing 1 changed file with 25 additions and 41 deletions.
diff --git a/contrib/helm-eproject.el b/contrib/helm-eproject.el
@@ -1,86 +1,70 @@
-;;; helm-eproject.el --- 
-;; 
+;;; helm-eproject.el ---
+;;
 ;; Filename: helm-eproject.el
-;; Description: 
+;; Description:
 ;; Author: Glauber Alex Dias Prado
-;; Maintainer: 
+;; Author: Thomas Frössman
+;; Maintainer:
 ;; Created: Ter Mar 27 20:26:06 2012 (-0300)
-;; Version: 
-;; Last-Updated: Ter Mar 27 21:11:45 2012 (-0300)
-;;           By: Glauber Alex Dias Prado
-;;     Update #: 7
+;; Version:
+;; Last-Updated: sön sep 02 13:44:27 CEST 2012
+;;           By: Thomas Frössman
 ;; URL: github
 ;; Keywords: emacs eproject helm complection
-;; Compatibility: GNU Emacs 24.0.94.1
-;; 
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
+;;
 ;;; Commentary:
-;; 
+;;
 ;; This small utility helps eproject to show the project files under helm
 ;; perhaps it would be better implemented using helm completion hooks but this
 ;; is working pretty good for now :).
 ;;
 ;;; Install:
-;; 
+;;
 ;; Add the file somewhere to your load path like ~/elisp and add:
 ;; (require 'helm-eproject)
 ;; after you've setup both eproject and helm then just open a file that normal
 ;; eproject would pick up and voila :), you have to setup helm and eproject
 ;; for yourself so you can get the most out of these extensions.
-;; 
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
+;;
 ;;; Change log:
-;; 
-;; 
+;;
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
+;;
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation; either version 3, or
 ;; (at your option) any later version.
-;; 
+;;
 ;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
-;; 
+;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
 ;; Floor, Boston, MA 02110-1301, USA.
-;; 
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
+;;
 ;;; Code:
 
 ;; helm support
 (require 'helm-files)
-(require 'eproject)
 (require 'cl)
 
-(defun helm-eproject-build-matcher (matcher-type)
-  (format "\\(?:%s\\)"
-          (reduce (lambda (a b) (concat a "\\|" b))
-                  (mapcar (lambda (f) (format "\\(?:%s\\)" f))
-                          (eproject-get-project-metadatum
-                           (eproject-type) matcher-type)))))
-
-(defun helm-eproject-get-files ()
-  (eproject--search-directory-tree
-   (eproject-root)
-   (helm-eproject-build-matcher :relevant-files)
-   (helm-eproject-build-matcher :irrelevant-files)))
-
 (defvar helm-eproject-source
-  '((name . " helm-eproject: ")
-    (init . (lambda ()
-              (setq helm-eproject-last-buffer (current-buffer))))
+  '((name . "Eproject")
     (type . file)
     (candidates . (lambda ()
-                    (with-current-buffer helm-eproject-last-buffer
-                      (helm-eproject-get-files))))))
+		    (with-helm-current-buffer
+		      (when (and (boundp 'eproject-mode) eproject-mode)
+			(eproject-list-project-files)))))))
 
 (defun helm-eproject ()
   "helps helm to use eproject to find a file"