-;;; company-files.el --- A company-mode completion back-end for file names
+;;; company-files.el --- company-mode completion back-end for file names
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2013 Free Software Foundation, Inc.
;; Author: Nikolaj Schumacher
;;; Commentary:
-;;
+;;
;;; Code:
(require 'company)
-(eval-when-compile (require 'cl))
+(require 'cl-lib)
(defun company-files-directory-files (dir prefix)
(ignore-errors
(defun company-files-grab-existing-name ()
;; Grab file names with spaces, only when they include quotes.
(let (file dir)
- (and (dolist (regexp company-files-regexps)
+ (and (cl-dolist (regexp company-files-regexps)
(when (setq file (company-grab-line regexp 1))
- (return file)))
+ (cl-return file)))
(setq dir (file-name-directory file))
(not (string-match "//" dir))
(file-exists-p dir)
(defun company-files-complete (prefix)
(let* ((dir (file-name-directory prefix))
(file (file-name-nondirectory prefix))
- candidates)
+ candidates directories)
(unless (equal dir (car company-files-completion-cache))
(dolist (file (company-files-directory-files dir file))
(setq file (concat dir file))
(push file candidates)
(when (file-directory-p file)
- ;; Add one level of children.
- (dolist (child (company-files-directory-files file ""))
- (push (concat file child) candidates))))
+ (push file directories)))
+ (dolist (directory (reverse directories))
+ ;; Add one level of children.
+ (dolist (child (company-files-directory-files directory ""))
+ (push (concat directory
+ (unless (eq (aref directory (1- (length directory))) ?/) "/")
+ child) candidates)))
(setq company-files-completion-cache (cons dir (nreverse candidates))))
- (cdr company-files-completion-cache)))
+ (all-completions prefix
+ (cdr company-files-completion-cache))))
;;;###autoload
(defun company-files (command &optional arg &rest ignored)
- "A `company-mode' completion back-end existing file names."
+ "`company-mode' completion back-end existing file names."
(interactive (list 'interactive))
- (case command
+ (cl-case command
(interactive (company-begin-backend 'company-files))
(prefix (company-files-grab-existing-name))
(candidates (company-files-complete arg))