emacs: lisp/ido.el comparison

comparison lisp/ido.el @ 63476:a02cb15bf34c

2005-06-15 Matt Hodges <MPHodges@member.fsf.org> * ido.el (ido-incomplete-regexp): New variable. (ido-set-matches-1): Handle invalid-regexp error and set ido-incomplete-regexp. (ido-incomplete-regexp): New face. (ido-completions): Use it. (ido-complete, ido-exit-minibuffer, ido-completions): Handle incomplete regexps. (ido-completions): Add check for complete match when entering a regexp.

author	Kim F. Storm <storm@cua.dk>
date	Wed, 15 Jun 2005 22:44:09 +0000
parents	0e0fb0040526
children	6fb026ad601f 82d495f87e7b

comparison

equal deleted inserted replaced

-:69bb366fab26
+:a02cb15bf34c
 				 :width condensed))
 			       (t (:inverse-video t)))
 "*Font used by ido for highlighting its indicators."
 :group 'ido)
+(defface ido-incomplete-regexp
+'((t
+(:inherit font-lock-warning-face)))
+"Ido face for indicating incomplete regexps."
+:group 'ido)
 (defcustom ido-make-file-list-hook  nil
 "*List of functions to run when the list of matching files is created.
 Each function on the list may modify the dynamically bound variable
 `ido-temp-list' which contains the current list of matching files."
 :type 'hook
 (defvar ido-use-mycompletion-depth 0
 "Non-nil means use `ido' completion feedback.
 Is set by ido functions to the current minibuffer-depth, so that
 it doesn't interfere with other minibuffer usage.")
+(defvar ido-incomplete-regexp nil
+"Non-nil if an incomplete regexp is entered.")
 ;;; Variables with dynamic bindings.
 ;;; Declared here to keep the byte compiler quiet.
 ;; Stores the current ido item type ('file, 'dir, 'buffer, or 'list).
 (defun ido-complete ()
 "Try and complete the current pattern amongst the file names."
 (interactive)
 (let (res)
 (cond
+(ido-incomplete-regexp
+;; Do nothing
+)
 ((and (memq ido-cur-item '(file dir))
 	   (string-match "[$]" ido-text))
 (let ((evar (substitute-in-file-name (concat ido-current-directory ido-text))))
 	(if (not (file-exists-p (file-name-directory evar)))
 	    (message "Expansion generates non-existing directory name")
 	(exit-minibuffer))))
 (defun ido-exit-minibuffer ()
 "Exit minibuffer, but make sure we have a match if one is needed."
 (interactive)
-(if (or (not ido-require-match)
+(if (and (or (not ido-require-match)
-	   (ido-existing-item-p))
+(ido-existing-item-p))
+(not ido-incomplete-regexp))
 (exit-minibuffer)))
 (defun ido-select-text ()
 "Select the buffer or file named by the prompt.
 If no buffer or file exactly matching the prompt exists, maybe create a new one."
 			     (= (length ido-text) 0)))
 	 full-matches
 	 prefix-matches
 	 matches)
-(mapcar
+(setq ido-incomplete-regexp nil)
-(lambda (item)
+(condition-case error
-(let ((name (ido-name item)))
+(mapcar
-	 (if (and (or non-prefix-dot
+(lambda (item)
-		      (if (= (aref ido-text 0) ?.)
+(let ((name (ido-name item)))
-			  (= (aref name 0) ?.)
+(if (and (or non-prefix-dot
-			(/= (aref name 0) ?.)))
+(if (= (aref ido-text 0) ?.)
-		  (string-match re name))
+(= (aref name 0) ?.)
-	     (cond
+(/= (aref name 0) ?.)))
-	      ((and full-re (string-match full-re name))
+(string-match re name))
-	       (setq full-matches (cons item full-matches)))
+(cond
-	      ((and prefix-re (string-match prefix-re name))
+((and full-re (string-match full-re name))
-	       (setq prefix-matches (cons item prefix-matches)))
+(setq full-matches (cons item full-matches)))
-	      (t (setq matches (cons item matches))))))
+((and prefix-re (string-match prefix-re name))
-t)
+(setq prefix-matches (cons item prefix-matches)))
-items)
+(t (setq matches (cons item matches))))))
+t)
+items)
+(invalid-regexp
+(setq ido-incomplete-regexp t
+;; Consider the invalid regexp message internally as a
+;; special-case single match, and handle appropriately
+;; elsewhere.
+matches (cdr error))))
 (if prefix-matches
 	(setq matches (nconc prefix-matches matches)))
 (if full-matches
 	(setq matches (nconc full-matches matches)))
 (when (and (null matches)
 	(let* ((fn (ido-name (car comps)))
 	       (ln (length fn)))
 	  (setq first (format "%s" fn))
 	  (put-text-property 0 ln 'face
 			     (if (= (length comps) 1)
-				 'ido-only-match
+(if ido-incomplete-regexp
+'ido-incomplete-regexp
+'ido-only-match)
 			       'ido-first-match)
 			     first)
 	  (if ind (setq first (concat first ind)))
 	  (setq comps (cons first (cdr comps)))))
 	    (ido-directory-too-big
 	     (or (nth 9 ido-decorations) " [Too big]"))
 	    (ido-report-no-match
 	     (nth 6 ido-decorations))  ;; [No match]
 	    (t "")))
+	  (ido-incomplete-regexp
+(concat " " (car comps)))
 	  ((null (cdr comps))		;one match
-	   (concat (if (> (length (ido-name (car comps))) (length name))
+	   (concat (if (if (not ido-enable-regexp)
-		       ;; when there is one match, show the matching file name in full
+(= (length (ido-name (car comps))) (length name))
-		       (concat (nth 4 ido-decorations)  ;; [ ... ]
+;; We can't rely on the length of the input
-			       (ido-name (car comps))
+;; for regexps, so explicitly check for a
-			       (nth 5 ido-decorations))
+;; complete match
-		     "")
+(string-match name (ido-name (car comps)))
+(string-equal (match-string 0 (ido-name (car comps)))
+(ido-name (car comps))))
+""
+;; when there is one match, show the matching file name in full
+(concat (nth 4 ido-decorations)  ;; [ ... ]
+(ido-name (car comps))
+(nth 5 ido-decorations)))
 		   (if (not ido-use-faces) (nth 7 ido-decorations))))  ;; [Matched]
 	  (t				;multiple matches
 	   (let* ((items (if (> ido-max-prospects 0) (1+ ido-max-prospects) 999))
 		  (alternatives
 		   (apply

Mercurial > emacs

comparison lisp/ido.el @ 63476:a02cb15bf34c