Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add smartscan-scan-in-strings-modes #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add smartscan-scan-in-strings-modes #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions smartscan.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ either `smartscan-symbol-go-forward' or `smartscan-symbol-go-backward'")
(defvar smartscan-symbol-old-pt nil
"Contains the location of the old point")

(defvar smartscan-scan-in-strings-modes '(sh-mode cperl-mode)
"List of major modes to enable scanning in strings.

Normally, smartscan will ignore strings, but some languages can
have symbols inside strings (notably shell scripts and Perl).")

(make-local-variable 'smartscan-use-extended-syntax)

(defcustom smartscan-symbol-selector "word"
Expand Down Expand Up @@ -130,19 +136,22 @@ is valid."
(message (format "%s scan for symbol \"%s\""
(capitalize (symbol-name direction))
smartscan-last-symbol-name))
(smartscan-with-symbol
(unless (catch 'done
(while (funcall (cond
((eq direction 'forward) ; forward
're-search-forward)
((eq direction 'backward) ; backward
're-search-backward)
(t (error "Invalid direction"))) ; all others
(concat "\\<" smartscan-last-symbol-name "\\>") nil t)
(unless (memq (syntax-ppss-context
(syntax-ppss (point))) '(string comment))
(throw 'done t))))
(goto-char smartscan-symbol-old-pt))))
(let ((invalid-syntaxes '(string comment)))
(when (memq major-mode smartscan-scan-in-strings-modes)
(setq invalid-syntaxes '(comment)))
(smartscan-with-symbol
(unless (catch 'done
(while (funcall (cond
((eq direction 'forward) ; forward
're-search-forward)
((eq direction 'backward) ; backward
're-search-backward)
(t (error "Invalid direction"))) ; all others
(concat "\\<" smartscan-last-symbol-name "\\>") nil t)
(unless (memq (syntax-ppss-context (syntax-ppss (point)))
invalid-syntaxes)
(throw 'done t))))
(goto-char smartscan-symbol-old-pt)))))

;;;###autoload
(defun smartscan-symbol-go-forward ()
Expand Down