[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e6689ea 12/23: company-files--directory-files: Swallow fil
From: |
Dmitry Gutov |
Subject: |
[elpa] master e6689ea 12/23: company-files--directory-files: Swallow file-error |
Date: |
Fri, 11 Nov 2016 22:21:42 +0000 (UTC) |
branch: master
commit e6689ea1f54920fbca283203cc5e9f3c678280bd
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
company-files--directory-files: Swallow file-error
Fixes #563.
---
company-files.el | 16 +++++++++-------
test/files-tests.el | 5 +++++
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/company-files.el b/company-files.el
index 4397df9..4410281 100644
--- a/company-files.el
+++ b/company-files.el
@@ -40,13 +40,15 @@ The values should use the same format as
`completion-ignored-extensions'."
(defun company-files--directory-files (dir prefix)
;; Don't use directory-files. It produces directories without trailing /.
- (let ((comp (sort (file-name-all-completions prefix dir)
- (lambda (s1 s2) (string-lessp (downcase s1) (downcase
s2))))))
- (when company-files-exclusions
- (setq comp (company-files--exclusions-filtered comp)))
- (if (equal prefix "")
- (delete "../" (delete "./" comp))
- comp)))
+ (condition-case err
+ (let ((comp (sort (file-name-all-completions prefix dir)
+ (lambda (s1 s2) (string-lessp (downcase s1) (downcase
s2))))))
+ (when company-files-exclusions
+ (setq comp (company-files--exclusions-filtered comp)))
+ (if (equal prefix "")
+ (delete "../" (delete "./" comp))
+ comp))
+ (file-error nil)))
(defun company-files--exclusions-filtered (completions)
(let* ((dir-exclusions (cl-delete-if-not #'company-files--trailing-slash-p
diff --git a/test/files-tests.el b/test/files-tests.el
index d45a652..254baa2 100644
--- a/test/files-tests.el
+++ b/test/files-tests.el
@@ -28,6 +28,11 @@
(company-files 'candidates
company-dir)))))
+(ert-deftest company-files-candidates-normal-root ()
+ (let (company-files--completion-cache)
+ (should (member "/lost+found/"
+ (company-files 'candidates "/")))))
+
(ert-deftest company-files-candidates-excluding-dir ()
(let ((company-files-exclusions '("test/"))
company-files--completion-cache)
- [elpa] master 5fe2c23 04/23: Consider any frontend deriving from company-preview-frontend, (continued)
- [elpa] master 5fe2c23 04/23: Consider any frontend deriving from company-preview-frontend, Dmitry Gutov, 2016/11/11
- [elpa] master d3032e2 06/23: company-next-page: Wrap only when at the last item, Dmitry Gutov, 2016/11/11
- [elpa] master 63d4332 07/23: Reword, Dmitry Gutov, 2016/11/11
- [elpa] master e53f150 05/23: Mention the previous change, too, Dmitry Gutov, 2016/11/11
- [elpa] master 8e321eb 03/23: Auto-adjust company-idle-delay when it's zero, Dmitry Gutov, 2016/11/11
- [elpa] master 3d369e1 11/23: Don't convert user-error signals to error (#560), Dmitry Gutov, 2016/11/11
- [elpa] master 86c1f60 10/23: company-dabbrev-code: Look inside comments and strings when appropriate, Dmitry Gutov, 2016/11/11
- [elpa] master ac2606a 18/23: Add JSX modes to javascript aliases, Dmitry Gutov, 2016/11/11
- [elpa] master fc39277 15/23: Add keywords for rust-mode to company-keywords., Dmitry Gutov, 2016/11/11
- [elpa] master f78f9c1 21/23: Initialize grouped backends on the fly as well, Dmitry Gutov, 2016/11/11
- [elpa] master e6689ea 12/23: company-files--directory-files: Swallow file-error,
Dmitry Gutov <=
- [elpa] master 9476aef 09/23: company-files--directory-files: Don't ignore errors, Dmitry Gutov, 2016/11/11
- [elpa] master c353c71 14/23: global goes through all the tag files listed in GTAGSLIBPATH, Dmitry Gutov, 2016/11/11
- [elpa] master f2327bc 19/23: Merge pull request #575 from Wilfred/patch-1, Dmitry Gutov, 2016/11/11
- [elpa] master e077caf 22/23: Release 0.9.1, Dmitry Gutov, 2016/11/11
- [elpa] master ba87881 16/23: Merge pull request #572 from Wilfred/rust_keywords, Dmitry Gutov, 2016/11/11
- [elpa] master 6025006 08/23: Add company-files-exclusions, Dmitry Gutov, 2016/11/11
- [elpa] master d8ca520 13/23: Improve search visualization, Dmitry Gutov, 2016/11/11
- [elpa] master 1028f38 20/23: company-indent-or-complete-common: Blacklist some indentation functions, Dmitry Gutov, 2016/11/11
- [elpa] master 85bd83e 23/23: Merge commit 'e077caf1957f1846fae29aa84a021234c43be96f', Dmitry Gutov, 2016/11/11
- [elpa] master 917936c 17/23: Fix keyword ordering, Dmitry Gutov, 2016/11/11