mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

ruby-mode: Better detect regexp vs division (bug#67569)

Browse Source 
* lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re):
Add grouping around methods from the whitelist.
(ruby-syntax-propertize): Also look for spaces around the slash.
This commit is contained in:
Dmitry Gutov 2023-12-09 19:04:55 +02:00
parent 0f361cc985
commit 91f2ade57b
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/progmodes/ruby-mode.el
View File

@ -2124,7 +2124,7 @@ It will be properly highlighted even when the call omits parens.")
"or" "not" "&&" "||"))
;; Method name from the list.
"\\|\\_<"
(regexp-opt ruby-syntax-methods-before-regexp)
(regexp-opt ruby-syntax-methods-before-regexp t)
"\\)\\s *")
"Regexp to match text that can be followed by a regular expression."))
@ -2182,14 +2182,20 @@ It will be properly highlighted even when the call omits parens.")
(when (save-excursion
(forward-char -1)
(cl-evenp (skip-chars-backward "\\\\")))
(let ((state (save-excursion (syntax-ppss (match-beginning 1)))))
(let ((state (save-excursion (syntax-ppss (match-beginning 1))))
division-like)
(when (or
;; Beginning of a regexp.
(and (null (nth 8 state))
(save-excursion
(setq division-like
(or (eql (char-after) ?\s)
(not (eql (char-before (1- (point))) ?\s))))
(forward-char -1)
(looking-back ruby-syntax-before-regexp-re
(line-beginning-position))))
(line-beginning-position)))
(not (and division-like
(match-beginning 2))))
;; End of regexp. We don't match the whole
;; regexp at once because it can have
;; string interpolation inside, or span

12
test/lisp/progmodes/ruby-mode-tests.el
View File

@ -157,6 +157,18 @@ VALUES-PLIST is a list with alternating index and value elements."
(ert-deftest ruby-regexp-is-not-mistaken-for-slash-symbol ()
(ruby-assert-state "x = /foo:/" 3 nil))
(ert-deftest ruby-slash-not-regexp-when-surrounded-by-spaces ()
(ruby-assert-state "x = index / 3" 3 nil))
(ert-deftest ruby-slash-not-regexp-when-no-spaces ()
(ruby-assert-state "x = index/3" 3 nil))
(ert-deftest ruby-regexp-not-division-when-only-space-before ()
(ruby-assert-state "x = index /3" 3 ?/))
(ert-deftest ruby-slash-not-regexp-when-only-space-after ()
(ruby-assert-state "x = index/ 3" 3 nil))
(ert-deftest ruby-indent-simple ()
(ruby-should-indent-buffer
"if foo