@@ -185,7 +185,8 @@ function." ;; http://chopmo.blogspot.com/2008/09/quickly-jumping-to-symbols.html (defun textmate-goto-symbol () - "Will update the imenu index then use your completing read to jump to a symbol." + "Update the imenu index and then use ido to select a symbol to navigate to. +Symbols matching the text at point are put first in the completion list." (interactive) (imenu--make-index-alist) (let ((name-and-pos '()) @@ -210,7 +211,18 @@ function." (add-to-list 'symbol-names name) (add-to-list 'name-and-pos (cons name position)))))))) (addsymbols imenu--index-alist)) - (let* ((selected-symbol (textmate-completing-read "Symbol: " symbol-names)) + ;; If there are matching symbols at point, put them at the beginning of `symbol-names'. + (let ((symbol-at-point (thing-at-point 'symbol))) + (when symbol-at-point + (let* ((regexp (concat (regexp-quote symbol-at-point) "$")) + (matching-symbols (delq nil (mapcar (lambda (symbol) + (if (string-match regexp symbol) symbol)) + symbol-names)))) + (when matching-symbols + (sort matching-symbols (lambda (a b) (> (length a) (length b)))) + (mapc (lambda (symbol) (setq symbol-names (cons symbol (delete symbol symbol-names)))) + matching-symbols))))) + (let* ((selected-symbol (ido-completing-read "Symbol? " symbol-names)) (position (cdr (assoc selected-symbol name-and-pos)))) (goto-char position)))) textmate.el acd201947250bfcb1a26138d175cf33a77779b1b Augie Fackler durin42@gmail.com http://github.com/defunkt/textmate.el/commit/44ee782f992fbd46c05a62bca6857e62d1e4cda3 44ee782f992fbd46c05a62bca6857e62d1e4cda3 2009-09-19T10:59:47-07:00 2009-09-15T15:20:34-07:00 I had an improved varation on this in my emacs setup. No idea where it is from. 914b4d63f24511c9480ad865c149ce8f31c1ab3d Chris Wanstrath chris@ozmm.org