mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-11 16:40:45 -08:00
cc0b713210
* lisp/progmodes/xref.el (xref-collect-references): Instead of calling `semantic-symref-find-references-by-name', use `semantic-symref-instantiate' and `semantic-symref-perform-search' directly. Ask for `line-and-text' results (bug#23223). (xref-collect-matches): Include the line text in the "hit" structure. (xref--convert-hits): New function, split off from `xref-collect-references' and `xref-collect-matches', to convert "hits" to xref instance list. Create a temporary buffer here, to use it for post-processing all hit lines. (xref--collect-matches): Use a different approach for non-visited files. Insert the line text into the temp buffer, apply the file's major mode the best we can without reading its whole contents, syntax-propertize, and search in the result. (xref--collect-matches-1): Extract, to handle the common logic between two cases. (xref--find-buffer-visiting): New function, a wrapper around `find-buffer-visiting' to amortize its cost. * lisp/cedet/semantic/symref/idutils.el (semantic-symref-idutils--line-re): New constant. (semantic-symref-parse-tool-output-one-line): Support result type `line-and-text'. * lisp/cedet/semantic/symref/grep.el (semantic-symref-grep--line-re) (semantic-symref-parse-tool-output-one-line): Same. * lisp/cedet/semantic/symref/cscope.el (semantic-symref-cscope--line-re) (semantic-symref-parse-tool-output-one-line): Same. * lisp/cedet/semantic/symref/global.el (semantic-symref-global--line-re) (semantic-symref-parse-tool-output-one-line): Same.
83 lines
2.9 KiB
EmacsLisp
83 lines
2.9 KiB
EmacsLisp
;;; semantic/symref/idutils.el --- Symref implementation for idutils
|
|
|
|
;;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <eric@siege-engine.com>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Support IDUtils use in the Semantic Symref tool.
|
|
|
|
(require 'cedet-idutils)
|
|
(require 'semantic/symref)
|
|
|
|
;;; Code:
|
|
;;;###autoload
|
|
(defclass semantic-symref-tool-idutils (semantic-symref-tool-baseclass)
|
|
(
|
|
)
|
|
"A symref tool implementation using ID Utils.
|
|
The udutils command set can be used to generate lists of tags in a way
|
|
similar to that of `grep'. This tool will parse the output to generate
|
|
the hit list.
|
|
|
|
See the function `cedet-idutils-search' for more details.")
|
|
|
|
(cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-idutils))
|
|
"Perform a search with IDUtils."
|
|
(let ((b (cedet-idutils-search (oref tool :searchfor)
|
|
(oref tool :searchtype)
|
|
(oref tool :resulttype)
|
|
(oref tool :searchscope)
|
|
))
|
|
)
|
|
(semantic-symref-parse-tool-output tool b)
|
|
))
|
|
|
|
(defconst semantic-symref-idutils--line-re
|
|
"^\\(\\(?:[a-zA-Z]:\\)?[^:\n]+\\):\\([0-9]+\\):")
|
|
|
|
(cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-idutils))
|
|
"Parse one line of grep output, and return it as a match list.
|
|
Moves cursor to end of the match."
|
|
(cond ((eq (oref tool :resulttype) 'file)
|
|
;; Search for files
|
|
(when (re-search-forward "^\\([^\n]+\\)$" nil t)
|
|
(match-string 1)))
|
|
((eq (oref tool :searchtype) 'tagcompletions)
|
|
(when (re-search-forward "^\\([^ ]+\\) " nil t)
|
|
(match-string 1)))
|
|
((eq (oref tool :resulttype) 'line-and-text)
|
|
(when (re-search-forward semantic-symref-idutils--line-re nil t)
|
|
(list (string-to-number (match-string 2))
|
|
(expand-file-name (match-string 1) default-directory)
|
|
(buffer-substring-no-properties (point) (line-end-position)))))
|
|
(t ; resulttype is line
|
|
(when (re-search-forward semantic-symref-idutils--line-re nil t)
|
|
(cons (string-to-number (match-string 2))
|
|
(expand-file-name (match-string 1) default-directory))
|
|
))))
|
|
|
|
(provide 'semantic/symref/idutils)
|
|
|
|
;; Local variables:
|
|
;; generated-autoload-file: "../loaddefs.el"
|
|
;; generated-autoload-load-name: "semantic/symref/idutils"
|
|
;; End:
|
|
|
|
;;; semantic/symref/idutils.el ends here
|