[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master abe46da 037/173: company-files: Skip disconnected remote c
From: |
Dmitry Gutov |
Subject: |
[elpa] master abe46da 037/173: company-files: Skip disconnected remote completions for "/xyz" |
Date: |
Thu, 23 Jun 2016 00:28:36 +0000 (UTC) |
branch: master
commit abe46daf96fd4fb105f519509693b6a55b02dc70
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
company-files: Skip disconnected remote completions for "/xyz"
Fixes #347
---
company-files.el | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/company-files.el b/company-files.el
index e44b4f5..200f9cf 100644
--- a/company-files.el
+++ b/company-files.el
@@ -50,14 +50,17 @@
(and (cl-dolist (regexp company-files--regexps)
(when (setq file (company-grab-line regexp 1))
(cl-return file)))
- (or (not (file-remote-p file))
- (file-remote-p file nil t))
+ (company-files--connected-p file)
(setq dir (file-name-directory file))
(not (string-match "//" dir))
(file-exists-p dir)
(file-name-all-completions (file-name-nondirectory file) dir)
file)))
+(defun company-files--connected-p (file)
+ (or (not (file-remote-p file))
+ (file-remote-p file nil t)))
+
(defvar company-files--completion-cache nil)
(defun company-files--complete (prefix)
@@ -71,9 +74,10 @@
(unless (company-file--keys-match-p key (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)
- (push file directories)))
+ (when (company-files--connected-p file)
+ (push file candidates)
+ (when (file-directory-p file)
+ (push file directories))))
(dolist (directory (reverse directories))
;; Add one level of children.
(dolist (child (company-files--directory-files directory ""))
- [elpa] master 5fe84a2 028/173: Merge pull request #334 from vermiculus/patch-1, (continued)
- [elpa] master 5fe84a2 028/173: Merge pull request #334 from vermiculus/patch-1, Dmitry Gutov, 2016/06/22
- [elpa] master 2de213e 032/173: company-dabbrev--search-buffer: Save match data, Dmitry Gutov, 2016/06/22
- [elpa] master a0ba593 029/173: Drop githalytics link, Dmitry Gutov, 2016/06/22
- [elpa] master 6301093 023/173: Clarify the meaning of cdr in the prefix cons, Dmitry Gutov, 2016/06/22
- [elpa] master 9f67f1e 027/173: Fix docstring, Dmitry Gutov, 2016/06/22
- [elpa] master 17e6d19 016/173: Remove company-pysmell, Dmitry Gutov, 2016/06/22
- [elpa] master 733d4a9 019/173: Merge pull request #318 from iqbalansari/master, Dmitry Gutov, 2016/06/22
- [elpa] master 7ad049d 031/173: Fix the svg url, Dmitry Gutov, 2016/06/22
- [elpa] master 5296784 038/173: company-template: Add a summary line, Dmitry Gutov, 2016/06/22
- [elpa] master 5fc4a9a 034/173: Update company-clang-objc-templatify in line with the previous change, Dmitry Gutov, 2016/06/22
- [elpa] master abe46da 037/173: company-files: Skip disconnected remote completions for "/xyz",
Dmitry Gutov <=
- [elpa] master 1f1925f 005/173: company-backends: Make the version check more conservative, Dmitry Gutov, 2016/06/22
- [elpa] master 9486563 035/173: Accept markers in the data returned by c-a-p-f functions, Dmitry Gutov, 2016/06/22
- [elpa] master c08dbc1 039/173: Don't use `sit-for', Dmitry Gutov, 2016/06/22
- [elpa] master 1dce769 036/173: company-version: Require find-func, Dmitry Gutov, 2016/06/22
- [elpa] master 5b736e9 024/173: Introduce company-dabbrev-ignore-invisible, Dmitry Gutov, 2016/06/22
- [elpa] master b20726c 026/173: string-prefix-p signals error on nil in Emacs < 25, Dmitry Gutov, 2016/06/22
- [elpa] master 27c913a 040/173: Don't use `require-match t' in normal backends, Dmitry Gutov, 2016/06/22
- [elpa] master 4ba4264 047/173: company--begin-new: Reorder statements, Dmitry Gutov, 2016/06/22
- [elpa] master 9c8364d 049/173: company-keywords: Support scala-mode, Dmitry Gutov, 2016/06/22
- [elpa] master d2ff1dc 046/173: company--begin-new: Call `company-cancel' in the unique case, Dmitry Gutov, 2016/06/22