mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Code Issues Releases Activity

Fix error in completion for separate Tramp syntax

Browse Source 
* lisp/net/tramp.el (tramp-completion-file-name-regexp-separate):
Tweak regexp.

* test/lisp/net/tramp-tests.el (tramp-test24-file-name-completion):
Run method and host name completion for all syntaxes.
This commit is contained in:
Michael Albinus 2017-05-02 16:30:55 +02:00
parent 5f75304f61
commit b50dda3fa2
2 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/net/tramp.el
View File

@ -945,7 +945,7 @@ See `tramp-file-name-structure' for more explanations.
On W32 systems, the volume letter must be ignored.")
(defconst tramp-completion-file-name-regexp-separate
"\\`/\\[[^]]*\\'"
"\\`/\\(\\[[^]]*\\)?\\'"
"Value for `tramp-completion-file-name-regexp' for separate remoting.
See `tramp-file-name-structure' for more explanations.")

79
test/lisp/net/tramp-tests.el
View File

@ -2448,37 +2448,66 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
"Check `file-name-completion' and `file-name-all-completions'."
(skip-unless (tramp--test-enabled))
;; Method and host name in completion mode. This kind of completion
;; does not work on MS Windows.
(when (not (memq system-type '(cygwin windows-nt)))
(let ((method (file-remote-p tramp-test-temporary-file-directory 'method))
(host (file-remote-p tramp-test-temporary-file-directory 'host))
(orig-syntax tramp-syntax))
(unwind-protect
(dolist (syntax (tramp-syntax-values))
(tramp-change-syntax syntax)
(let ;; This is needed for the `simplified' syntax.
((method-marker
(if (zerop (length (tramp-method-regexp)))
"" tramp-default-method-marker))
;; This is needed for the `separate' syntax.
(prefix-format (substring (tramp-prefix-format) 1)))
;; Complete method name.
(unless (or (zerop (length method))
(zerop (length (tramp-method-regexp))))
(should
(member
(concat prefix-format method (tramp-postfix-method-format))
(file-name-all-completions
(concat prefix-format (substring method 0 1)) "/"))))
;; Complete host name for default method.
(unless (zerop (length host))
(let ((tramp-default-method (or method tramp-default-method)))
(should
(member
(concat
prefix-format method-marker (tramp-postfix-method-format)
host (tramp-postfix-host-format))
(file-name-all-completions
(concat
prefix-format method-marker (tramp-postfix-method-format)
(substring host 0 1))
"/")))))
;; Complete host name.
(unless (or (zerop (length method))
(zerop (length (tramp-method-regexp)))
(zerop (length host)))
(should
(member
(concat
prefix-format method (tramp-postfix-method-format)
host (tramp-postfix-host-format))
(file-name-all-completions
(concat prefix-format method (tramp-postfix-method-format))
"/"))))))
;; Cleanup.
(tramp-change-syntax orig-syntax))))
(dolist (n-e '(nil t))
(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
(let ((non-essential n-e)
(tmp-name (tramp--test-make-temp-name nil quoted))
(method (file-remote-p tramp-test-temporary-file-directory 'method))
(host (file-remote-p tramp-test-temporary-file-directory 'host)))
(tmp-name (tramp--test-make-temp-name nil quoted)))
(unwind-protect
(progn
;; Method and host name in completion mode. This kind
;; of completion does not work on MS Windows.
(when (not (memq system-type '(cygwin windows-nt)))
(unless (zerop (length method))
(should
(member
(format "%s:" method)
(file-name-all-completions (substring method 0 1) "/"))))
(unless (zerop (length host))
(let ((tramp-default-method (or method tramp-default-method)))
(should
(member
(format "-:%s:" host)
(file-name-all-completions
(format "-:%s" (substring host 0 1)) "/")))))
(unless (or (zerop (length method)) (zerop (length host)))
(should
(member
(format "%s:%s:" method host)
(file-name-all-completions
(format "%s:" method) "/")))))
;; Local files.
(make-directory tmp-name)
(should (file-directory-p tmp-name))